WIP: Add remix to maps

Not sure why I remixed lines originally.