Jonnie/dev

Merged code for demo.