Refactory
Merge pull request #6 from gotdibbs/stats

Refactory