Doc-ed and a little more testing. Ready for checkpoint