Beginning of final refactor