Finalized JSON changes, leaving old system commented for ease of translation during impending update.