Mostly done

TODO list shows what is left to complete