Adding underscore
Filling in some initial data to work with
Merge branch 'chrisrw/implement-models'