Move around methods
A terribly large commit that shouldve been broken up