Big refactor :) Implemented up to roll and re-roll for first player