0529 common_2

Wanted to put nonpersonnel and personnel into one pull request, but it will be big. Please review #265 first since this one is based on #265(nonpersonnel).