Removed hardcoded models[0] limitations.  Rejigged hierarchy bits and pieces.

Fixes #22