Created by: ecoulson
Merging into master with current evaluation tree implementation. Currently passes all tests