Begin work on improving 610 mapping in marcframe