Bring over complete score class, fix formatting

oh, how much i love moving between ides, and their different means of
handling tabs/spaces