Feature/score keeping