Pre-demo push

very basic stuff works