revert started refactoring (building it up new in another module)