added todo comments from meeting with Silvio