Add check to make sure order of operations happens properly
swapped structures to make writing e-mail body easier