Added a bunch of stuff to analysis for breaking into different aggregates