Attached in case anyone has time to review before I get a chance to
test it.