Making the move work
Some consolidation refactoring