Feature/review controller

Closes #140