Refactored and added window size features.
refactor order of classes and splitting out methods