Move more game-specific collision actions to game, outside of gramework.
Resolve merge.