WORK IN PROGRESS / NO CRASHERS

* Refactored fetching code on controller and in agents so
that it can later more easily be extracted out into boilerplate
modules.