More re-factoring. Created a method that rolls a spare.