added new TODOs for features to implement