Pull request for initial feedback

Typically the API should respond with JSON code, rather than HTML