Creating branch for the mappers feature so I can switch to a new machine, and also in case it takes me awhile to get these tests back up and running.