Put off the usability issues for another time, added the class for the window, and replaced everything that relied on the old system