More score stuff

Still not finished