Changed some ref logic. Preparing to handle standard Yahtzee