much refactoring was had
and there was rejoicing throughout the land