completes #1395 - nested model for organizations