Some work on the category controller.