Moved a few things around and starting making models