Finished the demo controller