initial commit on azure
merge conflicts