gonna add score stuff and merge conflicts
fixed merging to add score