Refactoring, and restarting development!