Fixed tests, all passing
Added new category functionality