Added a controller to factor methods even more
.