Added main loop and ability to re-roll