Experimental branch: Finish new category impl