Adding Map loading and drawing