Initial commit for making the mapper more portable.