Copied across paul saxman's demo
demo working with new json format