Added scoring as discussed 11/25
Merge w/ latest master