Proper categorization.

Frick!