Missed this in initial commit. Copy error/failure on first pass.
Corresponds to Henry's updates of 1/26/2019 plus "roughly half" fix.