Merge pull request #7 from catburston/development

Basic functionality & model tests
Merge pull request #8 from catburston/master

Merge pull request #7 from catburston/development