Moved a few things around for better structure