Started working on a better map