Working on separating player from map logic