Merge pull request #5 from wesleyeewong/master

added a couple of classes and one interface
moved files into model package
Merge pull request #3 from jsuit/master

Moved your most recent files into the model package