Now returns JSON!

Now returns what it should.
Merge API