Fixed bug
Refactored stats to another file -- cleaned up controller
Latest changes