WIP: Create additional personName fields
Merge changes from master
WIP. Saving place.
Working now, but still needs more testing.
Working now after more testing. Now on to removing them...