Refactor, added dices, started on gam