Refactoring & started game mechanics