Almost demo-ready

Needs final review