JK: Working on fixing JSON construction.