added more filter options. Not quite functional yet, but close