Close to the final commit on this stuff.