Refactoring to start a new demo based on lessons learned over the last few days.