add TODO items from AP & JC