MVP, got the stats working correctly, cleaned up some methods