[OSS Oxon] Swim 40/41 Catchup