Remove count from category, move build logic from CategoryBuilder, put in CRData