Start of the Makers....

And some JSON fixes.