Made stuff more category-based.