Re-adds score, removes old shape class

Closes Issue #12
Resolve merge conflict.
Resolve merge conflict.