Moved some things around to allow for faster development