annotated models
Merge pull request #50 from calblueprint/varun/annotate

annotated models
merging in master