Pre-Cleanup version ready

Basic GUI functioning, PreCleanup version has lots of legacy code, will
remove before version 1.0 released