Starting to add scoring functionality