new types, some moving tsuff around, more model defs, containment parsing.

Signed-off-by: dvorkinista <villain@noironetworks.com>