OT-2824 surepost

Im not sure if we'll ever need this.