Progress on 6 Dec

The commit messages describe my progress.

Meanwhile, I recommend you update your section of the TODO yourself. I have left it empty. See to it