Everything in the demo is now working