Tried to make Gavin.dia tractable. Added "has" everywhere, basically.