Renamed a few things, also adding things onto the window at the best place now