Added score stuff to Colin's branch