start of cleaning up editor code
everything working in cleanup except save/load
most of refactoring complete