Feature/stats special

3rd time lucky! I don't understand how Aaron's commit is included with this, but I guess you do, @jonlemmon !