Finished 9.6.2, including supporting test, that was the hard part.