Demo ready

Let's merge the previous demo branch into master for now