I1: Implement 'Categories'
Fixed commit comments