Completed first draft of Mapping Resolver implementation