Start managing categories. Still in progress
Manage categories, various fixes