A few new notes to the TODO list