Moved some code around and worked on the setup file a bit