[dcs] Add catchr/catwch and tests