move mapper out of here