roughed in scoring, not currently working
merge conflicts