Changed my mind about a few things.  I now have both definitions of a subcategory.
Merge branch 'dev'