todo list updated with Matt's remarks