V1beta16

Brian - PTAL?