Initial commit from current working sources