Refactored using controllers, started stats