continue on json loading refactor