Almost finished implementing stats