Reorganised TODO list