Yet more progress... I should probably do some sort of final sprint.