This is a punt for now, going to do a better job handling mapping so that it can happen in 1 place.