Split things up, make stats methods work