Integrate Code on TFS Master

Connor and Christian Code