Created valueMapper but realizing we have done large portion of work already