Moved a few things around

102 to be exact...