Post-demo commit

Commit after frantic scramble to get things ready for demo