More work on framework to allow for stats handling