Chris Initial Commit
Resolves Merge Conflict