Moved a bunch of stuff around
I don't want to forget about this