gh-4
Refactored the entire controller