Shoved everything in because my past commits weren't pushed :(