annotated models

Annotated models

Fixes #49