Started work on redoing map command