created two versions, not running yet
first draft without test code yet
removed all deleted files
submitted and passed, changed to string for dpid