Demonstration Preparation

Getting things ready for demo.