Megarefactoring; small commits from now on