Developing new jsonoa model, not complete yet. Some minor fixes from
demo.