Added refactoring plan because that code wasn't going to work out