added in map data, and collision with movement.