Big Commit of stuff that should have been seperated