Huge Commit

Please ignoree

Major refactoring incoming