More progress, does not run
Mostly done, just a bit of work perfecting the rendering left