move that to the base model instead