more todos from meeting with Martin