NEW: moved the TODO list in here