Should we make these use the mapping object you made earlier?