Lunchtime push of changes: Re-annotated model classes for relationships, Typed Queries for retrieval, zero-argument constructors.