Moved a bunch of crap around