FInished demo v1
Change for deploy
Final tweaks