Refactor dice rolls
Refactor movement commands