Ready for initial demo

8th commit