Add in achievements for scores
typo
temp fix
Add tests, move some stuff to scopes, clean up a bit