expanded on existing and added new TODOs