Added in Dougs Code from Saturday
Merged Commits
Performed Manual Merge