TODO: Change "addMultiple" to not require a map. That only exists so I could import easily from my old project.