Added more category stuff, just need to filter by categories now which is dead simple.