branch working on category indexes
merged branch back in i think