Adding class to hold averages