Additions to the TODO list