Version 1.0 Merge.

This is version 1.0 merging to the repo.