Added score and progress handling
Fixed merge conflicts