Merge pull request #29 from cptmashek/master

Migrating bulk of code to core
Merge pull request #30 from cptmashek/master

Blanked out JSON