Massive amounts of cleanup.  Write ConductorManager for light manipulation (currently unused)