Merge pull request #8 from HeisenBugDev/Controller

more work on the controller
More work on JSON
Merge pull request #9 from HeisenBugDev/Json

More work on JSON