Initial support for partial mappings.  Still needs a UI.