Initial merge from local work to github.