merge of ahaefner_yk_json_for_realz