Refactoring
Test Refactoring
Added controller