Caroline to Master 

Adds changes made by Corbin, including algorithm.