And I think that's a wrap on the front-end. Finished the aggregation matrices, done a bit more tidying