Initial merge to master

Putting the initial code into master