Mungemap

This restores the mungemap proposal against HEAD