some cleanup
Merge branch 'master' into Menu
come cleanup
Merge branch 'master' into Menu
commit to save
Commit to save

Decided to use dialog boxes instead of new frames
Added in some new TODOs
some refactoring