V2

@mcdonamp 

This update includes changes for the new login methods. There was a global change to UID from ID.