almost passing cucumber for categories
merge conflicts