Derek/ Filtering Categories

Filtering by category works, might bring in a couple new bugs.