code review TODOs from Ben