Slowly getting functionality back to stats