Lots to be done here
Merge pull request #6 from rkophs/JSONrefactor

Lots to be done here