saving changes real quick to help John
Merge branch 'editpersons'