Refactor started, new aggregation not yet hooked in.
Merge branch 'master' of github.com:killrweather/killrweather