Revert "Revert "problem with container model validation fixed""
Revert "Revert "problem with container model validation fixed""

This reverts commit 44c7dd4d33ae4032a389eafa86a1c228460156a1.

acurrieclark/clocktower,acurrieclark/clocktower,acurrieclark/clocktower