Re-write of window parameters to make them encapsulated within the Window class. This will allow new class types more easily