Initial commit from master again
checkpoint Oct27 again