In the middle of getting the demo to work