Last files from the demo

Everything after this is fresh development