Refactoring is starting to settle down...

Need to start thinking about unit tests, troubleshooting soon.
NEED to figure out how to break up the WindowStateManager class!