Fixed the demo module for now. This is all probably going to be rewritten