Working except for tidy up after scores are displayed