making progress on remap