Moved things around and cleaned up code (also added some things)