I1: Implement 'Categories'
Fixed comments for commit 9dc5795912e32b9aabeaae94d5c5213bc0942ac5