Broke all the player stuff because I took Map

This fixes it.