Add string
Split out call
Move around the atomic types