Private Repo Commit

Attempting to create a pathway for merging into Chris' repo.
2nd private repo commit

For some reason my first commit didn't include all file changes, so
adding these now.