added categories, not completely working yet