Added # TODOs for all outstanding review comments