Big changes!

Added Window class to replace Editor class.  This caused some refactoring...