completes #1389 - nested model for work