Add some todos from meeting with Stig