Feature/model

Initial thoughts on data model.