Minor refactoring, fixed roll method, need some clarification from partner to continue