Another 2 hour tidying session. The productive phase continues.