Custom mapping working--needs further testing.