refactor treatments to allow for arbitrary fields