first commit from working dev code