Branch chris

##Merging feedback into the Master branch.##