Some more work on TODO list handling