Pretty much final version of the demo