More progress towards a demo