Server now can use categories

Please merge me