Working category version
Cleaning
Merge branch 'addingCategories'