First round of updates for new subtype.  Still have edit and tests