Adding category.
Tidying.
Category validation.
Category validation.