Progress on JSON importing