Added a pie aggregator.
Wrote more tests.
Rename server to watcher.