rejiggering data model (again)