Basic map functionality working again.