got the mapping questions to work as intended