TODOs from team code review (go team duck punchers)