Fix up fixtures/expectations
For fields, recognize when a field may refer to another entity and use an integer _id field rather than the custom type/entity
Refactor builder to use ERB files and make model more like a data-only presenter class.