Require Mockery
Let's use a controller instead
Merge branch 'feature/controller' into develop