More work on the mapper.  Not ready yet