Moved some more stuff
Split out some more things