tlubke refined ideas for refactoring, untested