Refactored server made runnable.
Support for plans.
Use "adder" more consistently, add filter and (unfinished) context method.
Actually add in the filters, and update tests to use the refactored
builder. (Most are passing!)