Rough first pass at embedded relationships