Some progress towards refactoring!