More progress towards a working prototype.