Faris/Akash - #1709 - moving JSON calls into separate controller - WIP, tests still broken