Moved alot of stuff, and made things better