DEP-80

review, added new TODOs