added comments in todos for Richard to follow up