Trying to fix save_and_reroll & integrate into roll()