Some further progress with the TODO list section