Some more work on getting the base of the demo - will take out certain parts later.