Started breaking out the mappings.