Score class added.
some merged changes still to be comitted