Refactoring entity collision
Adding custom keybindings