json-entities: even more progress
json-entities: last progress?