not sure if you wanted to get rid of `Model` too, happy to revert that one