WIP
First pass - all over but the lambdas
Ranges now a lamdba, fix specs.
Remove excess debugging.
Term and Date filter refactor.
Simplify TermSearch integration.
delete. Oops.