David Price

Continued work on data model