Prep for application data

Fixing up assignee disambiguation and some preparatory commits for integrating application and grant data