I sense a refactoring coming