Work on JsonAdapterEx - unit test passes, with hacks