Recomitting everything

Roulette could be so much cleaner and separated