Changes to alot of stuff
New commit