Implement upgrade types with categories
Test data file wasn't correct.
Continue with type as category.
Getting rid of Upgrade sub-classes.
More work on types as categories.