I did get a little bit more done today, but, as expected, did not have time to finish. However, I am now at a point where I am confident of finishing tomorrow. The update will be posted some time tomorrow evening, although stats will have to a wait another day or so.
Reserved for update, part 1.