WIP - More JSON support.