more work from yesterday, ready for demo