Woah! Big commit, build works! Time to cleanup