some TODOs in our refactoring