add some todo/notes for refactoring