making progress with remapping everything