Refactor complete, one last commit before removing the old code