First pass at #233 (O000169.yaml)