A first (slightly ugly) pass at inclusion and category filters. Resolves #44.