Overview Demo Complete and Cleanup

Overview Demo Script Complete.  General structure cleanup