initial commit from current dev code on Edam