Added scoring as discussed 11/25