Basic refactor complete.