Final Commit of Phase 2
Merge remote-tracking branch 'wes/master' into merging
merged and updated