Added Filtering Functionality

Requires db update
Merge pull request #10 from grimSkepsis/Mike's-Branch

Added Filtering Functionality