Finish and clean up controller
Merge pull request #13 from devin-liu/leonard

Finish and clean up controller