Wip of Konrad, but happy with the current progress!