commit for some progress - need to test single versus dictionary version