- Adding ModelManagers for several shapes
  * lacking unit tests..