revert some of yesterday's changes to get back to serving the correct json
Changes so that barebones implementation is available for Nigel to test against (despite chema changing overnight tonight)