- More work fleshing out data model