More General Improvements

Working on getting everything demoable for the presentation