Added Mark's remarks to the TODO list