Working on proper handling for dragging map