Updating for better demo

Lots of refactoring and updating to clean up the code and make for a better demo.