Continuing ye olde refactor