add TODO items from meeting with JC and Ap