Trying to get the mapping working fully