Cleaning up some stuff
Cleaning up the test data
adding in demo mode