Started working on the mapping task again