Todo lists, and tidying up....