Merged my files from internal

This is a merge of my files from our internal "approval to start open source" development repo.