diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index 4084eb66..dd662c40 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -42,8 +42,7 @@ If an item contains spaces, it should be surrounded by " or '.
 <Date> ::= <Year>-<Month>-<Day>
 <DateTime> ::= <Year>-<Month>-<Day>(<Space>|T)<Hour>:<Minute>
 <Time> ::= <Year>-<Month>-<Day>(<Space>|T)<Hour>:<Minute>[:<Second>[.<MilliSeconds>[Z]]]
-<PrintJobAge> ::= <Number>(m|h|d)
-<REPattern> ::= <Python Regular Expression, see: https://docs.python.org/2/library/re.html>
+<RegularExpression> ::= <Python Regular Expression, see: https://docs.python.org/2/library/re.html>
 <Tag> ::= <String>
 <UniqueID> ::= uid:<String>
 
@@ -58,7 +57,7 @@ If an item contains spaces, it should be surrounded by " or '.
 <CourseID> ::= <Number>|d:<CourseAlias>
 <CourseParticipantType> ::= teacher|teachers|student|students
 <CrOSID> ::= <String>
-<CrOSItem> ::= <CrOSID>|(query:<Query>)|(query <Query>)
+<CrOSItem> ::= <CrOSID>|(query:<QueryCrOS>)|(query <QueryCrOS>)
 <DomainAlias> ::= <String>
 <DriveFileACLRole> :: =commenter|editor|owner|reader|writer
 <EventColorIndex> ::== <Number in range 1-11>
@@ -75,25 +74,36 @@ If an item contains spaces, it should be surrounded by " or '.
 <FieldName> ::= <String>
 <FileName> ::= <String>
 <FileNamePattern> ::= <String>
+<FilterID> ::= <Sttring>
 <FolderName> ::= <String>
 <GroupItem> ::= <EmailAddress>|<UniqueID>|<String>
 <HostName> ::= <String>
 <Key> ::= <String>
+<LabelID> ::= <String>
 <LabelName> ::= <String>
 <LabelReplacement> ::= <String>
 <Marker> ::= <String>
 <MobileID> ::= <String>
-<MobileItem> ::= <MobileID>|(query:<Query>)|(query <Query>)
+<MobileItem> ::= <MobileID>|(query:<QueryMobile>)|(query <QueryMobile>)
 <Name> ::= <String>
 <NotificationID> ::= <String>
 <OrgUnitID> ::= <String>
 <OrgUnitPath> ::= /|(/<String)+
 <PermissionID> ::= id:<String>|<EmailAddress>|anyone|anyonewithlink
 <PrinterID> ::= <String>
+<PrintJobAge> ::= <Number>(m|h|d)
 <PrintJobID> ::= <String>
+<PrintJobStatus> ::= done|error|held|in_progress|queued|submitted
 <PropertyKey> ::= <String>
 <PropertyValue> ::= <String>
-<Query> ::= <String>
+<QueryContact> ::= <String> See: https://developers.google.com/google-apps/contacts/v3/reference#contacts-query-parameters-reference
+<QueryCrOS> ::= <String> See: https://support.google.com/chrome/a/answer/1698333?hl=en
+<QueryDriveFile> :: = <String> See: https://developers.google.com/drive/v2/web/search-parameters 
+<QueryGmail> ::= <String> See: https://support.google.com/mail/answer/7190
+<QueryMobile> ::= <String> See: https://support.google.com/a/answer/1408863?hl=en#search
+<QueryPrinter> ::= <String> See: https://developers.google.com/cloud-print/docs/appInterfaces#search
+<QueryPrintJob> ::= <String> See: https://developers.google.com/cloud-print/docs/appInterfaces#parameters_3
+<QueryUser> :: = <String> See: https://developers.google.com/admin-sdk/directory/v1/guides/search-users
 <RequestID> ::= <String>
 <ResourceID> ::= <String>
 <RoleItem> ::= <UniqueID>|<String>
@@ -234,6 +244,9 @@ If an item contains spaces, it should be surrounded by " or '.
 <MobileOrderByFieldName> ::=
 	deviceid|email|lastsync|model|name|os|status|type
 
+<OrgUnitFieldName> ::=
+	description|id|inherit|name|orgunitpath|parent|parentid|inherit
+
 <PrintJobOrderByFieldName> ::=
 	create_time|status|title
 
@@ -243,7 +256,7 @@ If an item contains spaces, it should be surrounded by " or '.
 	changepasswordatnextlogin|changepassword|
 	creationtime|
 	deletiontime|
-	email|emails|
+	email|emails|otheremail|otheremails|
 	externalids|externalid|
 	familyname|firstname|fullname|givenname|lastname|name|
 	id|
@@ -254,6 +267,7 @@ If an item contains spaces, it should be surrounded by " or '.
 	ismailboxsetup|
 	lastlogintime|
 	noneditablealiases|aliases|nicknames|
+	notes|note|
 	organizations|organization|
 	orgunitpath|org|ou|
 	phones|phone|
@@ -261,6 +275,7 @@ If an item contains spaces, it should be surrounded by " or '.
 	relations|relation|
 	suspended|
 	thumbnailphotourl|photo|photourl|
+	websites|website|
 	custom all|<SchemaNameList>
 
 <UserOrderByFieldName> ::=
@@ -277,6 +292,7 @@ If an item contains spaces, it should be surrounded by " or '.
 <EmailAddressList> ::= '<EmailAddress>(,<EmailAddress>)*'
 <EventIDList> ::= '<EventID>(,<EventID>)*'
 <FileFormatList> ::= '<FileFormat>(,<FileFormat)*'
+<FilterIDList> ::= '<FilterID>(,<FilterID>)*'
 <GroupFieldNameList> ::= '<GroupFieldName(,<GroupFieldName>)*'
 <GroupSettingsFieldNameList> ::= '<GroupSettingsFieldName(,<GroupSettingsFieldName>)*'
 <GroupList> ::= '<GroupItem>(,<GroupItem>)*'
@@ -311,7 +327,7 @@ If an item contains spaces, it should be surrounded by " or '.
 		(file <FileName>)|
 		(csvfile <FileName>:<FieldName>)|
 		(license|licenses|licence|licences <SKUIDList>)|
-		(query <Query>)
+		(query <QueryUser>)
 
 
 # Item attributes
@@ -410,9 +426,10 @@ If an item contains spaces, it should be surrounded by " or '.
 	(externalid|externalids clear|(account|customer|network|organization|<String> <String>))|
 	(firstname|givenname <String>)|
 	(gal|includeinglobaladdresslist <Boolean>)|
-	(im|ims clear|(type work|home|other|(custom <String>) protocol aim|gtalk|icq|jabber|msn|net_meeting|qq|skype|yahoo|(custom_protocol <String>) [primary] <String>))|
+	(im|ims clear|(type work|home|other|(custom <String>) protocol aim|gtalk|icq|jabber|msn|net_meeting|qq|skype|yahoo|(custom_protocol <String>) <String> [notprimary|primary]))|
 	(ipwhitelisted <Boolean>)|
 	(lastname|familyname <String>)|
+	(note|notes clear|([text_plain|text_html] <String>|(file <FileName>)))|
 	(organization|organizations clear|([type domain_only|school|unknown|work] [customtype <String>] [name <String>] [title <String>] [department <String>] [symbol <String>]
 		[costcenter <String>]  [location <String>] [description <String>] [domain <String>] notprimary|primary))|
 	(org|ou|orgunitpath <OrgUnitPath>)
@@ -421,6 +438,7 @@ If an item contains spaces, it should be surrounded by " or '.
 		[value <String>] notprimary|primary))|
 	(relation|relations clear|(spouse|child|mother|father|parent|brother|sister|friend|relative|domestic_partner|manager|assistant|referred_by|partner|<String> <String>))|
 	(suspended <Boolean>)|
+	(website|websites clear|(home_page|blog|profile|work|home|other|ftp|reservations|app_install_page|<String> <URL> [notprimary|primary]))|
 	(<SchemaName>.<FieldName> [multivalued|multivalue|value] <String>)
 
 
@@ -428,7 +446,7 @@ gam version
 gam help
 
 gam batch <FileName>|- [charset <Charset>]
-gam csv <FileName>|- [charset <Charset>] [matchfield <FieldName> <PythonRegularExpression>] gam <GAM argument list>
+gam csv <FileName>|- [charset <Charset>] [matchfield <FieldName> <RegularExpression>] gam <GAM argument list>
 
 gam oauth|oauth2 create|request
 gam oauth|oauth2 delete|revoke
@@ -457,6 +475,8 @@ gam print domains [todrive]
 gam create domainalias|aliasdomain <DomainAlias> <DomainName>
 gam delete domainalias|aliasdomain <DomainAlias>
 gam info domainalias|aliasdomain <DomainAlias>
+gam print domainaliases|aliasdomains [todrive]
+
 
 gam info customer
 gam update customer [adminsecondaryemail|alternateemail <EmailAddress>] [language <LanguageCode] [phone|phonenumber <String>]
@@ -480,7 +500,7 @@ gam update org|ou <OrgUnitPath> [name <Name>] [description <String>] [parent <Or
 gam update org|ou <OrgUnitPath> add|move <CrOSTypeEntity>|<UserTypeEntity>
 gam delete org|ou <OrgUnitPath>
 gam info org|ou <OrgUnitPath> [nousers] [children|child]
-gam print orgs|ous [todrive] [toplevelonly] [from_parent <OrgUnitPath>] [allfields|([name] [description] [parent] [id] [parentid] [inherit])]
+gam print orgs|ous [todrive] [toplevelonly] [from_parent <OrgUnitPath>] [allfields|<OrgUnitFieldName>*]
 
 gam create alias|nickname <EmailAddress> user|group|target <UniqueID>|<EmailAddress>
 gam update alias|nickname <EmailAddress> user|group|target <UniqueID>|<EmailAddress>
@@ -494,7 +514,7 @@ gam audit activity delete <EmailAddress> <RequestID>
 gam audit activity download <EmailAddress> <RequestID>
 gam audit activity status [<EmailAddress> <RequestID>]
 
-gam audit export request <EmailAddress> [begin <DateTime>] [end <DateTime>] [search <Query>] [headersonly] [includedeleted]
+gam audit export request <EmailAddress> [begin <DateTime>] [end <DateTime>] [search <QueryGmail>] [headersonly] [includedeleted]
 gam audit export delete <EmailAddress> <RequestID>
 gam audit export download <EmailAddress> <RequestID>
 gam audit export status [<EmailAddress> <RequestID>]
@@ -513,22 +533,40 @@ gam calendar <CalendarItem> addevent <EventAttributes>+
 gam calendar <CalendarItem> wipe
 
 gam update cros <CrOSItem> <CrOSAttributes>+
-gam info cros <CrOSItem>
-gam print cros [todrive] [query <Query>] [basic|full] [nolists|recentusers|timeranges] [listlimit <Number>]
-	[orderby <CrOSOrderByFieldName> [ascending|descending]]
-gam <CrOSTypeEntity> update <CrOSAttributes>+
+gam info cros <CrOSItem> [nolists] [listlimit <Number>]
+	[basic|full|allfields] <CrOSFieldName>* [fields <CrOSFieldNameList>]
+
+gam print cros [todrive] [query <QueryCrOS>]
+	[orderby <CrOSOrderByFieldName> [ascending|descending]] [nolists] [listlimit <Number>]
+	[basic|full|allfields] <CrOSFieldName>* [fields <CrOSFieldNameList>]
 gam <CrOSTypeEntity> print
 
+Summary of printing:
+gam print cros
+Prints a header row and deviceId for all CrOS devices.
+gam <CrOSTypeEntity> print cros
+Prints no header row and deviceId for specified CrOS devices
+gam print cros ... basic|full
+Prints a header row and selected fields for specified CrOS devices.
+
+The basic argument yields these column headers: deviceId,annotatedAssetId,annotatedLocation,annotatedUser,lastSync,notes,serialNumber,status
+The full argument yields all column headers including two headers, recentUsers and activeTimeRanges,
+that repeat with two subvalues each, yielding a large number of columns that make the output hard to process.
+The nolists argument suppresses these two headers; if you want these headers in a more manageable form use the following arguments.
+The listlimit <Number> argument limits the number of repetitions to <Number>. If <Number> equals zero, there is no limit.
+If recentusers is specified as a field, each pair of values for recentUsers is put on a separate row with all of the other headers.
+If timeranges is specified as a field, each  pair of values for activeTimeRanges is put on a separate row with all of the other headers.
+
 gam update mobile <MobileItem> <MobileAttributes>+
 gam delete mobile <MobileItem>
 gam info mobile <MobileItem>
-gam print mobile [todrive] [query <Query>]
+gam print mobile [todrive] [query <QueryMobile>]
 	[orderby <MobileOrderByFieldName> [ascending|descending]]
 
 gam create group <EmailAddress> <GroupAttributes>*
 gam update group <GroupItem> [admincreated <Boolean>] [email <EmailAddress>] <GroupAttributes>*
 gam update group <GroupItem> add [owner|manager|member] <UserTypeEntity>
-gam update group <GroupItem> remove [owner|manager|member] <UserTypeEntity>
+gam update group <GroupItem> delete|remove [owner|manager|member] <UserTypeEntity>
 gam update group <GroupItem> sync [owner|manager|member] <UserTypeEntity>
 gam update group <GroupItem> update [owner|manager|member] <UserTypeEntity>
 gam delete group <GroupItem>
@@ -537,9 +575,11 @@ gam update group <GroupItem> clear [owner] [manager] [member]
 
 gam print groups [todrive] ([domain <DomainName>] [member <UserItem>])
 	[maxresults <Number>] [delimiter <String>]
-	[members] [owners] [managers] <GroupFieldName>* [settings] 
+	[members] [owners] [managers] [settings] <GroupFieldName>* [fields <GroupFieldNameList>|<GroupSettingsFieldNameList>]
 
-gam print group-members|groups-members [todrive] ([domain <DomainName>] [member <UserItem>])|[group <GroupItem>] [membernames] [fields <MembersFieldNameList>]
+
+gam print group-members|groups-members [todrive] ([domain <DomainName>] [member <UserItem>])|[group <GroupItem>]
+	[membernames] [fields <MembersFieldNameList>]
 
 gam print license|licenses|licence|licences [todrive] [products|product <ProductIDList>] [skus|sku <SKUIDList>]
 
@@ -553,23 +593,30 @@ gam delete resource <ResourceID>
 gam info resource <ResourceID>
 gam print resources [todrive] [allfields] [id] [description] [email] [type]
 
-gam create schema|schemas <SchemaName> <SchemaFieldDefinition>*
-gam update schema <SchemaName>  <SchemaFieldDefinition>*
+gam create schema|schemas <SchemaName> <SchemaFieldDefinition>+
+gam update schema <SchemaName> <SchemaFieldDefinition>+
 gam delete schema <SchemaName>
 gam info schema <SchemaName>
+gam show schema|schemas
 gam print schema|schemas
 
-gam print tokens|token [todrive] [<UserTypeEntity>]
-
 gam create user <EmailAddress> <UserAttrubutes>*
 gam update user <UserItem> <UserAttributes>+
 gam delete user <UserItem>
 gam undelete user <UserItem> [org|ou <OrgUnitPath>]
 gam info user [<UserItem>] [noaliases] [nogroups] [nolicenses|nolicences] [noschemas] [schemas <SchemaNameList>] [userview] [skus|sku <SKUIDList>]
-gam print users [todrive] ([domain <DomainName>] [query <Query>] [deleted_only|only_deleted])
-	 [groups] [license|licenses|licence|licences] [emailpart|emailparts|username]
+
+gam print users [todrive] ([domain <DomainName>] [query <QueryUser>] [deleted_only|only_deleted])
+	[groups] [license|licenses|licence|licences] [emailpart|emailparts|username]
 	[orderby <UserOrderByFieldName> [ascending|descending]] [userview]
-	[allfields | <UserFieldName>*]
+	[basic|full|allfields | <UserFieldName>* | fields <UserFieldNameList>]
+gam <UserTypeEntity> print
+
+Summary of printing:
+gam print users
+Prints a header row and primaryEmail for all users.
+gam <UserTypeEntity> print users
+Prints no header row and primaryEmail for specified users
 
 gam create verify|verification <DomainName>
 gam update verify|verification <DomainName> cname|txt|text|site|file
@@ -584,7 +631,7 @@ gam print courses [todrive] [teacher] [student] [alias|aliases]
 gam course <CourseID> add alias <CourseAlias>
 gam course <CourseID> delete alias <CourseAlias>
 gam course <CourseID> add teachers|students <UserItem>
-gam course <CourseID> delete teachers|students <UserItem>
+gam course <CourseID> delete|remove teachers|students <UserItem>
 gam course <CourseID> sync teachers|students <UserTypeEntity>
 gam print course-participants [todrive](course <CourseID>)* [teacher] [student] [show all|students|teachers]
 
@@ -592,7 +639,7 @@ gam printer register
 gam update printer <PrinterID> <PrinterAttributes>+
 gam delete printer <PrinterID>
 gam info printer <PrinterID> [everything]
-gam print printers [todrive] [query <Query>] [type <String>] [status <String>] [extrafields <String>]
+gam print printers [todrive] [query <QueryPrinter>] [type <String>] [status <String>] [extrafields <String>]
 
 gam printer <PrinterID> add user|manager|owner <EmailAddress>|[domain:]<DomainName>|public
 gam printer <PrinterID> delete <EmailAddress>|[domain:]<DomainName>|public
@@ -602,15 +649,15 @@ gam printjob <PrintJobID> delete
 gam printjob <PrintJobID> resubmit <PrinterID>
 
 gam printjob <PrinterID>|any fetch
-	[olderthan|newerthan <PrintJobAge>] [query <Query>]
-	[status done|error|held|in_progress|queued|submitted]
+	[olderthan|newerthan <PrintJobAge>] [query <QueryPrintJob>]
+	[status <PrintJobStatus>]
 	[orderby <PrintJobOrderByFieldName> [ascending|descending]]
 	[owner|user <EmailAddress>]
-	[limit <Number>]
+	[limit <Number>] [drivedir|(targetfolder <FilePath>)]
 gam printjob <PrinterID> submit <FileName>|<URL> [name|title <String>] (tag <String>)*
 gam print printjobs [todrive] [printer|printerid <PrinterID>]
-	[olderthan|newerthan <PrintJobAge>] [query <Query>]
-	[status done|error|held|in_progress|queued|submitted]
+	[olderthan|newerthan <PrintJobAge>] [query <QueryPrintJob>]
+	[status <PrintJobStatus>]
 	[orderby <PrintJobOrderByFieldName> [ascending|descending]]
 	[owner|user <EmailAddress>]
 	[limit <Number>]
@@ -626,23 +673,24 @@ gam <UserTypeEntity> add calendar <CalendarItem> <CalendarAttributes>*
 gam <UserTypeEntity> update calendar <CalendarItem> <CalendarAttributes>+
 gam <UserTypeEntity> delete|del calendar <CalendarItem>
 gam <UserTypeEntity> show calendars
+gam <UserTypeEntity> info calendar <CalendarItem>|primary
+gam <UserTypeEntity> print calendars [todrive]
 
 gam <UserTypeEntity> show calsettings
 gam <UserTypeEntity> update calattendees csv <FileName> [dryrun] [start <Date>] [end <Date>] [allevents]
 gam <UserTypeEntity> transfer seccals <UserItem> [keepuser]
 
-gam <UserTypeEntity> show driveactivity [todrive] [fileid <DriveFileID>] [folderid <DriveFolderID>]
-gam <UserTypeEntity> show drivesettings [todrive]
-
+gam <UserTypeEntity> print|show driveactivity [todrive] [fileid <DriveFileID>] [folderid <DriveFolderID>]
+gam <UserTypeEntity> print|show drivesettings [todrive]
+gam <UserTypeEntity> print|show filelist [todrive] [query <QueryDriveFile>] [allfields|<DriveFieldName>*]
 gam <UserTypeEntity> show fileinfo <DriveFileID> [allfields|<DriveFieldName>*]
 gam <UserTypeEntity> show filerevisions <DriveFileID>
-gam <UserTypeEntity> show filelist [todrive] [query <Query>] [allfields|<DriveFieldName>*]
 gam <UserTypeEntity> show filetree
 
 gam <UserTypeEntity> add drivefile [drivefilename <DriveFileName>] <DriveFileAddAttributes>*
-gam <UserTypeEntity> update drivefile (id <DriveFileID)|(drivefilename <DriveFileName>)|(query <Query) [copy] [newfilename <DriveFileName>] <DriveFileUpdateAttributes>*
-gam <UserTypeEntity> get drivefile (id <DriveFileID>)|(query <Query>) [format <FileFormatList>] [targetfolder <FilePath>] [revision <Number>]
-gam <UserTypeEntity> delete|del drivefile <DriveFileID>|<DriveFileURL>|(query:<Query>) [purge|untrash]
+gam <UserTypeEntity> update drivefile (id <DriveFileID)|(drivefilename <DriveFileName>)|(query <QueryDriveFile) [copy] [newfilename <DriveFileName>] <DriveFileUpdateAttributes>*
+gam <UserTypeEntity> get drivefile (id <DriveFileID>)|(query <QueryDriveFile>) [format <FileFormatList>] [targetfolder <FilePath>] [revision <Number>]
+gam <UserTypeEntity> delete|del drivefile <DriveFileID>|<DriveFileURL>|(query:<QueryDriveFile>) [purge|untrash]
 gam <UserTypeEntity> transfer drive <UserItem> [keepuser]
 gam <UserTypeEntity> delete|del emptydrivefolders
 
@@ -663,15 +711,15 @@ gam <UserTypeEntity> delete|del license <SKUID>
 
 gam <UserTypeEntity> update photo <FileNamePattern>
 gam <UserTypeEntity> delete|del photo
-gam <UserTypeEntity> get photo
+gam <UserTypeEntity> get photo [drivedir|(targetfolder <FilePath>)]
 
 gam <UserTypeEntity> profile share|shared|unshare|unshared
 gam <UserTypeEntity> show profile
 
-gam <UserTypeEntity> print
-
-gam <UserTypeEntity> delete|del token|tokens|3lo|oauth clientid <ClientID>
-gam <UserTypeEntity> show tokens|token|3lo|oauth [clientid <ClientID>]
+gam <UserTypeEntity> delete|del token|tokens clientid <ClientID>
+gam <UserTypeEntity> show tokens|token [clientid <ClientID>]
+gam <UserTypeEntity> print tokens|token [todrive] [clientid <ClientID>]
+gam print tokens|token [todrive] [clientid <ClientID>] [<UserTypeEntity>]
 
 gam <UserTypeEntity> update user <UserAttrubutes>
 
@@ -681,50 +729,65 @@ gam <UserTypeEntity> deprovision|deprov
 #
 gam <UserTypeEntity> [add] label|labels <Name> [messagelistvisibility hide|show] [labellistvisibility hide|show|showifunread]
 gam <UserTypeEntity> update labelsettings <LabelName> [name <Name>] [messagelistvisibility hide|show] [labellistvisibility hide|show|showifunread]
-gam <UserTypeEntity> update label|labels [search <PythonRegularExpression>] [replace <LabelReplacement>] [merge]
-gam <UserTypeEntity> delete|del label|labels <LabelName>|regex:<REPattern>|--ALL_LABELS--
+gam <UserTypeEntity> update label|labels [search <RegularExpression>] [replace <LabelReplacement>] [merge]
+gam <UserTypeEntity> delete|del label|labels <LabelName>|regex:<RegularExpression>|--ALL_LABELS--
 gam <UserTypeEntity> show labels|label [onlyuser] [showcounts]
 
-gam <UserTypeEntity> delete message|messages query <Query> [doit] [max_to_delete <Number>]
-gam <UserTypeEntity> modify message|messages query <Query> (addlabel <LabelName>)* (removelabel <LabelName>)* [doit] [max_to_modify <Number>]
-gam <UserTypeEntity> trash message|messages query <Query> [doit] [max_to_trash <Number>]
-gam <UserTypeEntity> untrash message|messages query <Query> [doit] [max_to_untrash <Number>]
+gam <UserTypeEntity> delete messages query <QueryGmail> [doit] [max_to_delete|max_to_process <Number>]
+gam <UserTypeEntity> modify messages query <QueryGmail> [doit] [max_to_modify|max_to_process <Number>] (addlabel <LabelName>)* (removelabel <LabelName>)*
+gam <UserTypeEntity> trash messages query <QueryGmail> [doit] [max_to_trash|max_to_process <Number>]
+gam <UserTypeEntity> untrash messages query <QueryGmail> [doit] [max_to_untrash|max_to_process <Number>]
 #
 # Update user Gmail settings
 #
 gam <UserTypeEntity> show gmailprofile [todrive]
 gam <UserTypeEntity> show gplusprofile [todrive]
-
 gam <UserTypeEntity> arrows <Boolean>
 
-gam <UserTypeEntity> delegate|delegates to <UserEntity>
-gam <UserTypeEntity> delete|del delegate|delegates <UserEntity>
+gam <UserTypeEntity> add delegate|delegates <EmailAddress>
+gam <UserTypeEntity> delegate|delegates to <EmailAddress>
+gam <UserTypeEntity> delete|del delegate|delegates <EmailAddress>
 gam <UserTypeEntity> show delegates|delegate [csv]
+gam <UserTypeEntity> print delegates [todrive]
 
-gam <UserTypeEntity> filter [from <EmailAddress>] [to <EmailAddress>] [subject <String>] [haswords <List>] [nowords <List>] [musthaveattachment]
-	[label <LabelName>] [markread] [archive] [star] [forward <EmailAddress>] [trash] [neverspam]
-# A condition and an action must both be specified
+gam <UserTypeEntity> [add] filter [from <EmailAddress>] [to <EmailAddress>] [subject <String>] [haswords|query <List>] [nowords|negatedquery <List>] [musthaveattachment|hasattachment] [excludechats] [size larger|smaller <ByteCount>]
+	[label <LabelID>] [important|notimportant] [star] [trash] [markread] [archive] [neverspam] [forward <EmailAddress>]
+gam <UserTypeEntity> delete filters <FilterIDEntity>
+gam <UserTypeEntity> show filters
+gam <UserTypeEntity> info filters <FilterIDEntity>
+gam <UserTypeEntity> print filters [todrive]
 
-gam <UserTypeEntity> forward <FalseValues> [keep|archive|delete] [<EmailAddress>]
-gam <UserTypeEntity> forward <TrueValues> keep|archive|delete <EmailAddress>
+gam <UserTypeEntity> forward <FalseValues>
+gam <UserTypeEntity> forward <TrueValues> keep|leaveininbox|archive|delete|trash|markread <EmailAddress>
 gam <UserTypeEntity> show forward
+gam <UserTypeEntity> print forward [todrive]
 
-gam <UserTypeEntity> imap|imap4 <Boolean>
+gam <UserTypeEntity> add forwardingaddress|forwardingaddresses <EmailAddress>
+gam <UserTypeEntity> delete forwardingaddress|forwardingaddresses <EmailAddress>
+gam <UserTypeEntity> show forwardingaddress|forwardingaddresses
+gam <UserTypeEntity> info forwardingaddress|forwardingaddresses <EmailAddress>
+gam <UserTypeEntity> print forwardingaddress|forwardingaddresses [todrive]
+
+gam <UserTypeEntity> imap|imap4 <Boolean> [noautoexpunge] [expungebehavior archive|deleteforever|trash] [maxfoldersize 0|1000|2000|5000|10000]
 gam <UserTypeEntity> show imap|imap4
 
-gam <UserTypeEntity> pop|pop3 <Boolean> [for allmail|newmail|mailfromnowon] [action keep|archive|delete]
+gam <UserTypeEntity> pop|pop3 <Boolean> [for allmail|newmail|mailfromnowon|fromnowown] [action keep|leaveininbox|archive|delete|trash|markread]
 gam <UserTypeEntity> show pop|pop3
 
 gam <UserTypeEntity> language <Language>
 
 gam <UserTypeEntity> pagesize 25|50|100
 
-gam <UserTypeEntity> sendas <EmailAddress> <Name> [default] [replyto <EmailAddress>]
-gam <UserTypeEntity> show sendas
+gam <UserTypeEntity> [add] sendas <EmailAddress> <Name> [replyto <EmailAddress>] [default] [treatasalias <Boolean>] [signature|sig <String>|(file <FileName> [charset <CharSet>]) (replace <RegularExpression> <String>)*]
+gam <UserTypeEntity> update sendas <EmailAddress> [name <Name>] [replyto <EmailAddress>] [default] [treatasalias <Boolean>] [signature|sig <String>|(file <FileName> [charset <CharSet>]) (replace <RegularExpression> <String>)*]
+gam <UserTypeEntity> delete sendas <EmailAddress>
+gam <UserTypeEntity> show sendas [format]
+gam <UserTypeEntity> info sendas <EmailAddress> [format]
+gam <UserTypeEntity> print sendas [todrive]
 
 gam <UserTypeEntity> shortcuts <Boolean>
 
-gam <UserTypeEntity> signature|sig <String>|(file <FileName> [charset <Charset>]) (replace <Tag> <String>)*
+gam <UserTypeEntity> signature|sig <String>|(file <FileName> [charset <Charset>]) (replace <Tag> <String>)* [name <String>] [replyto <EmailAddress>] 
 gam <UserTypeEntity> show signature|sig [format]
 
 gam <UserTypeEntity> snippets <Boolean>
@@ -732,8 +795,8 @@ gam <UserTypeEntity> snippets <Boolean>
 gam <UserTypeEntity> utf|utf8|utf-8|unicode <Boolean>
 
 gam <UserTypeEntity> vacation <FalseValues>
-gam <UserTypeEntity> vacation <TrueValues> subject <String> (message <String>)|(file <FileName> [charset <CharSet>]) (replace <Tag> <String>)*
+gam <UserTypeEntity> vacation <TrueValues> subject <String> (message <String>)|(file <FileName> [charset <CharSet>]) (replace <Tag> <String>)* [html]
 	[contactsonly] [domainonly] [startdate <Date>] [enddate <Date>]
-gam <UserTypeEntity> show vacation
+gam <UserTypeEntity> show vacation [format]
 
 gam <UserTypeEntity> webclips <Boolean>
diff --git a/src/gam.py b/src/gam.py
index f9217a48..46d434fb 100755
--- a/src/gam.py
+++ b/src/gam.py
@@ -69,13 +69,15 @@ ERROR_PREFIX = ERROR+u': '
 WARNING = u'WARNING'
 WARNING_PREFIX = WARNING+u': '
 DEFAULT_CHARSET = [u'mbcs', u'utf-8'][os.name != u'nt']
+ONE_KILO_BYTES = 1000
+ONE_MEGA_BYTES = 1000000
+ONE_GIGA_BYTES = 1000000000
 FN_CLIENT_SECRETS_JSON = u'client_secrets.json'
 FN_EXTRA_ARGS_TXT = u'extra-args.txt'
 FN_LAST_UPDATE_CHECK_TXT = u'lastupdatecheck.txt'
 FN_OAUTH2SERVICE_JSON = u'oauth2service.json'
 FN_OAUTH2_TXT = u'oauth2.txt'
 MY_CUSTOMER = u'my_customer'
-UNKNOWN = u'Unknown'
 #
 # Global variables
 #
@@ -93,6 +95,10 @@ GM_SYS_ENCODING = u'syen'
 GM_BATCH_QUEUE = u'batq'
 # Extra arguments to pass to GAPI functions
 GM_EXTRA_ARGS_DICT = u'exad'
+# Current API user
+GM_CURRENT_API_USER = u'capu'
+# Current API scope
+GM_CURRENT_API_SCOPES = u'scoc'
 # Values retrieved from oauth2service.json
 GM_OAUTH2SERVICE_JSON_DATA = u'oajd'
 GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID = u'oaci'
@@ -114,6 +120,8 @@ GM_Globals = {
   GM_SYS_ENCODING: DEFAULT_CHARSET,
   GM_BATCH_QUEUE: None,
   GM_EXTRA_ARGS_DICT:  {u'prettyPrint': False},
+  GM_CURRENT_API_USER: None,
+  GM_CURRENT_API_SCOPES: [],
   GM_OAUTH2SERVICE_JSON_DATA: None,
   GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID: None,
   GM_LAST_UPDATE_CHECK_TXT: u'',
@@ -200,7 +208,7 @@ GC_Defaults = {
   GC_OAUTH2_TXT: FN_OAUTH2_TXT,
   GC_OAUTH2SERVICE_JSON: FN_OAUTH2SERVICE_JSON,
   GC_SECTION: u'',
-  GC_SHOW_COUNTS_MIN: 1,
+  GC_SHOW_COUNTS_MIN: 0,
   GC_SHOW_GETTINGS: TRUE,
   GC_SITE_DIR: u'',
   GC_USER_MAX_RESULTS: 500,
@@ -247,10 +255,25 @@ GC_VAR_INFO = {
   GC_SITE_DIR: {GC_VAR_TYPE: GC_TYPE_DIRECTORY},
   GC_USER_MAX_RESULTS: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (1, 500)},
   }
+# Google API constants
+NEVER_TIME = u'1970-01-01T00:00:00.000Z'
+NEVER_START_DATE = u'1970-01-01'
+NEVER_END_DATE = u'1969-12-31'
+ROLE_MANAGER = u'MANAGER'
+ROLE_MEMBER = u'MEMBER'
+ROLE_OWNER = u'OWNER'
+ROLE_USER = u'USER'
+ROLE_MANAGER_MEMBER = u','.join([ROLE_MANAGER, ROLE_MEMBER])
+ROLE_MANAGER_OWNER = u','.join([ROLE_MANAGER, ROLE_OWNER])
+ROLE_MANAGER_MEMBER_OWNER = u','.join([ROLE_MANAGER, ROLE_MEMBER, ROLE_OWNER])
+ROLE_MEMBER_OWNER = u','.join([ROLE_MEMBER, ROLE_OWNER])
+PROJECTION_CHOICES_MAP = {u'basic': u'BASIC', u'full': u'FULL',}
+SORTORDER_CHOICES_MAP = {u'ascending': u'ASCENDING', u'descending': u'DESCENDING',}
 #
 CLEAR_NONE_ARGUMENT = [u'clear', u'none',]
 #
-MESSAGE_CLIENT_API_ACCESS_DENIED = u'Access Denied. Please make sure the Client Name:\n\n{0}\n\nis authorized for the API Scope(s):\n\n{1}\n\nThis can be configured in your Control Panel under:\n\nSecurity -->\nAdvanced Settings -->\nManage API client access'
+MESSAGE_API_ACCESS_CONFIG = u'API access is configured in your Control Panel under: Security-Show more-Advanced settings-Manage API client access'
+MESSAGE_API_ACCESS_DENIED = u'API access Denied.\n\nPlease make sure the Client ID: {0} is authorized for the API Scope(s): {1}'
 MESSAGE_GAM_EXITING_FOR_UPDATE = u'GAM is now exiting so that you can overwrite this old version with the latest release'
 MESSAGE_GAM_OUT_OF_MEMORY = u'GAM has run out of memory. If this is a large Google Apps instance, you should use a 64-bit version of GAM on Windows or a 64-bit version of Python on other systems.'
 MESSAGE_HEADER_NOT_FOUND_IN_CSV_HEADERS = u'Header "{0}" not found in CSV headers of "{1}".'
@@ -262,8 +285,42 @@ MESSAGE_NO_TRANSFER_LACK_OF_DISK_SPACE = u'Cowardly refusing to perform migratio
 MESSAGE_REQUEST_COMPLETED_NO_FILES = u'Request completed but no results/files were returned, try requesting again'
 MESSAGE_REQUEST_NOT_COMPLETE = u'Request needs to be completed before downloading, current status is: {0}'
 MESSAGE_RESULTS_TOO_LARGE_FOR_GOOGLE_SPREADSHEET = u'Results are too large for Google Spreadsheets. Uploading as a regular CSV file.'
+MESSAGE_SERVICE_NOT_APPLICABLE = u'Service not applicable for this address: {0}'
 MESSAGE_WIKI_INSTRUCTIONS_OAUTH2SERVICE_JSON = u'Please follow the instructions at this site to setup a Service Account.'
 MESSAGE_OAUTH2SERVICE_JSON_INVALID = u'The file {0} is missing required keys (client_email, client_id or private_key).'
+# callGData throw errors
+GDATA_BAD_REQUEST = 601
+GDATA_DOES_NOT_EXIST = 1301
+GDATA_ENTITY_EXISTS = 1300
+GDATA_INVALID_DOMAIN = 602
+GDATA_INVALID_SSO_SIGNING_KEY = 1408
+GDATA_INVALID_VALUE = 1801
+GDATA_NAME_NOT_VALID = 1303
+GDATA_NOT_FOUND = 600
+GDATA_SERVICE_NOT_APPLICABLE = 1410
+#
+GDATA_EMAILSETTINGS_THROW_LIST = [GDATA_INVALID_DOMAIN, GDATA_DOES_NOT_EXIST, GDATA_SERVICE_NOT_APPLICABLE, GDATA_BAD_REQUEST, GDATA_NAME_NOT_VALID]
+# oauth errors
+OAUTH2_TOKEN_ERRORS = [u'access_denied', u'unauthorized_client: Unauthorized client or scope in request.', u'access_denied: Requested client not authorized.',
+                       u'invalid_grant: Not a valid email.', u'invalid_grant: Invalid email or User ID', u'invalid_grant: Bad Request',
+                       u'invalid_request: Invalid impersonation prn email address.', u'internal_failure: Backend Error']
+#
+# callGAPI throw reasons
+GAPI_BACKEND_ERROR = u'backendError'
+GAPI_BAD_REQUEST = u'badRequest'
+GAPI_FORBIDDEN = u'forbidden'
+GAPI_INTERNAL_ERROR = u'internalError'
+GAPI_INVALID = u'invalid'
+GAPI_NOT_FOUND = u'notFound'
+GAPI_QUOTA_EXCEEDED = u'quotaExceeded'
+GAPI_RATE_LIMIT_EXCEEDED = u'rateLimitExceeded'
+GAPI_SERVICE_NOT_AVAILABLE = u'serviceNotAvailable'
+GAPI_USER_NOT_FOUND = u'userNotFound'
+GAPI_USER_RATE_LIMIT_EXCEEDED = u'userRateLimitExceeded'
+#
+GAPI_DEFAULT_RETRY_REASONS = [GAPI_QUOTA_EXCEEDED, GAPI_RATE_LIMIT_EXCEEDED, GAPI_USER_RATE_LIMIT_EXCEEDED, GAPI_BACKEND_ERROR, GAPI_INTERNAL_ERROR]
+GAPI_GMAIL_THROW_REASONS = [GAPI_SERVICE_NOT_AVAILABLE]
+GAPI_GPLUS_THROW_REASONS = [GAPI_SERVICE_NOT_AVAILABLE]
 
 def convertUTF8(data):
   import collections
@@ -350,6 +407,18 @@ gam.exe update group announcements add member jsmith
 ...
 
 '''
+def formatMaxMessageBytes(maxMessageBytes):
+  if maxMessageBytes < ONE_KILO_BYTES:
+    return maxMessageBytes
+  if maxMessageBytes < ONE_MEGA_BYTES:
+    return u'{0}K'.format(maxMessageBytes / ONE_KILO_BYTES)
+  return u'{0}M'.format(maxMessageBytes / ONE_MEGA_BYTES)
+
+def formatMilliSeconds(millis):
+  seconds, millis = divmod(millis, 1000)
+  minutes, seconds = divmod(seconds, 60)
+  hours, minutes = divmod(minutes, 60)
+  return u'%02d:%02d:%02d' % (hours, minutes, seconds)
 #
 # Error handling
 #
@@ -370,6 +439,25 @@ def invalidJSONExit(fileName):
 def noPythonSSLExit():
   systemErrorExit(8, MESSAGE_NO_PYTHON_SSL)
 
+def currentCount(i, count):
+  return u' ({0}/{1})'.format(i, count) if (count > GC_Values[GC_SHOW_COUNTS_MIN]) else u''
+
+def currentCountNL(i, count):
+  return u' ({0}/{1})\n'.format(i, count) if (count > GC_Values[GC_SHOW_COUNTS_MIN]) else u'\n'
+
+def entityServiceNotApplicableWarning(entityType, entityName, i, count):
+  sys.stderr.write(u'{0}: {1}, Service not applicable/Does not exist{2}'.format(entityType, entityName, currentCountNL(i, count)))
+
+def entityDoesNotExistWarning(entityType, entityName, i, count):
+  sys.stderr.write(u'{0}: {1}, Does not exist{2}'.format(entityType, entityName, currentCountNL(i, count)))
+
+def entityUnknownWarning(entityType, entityName, i, count):
+  domain = getEmailAddressDomain(entityName)
+  if (domain == GC_Values[GC_DOMAIN]) or (domain.endswith(u'google.com')):
+    entityDoesNotExistWarning(entityType, entityName, i, count)
+  else:
+    entityServiceNotApplicableWarning(entityType, entityName, i, count)
+
 # Invalid CSV ~Header or ~~Header~~
 def csvFieldErrorExit(fieldName, fieldNames):
   systemErrorExit(2, MESSAGE_HEADER_NOT_FOUND_IN_CSV_HEADERS.format(fieldName, u','.join(fieldNames)))
@@ -395,13 +483,63 @@ def getString(i, item, emptyOK=False, optional=False):
     return u''
   print u'ERROR: expected a <{0}>'.format(item)
   sys.exit(2)
+
+YYYYMMDD_FORMAT = u'%Y-%m-%d'
+YYYYMMDD_FORMAT_REQUIRED = u'yyyy-mm-dd'
+
+def getYYYYMMDD(i, emptyOK=False, returnTimeStamp=False):
+  if i < len(sys.argv):
+    argstr = sys.argv[i].strip()
+    if argstr:
+      try:
+        timeStamp = time.mktime(datetime.datetime.strptime(argstr, YYYYMMDD_FORMAT).timetuple())*1000
+        if not returnTimeStamp:
+          return argstr
+        return timeStamp
+      except ValueError:
+        print u'ERROR: expected a <{0}>, got {1}'.format(YYYYMMDD_FORMAT_REQUIRED, argstr)
+        sys.exit(2)
+    elif emptyOK:
+      return u''
+  print u'ERROR: expected a <{0}>'.format(YYYYMMDD_FORMAT_REQUIRED)
+  sys.exit(2)
+
+# Get domain from email address
+def getEmailAddressDomain(emailAddress):
+  atLoc = emailAddress.find(u'@')
+  if atLoc == -1:
+    return GC_Values[GC_DOMAIN].lower()
+  return emailAddress[atLoc+1:].lower()
+#
+# Normalize user/group email address/uid
+# uid:12345abc -> 12345abc
+# foo -> foo@domain
+# foo@ -> foo@domain
+# foo@bar.com -> foo@bar.com
+# @domain -> domain
+#
+def normalizeEmailAddressOrUID(emailAddressOrUID, noUid=False):
+  if (not noUid) and (emailAddressOrUID.find(u':') != -1):
+    if emailAddressOrUID[:4].lower() == u'uid:':
+      return emailAddressOrUID[4:]
+    if emailAddressOrUID[:3].lower() == u'id:':
+      return emailAddressOrUID[3:]
+  atLoc = emailAddressOrUID.find(u'@')
+  if atLoc == 0:
+    return emailAddressOrUID[1:].lower()
+  if (atLoc == -1) or (atLoc == len(emailAddressOrUID)-1) and GC_Values[GC_DOMAIN]:
+    if atLoc == -1:
+      emailAddressOrUID = u'{0}@{1}'.format(emailAddressOrUID, GC_Values[GC_DOMAIN])
+    else:
+      emailAddressOrUID = u'{0}{1}'.format(emailAddressOrUID, GC_Values[GC_DOMAIN])
+  return emailAddressOrUID.lower()
 #
 # Open a file
 #
 def openFile(filename, mode=u'rb'):
   try:
     if filename != u'-':
-      return open(filename, mode)
+      return open(os.path.expanduser(filename), mode)
     if mode.startswith(u'r'):
       return StringIO.StringIO(unicode(sys.stdin.read()))
     return sys.stdout
@@ -424,10 +562,10 @@ def readFile(filename, mode=u'rb', continueOnError=False, displayError=True, enc
   try:
     if filename != u'-':
       if not encoding:
-        with open(filename, mode) as f:
+        with open(os.path.expanduser(filename), mode) as f:
           return f.read()
       else:
-        with codecs.open(filename, mode, encoding) as f:
+        with codecs.open(os.path.expanduser(filename), mode, encoding) as f:
           content = f.read()
           if not content.startswith(codecs.BOM_UTF8):
             return content
@@ -445,7 +583,7 @@ def readFile(filename, mode=u'rb', continueOnError=False, displayError=True, enc
 #
 def writeFile(filename, data, mode=u'wb', continueOnError=False, displayError=True):
   try:
-    with open(filename, mode) as f:
+    with open(os.path.expanduser(filename), mode) as f:
       f.write(data)
     return True
   except IOError as e:
@@ -593,17 +731,52 @@ def doGAMVersion():
                                                                                                                          platform.platform(), platform.machine(),
                                                                                                                          GM_Globals[GM_GAM_PATH])
 
-def tryOAuth(gdataObject):
+def handleOAuthTokenError(e, soft_errors):
+  if e.message in OAUTH2_TOKEN_ERRORS:
+    if soft_errors:
+      return None
+    if not GM_Globals[GM_CURRENT_API_USER]:
+      stderrErrorMsg(MESSAGE_API_ACCESS_DENIED.format(GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID],
+                                                      u','.join(GM_Globals[GM_CURRENT_API_SCOPES])))
+      systemErrorExit(12, MESSAGE_API_ACCESS_CONFIG)
+    else:
+      systemErrorExit(19, MESSAGE_SERVICE_NOT_APPLICABLE.format(GM_Globals[GM_CURRENT_API_USER]))
+  systemErrorExit(18, u'Authentication Token Error - {0}'.format(e))
+
+def getSvcAcctCredentials(scopes, act_as):
+  try:
+    if not GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]:
+      json_string = readFile(GC_Values[GC_OAUTH2SERVICE_JSON], continueOnError=True, displayError=True)
+      if not json_string:
+        printLine(MESSAGE_WIKI_INSTRUCTIONS_OAUTH2SERVICE_JSON)
+        printLine(GAM_WIKI_CREATE_CLIENT_SECRETS)
+        systemErrorExit(6, None)
+      GM_Globals[GM_OAUTH2SERVICE_JSON_DATA] = json.loads(json_string)
+    credentials = oauth2client.service_account.ServiceAccountCredentials.from_json_keyfile_dict(GM_Globals[GM_OAUTH2SERVICE_JSON_DATA], scopes)
+    credentials = credentials.create_delegated(act_as)
+    credentials.user_agent = GAM_INFO
+    serialization_data = credentials.serialization_data
+    GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID] = serialization_data[u'client_id']
+    return credentials
+  except (ValueError, KeyError):
+    printLine(MESSAGE_WIKI_INSTRUCTIONS_OAUTH2SERVICE_JSON)
+    printLine(GAM_WIKI_CREATE_CLIENT_SECRETS)
+    invalidJSONExit(GC_Values[GC_OAUTH2SERVICE_JSON])
+
+def getGDataOAuthToken(gdataObject):
   storage = oauth2client.file.Storage(GC_Values[GC_OAUTH2_TXT])
   credentials = storage.get()
-  if credentials is None or credentials.invalid:
+  if not credentials or credentials.invalid:
     doRequestOAuth()
     credentials = storage.get()
-  if credentials.access_token_expired:
-    credentials.refresh(httplib2.Http(disable_ssl_certificate_validation=GC_Values[GC_NO_VERIFY_SSL]))
-  gdataObject.additional_headers = {u'Authorization': u'Bearer %s' % credentials.access_token}
+  try:
+    if credentials.access_token_expired:
+      credentials.refresh(httplib2.Http(disable_ssl_certificate_validation=GC_Values[GC_NO_VERIFY_SSL]))
+  except oauth2client.client.AccessTokenRefreshError as e:
+    return handleOAuthTokenError(e, False)
+  gdataObject.additional_headers[u'Authorization'] = u'Bearer {0}'.format(credentials.access_token)
   if not GC_Values[GC_DOMAIN]:
-    GC_Values[GC_DOMAIN] = credentials.id_token.get(u'hd', UNKNOWN).lower()
+    GC_Values[GC_DOMAIN] = credentials.id_token.get(u'hd', u'UNKNOWN').lower()
   if not GC_Values[GC_CUSTOMER_ID]:
     GC_Values[GC_CUSTOMER_ID] = MY_CUSTOMER
   gdataObject.domain = GC_Values[GC_DOMAIN]
@@ -613,15 +786,21 @@ def checkGDataError(e, service):
   # First check for errors that need special handling
   if e[0].get(u'reason', u'') in [u'Token invalid - Invalid token: Stateless token expired', u'Token invalid - Invalid token: Token not found']:
     keep_domain = service.domain
-    tryOAuth(service)
+    getGDataOAuthToken(service)
     service.domain = keep_domain
     return False
   if e[0][u'body'].startswith(u'Required field must not be blank:') or e[0][u'body'].startswith(u'These characters are not allowed:'):
-    return e[0][u'body']
+    return u'{0} - {1}'.format(GDATA_BAD_REQUEST, e[0][u'body'])
   if e.error_code == 600 and e[0][u'body'] == u'Quota exceeded for the current request' or e[0][u'reason'] == u'Bad Gateway':
     return False
   if e.error_code == 600 and e[0][u'reason'] == u'Token invalid - Invalid token: Token disabled, revoked, or expired.':
     return u'403 - Token disabled, revoked, or expired. Please delete and re-create oauth.txt'
+  if e.error_code == 600 and e[0][u'reason'] == u'Invalid domain.':
+    return u'{0} - {1}'.format(GDATA_INVALID_DOMAIN, e[0][u'reason'])
+  if e.error_code == 600 and e[0][u'reason'].startswith(u'You are not authorized to perform operations on the domain'):
+    return u'{0} - {1}'.format(GDATA_INVALID_DOMAIN, e[0][u'reason'])
+  if e.error_code == 600 and e[0][u'reason'] == u'Bad Request':
+    return u'{0} - {1}'.format(GDATA_BAD_REQUEST, e[0][u'reason'])
   # We got a "normal" error, define the mapping below
   error_code_map = {
     1000: False,
@@ -660,94 +839,154 @@ def checkGDataError(e, service):
   }
   return u'{0} - {1}'.format(e.error_code, error_code_map.get(e.error_code, u'Unknown Error: {0}'.format(str(e))))
 
-def callGData(service, function, soft_errors=False, throw_errors=[], **kwargs):
+def waitOnFailure(n, retries, errMsg):
+  wait_on_fail = min(2 ** n, 60) + float(random.randint(1, 1000)) / 1000
+  if n > 3:
+    sys.stderr.write(u'Temp error {0}. Backing off {1} seconds...'.format(errMsg, int(wait_on_fail)))
+  time.sleep(wait_on_fail)
+  if n > 3:
+    sys.stderr.write(u'attempt {0}/{1}\n'.format(n+1, retries))
+
+class GData_exception(Exception):
+  def __init__(self, value):
+    super(GData_exception, self).__init__(value)
+    self.value = value
+  def __str__(self):
+    return repr(self.value)
+
+class GData_serviceNotApplicable(GData_exception): pass
+
+def callGData(service, function,
+              soft_errors=False, throw_errors=[],
+              **kwargs):
   import gdata.apps.service
   method = getattr(service, function)
   retries = 10
   for n in range(1, retries+1):
     try:
       return method(**kwargs)
-    except gdata.apps.service.AppsForYourDomainException, e:
+    except gdata.apps.service.AppsForYourDomainException as e:
       terminating_error = checkGDataError(e, service)
-      if e.error_code in throw_errors:
+      if terminating_error:
+        throw_error_code = int(terminating_error.split(u' - ')[0])
+      else:
+        throw_error_code = e.error_code
+      if throw_error_code in throw_errors:
         raise
-      if not terminating_error and n != retries:
-        wait_on_fail = (2 ** n) if (2 ** n) < 60 else 60
-        randomness = float(random.randint(1, 1000)) / 1000
-        wait_on_fail = wait_on_fail + randomness
-        if n > 3:
-          sys.stderr.write(u'Temp error. Backing off %s seconds...' % (int(wait_on_fail)))
-        time.sleep(wait_on_fail)
-        if n > 3:
-          sys.stderr.write(u'attempt %s/%s\n' % (n+1, retries))
+      if (n != retries) and not terminating_error:
+        waitOnFailure(n, retries, str(e.error_code))
         continue
-      stderrErrorMsg(terminating_error)
       if soft_errors:
-        if n != 1:
-          sys.stderr.write(u' - Giving up.\n')
+        stderrErrorMsg(u'{0}{1}'.format(terminating_error, u': Giving up.\n' if n > 1 else u''))
         return None
-      sys.exit(int(e.error_code))
+      systemErrorExit(4, terminating_error)
+    except oauth2client.client.AccessTokenRefreshError as e:
+      handleOAuthTokenError(e, soft_errors or GDATA_SERVICE_NOT_APPLICABLE in throw_errors)
+      if GDATA_SERVICE_NOT_APPLICABLE in throw_errors:
+        raise GData_serviceNotApplicable(e.message)
+      entityUnknownWarning(u'User', GM_Globals[GM_CURRENT_API_USER], 0, 0)
+      return None
 
-def callGAPI(service, function, silent_errors=False, soft_errors=False, throw_reasons=[], retry_reasons=[], **kwargs):
+def checkGAPIError(e, soft_errors=False, silent_errors=False, retryOnHttpError=False, service=None):
+  try:
+    error = json.loads(e.content)
+  except ValueError:
+    if (e.resp[u'status'] == u'503') and (e.content == u'Quota exceeded for the current request'):
+      return (e.resp[u'status'], GAPI_QUOTA_EXCEEDED, e.content)
+    if retryOnHttpError:
+      service._http.request.credentials.refresh(httplib2.Http(disable_ssl_certificate_validation=GC_Values[GC_NO_VERIFY_SSL]))
+      return (-1, None, None)
+    if soft_errors:
+      if not silent_errors:
+        stderrErrorMsg(e.content)
+      return (0, None, None)
+    systemErrorExit(5, e.content)
+  if u'error' in error:
+    http_status = error[u'error'][u'code']
+    try:
+      message = error[u'error'][u'errors'][0][u'message']
+    except KeyError:
+      message = error[u'error'][u'message']
+  else:
+    if u'error_description' in error:
+      if error[u'error_description'] == u'Invalid Value':
+        message = error[u'error_description']
+        http_status = 400
+        error = {u'error': {u'errors': [{u'reason': GAPI_INVALID, u'message': message}]}}
+      else:
+        systemErrorExit(4, str(error))
+    else:
+      systemErrorExit(4, str(error))
+  try:
+    reason = error[u'error'][u'errors'][0][u'reason']
+    if reason == u'notFound':
+      if u'userKey' in message:
+        reason = GAPI_USER_NOT_FOUND
+    elif reason == u'invalid':
+      if u'userId' in message:
+        reason = GAPI_USER_NOT_FOUND
+    elif reason == u'failedPrecondition':
+      if u'Bad Request' in message:
+        reason = GAPI_BAD_REQUEST
+      elif u'Mail service not enabled' in message:
+        reason = GAPI_SERVICE_NOT_AVAILABLE
+  except KeyError:
+    reason = http_status
+  return (http_status, reason, message)
+
+class GAPI_exception(Exception):
+  def __init__(self, value):
+    super(GAPI_exception, self).__init__(value)
+    self.value = value
+  def __str__(self):
+    return repr(self.value)
+
+class GAPI_serviceNotAvailable(GAPI_exception): pass
+
+def callGAPI(service, function,
+             silent_errors=False, soft_errors=False, throw_reasons=[], retry_reasons=[],
+             **kwargs):
   method = getattr(service, function)
   retries = 10
   parameters = dict(kwargs.items() + GM_Globals[GM_EXTRA_ARGS_DICT].items())
   for n in range(1, retries+1):
     try:
       return method(**parameters).execute()
-    except googleapiclient.errors.HttpError, e:
-      try:
-        error = json.loads(e.content)
-      except ValueError:
-        if n < 3:
-          service._http.request.credentials.refresh(httplib2.Http(disable_ssl_certificate_validation=GC_Values[GC_NO_VERIFY_SSL]))
-          continue
-        if (e.resp[u'status'] == u'503') and (e.content == u'Quota exceeded for the current request'):
-          time.sleep(1)
-          continue
-        if not silent_errors:
-          stderrErrorMsg(e.content)
-        if soft_errors:
-          return None
-        sys.exit(5)
-      http_status = error[u'error'][u'code']
-      message = error[u'error'][u'errors'][0][u'message']
-      try:
-        reason = error[u'error'][u'errors'][0][u'reason']
-      except KeyError:
-        reason = http_status
+    except googleapiclient.errors.HttpError as e:
+      http_status, reason, message = checkGAPIError(e, soft_errors=soft_errors, silent_errors=silent_errors, retryOnHttpError=n < 3, service=service)
+      if http_status == -1:
+        continue
+      if http_status == 0:
+        return None
       if reason in throw_reasons:
         raise e
-      if n != retries and (reason in [u'quotaExceeded', u'rateLimitExceeded', u'userRateLimitExceeded', u'backendError', u'internalError'] or reason in retry_reasons):
-        wait_on_fail = (2 ** n) if (2 ** n) < 60 else 60
-        randomness = float(random.randint(1, 1000)) / 1000
-        wait_on_fail = wait_on_fail + randomness
-        if n > 3:
-          sys.stderr.write(u'Temp error %s. Backing off %s seconds...' % (reason, int(wait_on_fail)))
-        time.sleep(wait_on_fail)
-        if n > 3:
-          sys.stderr.write(u'attempt %s/%s\n' % (n+1, retries))
+      if (n != retries) and (reason in GAPI_DEFAULT_RETRY_REASONS+retry_reasons):
+        waitOnFailure(n, retries, reason)
         continue
-      stderrErrorMsg(u'{0}: {1} - {2}'.format(http_status, message, reason))
       if soft_errors:
-        if n != 1:
-          sys.stderr.write(u' - Giving up.\n')
+        stderrErrorMsg(u'{0}: {1} - {2}{3}'.format(http_status, message, reason, u': Giving up.\n' if n > 1 else u''))
         return None
-      sys.exit(int(http_status))
-    except oauth2client.client.AccessTokenRefreshError, e:
-      stderrErrorMsg(u'Authentication Token Error: {0}'.format(e))
-      sys.exit(403)
+      systemErrorExit(int(http_status), u'{0}: {1} - {2}'.format(http_status, message, reason))
+    except oauth2client.client.AccessTokenRefreshError as e:
+      handleOAuthTokenError(e, soft_errors or GAPI_SERVICE_NOT_AVAILABLE in throw_reasons)
+      if GAPI_SERVICE_NOT_AVAILABLE in throw_reasons:
+        raise GAPI_serviceNotAvailable(e.message)
+      entityUnknownWarning(u'User', GM_Globals[GM_CURRENT_API_USER], 0, 0)
+      return None
     except httplib2.CertificateValidationUnsupported:
       noPythonSSLExit()
-    except TypeError, e:
+    except TypeError as e:
       systemErrorExit(4, e)
 
-def callGAPIpages(service, function, items, page_message=None, message_attribute=None, **kwargs):
+def callGAPIpages(service, function, items,
+                  page_message=None, message_attribute=None,
+                  throw_reasons=[],
+                  **kwargs):
   pageToken = None
   all_pages = list()
   total_items = 0
   while True:
-    this_page = callGAPI(service, function, pageToken=pageToken, **kwargs)
+    this_page = callGAPI(service, function, throw_reasons=throw_reasons, pageToken=pageToken, **kwargs)
     if this_page:
       pageToken = this_page.get(u'nextPageToken')
       if items in this_page:
@@ -789,68 +1028,69 @@ API_VER_MAPPING = {
   u'datatransfer': u'datatransfer_v1',
   u'directory': u'directory_v1',
   u'drive': u'v2',
+  u'email-audit': u'v1',
+  u'email-settings': u'v2',
   u'gmail': u'v1',
   u'groupssettings': u'v1',
   u'licensing': u'v1',
   u'oauth2': u'v2',
   u'plus': u'v1',
-  u'plusDomains': u'v1',
   u'reports': u'reports_v1',
   u'siteVerification': u'v1',
   }
 
-def getAPIVer(api):
-  return API_VER_MAPPING.get(api, u'v1')
+def getAPIVersion(api):
+  version = API_VER_MAPPING.get(api, u'v1')
+  if api in [u'directory', u'reports', u'datatransfer']:
+    api = u'admin'
+  return (api, version, u'{0}-{1}'.format(api, version))
 
-API_SCOPE_MAPPING = {
-  u'appsactivity': [u'https://www.googleapis.com/auth/activity',
-                    u'https://www.googleapis.com/auth/drive'],
-  u'calendar': [u'https://www.googleapis.com/auth/calendar',],
-  u'drive': [u'https://www.googleapis.com/auth/drive',],
-  u'gmail': [u'https://mail.google.com/',],
-  u'plus': [u'https://www.googleapis.com/auth/plus.me',],
-  u'plusDomains': [u'https://www.googleapis.com/auth/plus.me',
-                   u'https://www.googleapis.com/auth/plus.circles.read',
-                   u'https://www.googleapis.com/auth/plus.circles.write'],
-}
-
-def getAPIScope(api):
-  return API_SCOPE_MAPPING.get(api, [])
-
-def getServiceFromDiscoveryDocument(api, version, http):
-  disc_filename = u'%s-%s.json' % (api, version)
-  disc_file = os.path.join(GC_Values[GC_SITE_DIR], disc_filename)
+def readDiscoveryFile(api_version):
+  disc_filename = u'%s.json' % (api_version)
+  disc_file = os.path.join(GM_Globals[GM_GAM_PATH], disc_filename)
   if hasattr(sys, u'_MEIPASS'):
     pyinstaller_disc_file = os.path.join(sys._MEIPASS, disc_filename)
   else:
     pyinstaller_disc_file = None
   if os.path.isfile(disc_file):
-    discovery = readFile(disc_file)
+    json_string = readFile(disc_file)
   elif pyinstaller_disc_file:
-    discovery = readFile(pyinstaller_disc_file)
+    json_string = readFile(pyinstaller_disc_file)
   else:
-    systemErrorExit(4, MESSAGE_NO_DISCOVERY_INFORMATION.format(disc_file))
-  return googleapiclient.discovery.build_from_document(discovery, base=u'https://www.googleapis.com', http=http)
+    systemErrorExit(11, MESSAGE_NO_DISCOVERY_INFORMATION.format(disc_file))
+  try:
+    discovery = json.loads(json_string)
+    return (disc_file, discovery)
+  except ValueError:
+    invalidJSONExit(disc_file)
 
-def buildGAPIObject(api):
+def getClientAPIversionHttpService(api):
   storage = oauth2client.file.Storage(GC_Values[GC_OAUTH2_TXT])
   credentials = storage.get()
   if not credentials or credentials.invalid:
     doRequestOAuth()
     credentials = storage.get()
   credentials.user_agent = GAM_INFO
-  http = credentials.authorize(httplib2.Http(disable_ssl_certificate_validation=GC_Values[GC_NO_VERIFY_SSL], cache=GC_Values[GC_CACHE_DIR]))
-  version = getAPIVer(api)
-  if api in [u'directory', u'reports', u'datatransfer']:
-    api = u'admin'
+  api, version, api_version = getAPIVersion(api)
+  http = credentials.authorize(httplib2.Http(disable_ssl_certificate_validation=GC_Values[GC_NO_VERIFY_SSL],
+                                             cache=GC_Values[GC_CACHE_DIR]))
   try:
-    service = googleapiclient.discovery.build(api, version, http=http, cache_discovery=False)
-  except googleapiclient.errors.UnknownApiNameOrVersion:
-    service = getServiceFromDiscoveryDocument(api, version, http)
+    return (credentials, googleapiclient.discovery.build(api, version, http=http, cache_discovery=False))
   except httplib2.ServerNotFoundError as e:
     systemErrorExit(4, e)
   except httplib2.CertificateValidationUnsupported:
     noPythonSSLExit()
+  except googleapiclient.errors.UnknownApiNameOrVersion:
+    pass
+  disc_file, discovery = readDiscoveryFile(api_version)
+  try:
+    return (credentials, googleapiclient.discovery.build_from_document(discovery, http=http))
+  except (ValueError, KeyError):
+    invalidJSONExit(disc_file)
+
+def buildGAPIObject(api):
+  GM_Globals[GM_CURRENT_API_USER] = None
+  credentials, service = getClientAPIversionHttpService(api)
   if GC_Values[GC_DOMAIN]:
     if not GC_Values[GC_CUSTOMER_ID]:
       resp, result = service._http.request(u'https://www.googleapis.com/admin/directory/v1/users?domain={0}&maxResults=1&fields=users(customerId)'.format(GC_Values[GC_DOMAIN]))
@@ -869,90 +1109,115 @@ def buildGAPIObject(api):
       except KeyError:
         GC_Values[GC_CUSTOMER_ID] = MY_CUSTOMER
   else:
-    GC_Values[GC_DOMAIN] = credentials.id_token.get(u'hd', UNKNOWN).lower()
+    GC_Values[GC_DOMAIN] = credentials.id_token.get(u'hd', u'UNKNOWN').lower()
     if not GC_Values[GC_CUSTOMER_ID]:
       GC_Values[GC_CUSTOMER_ID] = MY_CUSTOMER
   return service
 
-def buildGAPIServiceObject(api, act_as, soft_errors=False):
+# Convert User UID to email address
+def convertUserUIDtoEmailAddress(emailAddressOrUID):
+  normalizedEmailAddressOrUID = normalizeEmailAddressOrUID(emailAddressOrUID)
+  if normalizedEmailAddressOrUID.find(u'@') > 0:
+    return normalizedEmailAddressOrUID
   try:
-    if not GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]:
-      json_string = readFile(GC_Values[GC_OAUTH2SERVICE_JSON], continueOnError=True, displayError=True)
-      if not json_string:
-        printLine(MESSAGE_WIKI_INSTRUCTIONS_OAUTH2SERVICE_JSON)
-        printLine(GAM_WIKI_CREATE_CLIENT_SECRETS)
-        systemErrorExit(6, None)
-      GM_Globals[GM_OAUTH2SERVICE_JSON_DATA] = json.loads(json_string)
-    scopes = getAPIScope(api)
-    credentials = oauth2client.service_account.ServiceAccountCredentials.from_json_keyfile_dict(GM_Globals[GM_OAUTH2SERVICE_JSON_DATA], scopes)
-    credentials = credentials.create_delegated(act_as)
-    credentials.user_agent = GAM_INFO
-    serialization_data = credentials.serialization_data
-    GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID] = serialization_data[u'client_id']
-  except (ValueError, KeyError):
-    printLine(MESSAGE_WIKI_INSTRUCTIONS_OAUTH2SERVICE_JSON)
-    printLine(GAM_WIKI_CREATE_CLIENT_SECRETS)
-    invalidJSONExit(GC_Values[GC_OAUTH2SERVICE_JSON])
-  http = credentials.authorize(httplib2.Http(disable_ssl_certificate_validation=GC_Values[GC_NO_VERIFY_SSL],
-                                             cache=GC_Values[GC_CACHE_DIR]))
-  version = getAPIVer(api)
+    cd = buildGAPIObject(u'directory')
+    result = callGAPI(cd.users(), u'get',
+                      throw_reasons=[GAPI_USER_NOT_FOUND],
+                      userKey=normalizedEmailAddressOrUID, fields=u'primaryEmail')
+    if u'primaryEmail' in result:
+      return result[u'primaryEmail'].lower()
+  except:
+    pass
+  return normalizedEmailAddressOrUID
+
+API_SCOPE_MAPPING = {
+  u'appsactivity': [u'https://www.googleapis.com/auth/activity',
+                    u'https://www.googleapis.com/auth/drive'],
+  u'calendar': [u'https://www.googleapis.com/auth/calendar',],
+  u'drive': [u'https://www.googleapis.com/auth/drive',],
+  u'gmail': [u'https://mail.google.com/',
+             u'https://www.googleapis.com/auth/gmail.settings.basic',
+             u'https://www.googleapis.com/auth/gmail.settings.sharing',],
+  u'plus': [u'https://www.googleapis.com/auth/plus.me',],
+}
+
+def getSvcAcctAPIversionHttpService(api):
+  api, version, api_version = getAPIVersion(api)
+  http = httplib2.Http(disable_ssl_certificate_validation=GC_Values[GC_NO_VERIFY_SSL],
+                       cache=GC_Values[GC_CACHE_DIR])
   try:
-    return googleapiclient.discovery.build(api, version, http=http, cache_discovery=False)
-  except googleapiclient.errors.UnknownApiNameOrVersion:
-    return getServiceFromDiscoveryDocument(api, version, http)
+    return (api_version, http, googleapiclient.discovery.build(api, version, http=http, cache_discovery=False))
   except httplib2.ServerNotFoundError as e:
     systemErrorExit(4, e)
-  except oauth2client.client.AccessTokenRefreshError, e:
-    if e.message in [u'access_denied',
-                     u'unauthorized_client: Unauthorized client or scope in request.',
-                     u'access_denied: Requested client not authorized.']:
-      systemErrorExit(5, MESSAGE_CLIENT_API_ACCESS_DENIED.format(GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID], u','.join(scopes)))
-    stderrErrorMsg(e)
-    if soft_errors:
-      return False
-    sys.exit(4)
-
-def buildDiscoveryObject(api):
-  import uritemplate
-  version = getAPIVer(api)
-  if api in [u'directory', u'reports']:
-    api = u'admin'
-  params = {u'api': api, u'apiVersion': version}
-  http = httplib2.Http(disable_ssl_certificate_validation=GC_Values[GC_NO_VERIFY_SSL], cache=GC_Values[GC_CACHE_DIR])
-  requested_url = uritemplate.expand(googleapiclient.discovery.DISCOVERY_URI, params)
-  resp, content = http.request(requested_url)
-  if resp.status == 404:
-    raise googleapiclient.errors.UnknownApiNameOrVersion(u'name: %s  version: %s' % (api, version))
-  if resp.status >= 400:
-    raise googleapiclient.errors.HttpError(resp, content, uri=requested_url)
+  except googleapiclient.errors.UnknownApiNameOrVersion:
+    pass
+  disc_file, discovery = readDiscoveryFile(api_version)
   try:
-    return json.loads(content)
-  except ValueError:
-    stderrErrorMsg(u'Failed to parse as JSON: {0}'.format(content))
-    raise googleapiclient.errors.InvalidJsonError()
+    return (api_version, http, googleapiclient.discovery.build_from_document(discovery, http=http))
+  except (ValueError, KeyError):
+    invalidJSONExit(disc_file)
 
-def commonAppsObjInit(appsObj):
-  if not tryOAuth(appsObj):
+def buildGAPIServiceObject(api, act_as):
+  _, http, service = getSvcAcctAPIversionHttpService(api)
+  GM_Globals[GM_CURRENT_API_USER] = act_as
+  GM_Globals[GM_CURRENT_API_SCOPES] = API_SCOPE_MAPPING[api]
+  credentials = getSvcAcctCredentials(GM_Globals[GM_CURRENT_API_SCOPES], act_as)
+  try:
+    service._http = credentials.authorize(http)
+  except httplib2.ServerNotFoundError as e:
+    systemErrorExit(4, e)
+  except oauth2client.client.AccessTokenRefreshError as e:
+    entityServiceNotApplicableWarning([u'Calendar', u'User'][api != u'calendar'], act_as, 0, 0)
+    return handleOAuthTokenError(e, True)
+  return service
+
+def buildActivityGAPIObject(user):
+  userEmail = convertUserUIDtoEmailAddress(user)
+  return (userEmail, buildGAPIServiceObject(u'appsactivity', userEmail))
+
+def buildCalendarGAPIObject(calname):
+  calendarId = convertUserUIDtoEmailAddress(calname)
+  return (calendarId, buildGAPIServiceObject(u'calendar', calendarId))
+
+def buildDriveGAPIObject(user):
+  userEmail = convertUserUIDtoEmailAddress(user)
+  return (userEmail, buildGAPIServiceObject(u'drive', userEmail))
+
+def buildGmailGAPIObject(user):
+  userEmail = convertUserUIDtoEmailAddress(user)
+  return (userEmail, buildGAPIServiceObject(u'gmail', userEmail))
+
+def buildGplusGAPIObject(user):
+  userEmail = convertUserUIDtoEmailAddress(user)
+  return (userEmail, buildGAPIServiceObject(u'plus', userEmail))
+
+def initGDataObject(gdataObj, api):
+  _, _, api_version = getAPIVersion(api)
+  disc_file, discovery = readDiscoveryFile(api_version)
+  GM_Globals[GM_CURRENT_API_USER] = None
+  try:
+    GM_Globals[GM_CURRENT_API_SCOPES] = discovery[u'auth'][u'oauth2'][u'scopes'].keys()
+  except KeyError:
+    invalidJSONExit(disc_file)
+  if not getGDataOAuthToken(gdataObj):
     doRequestOAuth()
-    tryOAuth(appsObj)
-  #Identify GAM to Google's Servers
-  appsObj.source = GAM_INFO
-  #Show debugging output if debug.gam exists
+    getGDataOAuthToken(gdataObj)
+  gdataObj.source = GAM_INFO
   if GC_Values[GC_DEBUG_LEVEL] > 0:
-    appsObj.debug = True
-  return appsObj
+    gdataObj.debug = True
+  return gdataObj
 
 def getAdminSettingsObject():
   import gdata.apps.adminsettings.service
-  return commonAppsObjInit(gdata.apps.adminsettings.service.AdminSettingsService())
+  return initGDataObject(gdata.apps.adminsettings.service.AdminSettingsService(), u'admin-settings')
 
 def getAuditObject():
   import gdata.apps.audit.service
-  return commonAppsObjInit(gdata.apps.audit.service.AuditService())
+  return initGDataObject(gdata.apps.audit.service.AuditService(), u'email-audit')
 
 def getEmailSettingsObject():
   import gdata.apps.emailsettings.service
-  return commonAppsObjInit(gdata.apps.emailsettings.service.EmailSettingsService())
+  return initGDataObject(gdata.apps.emailsettings.service.EmailSettingsService(), u'email-settings')
 
 def geturl(url, dst):
   import urllib2
@@ -1038,15 +1303,15 @@ def showReport():
         usage = callGAPIpages(rep.userUsageReport(), u'get', u'usageReports', page_message=page_message, throw_reasons=[u'invalid'],
                               date=try_date, userKey=userKey, customerId=customerId, filters=filters, parameters=parameters)
         break
-      except googleapiclient.errors.HttpError, e:
+      except googleapiclient.errors.HttpError as e:
         error = json.loads(e.content)
       try:
         message = error[u'error'][u'errors'][0][u'message']
       except KeyError:
         raise
       try_date = _adjustDate(message)
-    user_attributes = []
     titles = [u'email', u'date']
+    csvRows = []
     for user_report in usage:
       row = {u'email': user_report[u'entity'][u'userEmail'], u'date': try_date}
       try:
@@ -1059,27 +1324,23 @@ def showReport():
           row[name] = value
       except KeyError:
         pass
-      user_attributes.append(row)
-    header = {}
-    for title in titles:
-      header[title] = title
-    user_attributes.insert(0, header)
-    output_csv(user_attributes, titles, u'User Reports - %s' % try_date, to_drive)
+      csvRows.append(row)
+    writeCSVfile(csvRows, titles, u'User Reports - %s' % try_date, to_drive)
   elif report in [u'customer', u'customers', u'domain']:
     while True:
       try:
         usage = callGAPIpages(rep.customerUsageReports(), u'get', u'usageReports', throw_reasons=[u'invalid'],
                               customerId=customerId, date=try_date, parameters=parameters)
         break
-      except googleapiclient.errors.HttpError, e:
+      except googleapiclient.errors.HttpError as e:
         error = json.loads(e.content)
       try:
         message = error[u'error'][u'errors'][0][u'message']
       except KeyError:
         raise
       try_date = _adjustDate(message)
-    cust_attributes = [{u'name': u'name', u'value': u'value', u'client_id': u'client_id'}]
     titles = [u'name', u'value', u'client_id']
+    csvRows = []
     auth_apps = list()
     for item in usage[0][u'parameters']:
       name = item[u'name']
@@ -1088,7 +1349,7 @@ def showReport():
       except KeyError:
         if name == u'accounts:authorized_apps':
           for subitem in item[u'msgValue']:
-            app = dict()
+            app = {}
             for an_item in subitem:
               if an_item == u'client_name':
                 app[u'name'] = u'App: %s' % subitem[an_item]
@@ -1098,10 +1359,10 @@ def showReport():
                 app[u'client_id'] = subitem[an_item]
             auth_apps.append(app)
         continue
-      cust_attributes.append({u'name': name, u'value': value})
+      csvRows.append({u'name': name, u'value': value})
     for app in auth_apps: # put apps at bottom
-      cust_attributes.append(app)
-    output_csv(csv_list=cust_attributes, titles=titles, list_type=u'Customer Report - %s' % try_date, todrive=to_drive)
+      csvRows.append(app)
+    writeCSVfile(csvRows, titles, u'Customer Report - %s' % try_date, todrive=to_drive)
   elif report in [u'doc', u'docs', u'drive', u'calendar', u'calendars', u'login', u'logins', u'admin', u'token', u'tokens', u'group', u'groups', u'mobile']:
     if report in [u'doc', u'docs']:
       report = u'drive'
@@ -1118,8 +1379,8 @@ def showReport():
                                userKey=userKey, customerId=customerId, actorIpAddress=actorIpAddress,
                                startTime=startTime, endTime=endTime, eventName=eventName, filters=filters)
     if len(activities) > 0:
-      attrs = []
       titles = [u'name']
+      csvRows = []
       for activity in activities:
         events = activity[u'events']
         del activity[u'events']
@@ -1130,28 +1391,29 @@ def showReport():
           for item in row:
             if item not in titles:
               titles.append(item)
-          attrs.append(row)
-      addSortedTitlesToCSV(attrs, u'name', titles)
-      cap_report = u'%s%s' % (report[0].upper(), report[1:])
-      output_csv(attrs, titles, u'%s Activity Report' % cap_report, to_drive)
+          csvRows.append(row)
+      sortCSVTitles([u'name',], titles)
+      writeCSVfile(csvRows, titles, u'%s Activity Report' % report.capitalize(), to_drive)
 
-def doDelegates(users):
+def addDelegates(users, i):
   import gdata.apps.service
   emailsettings = getEmailSettingsObject()
-  if sys.argv[4].lower() == u'to':
-    delegate = sys.argv[5].lower()
-    if not delegate.find(u'@') > 0:
-      delegate_domain = GC_Values[GC_DOMAIN].lower()
-      delegate_email = u'%s@%s' % (delegate, delegate_domain)
-    else:
-      delegate_domain = delegate[delegate.find(u'@')+1:].lower()
-      delegate_email = delegate
+  if i == 4:
+    if sys.argv[i].lower() != u'to':
+      print u'ERROR: %s is not a valid argument for "gam <users> delegate", expected to' % sys.argv[i]
+      sys.exit(2)
+    i += 1
+  delegate = sys.argv[i].lower()
+  if not delegate.find(u'@') > 0:
+    delegate_domain = GC_Values[GC_DOMAIN].lower()
+    delegate_email = u'%s@%s' % (delegate, delegate_domain)
   else:
-    print u'ERROR: %s is not a valid argument for "gam <users> delegate", expected to' % sys.argv[4]
-    sys.exit(2)
+    delegate_domain = delegate[delegate.find(u'@')+1:].lower()
+    delegate_email = delegate
+  i = 0
   count = len(users)
-  i = 1
   for delegator in users:
+    i += 1
     if delegator.find(u'@') > 0:
       delegator_domain = delegator[delegator.find(u'@')+1:].lower()
       delegator_email = delegator
@@ -1160,8 +1422,7 @@ def doDelegates(users):
       delegator_domain = GC_Values[GC_DOMAIN].lower()
       delegator_email = u'%s@%s' % (delegator, delegator_domain)
     emailsettings.domain = delegator_domain
-    print u"Giving %s delegate access to %s (%s of %s)" % (delegate_email, delegator_email, i, count)
-    i += 1
+    print u"Giving %s delegate access to %s (%s/%s)" % (delegate_email, delegator_email, i, count)
     delete_alias = False
     if delegate_domain == delegator_domain:
       use_delegate_address = delegate_email
@@ -1191,7 +1452,7 @@ def doDelegates(users):
       try:
         callGData(emailsettings, u'CreateDelegate', throw_errors=[600, 1000, 1001], delegate=use_delegate_address, delegator=delegator)
         break
-      except gdata.apps.service.AppsForYourDomainException, e:
+      except gdata.apps.service.AppsForYourDomainException as e:
         # 1st check to see if delegation already exists (causes 1000 error on create when using alias)
         get_delegates = callGData(emailsettings, u'GetDelegates', delegator=delegator)
         for get_delegate in get_delegates:
@@ -1246,33 +1507,49 @@ def gen_sha512_hash(password):
   from passlib.handlers.sha2_crypt import sha512_crypt
   return sha512_crypt.encrypt(password, rounds=5000)
 
-def getDelegates(users):
+def printShowDelegates(users, csvFormat):
   emailsettings = getEmailSettingsObject()
-  csv_format = False
+  if csvFormat:
+    todrive = False
+    csvRows = []
+    titles = [u'User', u'delegateName', u'delegateAddress', u'delegationStatus']
+  else:
+    csvStyle = False
   i = 5
   while i < len(sys.argv):
-    if sys.argv[i].lower() == u'csv':
-      csv_format = True
+    myarg = sys.argv[i].lower()
+    if not csvFormat and myarg == u'csv':
+      csvStyle = True
+      i += 1
+    elif csvFormat and myarg == u'todrive':
+      todrive = True
       i += 1
     else:
       print u'ERROR: %s is not a valid argument for "gam <users> show delegates"' % sys.argv[i]
       sys.exit(2)
   for user in users:
-    if user.find(u'@') > 0:
-      emailsettings.domain = user[user.find(u'@')+1:]
-      user = user[:user.find(u'@')]
-    else:
+    if user.find(u'@') == -1:
+      userName = user
+      user = u'%s@%s' % (user, GC_Values[GC_DOMAIN])
       emailsettings.domain = GC_Values[GC_DOMAIN]
-    sys.stderr.write(u"Getting delegates for %s...\n" % (user + u'@' + emailsettings.domain))
-    delegates = callGData(emailsettings, u'GetDelegates', soft_errors=True, delegator=user)
-    try:
-      for delegate in delegates:
-        if csv_format:
-          print u'%s,%s,%s' % (user + u'@' + emailsettings.domain, delegate[u'address'], delegate[u'status'])
-        else:
-          print convertUTF8(u"Delegator: %s\n Delegate: %s\n Status: %s\n Delegate Email: %s\n Delegate ID: %s\n" % (user, delegate[u'delegate'], delegate[u'status'], delegate[u'address'], delegate[u'delegationId']))
-    except TypeError:
-      pass
+    else:
+      userName = user[:user.find(u'@')]
+      emailsettings.domain = user[user.find(u'@')+1:]
+    sys.stderr.write(u"Getting delegates for %s...\n" % (user))
+    delegates = callGData(emailsettings, u'GetDelegates', soft_errors=True, delegator=userName)
+    if delegates:
+      if not csvFormat:
+        for delegate in delegates:
+          if csvStyle:
+            print u'%s,%s,%s' % (user, delegate[u'address'], delegate[u'status'])
+          else:
+            print convertUTF8(u"Delegator: %s\n Delegate: %s\n Status: %s\n Delegate Email: %s\n Delegate ID: %s\n" % (user, delegate[u'delegate'], delegate[u'status'], delegate[u'address'], delegate[u'delegationId']))
+      else:
+        for delegate in delegates:
+          row = {u'User': user, u'delegateName': delegate[u'delegate'], u'delegateAddress': delegate[u'address'], u'delegationStatus': delegate[u'status']}
+          csvRows.append(row)
+  if csvFormat:
+    writeCSVfile(csvRows, titles, u'Delegates', todrive)
 
 def deleteDelegate(users):
   emailsettings = getEmailSettingsObject()
@@ -1283,16 +1560,16 @@ def deleteDelegate(users):
     else:
       delegatedomain = GC_Values[GC_DOMAIN]
     delegate = delegate+u'@'+delegatedomain
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
+    i += 1
     if user.find(u'@') > 0:
       emailsettings.domain = user[user.find(u'@')+1:]
       user = user[:user.find(u'@')]
     else:
       emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Deleting %s delegate access to %s (%s of %s)" % (delegate, user+u'@'+emailsettings.domain, i, count)
-    i += 1
+    print u"Deleting %s delegate access to %s (%s/%s)" % (delegate, user+u'@'+emailsettings.domain, i, count)
     callGData(emailsettings, u'DeleteDelegate', delegate=delegate, delegator=user)
 
 def doAddCourseParticipant():
@@ -1549,10 +1826,9 @@ def doDelDomainAlias():
 
 def doPrintDomains():
   cd = buildGAPIObject(u'directory')
-  titles = []
-  domains_attributes = [{}]
   todrive = False
-  domains = callGAPI(cd.domains(), u'list', customer=GC_Values[GC_CUSTOMER_ID])
+  titles = [u'domainName',]
+  csvRows = []
   i = 3
   while i < len(sys.argv):
     if sys.argv[i].lower() == u'todrive':
@@ -1561,19 +1837,19 @@ def doPrintDomains():
     else:
       print u'ERROR: %s is not a valid argument for "gam print domains".' % sys.argv[i]
       sys.exit(2)
-  for domain in domains[u'domains']:
+  results = callGAPI(cd.domains(), u'list', customer=GC_Values[GC_CUSTOMER_ID])
+  for domain in results[u'domains']:
     domain_attributes = {}
     domain[u'type'] = [u'secondary', u'primary'][domain[u'isPrimary']]
     for attr in domain:
-      if attr in [u'kind', u'domainAliases', u'etag', u'etags', u'isPrimary']:
+      if attr in [u'kind', u'etag', u'domainAliases', u'isPrimary']:
         continue
-      elif attr in [u'creationTime',]:
+      if attr in [u'creationTime',]:
         domain[attr] = unicode(datetime.datetime.fromtimestamp(int(domain[attr])/1000))
       if attr not in titles:
         titles.append(attr)
-        domains_attributes[0][attr] = attr
       domain_attributes[attr] = domain[attr]
-    domains_attributes.append(domain_attributes)
+    csvRows.append(domain_attributes)
     if u'domainAliases' in domain:
       for aliasdomain in domain[u'domainAliases']:
         aliasdomain[u'domainName'] = aliasdomain[u'domainAliasName']
@@ -1583,14 +1859,40 @@ def doPrintDomains():
         for attr in aliasdomain:
           if attr in [u'kind', u'etag']:
             continue
-          elif attr in [u'creationTime',]:
+          if attr in [u'creationTime',]:
             aliasdomain[attr] = unicode(datetime.datetime.fromtimestamp(int(aliasdomain[attr])/1000))
           if attr not in titles:
             titles.append(attr)
-            domains_attributes[0][attr] = attr
           aliasdomain_attributes[attr] = aliasdomain[attr]
-        domains_attributes.append(aliasdomain_attributes)
-  output_csv(domains_attributes, titles, u'Domains', todrive)
+        csvRows.append(aliasdomain_attributes)
+  writeCSVfile(csvRows, titles, u'Domains', todrive)
+
+def doPrintDomainAliases():
+  cd = buildGAPIObject(u'directory')
+  todrive = False
+  titles = [u'domainAliasName',]
+  csvRows = []
+  i = 3
+  while i < len(sys.argv):
+    if sys.argv[i].lower() == u'todrive':
+      todrive = True
+      i += 1
+    else:
+      print u'ERROR: %s is not a valid argument for "gam print domainaliases".' % sys.argv[i]
+      sys.exit(2)
+  results = callGAPI(cd.domainAliases(), u'list', customer=GC_Values[GC_CUSTOMER_ID])
+  for domainAlias in results[u'domainAliases']:
+    domainAlias_attributes = {}
+    for attr in domainAlias:
+      if attr in [u'kind', u'etag']:
+        continue
+      if attr == u'creationTime':
+        domainAlias[attr] = unicode(datetime.datetime.fromtimestamp(int(domainAlias[attr])/1000))
+      if attr not in titles:
+        titles.append(attr)
+      domainAlias_attributes[attr] = domainAlias[attr]
+    csvRows.append(domainAlias_attributes)
+  writeCSVfile(csvRows, titles, u'Domains', todrive)
 
 def doDelAdmin():
   cd = buildGAPIObject(u'directory')
@@ -1644,6 +1946,9 @@ def doCreateAdmin():
 def doPrintAdminRoles():
   cd = buildGAPIObject(u'directory')
   todrive = False
+  titles = [u'roleId', u'roleName', u'roleDescription', u'isSuperAdminRole', u'isSystemRole']
+  fields = u'nextPageToken,items({0})'.format(u','.join(titles))
+  csvRows = []
   i = 3
   while i < len(sys.argv):
     if sys.argv[i].lower() == u'todrive':
@@ -1653,26 +1958,22 @@ def doPrintAdminRoles():
       print u'ERROR: %s is not a valid argument for "gam print adminroles".' % sys.argv[i]
       sys.exit(2)
   roles = callGAPIpages(cd.roles(), u'list', u'items',
-                        customer=GC_Values[GC_CUSTOMER_ID])
-  roles_attrib = [{}]
+                        customer=GC_Values[GC_CUSTOMER_ID], fields=fields)
   for role in roles:
     role_attrib = {}
     for key, value in role.items():
-      if key in [u'kind', u'etag', u'etags']:
-        continue
-      if not isinstance(value, (str, unicode, bool)):
-        continue
-      if key not in roles_attrib[0]:
-        roles_attrib[0][key] = key
       role_attrib[key] = value
-    roles_attrib.append(role_attrib)
-  output_csv(roles_attrib, roles_attrib[0], u'Admin Roles', todrive)
+    csvRows.append(role_attrib)
+  writeCSVfile(csvRows, titles, u'Admin Roles', todrive)
 
 def doPrintAdmins():
   cd = buildGAPIObject(u'directory')
   roleId = None
   userKey = None
   todrive = False
+  fields = u'nextPageToken,items({0})'.format(u','.join([u'roleAssignmentId', u'roleId', u'assignedTo', u'scopeType', u'orgUnitId']))
+  titles = [u'roleAssignmentId', u'roleId', u'role', u'assignedTo', u'assignedToUser', u'scopeType', u'orgUnitId', u'orgUnit']
+  csvRows = []
   i = 3
   while i < len(sys.argv):
     if sys.argv[i].lower() == u'user':
@@ -1695,34 +1996,20 @@ def doPrintAdmins():
       print u'ERROR: %s is not a valid argument for "gam print admins".' % sys.argv[i]
       sys.exit(2)
   admins = callGAPIpages(cd.roleAssignments(), u'list', u'items',
-                         customer=GC_Values[GC_CUSTOMER_ID], userKey=userKey, roleId=roleId, maxResults=200)
-  admins_attrib = [{}]
+                         customer=GC_Values[GC_CUSTOMER_ID], userKey=userKey, roleId=roleId, fields=fields)
   for admin in admins:
     admin_attrib = {}
     for key, value in admin.items():
-      if key in [u'kind', u'etag']:
-        continue
-      if key not in admins_attrib[0]:
-        admins_attrib[0][key] = key
       if key == u'assignedTo':
-        assignedToUser = user_from_userid(value)
-        if u'assignedToUser' not in admins_attrib[0]:
-          admins_attrib[0][u'assignedToUser'] = u'assignedToUser'
-        admin_attrib[u'assignedToUser'] = assignedToUser
+        admin_attrib[u'assignedToUser'] = user_from_userid(value)
       elif key == u'roleId':
-        role = role_from_roleid(value)
-        if u'role' not in admins_attrib[0]:
-          admins_attrib[0][u'role'] = u'role'
-        admin_attrib[u'role'] = role
+        admin_attrib[u'role'] = role_from_roleid(value)
       elif key == u'orgUnitId':
-        value = u'id:%s' % value
-        orgUnit = orgunit_from_orgunitid(value)
-        if u'orgUnit' not in admins_attrib[0]:
-          admins_attrib[0][u'orgUnit'] = u'orgUnit'
-        admin_attrib[u'orgUnit'] = orgUnit
+        value = u'id:{0}'.format(value)
+        admin_attrib[u'orgUnit'] = orgunit_from_orgunitid(value)
       admin_attrib[key] = value
-    admins_attrib.append(admin_attrib)
-  output_csv(admins_attrib, admins_attrib[0], u'Admins', todrive)
+    csvRows.append(admin_attrib)
+  writeCSVfile(csvRows, titles, u'Admins', todrive)
 
 def buildOrgUnitIdToNameMap():
   cd = buildGAPIObject(u'directory')
@@ -1864,6 +2151,8 @@ def doPrintDataTransfers():
   oldOwnerUserId = None
   status = None
   todrive = False
+  titles = [u'id',]
+  csvRows = []
   while i < len(sys.argv):
     if sys.argv[i].lower().replace(u'_', u'') in [u'olduser', u'oldowner']:
       oldOwnerUserId = convertToUserID(sys.argv[i+1])
@@ -1880,13 +2169,12 @@ def doPrintDataTransfers():
     else:
       print u'ERROR: %s is not a valid argument for "gam print transfers"' % sys.argv[i]
       sys.exit(2)
-  transfers_attributes = [{}]
   transfers = callGAPIpages(dt.transfers(), u'list', u'dataTransfers',
                             customerId=GC_Values[GC_CUSTOMER_ID], status=status,
                             newOwnerUserId=newOwnerUserId, oldOwnerUserId=oldOwnerUserId)
   for transfer in transfers:
     for i in range(0, len(transfer[u'applicationDataTransfers'])):
-      a_transfer = dict()
+      a_transfer = {}
       a_transfer[u'oldOwnerUserEmail'] = convertUserIDtoEmail(transfer[u'oldOwnerUserId'])
       a_transfer[u'newOwnerUserEmail'] = convertUserIDtoEmail(transfer[u'newOwnerUserId'])
       a_transfer[u'requestTime'] = transfer[u'requestTime']
@@ -1898,10 +2186,10 @@ def doPrintDataTransfers():
         for param in transfer[u'applicationDataTransfers'][i][u'applicationTransferParams']:
           a_transfer[param[u'key']] = u','.join(param[u'value'])
     for title in a_transfer:
-      if title not in transfers_attributes[0]:
-        transfers_attributes[0][title] = title
-    transfers_attributes.append(a_transfer)
-  output_csv(transfers_attributes, transfers_attributes[0], u'Data Transfers', todrive)
+      if title not in titles:
+        titles.append(title)
+    csvRows.append(a_transfer)
+  writeCSVfile(csvRows, titles, u'Data Transfers', todrive)
 
 def doGetDataTransferInfo():
   dt = buildGAPIObject(u'datatransfer')
@@ -1923,7 +2211,7 @@ def doGetDataTransferInfo():
 
 def doCreateCourse():
   croom = buildGAPIObject(u'classroom')
-  body = dict()
+  body = {}
   i = 3
   while i < len(sys.argv):
     if sys.argv[i].lower() == u'name':
@@ -1996,9 +2284,9 @@ def doGetCourseInfo():
 
 def doPrintCourses():
   croom = buildGAPIObject(u'classroom')
-  croom_attributes = [{}]
-  titles = []
   todrive = False
+  titles = [u'id',]
+  csvRows = []
   teacherId = None
   studentId = None
   get_aliases = False
@@ -2023,31 +2311,26 @@ def doPrintCourses():
   page_message = u'Got %%num_items%% courses...\n'
   all_courses = callGAPIpages(croom.courses(), u'list', u'courses', page_message=page_message, teacherId=teacherId, studentId=studentId)
   for course in all_courses:
-    croom_attributes.append(flatten_json(course))
-    for item in croom_attributes[-1]:
-      if item not in titles:
-        titles.append(item)
-        croom_attributes[0][item] = item
+    addRowTitlesToCSVfile(flatten_json(course), csvRows, titles)
   if get_aliases:
     titles.append(u'Aliases')
-    croom_attributes[0].update(Aliases=u'Aliases')
-    num_courses = len(croom_attributes[1:])
-    i = 1
-    for course in croom_attributes[1:]:
+    i = 0
+    num_courses = len(csvRows)
+    for course in csvRows:
+      i += 1
       sys.stderr.write(u'Getting aliases for course %s (%s/%s)\n' % (course[u'id'], i, num_courses))
       course_aliases = callGAPIpages(croom.courses().aliases(), u'list', u'aliases', courseId=course[u'id'])
       my_aliases = []
       for alias in course_aliases:
         my_aliases.append(alias[u'alias'][2:])
       course.update(Aliases=u' '.join(my_aliases))
-      i += 1
-  output_csv(croom_attributes, titles, u'Courses', todrive)
+  writeCSVfile(csvRows, titles, u'Courses', todrive)
 
 def doPrintCourseParticipants():
   croom = buildGAPIObject(u'classroom')
-  participants_attributes = [{}]
-  titles = []
   todrive = False
+  titles = [u'courseId',]
+  csvRows = []
   courses = []
   teacherId = None
   studentId = None
@@ -2094,23 +2377,21 @@ def doPrintCourseParticipants():
       participant[u'courseId'] = course_id
       participant[u'courseName'] = course[u'name']
       participant[u'userRole'] = u'TEACHER'
-      participants_attributes.append(participant)
+      csvRows.append(participant)
       for item in participant:
         if item not in titles:
           titles.append(item)
-          participants_attributes[0][item] = item
     for student in students:
       participant = flatten_json(student)
       participant[u'courseId'] = course_id
       participant[u'courseName'] = course[u'name']
       participant[u'userRole'] = u'STUDENT'
-      participants_attributes.append(participant)
+      csvRows.append(participant)
       for item in participant:
         if item not in titles:
           titles.append(item)
-          participants_attributes[0][item] = item
     y += 1
-  output_csv(participants_attributes, titles, u'Course Participants', todrive)
+  writeCSVfile(csvRows, titles, u'Course Participants', todrive)
 
 PRINTJOB_ASCENDINGORDER_MAP = {
   u'createtime': u'CREATE_TIME',
@@ -2128,9 +2409,9 @@ PRINTJOBS_DEFAULT_MAX_RESULTS = 100
 
 def doPrintPrintJobs():
   cp = buildGAPIObject(u'cloudprint')
-  job_attributes = [{}]
-  titles = []
   todrive = False
+  titles = [u'printerid', u'id']
+  csvRows = []
   printerid = None
   owner = None
   status = None
@@ -2231,18 +2512,14 @@ def doPrintPrintJobs():
       job[u'createTime'] = datetime.datetime.fromtimestamp(createTime).strftime(u'%Y-%m-%d %H:%M:%S')
       job[u'updateTime'] = datetime.datetime.fromtimestamp(updateTime).strftime(u'%Y-%m-%d %H:%M:%S')
       job[u'tags'] = u' '.join(job[u'tags'])
-      job_attributes.append(flatten_json(job))
-      for item in job_attributes[-1]:
-        if item not in titles:
-          titles.append(item)
-          job_attributes[0][item] = item
-  output_csv(job_attributes, titles, u'Print Jobs', todrive)
+      addRowTitlesToCSVfile(flatten_json(job), csvRows, titles)
+  writeCSVfile(csvRows, titles, u'Print Jobs', todrive)
 
 def doPrintPrinters():
   cp = buildGAPIObject(u'cloudprint')
-  printer_attributes = [{}]
-  titles = []
   todrive = False
+  titles = [u'id',]
+  csvRows = []
   query = None
   printer_type = None
   connection_status = None
@@ -2277,15 +2554,10 @@ def doPrintPrinters():
     printer[u'accessTime'] = datetime.datetime.fromtimestamp(accessTime).strftime(u'%Y-%m-%d %H:%M:%S')
     printer[u'updateTime'] = datetime.datetime.fromtimestamp(updateTime).strftime(u'%Y-%m-%d %H:%M:%S')
     printer[u'tags'] = u' '.join(printer[u'tags'])
-    printer_attributes.append(flatten_json(printer))
-    for item in printer_attributes[-1]:
-      if item not in titles:
-        titles.append(item)
-        printer_attributes[0][item] = item
-  output_csv(printer_attributes, titles, u'Printers', todrive)
+    addRowTitlesToCSVfile(flatten_json(printer), csvRows, titles)
+  writeCSVfile(csvRows, titles, u'Printers', todrive)
 
 def changeCalendarAttendees(users):
-  cal = buildGAPIServiceObject(u'calendar', users[0])
   do_it = True
   i = 5
   allevents = False
@@ -2309,15 +2581,15 @@ def changeCalendarAttendees(users):
     else:
       print u'ERROR: %s is not a valid argument for "gam <users> update calattendees"' % sys.argv[i]
       sys.exit(2)
-  attendee_map = dict()
+  attendee_map = {}
   csvfile = csv.reader(open(csv_file, u'rb'))
   for row in csvfile:
     attendee_map[row[0].lower()] = row[1].lower()
   for user in users:
     sys.stdout.write(u'Checking user %s\n' % user)
-    if user.find(u'@') == -1:
-      user = u'%s@%s' % (user, GC_Values[GC_DOMAIN])
-    cal = buildGAPIServiceObject(u'calendar', user)
+    user, cal = buildCalendarGAPIObject(user)
+    if not cal:
+      continue
     page_token = None
     while True:
       events_page = callGAPI(cal.events(), u'list', calendarId=user, pageToken=page_token, timeMin=start_date, timeMax=end_date, showDeleted=False, showHiddenInvitations=False)
@@ -2352,7 +2624,7 @@ def changeCalendarAttendees(users):
         except KeyError:
           continue # no attendees
         if needs_update:
-          body = dict()
+          body = {}
           body[u'attendees'] = event[u'attendees']
           print u'UPDATING %s' % event_summary
           if do_it:
@@ -2372,9 +2644,9 @@ def deleteCalendar(users):
   if calendarId.find(u'@') == -1:
     calendarId = u'%s@%s' % (calendarId, GC_Values[GC_DOMAIN])
   for user in users:
-    if user.find(u'@') == -1:
-      user = u'%s@%s' % (user, GC_Values[GC_DOMAIN])
-    cal = buildGAPIServiceObject(u'calendar', user)
+    user, cal = buildCalendarGAPIObject(user)
+    if not cal:
+      continue
     callGAPI(cal.calendarList(), u'delete', calendarId=calendarId)
 
 CALENDAR_REMINDER_METHODS = [u'email', u'sms', u'popup',]
@@ -2466,15 +2738,15 @@ def addCalendar(users):
     calendarId = u'%s@%s' % (calendarId, GC_Values[GC_DOMAIN])
   body = {u'id': calendarId, u'selected': True, u'hidden': False}
   colorRgbFormat = getCalendarAttributes(6, body, u'add')
-  i = 1
+  i = 0
   count = len(users)
   for user in users:
-    if user.find(u'@') == -1:
-      user = u'%s@%s' % (user, GC_Values[GC_DOMAIN])
-    print u"Subscribing %s to %s calendar (%s of %s)" % (user, calendarId, i, count)
-    cal = buildGAPIServiceObject(u'calendar', user)
-    callGAPI(cal.calendarList(), u'insert', body=body, colorRgbFormat=colorRgbFormat)
     i += 1
+    user, cal = buildCalendarGAPIObject(user)
+    if not cal:
+      continue
+    print u"Subscribing %s to %s calendar (%s/%s)" % (user, calendarId, i, count)
+    callGAPI(cal.calendarList(), u'insert', body=body, colorRgbFormat=colorRgbFormat)
 
 def updateCalendar(users):
   buildGAPIObject(u'calendar')
@@ -2483,15 +2755,15 @@ def updateCalendar(users):
     calendarId = u'%s@%s' % (calendarId, GC_Values[GC_DOMAIN])
   body = {}
   colorRgbFormat = getCalendarAttributes(6, body, u'update')
-  i = 1
+  i = 0
   count = len(users)
   for user in users:
-    if user.find(u'@') == -1:
-      user = u'%s@%s' % (user, GC_Values[GC_DOMAIN])
-    print u"Updating %s's subscription to calendar %s (%s of %s)" % (user, calendarId, i, count)
-    cal = buildGAPIServiceObject(u'calendar', user)
-    callGAPI(cal.calendarList(), u'update', calendarId=calendarId, body=body, colorRgbFormat=colorRgbFormat)
     i += 1
+    user, cal = buildCalendarGAPIObject(user)
+    if not cal:
+      continue
+    print u"Updating %s's subscription to calendar %s (%s/%s)" % (user, calendarId, i, count)
+    callGAPI(cal.calendarList(), u'update', calendarId=calendarId, body=body, colorRgbFormat=colorRgbFormat)
 
 def doPrinterShowACL():
   cp = buildGAPIObject(u'cloudprint')
@@ -2593,6 +2865,7 @@ def doPrintJobFetch():
   age = None
   older_or_newer = None
   jobLimit = PRINTJOBS_DEFAULT_JOB_LIMIT
+  targetFolder = os.getcwd()
   i = 4
   while i < len(sys.argv):
     myarg = sys.argv[i].lower().replace(u'_', u'')
@@ -2641,6 +2914,14 @@ def doPrintJobFetch():
     elif myarg == u'limit':
       jobLimit = max(0, int(sys.argv[i+1]))
       i += 2
+    elif myarg == u'drivedir':
+      targetFolder = GC_Values[GC_DRIVE_DIR]
+      i += 1
+    elif myarg == u'targetfolder':
+      targetFolder = os.path.expanduser(sys.argv[i+1])
+      if not os.path.isdir(targetFolder):
+        os.makedirs(targetFolder)
+      i += 2
     else:
       print u'ERROR: %s is not a valid argument for "gam printjobs fetch"' % sys.argv[i]
       sys.exit(2)
@@ -2678,7 +2959,7 @@ def doPrintJobFetch():
           continue
       fileUrl = job[u'fileUrl']
       jobid = job[u'id']
-      fileName = u'{0}-{1}'.format(u''.join(c if c in valid_chars else u'_' for c in job[u'title']), jobid)
+      fileName = os.path.join(targetFolder, u'{0}-{1}'.format(u''.join(c if c in valid_chars else u'_' for c in job[u'title']), jobid))
       _, content = cp._http.request(uri=fileUrl, method='GET')
       if writeFile(fileName, content, continueOnError=True):
 #        ticket = callGAPI(cp.jobs(), u'getticket', jobid=jobid, use_cjt=True)
@@ -2832,7 +3113,7 @@ def doPrintJobSubmit():
   callGAPI(cp.printers(), u'get', printerid=printer)
   _, result = cp._http.request(uri='https://www.google.com/cloudprint/submit', method='POST', body=body, headers=headers)
   checkCloudPrintResult(result)
-  if type(result) is str:
+  if isinstance(result, str):
     result = json.loads(result)
   print u'Submitted print job %s' % result[u'job'][u'id']
 
@@ -2852,7 +3133,7 @@ def doCancelPrintJob():
   print u'Print Job %s cancelled' % job
 
 def checkCloudPrintResult(result):
-  if type(result) is str:
+  if isinstance(result, str):
     try:
       result = json.loads(result)
     except ValueError:
@@ -2878,11 +3159,10 @@ def doCalendarShowACL():
 
 def doCalendarAddACL(calendarId=None, act_as=None, role=None, scope=None, entity=None):
   if act_as != None:
-    cal = buildGAPIServiceObject(u'calendar', act_as)
+    act_as, cal = buildCalendarGAPIObject(act_as)
   else:
     cal = buildGAPIObject(u'calendar')
-  body = dict()
-  body[u'scope'] = dict()
+  body = {u'scope': {}}
   if calendarId == None:
     calendarId = sys.argv[2]
   if calendarId.find(u'@') == -1:
@@ -2946,15 +3226,15 @@ def doCalendarDelACL():
   doCalendarAddACL(calendarId=calendarId, role=u'none', scope=scope, entity=entity)
 
 def doCalendarWipeData():
-  calendarId = sys.argv[2]
-  cal = buildGAPIServiceObject(u'calendar', calendarId)
-  if calendarId.find(u'@') == -1:
-    calendarId = u'%s@%s' % (calendarId, GC_Values[GC_DOMAIN])
+  calendarId, cal = buildCalendarGAPIObject(sys.argv[2])
+  if not cal:
+    return
   callGAPI(cal.calendars(), u'clear', calendarId=calendarId)
 
 def doCalendarAddEvent():
-  calendarId = sys.argv[2]
-  cal = buildGAPIServiceObject(u'calendar', calendarId)
+  calendarId, cal = buildCalendarGAPIObject(sys.argv[2])
+  if not cal:
+    return
   sendNotifications = timeZone = None
   i = 4
   body = {}
@@ -3068,10 +3348,8 @@ def doCalendarAddEvent():
         body[a_time][u'timeZone'] = timeZone
       except KeyError:
         pass
-
   callGAPI(cal.events(), u'insert', calendarId=calendarId, sendNotifications=sendNotifications, body=body)
 
-
 def doProfile(users):
   cd = buildGAPIObject(u'directory')
   if sys.argv[4].lower() == u'share' or sys.argv[4].lower() == u'shared':
@@ -3081,22 +3359,23 @@ def doProfile(users):
   else:
     print u'ERROR: value for "gam <users> profile" must be true or false, got %s' % sys.argv[4]
     sys.exit(2)
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
+    i += 1
     if user[:4].lower() == u'uid:':
       user = user[4:]
     elif user.find(u'@') == -1:
       user = u'%s@%s' % (user, GC_Values[GC_DOMAIN])
-    print u'Setting Profile Sharing to %s for %s (%s of %s)' % (body[u'includeInGlobalAddressList'], user, i, count)
+    print u'Setting Profile Sharing to %s for %s (%s/%s)' % (body[u'includeInGlobalAddressList'], user, i, count)
     callGAPI(cd.users(), u'patch', soft_errors=True, userKey=user, body=body)
-    i += 1
 
 def showProfile(users):
   cd = buildGAPIObject(u'directory')
-  i = 1
+  i = 0
   count = len(users)
   for user in users:
+    i += 1
     if user[:4].lower() == u'uid:':
       user = user[4:]
     elif user.find(u'@') == -1:
@@ -3106,13 +3385,13 @@ def showProfile(users):
       print u'User: %s  Profile Shared: %s (%s/%s)' % (user, result[u'includeInGlobalAddressList'], i, count)
     except IndexError:
       pass
-    i += 1
 
 def doPhoto(users):
   cd = buildGAPIObject(u'directory')
-  i = 1
+  i = 0
   count = len(users)
   for user in users:
+    i += 1
     if user[:4].lower() == u'uid:':
       user = user[4:]
     elif user.find(u'@') == -1:
@@ -3120,21 +3399,20 @@ def doPhoto(users):
     filename = sys.argv[5].replace(u'#user#', user)
     filename = filename.replace(u'#email#', user)
     filename = filename.replace(u'#username#', user[:user.find(u'@')])
-    print u"Updating photo for %s with %s (%s of %s)" % (user, filename, i, count)
-    i += 1
+    print u"Updating photo for %s with %s (%s/%s)" % (user, filename, i, count)
     if re.match(u'^(ht|f)tps?://.*$', filename):
       import urllib2
       try:
         f = urllib2.urlopen(filename)
         image_data = str(f.read())
-      except urllib2.HTTPError, e:
+      except urllib2.HTTPError as e:
         print e
         continue
     else:
       try:
         with open(filename, u'rb') as f:
           image_data = f.read()
-      except IOError, e:
+      except IOError as e:
         print u' couldn\'t open %s: %s' % (filename, e.strerror)
         continue
     image_data = base64.urlsafe_b64encode(image_data)
@@ -3143,16 +3421,35 @@ def doPhoto(users):
 
 def getPhoto(users):
   cd = buildGAPIObject(u'directory')
-  i = 1
+  targetFolder = os.getcwd()
+  showPhotoData = True
+  i = 5
+  while i < len(sys.argv):
+    myarg = sys.argv[i].lower().replace(u'_', u'')
+    if myarg == u'drivedir':
+      targetFolder = GC_Values[GC_DRIVE_DIR]
+      i += 1
+    elif myarg == u'targetfolder':
+      targetFolder = os.path.expanduser(sys.argv[i+1])
+      if not os.path.isdir(targetFolder):
+        os.makedirs(targetFolder)
+      i += 2
+    elif myarg == u'noshow':
+      showPhotoData = False
+      i += 1
+    else:
+      print u'ERROR: %s is not a valid argument for "gam <users> get photo"' % sys.argv[i]
+      sys.exit(2)
+  i = 0
   count = len(users)
   for user in users:
+    i += 1
     if user[:4].lower() == u'uid:':
       user = user[4:]
     elif user.find(u'@') == -1:
       user = u'%s@%s' % (user, GC_Values[GC_DOMAIN])
-    filename = u'%s.jpg' % user
+    filename = os.path.join(targetFolder, u'{0}.jpg'.format(user))
     print u"Saving photo to %s (%s/%s)" % (filename, i, count)
-    i += 1
     try:
       photo = callGAPI(cd.users().photos(), u'get', throw_reasons=[u'notFound'], userKey=user)
     except googleapiclient.errors.HttpError:
@@ -3160,7 +3457,8 @@ def getPhoto(users):
       continue
     try:
       photo_data = str(photo[u'photoData'])
-      print photo_data
+      if showPhotoData:
+        print photo_data
       photo_data = base64.urlsafe_b64decode(photo_data)
     except KeyError:
       print u' no photo for %s' % user
@@ -3169,47 +3467,105 @@ def getPhoto(users):
 
 def deletePhoto(users):
   cd = buildGAPIObject(u'directory')
-  i = 1
+  i = 0
   count = len(users)
   for user in users:
+    i += 1
     if user[:4].lower() == u'uid:':
       user = user[4:]
     elif user.find(u'@') == -1:
       user = u'%s@%s' % (user, GC_Values[GC_DOMAIN])
-    print u"Deleting photo for %s (%s of %s)" % (user, i, count)
+    print u"Deleting photo for %s (%s/%s)" % (user, i, count)
     callGAPI(cd.users().photos(), u'delete', userKey=user)
-    i += 1
 
-def showCalendars(users):
+def _showCalendar(userCalendar, j, jcount):
+  print u'  Calendar: {0} ({1}/{2})'.format(userCalendar[u'id'], j, jcount)
+  print convertUTF8(u'    Summary: {0}'.format(userCalendar.get(u'summaryOverride', userCalendar[u'summary'])))
+  print convertUTF8(u'    Description: {0}'.format(userCalendar.get(u'description', u'')))
+  print u'    Access Level: {0}'.format(userCalendar[u'accessRole'])
+  print u'    Timezone: {0}'.format(userCalendar[u'timeZone'])
+  print convertUTF8(u'    Location: {0}'.format(userCalendar.get(u'location', u'')))
+  print u'    Hidden: {0}'.format(userCalendar.get(u'hidden', u'False'))
+  print u'    Selected: {0}'.format(userCalendar.get(u'selected', u'False'))
+  print u'    Color ID: {0}, Background Color: {1}, Foreground Color: {2}'.format(userCalendar[u'colorId'], userCalendar[u'backgroundColor'], userCalendar[u'foregroundColor'])
+  print u'    Default Reminders:'
+  for reminder in userCalendar.get(u'defaultReminders', []):
+    print u'      Method: {0}, Minutes: {1}'.format(reminder[u'method'], reminder[u'minutes'])
+  print u'    Notifications:'
+  if u'notificationSettings' in userCalendar:
+    for notification in userCalendar[u'notificationSettings'].get(u'notifications', []):
+      print u'      Method: {0}, Type: {1}'.format(notification[u'method'], notification[u'type'])
+
+def infoCalendar(users):
+  buildGAPIObject(u'calendar')
+  calendarId = sys.argv[5].lower()
+  if calendarId != u'primary' and calendarId.find(u'@') == -1:
+    calendarId = u'%s@%s' % (calendarId, GC_Values[GC_DOMAIN])
+  i = 0
+  count = len(users)
   for user in users:
-    cal = buildGAPIServiceObject(u'calendar', user)
-    feed = callGAPI(cal.calendarList(), u'list')
-    for usercal in feed[u'items']:
-      print u'  Name: %s' % usercal[u'id']
-      print convertUTF8(u'  Summary: %s' % usercal.get(u'summaryOverride', usercal[u'summary']))
-      print convertUTF8(u'    Description: %s' % usercal.get(u'description', u''))
-      print u'    Access Level: %s' % usercal[u'accessRole']
-      print u'    Timezone: %s' % usercal[u'timeZone']
-      print convertUTF8(u'    Location: %s' % usercal.get(u'location', u''))
-      print u'    Hidden: %s' % usercal.get(u'hidden', u'False')
-      print u'    Selected: %s' % usercal.get(u'selected', u'False')
-      print u'    Default Reminders:'
-      for reminder in usercal.get(u'defaultReminders', []):
-        print u'      Type: %s  Minutes: %s' % (reminder[u'method'], reminder[u'minutes'])
-      print u'    Notifications:'
-      if u'notificationSettings' in usercal:
-        for notification in usercal[u'notificationSettings'].get(u'notifications', []):
-          print u'      Method: %s  Type: %s' % (notification[u'method'], notification[u'type'])
-      print u''
+    i += 1
+    user, cal = buildCalendarGAPIObject(user)
+    if not cal:
+      continue
+    result = callGAPI(cal.calendarList(), u'get',
+                      soft_errors=True,
+                      calendarId=calendarId)
+    if result:
+      print u'User: {0}, Calendar: ({1}/{2})'.format(user, i, count)
+      _showCalendar(result, 1, 1)
+
+def printShowCalendars(users, csvFormat):
+  if csvFormat:
+    todrive = False
+    titles = []
+    csvRows = []
+  i = 5
+  while i < len(sys.argv):
+    myarg = sys.argv[i].lower()
+    if csvFormat and myarg == u'todrive':
+      todrive = True
+      i += 1
+    else:
+      print u'ERROR: %s is not a valid argument for "gam <users> %s calendars"' %  (myarg, [u'show', u'print'][csvFormat])
+      sys.exit(2)
+  i = 0
+  count = len(users)
+  for user in users:
+    i += 1
+    user, cal = buildCalendarGAPIObject(user)
+    if not cal:
+      continue
+    result = callGAPIpages(cal.calendarList(), u'list', u'items')
+    jcount = len(result)
+    if not csvFormat:
+      print u'User: {0}, Calendars: ({1}/{2})'.format(user, i, count)
+      if jcount == 0:
+        continue
+      j = 0
+      for userCalendar in result:
+        j += 1
+        _showCalendar(userCalendar, j, jcount)
+    else:
+      if jcount == 0:
+        continue
+      for userCalendar in result:
+        row = {u'primaryEmail': user}
+        addRowTitlesToCSVfile(flatten_json(userCalendar, flattened=row), csvRows, titles)
+  if csvFormat:
+    sortCSVTitles([u'primaryEmail', u'id'], titles)
+    writeCSVfile(csvRows, titles, u'Calendars', todrive)
 
 def showCalSettings(users):
   for user in users:
-    cal = buildGAPIServiceObject(u'calendar', user)
+    user, cal = buildCalendarGAPIObject(user)
+    if not cal:
+      continue
     feed = callGAPI(cal.settings(), u'list')
     for setting in feed[u'items']:
       print u'%s: %s' % (setting[u'id'], setting[u'value'])
 
-def showDriveSettings(users):
+def printDriveSettings(users):
   todrive = False
   i = 5
   while i < len(sys.argv):
@@ -3220,13 +3576,16 @@ def showDriveSettings(users):
       print u'ERROR: %s is not a valid argument for "gam <users> show drivesettings"' % sys.argv[i]
       sys.exit(2)
   dont_show = [u'kind', u'selfLink', u'exportFormats', u'importFormats', u'maxUploadSizes', u'additionalRoleInfo', u'etag', u'features', u'user', u'isCurrentAppInstalled']
-  count = 1
-  drive_attr = []
+  csvRows = []
   titles = [u'email',]
+  i = 0
+  count = len(users)
   for user in users:
-    sys.stderr.write(u'Getting Drive settings for %s (%s of %s)\n' % (user, count, len(users)))
-    count += 1
-    drive = buildGAPIServiceObject(u'drive', user)
+    i += 1
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
+    sys.stderr.write(u'Getting Drive settings for %s (%s/%s)\n' % (user, i, count))
     feed = callGAPI(drive.about(), u'get', soft_errors=True)
     if feed == None:
       continue
@@ -3245,17 +3604,15 @@ def showDriveSettings(users):
       row[setting] = feed[setting]
       if setting not in titles:
         titles.append(setting)
-    drive_attr.append(row)
-  headers = {}
-  for title in titles:
-    headers[title] = title
-  drive_attr.insert(0, headers)
-  output_csv(drive_attr, titles, u'User Drive Settings', todrive)
+    csvRows.append(row)
+  writeCSVfile(csvRows, titles, u'User Drive Settings', todrive)
 
-def doDriveActivity(users):
+def printDriveActivity(users):
   drive_ancestorId = u'root'
   drive_fileId = None
   todrive = False
+  titles = [u'user.name', u'user.permissionId', u'target.id', u'target.name', u'target.mimeType']
+  csvRows = []
   i = 5
   while i < len(sys.argv):
     activity_object = sys.argv[i].lower().replace(u'_', u'')
@@ -3272,20 +3629,18 @@ def doDriveActivity(users):
     else:
       print u'ERROR: %s is not a valid argument for "gam <users> show driveactivity"' % sys.argv[i]
       sys.exit(2)
-  activity_attributes = [{},]
   for user in users:
-    activity = buildGAPIServiceObject(u'appsactivity', user)
+    user, activity = buildActivityGAPIObject(user)
+    if not activity:
+      continue
     page_message = u'Retrieved %%%%total_items%%%% activities for %s' % user
     feed = callGAPIpages(activity.activities(), u'list', u'activities',
                          page_message=page_message, source=u'drive.google.com', userId=u'me',
                          drive_ancestorId=drive_ancestorId, groupingStrategy=u'none',
                          drive_fileId=drive_fileId, pageSize=GC_Values[GC_ACTIVITY_MAX_RESULTS])
     for item in feed:
-      activity_attributes.append(flatten_json(item[u'combinedEvent']))
-      for an_item in activity_attributes[-1]:
-        if an_item not in activity_attributes[0]:
-          activity_attributes[0][an_item] = an_item
-  output_csv(activity_attributes, activity_attributes[0], u'Drive Activity', todrive)
+      addRowTitlesToCSVfile(flatten_json(item[u'combinedEvent']), csvRows, titles)
+  writeCSVfile(csvRows, titles, u'Drive Activity', todrive)
 
 def printPermission(permission):
   if u'name' in permission:
@@ -3305,7 +3660,9 @@ def printPermission(permission):
 def showDriveFileACL(users):
   fileId = sys.argv[5]
   for user in users:
-    drive = buildGAPIServiceObject(u'drive', user)
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
     feed = callGAPI(drive.permissions(), u'list', fileId=fileId)
     for permission in feed[u'items']:
       printPermission(permission)
@@ -3327,7 +3684,9 @@ def delDriveFileACL(users):
   fileId = sys.argv[5]
   isEmail, permissionId = getPermissionId(sys.argv[6])
   for user in users:
-    drive = buildGAPIServiceObject(u'drive', user)
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
     if isEmail:
       permissionId = callGAPI(drive.permissions(), u'getIdForEmail', email=permissionId, fields=u'id')[u'id']
       isEmail = False
@@ -3372,7 +3731,9 @@ def addDriveFileACL(users):
       print u'ERROR: %s is not a valid argument for "gam <users> add drivefileacl"' % sys.argv[i]
       sys.exit(2)
   for user in users:
-    drive = buildGAPIServiceObject(u'drive', user)
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
     result = callGAPI(drive.permissions(), u'insert', fileId=fileId, sendNotificationEmails=sendNotificationEmails, emailMessage=emailMessage, body=body)
     printPermission(result)
 
@@ -3407,7 +3768,9 @@ def updateDriveFileACL(users):
       print u'ERROR: %s is not a valid argument for "gam <users> update drivefileacl"' % sys.argv[i]
       sys.exit(2)
   for user in users:
-    drive = buildGAPIServiceObject(u'drive', user)
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
     if isEmail:
       permissionId = callGAPI(drive.permissions(), u'getIdForEmail', email=permissionId, fields=u'id')[u'id']
       isEmail = False
@@ -3416,6 +3779,7 @@ def updateDriveFileACL(users):
     printPermission(result)
 
 DRIVEFILE_FIELDS_CHOICES_MAP = {
+  u'alternatelink': u'alternateLink',
   u'appdatacontents': u'appDataContents',
   u'cancomment': u'canComment',
   u'canreadrevisions': u'canReadRevisions',
@@ -3488,33 +3852,35 @@ DRIVEFILE_LABEL_CHOICES_MAP = {
   u'view': u'viewed',
 }
 
-def showDriveFiles(users):
-  files_attr = [{u'Owner': u'Owner',}]
-  titles = [u'Owner',]
-  fieldsList = [u'title', u'alternateLink']
+def printDriveFileList(users):
+  allfields = todrive = False
+  fieldsList = []
+  fieldsTitles = {}
   labelsList = []
-  todrive = False
+  titles = [u'Owner',]
+  csvRows = []
   query = u'"me" in owners'
   i = 5
   while i < len(sys.argv):
-    my_arg = sys.argv[i].lower().replace(u'_', u'')
-    if my_arg == u'todrive':
+    myarg = sys.argv[i].lower().replace(u'_', u'')
+    if myarg == u'todrive':
       todrive = True
       i += 1
-    elif my_arg == u'query':
+    elif myarg == u'query':
       query += u' and %s' % sys.argv[i+1]
       i += 2
-    elif my_arg == u'allfields':
+    elif myarg == u'allfields':
       fieldsList = []
+      allfields = True
       i += 1
-    elif my_arg in DRIVEFILE_FIELDS_CHOICES_MAP:
-      fieldsList.append(DRIVEFILE_FIELDS_CHOICES_MAP[my_arg])
+    elif myarg in DRIVEFILE_FIELDS_CHOICES_MAP:
+      addFieldToCSVfile(myarg, {myarg: [DRIVEFILE_FIELDS_CHOICES_MAP[myarg]]}, fieldsList, fieldsTitles, titles)
       i += 1
-    elif my_arg in DRIVEFILE_LABEL_CHOICES_MAP:
-      labelsList.append(DRIVEFILE_LABEL_CHOICES_MAP[my_arg])
+    elif myarg in DRIVEFILE_LABEL_CHOICES_MAP:
+      addFieldToCSVfile(myarg, {myarg: [DRIVEFILE_LABEL_CHOICES_MAP[myarg]]}, labelsList, fieldsTitles, titles)
       i += 1
     else:
-      print u'ERROR: %s is not a valid argument for "gam <users> show filelist"' % my_arg
+      print u'ERROR: %s is not a valid argument for "gam <users> show filelist"' % myarg
       sys.exit(2)
   if fieldsList or labelsList:
     fields = u'nextPageToken,items('
@@ -3525,13 +3891,16 @@ def showDriveFiles(users):
     if labelsList:
       fields += u'labels({0})'.format(u','.join(set(labelsList)))
     fields += u')'
+  elif not allfields:
+    for field in [u'name', u'alternatelink']:
+      addFieldToCSVfile(field, {field: [DRIVEFILE_FIELDS_CHOICES_MAP[field]]}, fieldsList, fieldsTitles, titles)
+    fields = u'nextPageToken,items({0})'.format(u','.join(set(fieldsList)))
   else:
     fields = u'*'
   for user in users:
-    drive = buildGAPIServiceObject(u'drive', user)
-    if user.find(u'@') == -1:
-      print u'ERROR: got %s, expected a full email address' % user
-      sys.exit(2)
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
     sys.stderr.write(u'Getting files for %s...\n' % user)
     page_message = u' got %%%%total_items%%%% files for %s...\n' % user
     feed = callGAPIpages(drive.files(), u'list', u'items',
@@ -3544,25 +3913,23 @@ def showDriveFiles(users):
           continue
         if not isinstance(f_file[attrib], dict):
           if isinstance(f_file[attrib], list):
-            if isinstance(f_file[attrib][0], (str, unicode, int, bool)):
-              if attrib not in titles:
-                titles.append(attrib)
-                files_attr[0][attrib] = attrib
-              a_file[attrib] = u' '.join(f_file[attrib])
-            else:
-              for j, l_attrib in enumerate(f_file[attrib]):
-                for list_attrib in l_attrib:
-                  if list_attrib in [u'kind', u'etag', u'selfLink']:
-                    continue
-                  x_attrib = u'{0}.{1}.{2}'.format(attrib, j, list_attrib)
-                  if x_attrib not in titles:
-                    titles.append(x_attrib)
-                    files_attr[0][x_attrib] = x_attrib
-                  a_file[x_attrib] = l_attrib[list_attrib]
+            if f_file[attrib]:
+              if isinstance(f_file[attrib][0], (str, unicode, int, bool)):
+                if attrib not in titles:
+                  titles.append(attrib)
+                a_file[attrib] = u' '.join(f_file[attrib])
+              else:
+                for j, l_attrib in enumerate(f_file[attrib]):
+                  for list_attrib in l_attrib:
+                    if list_attrib in [u'kind', u'etag', u'selfLink']:
+                      continue
+                    x_attrib = u'{0}.{1}.{2}'.format(attrib, j, list_attrib)
+                    if x_attrib not in titles:
+                      titles.append(x_attrib)
+                    a_file[x_attrib] = l_attrib[list_attrib]
           elif isinstance(f_file[attrib], (str, unicode, int, bool)):
             if attrib not in titles:
               titles.append(attrib)
-              files_attr[0][attrib] = attrib
             a_file[attrib] = f_file[attrib]
           else:
             sys.stderr.write(u'File ID: {0}, Attribute: {1}, Unknown type: {2}\n'.format(f_file[u'id'], attrib, type(f_file[attrib])))
@@ -3570,7 +3937,6 @@ def showDriveFiles(users):
           for dict_attrib in f_file[attrib]:
             if dict_attrib not in titles:
               titles.append(dict_attrib)
-              files_attr[0][dict_attrib] = dict_attrib
             a_file[dict_attrib] = f_file[attrib][dict_attrib]
         else:
           for dict_attrib in f_file[attrib]:
@@ -3579,10 +3945,11 @@ def showDriveFiles(users):
             x_attrib = u'{0}.{1}'.format(attrib, dict_attrib)
             if x_attrib not in titles:
               titles.append(x_attrib)
-              files_attr[0][x_attrib] = x_attrib
             a_file[x_attrib] = f_file[attrib][dict_attrib]
-      files_attr.append(a_file)
-  output_csv(files_attr, titles, u'%s %s Drive Files' % (sys.argv[1], sys.argv[2]), todrive)
+      csvRows.append(a_file)
+  if allfields:
+    sortCSVTitles([u'Owner', u'id', u'title'], titles)
+  writeCSVfile(csvRows, titles, u'%s %s Drive Files' % (sys.argv[1], sys.argv[2]), todrive)
 
 def doDriveSearch(drive, query=None):
   print u'Searching for files with query: "%s"...' % query
@@ -3613,7 +3980,9 @@ def deleteDriveFile(users):
       sys.exit(2)
   action = DELETE_DRIVEFILE_FUNCTION_TO_ACTION_MAP[function]
   for user in users:
-    drive = buildGAPIServiceObject(u'drive', user)
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
     if fileIds[:6].lower() == u'query:':
       file_ids = doDriveSearch(drive, query=fileIds[6:])
     else:
@@ -3627,7 +3996,7 @@ def deleteDriveFile(users):
     i = 0
     for fileId in file_ids:
       i += 1
-      print u'%s %s for %s (%s of %s)' % (action, fileId, user, i, len(file_ids))
+      print u'%s %s for %s (%s/%s)' % (action, fileId, user, i, len(file_ids))
       callGAPI(drive.files(), function, fileId=fileId)
 
 def printDriveFolderContents(feed, folderId, indent):
@@ -3641,10 +4010,9 @@ def printDriveFolderContents(feed, folderId, indent):
 
 def showDriveFileTree(users):
   for user in users:
-    drive = buildGAPIServiceObject(u'drive', user)
-    if user.find(u'@') == -1:
-      print u'ERROR: got %s, expected a full email address' % user
-      sys.exit(2)
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
     root_folder = callGAPI(drive.about(), u'get', fields=u'rootFolderId')[u'rootFolderId']
     sys.stderr.write(u'Getting all files for %s...\n' % user)
     page_message = u' got %%%%total_items%%%% files for %s...\n' % user
@@ -3655,10 +4023,9 @@ def showDriveFileTree(users):
 def deleteEmptyDriveFolders(users):
   query = u'"me" in owners and mimeType = "application/vnd.google-apps.folder"'
   for user in users:
-    drive = buildGAPIServiceObject(u'drive', user)
-    if user.find(u'@') == -1:
-      print u'ERROR: got %s, expected a full email address' % user
-      sys.exit(2)
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
     deleted_empty = True
     while deleted_empty:
       sys.stderr.write(u'Getting folders for %s...\n' % user)
@@ -3676,6 +4043,14 @@ def deleteEmptyDriveFolders(users):
         else:
           print convertUTF8(u' not deleting folder %s because it contains at least 1 item (%s)' % (folder[u'title'], children[u'items'][0][u'id']))
 
+def doEmptyDriveTrash(users):
+  for user in users:
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
+    sys.stderr.write(u'Emptying Drive trash for %s...\n' % user)
+    callGAPI(drive.files(), u'emptyTrash')
+
 def doUpdateDriveFile(users):
   convert = ocr = ocrLanguage = parent_query = local_filepath = media_body = fileIds = query = drivefilename = None
   operation = u'update'
@@ -3717,7 +4092,7 @@ def doUpdateDriveFile(users):
       i += 2
     elif sys.argv[i].lower() in [u'restrict', u'restricted']:
       if u'labels' not in body:
-        body[u'labels'] = dict()
+        body[u'labels'] = {}
       if sys.argv[i+1].lower() in true_values:
         body[u'labels'][u'restricted'] = True
       elif sys.argv[i+1].lower() in false_values:
@@ -3728,7 +4103,7 @@ def doUpdateDriveFile(users):
       i += 2
     elif sys.argv[i].lower() in [u'star', u'starred']:
       if u'labels' not in body:
-        body[u'labels'] = dict()
+        body[u'labels'] = {}
       if sys.argv[i+1].lower() in true_values:
         body[u'labels'][u'starred'] = True
       elif sys.argv[i+1].lower() in false_values:
@@ -3739,7 +4114,7 @@ def doUpdateDriveFile(users):
       i += 2
     elif sys.argv[i].lower() in [u'trash', u'trashed']:
       if u'labels' not in body:
-        body[u'labels'] = dict()
+        body[u'labels'] = {}
       if sys.argv[i+1].lower() in true_values:
         body[u'labels'][u'trashed'] = True
       elif sys.argv[i+1].lower() in false_values:
@@ -3750,7 +4125,7 @@ def doUpdateDriveFile(users):
       i += 2
     elif sys.argv[i].lower() in [u'view', u'viewed']:
       if u'labels' not in body:
-        body[u'labels'] = dict()
+        body[u'labels'] = {}
       if sys.argv[i+1].lower() in true_values:
         body[u'labels'][u'viewed'] = True
       elif sys.argv[i+1].lower() in false_values:
@@ -3810,7 +4185,9 @@ def doUpdateDriveFile(users):
     print u'ERROR: you cannot specify multiple file identifiers. Choose one of id, drivefilename, query.'
     sys.exit(2)
   for user in users:
-    drive = buildGAPIServiceObject(u'drive', user)
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
     if parent_query:
       more_parents = doDriveSearch(drive, query=parent_query)
       if u'parents' not in body:
@@ -3865,22 +4242,22 @@ def createDriveFile(users):
       i += 2
     elif sys.argv[i].lower() in [u'restrict', u'restricted']:
       if u'labels' not in body:
-        body[u'labels'] = dict()
+        body[u'labels'] = {}
       body[u'labels'][u'restricted'] = True
       i += 1
     elif sys.argv[i].lower() in [u'star', u'starred']:
       if u'labels' not in body:
-        body[u'labels'] = dict()
+        body[u'labels'] = {}
       body[u'labels'][u'starred'] = True
       i += 1
     elif sys.argv[i].lower() in [u'trash', u'trashed']:
       if u'labels' not in body:
-        body[u'labels'] = dict()
+        body[u'labels'] = {}
       body[u'labels'][u'trashed'] = True
       i += 1
     elif sys.argv[i].lower() in [u'view', u'viewed']:
       if u'labels' not in body:
-        body[u'labels'] = dict()
+        body[u'labels'] = {}
       body[u'labels'][u'viewed'] = True
       i += 1
     elif sys.argv[i].lower() == u'lastviewedbyme':
@@ -3928,7 +4305,9 @@ def createDriveFile(users):
       print u'ERROR: %s is not a valid argument for "gam <users> create drivefile"' % sys.argv[i]
       sys.exit(2)
   for user in users:
-    drive = buildGAPIServiceObject(u'drive', user)
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
     if parent_query:
       more_parents = doDriveSearch(drive, query=parent_query)
       if u'parents' not in body:
@@ -3947,7 +4326,7 @@ def downloadDriveFile(users):
   i = 5
   query = fileIds = revisionId = None
   gdownload_format = u'openoffice'
-  target_folder = GC_Values[GC_DRIVE_DIR]
+  targetFolder = GC_Values[GC_DRIVE_DIR]
   safe_filename_chars = "-_.() %s%s" % (string.ascii_letters, string.digits)
   while i < len(sys.argv):
     myarg = sys.argv[i].lower().replace(u'_', u'')
@@ -3967,9 +4346,9 @@ def downloadDriveFile(users):
         sys.exit(2)
       i += 2
     elif myarg == u'targetfolder':
-      target_folder = sys.argv[i+1]
-      if not os.path.isdir(target_folder):
-        os.makedirs(target_folder)
+      targetFolder = os.path.expanduser(sys.argv[i+1])
+      if not os.path.isdir(targetFolder):
+        os.makedirs(targetFolder)
       i += 2
     else:
       print u'ERROR: %s is not a valid argument for "gam <users> get drivefile"' % sys.argv[i]
@@ -3996,7 +4375,9 @@ def downloadDriveFile(users):
     print u'ERROR: you cannot specify both the id and query parameters at the same time.'
     sys.exit(2)
   for user in users:
-    drive = buildGAPIServiceObject(u'drive', user)
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
     if query:
       fileIds = doDriveSearch(drive, query=query)
     else:
@@ -4045,14 +4426,14 @@ def downloadDriveFile(users):
         continue
       file_title = result[u'title']
       safe_file_title = u''.join(c for c in file_title if c in safe_filename_chars)
-      filename = os.path.join(target_folder, safe_file_title)
+      filename = os.path.join(targetFolder, safe_file_title)
       if extension and filename.lower()[-len(extension):] != extension:
         filename = u'%s%s' % (filename, extension)
       y = 0
       if os.path.isfile(filename):
         while True:
           y += 1
-          new_filename = os.path.join(target_folder, u'(%s)-%s' % (y, safe_file_title))
+          new_filename = os.path.join(targetFolder, u'(%s)-%s' % (y, safe_file_title))
           if extension and new_filename.lower()[-len(extension):] != extension:
             new_filename = u'%s%s' % (new_filename, extension)
           if not os.path.isfile(new_filename):
@@ -4070,18 +4451,18 @@ def showDriveFileInfo(users):
   fileId = sys.argv[5]
   i = 6
   while i < len(sys.argv):
-    my_arg = sys.argv[i].lower().replace(u'_', u'')
-    if my_arg == u'allfields':
+    myarg = sys.argv[i].lower().replace(u'_', u'')
+    if myarg == u'allfields':
       fieldsList = []
       i += 1
-    elif my_arg in DRIVEFILE_FIELDS_CHOICES_MAP:
-      fieldsList.append(DRIVEFILE_FIELDS_CHOICES_MAP[my_arg])
+    elif myarg in DRIVEFILE_FIELDS_CHOICES_MAP:
+      fieldsList.append(DRIVEFILE_FIELDS_CHOICES_MAP[myarg])
       i += 1
-    elif my_arg in DRIVEFILE_LABEL_CHOICES_MAP:
-      labelsList.append(DRIVEFILE_LABEL_CHOICES_MAP[my_arg])
+    elif myarg in DRIVEFILE_LABEL_CHOICES_MAP:
+      labelsList.append(DRIVEFILE_LABEL_CHOICES_MAP[myarg])
       i += 1
     else:
-      print u'ERROR: %s is not a valid argument for "gam <users> show fileinfo"' % my_arg
+      print u'ERROR: %s is not a valid argument for "gam <users> show fileinfo"' % myarg
       sys.exit(2)
   if fieldsList or labelsList:
     fieldsList.append(u'title')
@@ -4091,14 +4472,18 @@ def showDriveFileInfo(users):
   else:
     fields = u'*'
   for user in users:
-    drive = buildGAPIServiceObject(u'drive', user)
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
     feed = callGAPI(drive.files(), u'get', fileId=fileId, fields=fields)
     print_json(None, feed)
 
 def showDriveFileRevisions(users):
   fileId = sys.argv[5]
   for user in users:
-    drive = buildGAPIServiceObject(u'drive', user)
+    user, drive = buildDriveGAPIObject(user)
+    if not drive:
+      continue
     feed = callGAPI(drive.revisions(), u'list', fileId=fileId)
     print_json(None, feed)
 
@@ -4113,8 +4498,14 @@ def transferSecCals(users):
     else:
       print u'ERROR: %s is not a valid argument for "gam <users> transfer seccals"' % sys.argv[i]
       sys.exit(2)
+  if remove_source_user:
+    target_user, target_cal = buildCalendarGAPIObject(target_user)
+    if not target_cal:
+      return
   for user in users:
-    source_cal = buildGAPIServiceObject(u'calendar', user)
+    user, source_cal = buildCalendarGAPIObject(user)
+    if not source_cal:
+      continue
     source_calendars = callGAPIpages(source_cal.calendarList(), u'list', u'items', minAccessRole=u'owner', showHidden=True, fields=u'items(id),nextPageToken')
     for source_cal in source_calendars:
       if source_cal[u'id'].find(u'@group.calendar.google.com') != -1:
@@ -4133,12 +4524,16 @@ def transferDriveFiles(users):
     else:
       print u'ERROR: %s is not a valid argument for "gam <users> transfer drive"' % sys.argv[i]
       sys.exit(2)
-  target_drive = buildGAPIServiceObject(u'drive', target_user)
+  target_user, target_drive = buildDriveGAPIObject(target_user)
+  if not target_drive:
+    return
   target_about = callGAPI(target_drive.about(), u'get', fields=u'quotaBytesTotal,quotaBytesUsed')
   target_drive_free = int(target_about[u'quotaBytesTotal']) - int(target_about[u'quotaBytesUsed'])
   for user in users:
+    user, source_drive = buildDriveGAPIObject(user)
+    if not source_drive:
+      continue
     counter = 0
-    source_drive = buildGAPIServiceObject(u'drive', user)
     source_about = callGAPI(source_drive.about(), u'get', fields=u'quotaBytesTotal,quotaBytesUsed,rootFolderId,permissionId')
     source_drive_size = int(source_about[u'quotaBytesUsed'])
     if target_drive_free < source_drive_size:
@@ -4208,6 +4603,14 @@ def transferDriveFiles(users):
       if not skipped_files:
         break
 
+EMAILSETTINGS_IMAP_EXPUNGE_BEHAVIOR_CHOICES_MAP = {
+  u'archive': u'archive',
+  u'deleteforever': u'deleteForever',
+  u'trash': u'trash',
+  }
+
+EMAILSETTINGS_IMAP_MAX_FOLDER_SIZE_CHOICES = [u'0', u'1000', u'2000', u'5000', u'10000']
+
 def doImap(users):
   if sys.argv[4].lower() in true_values:
     enable = True
@@ -4216,35 +4619,61 @@ def doImap(users):
   else:
     print u'ERROR: value for "gam <users> imap" must be true or false, got %s' % sys.argv[4]
     sys.exit(2)
-  emailsettings = getEmailSettingsObject()
-  count = len(users)
-  i = 1
-  for user in users:
-    if user.find(u'@') > 0:
-      emailsettings.domain = user[user.find(u'@')+1:]
-      user = user[:user.find(u'@')]
+  body = {u'enabled': enable, u'autoExpunge': True, u'expungeBehavior': u'archive', u'maxFolderSize': 0}
+  i = 5
+  while i < len(sys.argv):
+    myarg = sys.argv[i].lower()
+    if myarg == u'noautoexpunge':
+      body[u'autoExpunge'] = False
+      i += 1
+    elif myarg == u'expungebehavior':
+      opt = sys.argv[i+1].lower()
+      if opt in EMAILSETTINGS_IMAP_EXPUNGE_BEHAVIOR_CHOICES_MAP:
+        body[u'expungeBehavior'] = EMAILSETTINGS_IMAP_EXPUNGE_BEHAVIOR_CHOICES_MAP[opt]
+        i += 2
+      else:
+        print u'ERROR: value for "gam <users> imap expungebehavior" must be %s, got %s' % (u'|'.join(EMAILSETTINGS_IMAP_EXPUNGE_BEHAVIOR_CHOICES_MAP), opt)
+        sys.exit(2)
+    elif myarg == u'maxfoldersize':
+      opt = sys.argv[i+1].lower()
+      if opt in EMAILSETTINGS_IMAP_MAX_FOLDER_SIZE_CHOICES:
+        body[u'maxFolderSize'] = int(opt)
+        i += 2
+      else:
+        print u'ERROR: value for "gam <users> imap maxfoldersize" must be %s, got %s' % (u'|'.join(EMAILSETTINGS_IMAP_MAX_FOLDER_SIZE_CHOICES), opt)
+        sys.exit(2)
     else:
-      emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Setting IMAP Access to %s for %s (%s of %s)" % (str(enable), user+u'@'+emailsettings.domain, i, count)
+      print u'ERROR: %s is not a valid argument for "gam <users> imap"' % myarg
+      sys.exit(2)
+  i = 0
+  count = len(users)
+  for user in users:
     i += 1
-    callGData(emailsettings, u'UpdateImap', soft_errors=True, username=user, enable=enable)
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    print u"Setting IMAP Access to %s for %s (%s/%s)" % (str(enable), user, i, count)
+    callGAPI(gmail.users().settings(), u'updateImap',
+             soft_errors=True,
+             userId=u'me', body=body)
 
 def getImap(users):
-  emailsettings = getEmailSettingsObject()
-  i = 1
+  i = 0
   count = len(users)
   for user in users:
-    if user.find(u'@') > 0:
-      emailsettings.domain = user[user.find(u'@')+1:]
-      user = user[:user.find(u'@')]
-    else:
-      emailsettings.domain = GC_Values[GC_DOMAIN]
-    imapsettings = callGData(emailsettings, u'GetImap', soft_errors=True, username=user)
-    try:
-      print u'User %s  IMAP Enabled:%s (%s of %s)' % (user+u'@'+emailsettings.domain, imapsettings[u'enable'], i, count)
-    except TypeError:
-      pass
     i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    result = callGAPI(gmail.users().settings(), u'getImap',
+                      soft_errors=True,
+                      userId=u'me')
+    if result:
+      enabled = result[u'enabled']
+      if enabled:
+        print u'User: {0}, IMAP Enabled: {1}, autoExpunge: {2}, expungeBehavior: {3}, maxFolderSize:{4} ({5}/{6})'.format(user, enabled, result[u'autoExpunge'], result[u'expungeBehavior'], result[u'maxFolderSize'], i, count)
+      else:
+        print u'User: {0}, IMAP Enabled: {1} ({2}/{3})'.format(user, enabled, i, count)
 
 def getProductAndSKU(sku):
   if sku.lower() in [u'apps', u'gafb', u'gafw']:
@@ -4310,6 +4739,22 @@ def doLicense(users, operation):
       _, old_sku = getProductAndSKU(old_sku)
       callGAPI(lic.licenseAssignments(), operation, soft_errors=True, productId=productId, skuId=old_sku, userId=user, body={u'skuId': skuId})
 
+EMAILSETTINGS_POP_ENABLE_FOR_CHOICES_MAP = {
+  u'allmail': u'allMail',
+  u'fromnowon': u'fromNowOn',
+  u'mailfromnowon': u'fromNowOn',
+  u'newmail': u'fromNowOn',
+  }
+
+EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP = {
+  u'archive': u'archive',
+  u'delete': u'trash',
+  u'keep': u'leaveInInbox',
+  u'leaveininbox': u'leaveInInbox',
+  u'markread': u'markRead',
+  u'trash': u'trash',
+  }
+
 def doPop(users):
   if sys.argv[4].lower() in true_values:
     enable = True
@@ -4318,137 +4763,280 @@ def doPop(users):
   else:
     print u'ERROR: value for "gam <users> pop" must be true or false, got %s' % sys.argv[4]
     sys.exit(2)
-  enable_for = u'ALL_MAIL'
-  action = u'KEEP'
+  body = {u'accessWindow': [u'disabled', u'allMail'][enable], u'disposition': u'leaveInInbox'}
   i = 5
   while i < len(sys.argv):
-    if sys.argv[i].lower() == u'for':
-      if sys.argv[i+1].lower() == u'allmail':
-        enable_for = u'ALL_MAIL'
-        i += 2
-      elif sys.argv[i+1].lower() == u'newmail':
-        enable_for = u'MAIL_FROM_NOW_ON'
+    myarg = sys.argv[i].lower()
+    if myarg == u'for':
+      opt = sys.argv[i+1].lower()
+      if opt in EMAILSETTINGS_POP_ENABLE_FOR_CHOICES_MAP:
+        body[u'accessWindow'] = EMAILSETTINGS_POP_ENABLE_FOR_CHOICES_MAP[opt]
         i += 2
       else:
-        print u'ERROR: %s is not a valid argument for "gam <users> pop for"' % sys.argv[i]
+        print u'ERROR: value for "gam <users> pop for" must be %s, got %s' % (u'|'.join(EMAILSETTINGS_POP_ENABLE_FOR_CHOICES_MAP), opt)
         sys.exit(2)
-    elif sys.argv[i].lower() == u'action':
-      if sys.argv[i+1].lower() == u'keep':
-        action = u'KEEP'
-        i += 2
-      elif sys.argv[i+1].lower() == u'archive':
-        action = u'ARCHIVE'
-        i += 2
-      elif sys.argv[i+1].lower() == u'delete':
-        action = u'DELETE'
+    elif myarg == u'action':
+      opt = sys.argv[i+1].lower()
+      if opt in EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP:
+        body[u'disposition'] = EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP[opt]
         i += 2
       else:
-        print u'ERROR: %s is not a valid argument for "gam <users> pop action"' % sys.argv[i]
+        print u'ERROR: value for "gam <users> pop action" must be %s, got %s' % (u'|'.join(EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP), opt)
         sys.exit(2)
-    elif sys.argv[i].lower() == u'confirm':
+    elif myarg == u'confirm':
       i += 1
     else:
-      print u'ERROR: %s is not a valid argument for "gam <users> pop"' % sys.argv[i]
+      print u'ERROR: %s is not a valid argument for "gam <users> pop"' % myarg
       sys.exit(2)
-  emailsettings = getEmailSettingsObject()
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
-    if user.find(u'@') > 0:
-      emailsettings.domain = user[user.find(u'@')+1:]
-      user = user[:user.find(u'@')]
-    else:
-      emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Setting POP Access to %s for %s (%s of %s)" % (str(enable), user+u'@'+emailsettings.domain, i, count)
     i += 1
-    callGData(emailsettings, u'UpdatePop', soft_errors=True, username=user, enable=enable, enable_for=enable_for, action=action)
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    print u"Setting POP Access to %s for %s (%s/%s)" % (str(enable), user, i, count)
+    callGAPI(gmail.users().settings(), u'updatePop',
+             soft_errors=True,
+             userId=u'me', body=body)
 
 def getPop(users):
-  emailsettings = getEmailSettingsObject()
+  i = 0
+  count = len(users)
   for user in users:
-    if user.find(u'@') > 0:
-      emailsettings.domain = user[user.find(u'@')+1:]
-      user = user[:user.find(u'@')]
-    else:
-      emailsettings.domain = GC_Values[GC_DOMAIN]
-    popsettings = callGData(emailsettings, u'GetPop', soft_errors=True, username=user)
-    try:
-      print u'User %s  POP Enabled:%s  Action:%s' % (user+u'@'+emailsettings.domain, popsettings[u'enable'], popsettings[u'action'])
-    except TypeError:
-      pass
+    i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    result = callGAPI(gmail.users().settings(), u'getPop',
+                      soft_errors=True,
+                      userId=u'me')
+    if result:
+      enabled = result[u'accessWindow'] != u'disabled'
+      if enabled:
+        print u'User: {0}, POP Enabled: {1}, For: {2}, Action: {3} ({4}/{5})'.format(user, enabled, result[u'accessWindow'], result[u'disposition'], i, count)
+      else:
+        print u'User: {0}, POP Enabled: {1} ({2}/{3})'.format(user, enabled, i, count)
 
-def doSendAs(users):
-  sendas = sys.argv[4]
-  sendasName = sys.argv[5]
-  make_default = reply_to = None
-  i = 6
+def _showSendAs(result, j, jcount, formatSig):
+  if result[u'displayName']:
+    print convertUTF8(u'SendAs Address: {0} <{1}>{2}'.format(result[u'displayName'], result[u'sendAsEmail'], currentCount(j, jcount)))
+  else:
+    print convertUTF8(u'SendAs Address: <{0}>{1}'.format(result[u'sendAsEmail'], currentCount(j, jcount)))
+  if result.get(u'replyToAddress'):
+    print u'  ReplyTo: {0}'.format(result[u'replyToAddress'])
+  print u'  IsPrimary: {0}'.format(result.get(u'isPrimary', False))
+  print u'  Default: {0}'.format(result.get(u'isDefault', False))
+  if not result.get(u'isPrimary', False):
+    print u'  TreatAsAlias: {0}'.format(result.get(u'treatAsAlias', False))
+    print u'  Verification Status: {0}'.format(result.get(u'verificationStatus', u'unspecified'))
+  sys.stdout.write(u'  Signature:\n    ')
+  signature = result.get(u'signature')
+  if not signature:
+    signature = u'None'
+  if formatSig:
+    print convertUTF8(indentMultiLineText(dehtml(signature), n=4))
+  else:
+    print convertUTF8(indentMultiLineText(signature, n=4))
+
+RT_PATTERN = re.compile(r'(?s){RT}.*?{(.+?)}.*?{/RT}')
+RT_OPEN_PATTERN = re.compile(r'{RT}')
+RT_CLOSE_PATTERN = re.compile(r'{/RT}')
+RT_STRIP_PATTERN = re.compile(r'(?s){RT}.*?{/RT}')
+RT_TAG_REPLACE_PATTERN = re.compile(r'{(.*?)}')
+
+def _processTags(tagReplacements, message):
+  while True:
+    match = RT_PATTERN.search(message)
+    if not match:
+      break
+    if tagReplacements.get(match.group(1)):
+      message = RT_OPEN_PATTERN.sub(u'', message, count=1)
+      message = RT_CLOSE_PATTERN.sub(u'', message, count=1)
+    else:
+      message = RT_STRIP_PATTERN.sub(u'', message, count=1)
+  while True:
+    match = RT_TAG_REPLACE_PATTERN.search(message)
+    if not match:
+      break
+    message = re.sub(match.group(0), tagReplacements.get(match.group(1), u''), message)
+  return message
+
+def addUpdateSendAs(users, i, addCmd):
+  emailAddress = sys.argv[i]
+  if emailAddress.find(u'@') < 0:
+    emailAddress = emailAddress+u'@'+GC_Values[GC_DOMAIN]
+  i += 1
+  if addCmd:
+    body = {u'sendAsEmail': emailAddress, u'displayName': sys.argv[i]}
+    i += 1
+  else:
+    body = {}
+  signature = None
+  tagReplacements = {}
   while i < len(sys.argv):
-    if sys.argv[i].lower() == u'default':
-      make_default = True
+    myarg = sys.argv[i].lower()
+    if myarg in [u'signature', u'sig']:
+      signature = sys.argv[i+1]
+      i += 2
+      if signature == u'file':
+        filename = sys.argv[i]
+        i, encoding = getCharSet(i+1)
+        signature = readFile(filename, encoding=encoding)
+    elif myarg == u'replace':
+      matchTag = getString(i+1, u'Tag')
+      matchReplacement = getString(i+2, u'String', emptyOK=True)
+      tagReplacements[matchTag] = matchReplacement
+      i += 3
+    elif myarg == u'treatasalias':
+      if sys.argv[i+1].lower() == u'true':
+        body[u'treatAsAlias'] = True
+      elif sys.argv[i+1].lower() == u'false':
+        body[u'treatAsAlias'] = False
+      else:
+        print u'ERROR: value for treatasalias must be true or false, got %s' % sys.argv[i+1]
+        sys.exit(2)
+      i += 2
+    elif myarg == u'default':
+      body[u'isDefault'] = True
       i += 1
     elif sys.argv[i].lower() == u'replyto':
-      reply_to = sys.argv[i+1]
+      body[u'replyToAddress'] = sys.argv[i+1]
+      i += 2
+    elif myarg == u'name':
+      body[u'displayName'] = sys.argv[i+1]
       i += 2
     else:
       print u'ERROR: %s is not a valid argument for "gam <users> sendas"' % sys.argv[i]
       sys.exit(2)
-  emailsettings = getEmailSettingsObject()
-  if sendas.find(u'@') < 0:
-    sendas = sendas+u'@'+GC_Values[GC_DOMAIN]
+  if signature != None:
+    if not signature:
+      body[u'signature'] = None
+    elif tagReplacements:
+      body[u'signature'] = _processTags(tagReplacements, signature)
+    else:
+      body[u'signature'] = signature
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
-    if user.find(u'@') > 0:
-      emailsettings.domain = user[user.find(u'@')+1:]
-      user = user[:user.find(u'@')]
-    else:
-      emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Allowing %s to send as %s (%s of %s)" % (user+u'@'+emailsettings.domain, sendas, i, count)
     i += 1
-    callGData(emailsettings, u'CreateSendAsAlias', soft_errors=True, username=user, name=sendasName, address=sendas, make_default=make_default, reply_to=reply_to)
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    print u"Allowing %s to send as %s (%s/%s)" % (user, emailAddress, i, count)
+    kwargs = {u'body': body}
+    if not addCmd:
+      kwargs[u'sendAsEmail'] = emailAddress
+    callGAPI(gmail.users().settings().sendAs(), [u'patch', u'create'][addCmd],
+             soft_errors=True,
+             userId=u'me', **kwargs)
 
-def showSendAs(users):
-  emailsettings = getEmailSettingsObject()
+def deleteSendAs(users):
+  emailAddress = sys.argv[5]
+  if emailAddress.find(u'@') < 0:
+    emailAddress = emailAddress+u'@'+GC_Values[GC_DOMAIN]
+  i = 0
+  count = len(users)
   for user in users:
-    if user.find(u'@') > 0:
-      emailsettings.domain = user[user.find(u'@')+1:]
-      user = user[:user.find(u'@')]
+    i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    print u"Disallowing %s to send as %s (%s/%s)" % (user, emailAddress, i, count)
+    callGAPI(gmail.users().settings().sendAs(), u'delete',
+             soft_errors=True,
+             userId=u'me', sendAsEmail=emailAddress)
+
+def printShowSendAs(users, csvFormat):
+  if csvFormat:
+    todrive = False
+    titles = [u'User', u'displayName', u'sendAsEmail', u'replyToAddress', u'isPrimary', u'isDefault', u'treatAsAlias', u'verificationStatus']
+    csvRows = []
+  formatSig = False
+  i = 5
+  while i < len(sys.argv):
+    myarg = sys.argv[i].lower()
+    if csvFormat and myarg == u'todrive':
+      todrive = True
+      i += 1
+    elif not csvFormat and myarg == u'format':
+      formatSig = True
+      i += 1
     else:
-      emailsettings.domain = GC_Values[GC_DOMAIN]
-    print u'%s has the following send as aliases:' %  (user+u'@'+emailsettings.domain)
-    sendases = callGData(emailsettings, u'GetSendAsAlias', soft_errors=True, username=user)
-    try:
-      for sendas in sendases:
-        if sendas[u'isDefault'] == u'true':
-          default = u'yes'
-        else:
-          default = u'no'
-        if sendas[u'replyTo']:
-          replyto = u' Reply To:<'+sendas[u'replyTo']+u'>'
-        else:
-          replyto = u''
-        if sendas[u'verified'] == u'true':
-          verified = u'yes'
-        else:
-          verified = u'no'
-        print u' "%s" <%s>%s Default:%s Verified:%s' % (sendas[u'name'], sendas[u'address'], replyto, default, verified)
-    except TypeError:
-      pass
-    print u''
+      print u'ERROR: %s is not a valid argument for "gam <users> %s sendas"' %  (myarg, [u'show', u'print'][csvFormat])
+      sys.exit(2)
+  i = 0
+  count = len(users)
+  for user in users:
+    i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    result = callGAPI(gmail.users().settings().sendAs(), u'list',
+                      soft_errors=True,
+                      userId=u'me')
+    jcount = len(result.get(u'sendAs', [])) if (result) else 0
+    if not csvFormat:
+      print u'User: {0}, SendAs Addresses: ({1}/{2})'.format(user, i, count)
+      if jcount == 0:
+        continue
+      j = 0
+      for sendas in result[u'sendAs']:
+        j += 1
+        _showSendAs(sendas, j, jcount, formatSig)
+    else:
+      if jcount == 0:
+        continue
+      for sendas in result[u'sendAs']:
+        row = {u'User': user, u'isPrimary': False}
+        for item in sendas:
+          if item not in titles:
+            titles.append(item)
+          row[item] = sendas[item]
+        csvRows.append(row)
+  if csvFormat:
+    writeCSVfile(csvRows, titles, u'SendAs', todrive)
+
+def infoSendAs(users):
+  emailAddress = sys.argv[5]
+  if emailAddress.find(u'@') < 0:
+    emailAddress = emailAddress+u'@'+GC_Values[GC_DOMAIN]
+  formatSig = False
+  i = 6
+  while i < len(sys.argv):
+    myarg = sys.argv[i].lower()
+    if myarg == u'format':
+      formatSig = True
+      i += 1
+    else:
+      print u'ERROR: %s is not a valid argument for "gam <users> info sendas"' % sys.argv[i]
+      sys.exit(2)
+  i = 0
+  count = len(users)
+  for user in users:
+    i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    result = callGAPI(gmail.users().settings().sendAs(), u'get',
+                      soft_errors=True,
+                      userId=u'me', sendAsEmail=emailAddress)
+    if result:
+      _showSendAs(result, i, count, formatSig)
 
 def doLanguage(users):
   language = sys.argv[4]
   emailsettings = getEmailSettingsObject()
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
+    i += 1
     if user.find(u'@') > 0:
       emailsettings.domain = user[user.find(u'@')+1:]
       user = user[:user.find(u'@')]
     else:
       emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Setting the language for %s to %s (%s of %s)" % (user+u'@'+emailsettings.domain, language, i, count)
-    i += 1
+    print u"Setting the language for %s to %s (%s/%s)" % (user+u'@'+emailsettings.domain, language, i, count)
     callGData(emailsettings, u'UpdateLanguage', soft_errors=True, username=user, language=language)
 
 def doUTF(users):
@@ -4460,16 +5048,16 @@ def doUTF(users):
     print u'ERROR: value for "gam <users> utf" must be true or false, got %s' % sys.argv[4]
     sys.exit(2)
   emailsettings = getEmailSettingsObject()
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
+    i += 1
     if user.find(u'@') > 0:
       emailsettings.domain = user[user.find(u'@')+1:]
       user = user[:user.find(u'@')]
     else:
       emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Setting UTF-8 to %s for %s (%s of %s)" % (str(SetUTF), user+u'@'+emailsettings.domain, i, count)
-    i += 1
+    print u"Setting UTF-8 to %s for %s (%s/%s)" % (str(SetUTF), user+u'@'+emailsettings.domain, i, count)
     callGData(emailsettings, u'UpdateGeneral', soft_errors=True, username=user, unicode=SetUTF)
 
 def doPageSize(users):
@@ -4479,16 +5067,16 @@ def doPageSize(users):
     print u'ERROR: %s is not a valid argument for "gam <users> pagesize"' % sys.argv[4]
     sys.exit(2)
   emailsettings = getEmailSettingsObject()
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
+    i += 1
     if user.find(u'@') > 0:
       emailsettings.domain = user[user.find(u'@')+1:]
       user = user[:user.find(u'@')]
     else:
       emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Setting Page Size to %s for %s (%s of %s)" % (PageSize, user+u'@'+emailsettings.domain, i, count)
-    i += 1
+    print u"Setting Page Size to %s for %s (%s/%s)" % (PageSize, user+u'@'+emailsettings.domain, i, count)
     callGData(emailsettings, u'UpdateGeneral', soft_errors=True, username=user, page_size=PageSize)
 
 def doShortCuts(users):
@@ -4500,16 +5088,16 @@ def doShortCuts(users):
     print u'ERROR: value for "gam <users> shortcuts" must be true or false, got %s' % sys.argv[4]
     sys.exit(2)
   emailsettings = getEmailSettingsObject()
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
+    i += 1
     if user.find(u'@') > 0:
       emailsettings.domain = user[user.find(u'@')+1:]
       user = user[:user.find(u'@')]
     else:
       emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Setting Keyboard Short Cuts to %s for %s (%s of %s)" % (str(SetShortCuts), user+u'@'+emailsettings.domain, i, count)
-    i += 1
+    print u"Setting Keyboard Short Cuts to %s for %s (%s/%s)" % (str(SetShortCuts), user+u'@'+emailsettings.domain, i, count)
     callGData(emailsettings, u'UpdateGeneral', soft_errors=True, username=user, shortcuts=SetShortCuts)
 
 def doArrows(users):
@@ -4521,16 +5109,16 @@ def doArrows(users):
     print u'ERROR: value for "gam <users> arrows" must be true or false, got %s' % sys.argv[4]
     sys.exit(2)
   emailsettings = getEmailSettingsObject()
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
+    i += 1
     if user.find(u'@') > 0:
       emailsettings.domain = user[user.find(u'@')+1:]
       user = user[:user.find(u'@')]
     else:
       emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Setting Personal Indicator Arrows to %s for %s (%s of %s)" % (str(SetArrows), user+u'@'+emailsettings.domain, i, count)
-    i += 1
+    print u"Setting Personal Indicator Arrows to %s for %s (%s/%s)" % (str(SetArrows), user+u'@'+emailsettings.domain, i, count)
     callGData(emailsettings, u'UpdateGeneral', soft_errors=True, username=user, arrows=SetArrows)
 
 def doSnippets(users):
@@ -4542,16 +5130,16 @@ def doSnippets(users):
     print u'ERROR: value for "gam <users> snippets" must be true or false, got %s' % sys.argv[4]
     sys.exit(2)
   emailsettings = getEmailSettingsObject()
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
+    i += 1
     if user.find(u'@') > 0:
       emailsettings.domain = user[user.find(u'@')+1:]
       user = user[:user.find(u'@')]
     else:
       emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Setting Preview Snippets to %s for %s (%s of %s)" % (str(SetSnippets), user+u'@'+emailsettings.domain, i, count)
-    i += 1
+    print u"Setting Preview Snippets to %s for %s (%s/%s)" % (str(SetSnippets), user+u'@'+emailsettings.domain, i, count)
     callGData(emailsettings, u'UpdateGeneral', soft_errors=True, username=user, snippets=SetSnippets)
 
 def doLabel(users, i):
@@ -4582,12 +5170,14 @@ def doLabel(users, i):
     else:
       print u'ERROR: %s is not a valid argument for this command.' % sys.argv[i]
       sys.exit(2)
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
-    gmail = buildGAPIServiceObject(u'gmail', user)
-    print u"Creating label %s for %s (%s of %s)" % (label, user, i, count)
     i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    print u"Creating label %s for %s (%s/%s)" % (label, user, i, count)
     callGAPI(gmail.users().labels(), u'create', soft_errors=True, userId=user, body=body)
 
 PROCESS_MESSAGE_FUNCTION_TO_ACTION_MAP = {u'delete': u'deleted', u'trash': u'trashed', u'untrash': u'untrashed', u'modify': u'modified'}
@@ -4671,8 +5261,10 @@ def doProcessMessages(users, function):
     sys.exit(2)
   action = PROCESS_MESSAGE_FUNCTION_TO_ACTION_MAP[function]
   for user in users:
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
     print u'Searching messages for %s' % user
-    gmail = buildGAPIServiceObject(u'gmail', user)
     page_message = u'Got %%%%total_items%%%% messages for user %s' % user
     listResult = callGAPIpages(gmail.users().messages(), u'list', u'messages', page_message=page_message,
                                userId=u'me', q=query, includeSpamTrash=True, soft_errors=True)
@@ -4715,7 +5307,9 @@ def doDeleteLabel(users):
   label = sys.argv[5]
   label_name_lower = label.lower()
   for user in users:
-    gmail = buildGAPIServiceObject(u'gmail', user)
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
     print u'Getting all labels for %s...' % user
     labels = callGAPI(gmail.users().labels(), u'list', userId=user, fields=u'labels(id,name,type)')
     del_labels = []
@@ -4740,12 +5334,12 @@ def doDeleteLabel(users):
       else:
         print u' Error: no such label for %s' % user
         continue
+    j = 0
     del_me_count = len(del_labels)
-    i = 1
     dbatch = googleapiclient.http.BatchHttpRequest()
     for del_me in del_labels:
-      print u' deleting label %s (%s/%s)' % (del_me[u'name'], i, del_me_count)
-      i += 1
+      j += 1
+      print u' deleting label %s (%s/%s)' % (del_me[u'name'], j, del_me_count)
       dbatch.add(gmail.users().labels().delete(userId=user, id=del_me[u'id']), callback=gmail_del_result)
       if len(dbatch._order) == 10:
         dbatch.execute()
@@ -4772,7 +5366,9 @@ def showLabels(users):
       print u'ERROR: %s is not a valid argument for "gam <users> show labels"' % sys.argv[i]
       sys.exit(2)
   for user in users:
-    gmail = buildGAPIServiceObject(u'gmail', user)
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
     labels = callGAPI(gmail.users().labels(), u'list', userId=user, soft_errors=True)
     if labels:
       for label in labels[u'labels']:
@@ -4801,21 +5397,29 @@ def showGmailProfile(users):
     else:
       print u'ERROR: %s is not a valid argument for gam <users> show gmailprofile' % sys.argv[i]
       sys.exit(2)
-  profiles = []
+  csvRows = []
   titles = [u'emailAddress']
+  i = 0
+  count = len(users)
   for user in users:
-    sys.stderr.write(u'Getting Gmail profile for %s\n' % user)
-    gmail = buildGAPIServiceObject(u'gmail', user, soft_errors=True)
+    i += 1
+    user, gmail = buildGmailGAPIObject(user)
     if not gmail:
       continue
-    results = callGAPI(gmail.users(), u'getProfile', userId=u'me', soft_errors=True)
-    if results:
-      for item in results:
-        if item not in titles:
-          titles.append(item)
-      profiles.append(results)
-  addSortedTitlesToCSV(profiles, u'emailAddress', titles)
-  output_csv(profiles, titles, list_type=u'Gmail Profiles', todrive=todrive)
+    sys.stderr.write(u'Getting Gmail profile for %s\n' % user)
+    try:
+      results = callGAPI(gmail.users(), u'getProfile',
+                         throw_reasons=GAPI_GMAIL_THROW_REASONS,
+                         userId=u'me')
+      if results:
+        for item in results:
+          if item not in titles:
+            titles.append(item)
+        csvRows.append(results)
+    except GAPI_serviceNotAvailable:
+      entityServiceNotApplicableWarning(u'User', user, i, count)
+  sortCSVTitles([u'emailAddress',], titles)
+  writeCSVfile(csvRows, titles, list_type=u'Gmail Profiles', todrive=todrive)
 
 def showGplusProfile(users):
   todrive = False
@@ -4827,22 +5431,30 @@ def showGplusProfile(users):
     else:
       print u'ERROR: %s is not a valid argument for gam <users> show gplusprofile' % sys.argv[i]
       sys.exit(2)
-  profiles = []
+  csvRows = []
   titles = [u'id']
+  i = 0
+  count = len(users)
   for user in users:
-    sys.stderr.write(u'Getting Gplus profile for %s\n' % user)
-    gplus = buildGAPIServiceObject(u'plus', user, soft_errors=True)
+    i += 1
+    user, gplus = buildGplusGAPIObject(user)
     if not gplus:
       continue
-    results = callGAPI(gplus.people(), u'get', userId=u'me', soft_errors=True)
-    if results:
-      results = flatten_json(results)
-      profiles.append(results)
-      for item in results:
-        if item not in titles:
-          titles.append(item)
-  addSortedTitlesToCSV(profiles, u'id', titles)
-  output_csv(profiles, titles, list_type=u'Gplus Profiles', todrive=todrive)
+    sys.stderr.write(u'Getting Gplus profile for %s\n' % user)
+    try:
+      results = callGAPI(gplus.people(), u'get',
+                         throw_reasons=GAPI_GPLUS_THROW_REASONS,
+                         userId=u'me')
+      if results:
+        results = flatten_json(results)
+        csvRows.append(results)
+        for item in results:
+          if item not in titles:
+            titles.append(item)
+    except GAPI_serviceNotAvailable:
+      entityServiceNotApplicableWarning(u'User', user, i, count)
+  sortCSVTitles([u'id',], titles)
+  writeCSVfile(csvRows, titles, list_type=u'Gplus Profiles', todrive=todrive)
 
 def updateLabels(users):
   label_name = sys.argv[5]
@@ -4874,7 +5486,9 @@ def updateLabels(users):
       print u'ERROR: %s is not a valid argument for "gam <users> update labels"' % sys.argv[i]
       sys.exit(2)
   for user in users:
-    gmail = buildGAPIServiceObject(u'gmail', user)
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
     labels = callGAPI(gmail.users().labels(), u'list', userId=user, fields=u'labels(id,name)')
     for label in labels[u'labels']:
       if label[u'name'].lower() == label_name_lower:
@@ -4904,7 +5518,9 @@ def renameLabels(users):
       sys.exit(2)
   pattern = re.compile(search, re.IGNORECASE)
   for user in users:
-    gmail = buildGAPIServiceObject(u'gmail', user)
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
     labels = callGAPI(gmail.users().labels(), u'list', userId=user)
     for label in labels[u'labels']:
       if label[u'type'] == u'system':
@@ -4926,11 +5542,11 @@ def renameLabels(users):
                   new_label_id = new_label[u'id']
                   body = {u'addLabelIds': [new_label_id]}
                   break
-              i = 1
+              j = 1
               for message_to_relabel in messages_to_relabel:
-                print u'    relabeling message %s (%s/%s)' % (message_to_relabel[u'id'], i, len(messages_to_relabel))
+                print u'    relabeling message %s (%s/%s)' % (message_to_relabel[u'id'], j, len(messages_to_relabel))
                 callGAPI(gmail.users().messages(), u'modify', userId=user, id=message_to_relabel[u'id'], body=body)
-                i += 1
+                j += 1
             else:
               print u'   no messages with %s label' % label[u'name']
             print u'   Deleting label %s' % label[u'name']
@@ -4938,93 +5554,301 @@ def renameLabels(users):
           else:
             print u'  Error: looks like %s already exists, not renaming. Use the "merge" argument to merge the labels' % new_label_name
 
-def doFilter(users):
-  i = 4 # filter arguments start here
-  from_ = to = subject = has_the_word = does_not_have_the_word = has_attachment = label = should_mark_as_read = should_archive = should_star = forward_to = should_trash = should_not_spam = None
-  haveCondition = False
-  while sys.argv[i].lower() in [u'from', u'to', u'subject', u'haswords', u'nowords', u'musthaveattachment']:
-    if sys.argv[i].lower() == u'from':
-      from_ = sys.argv[i+1]
-      i += 2
-      haveCondition = True
-    elif sys.argv[i].lower() == u'to':
-      to = sys.argv[i+1]
-      i += 2
-      haveCondition = True
-    elif sys.argv[i].lower() == u'subject':
-      subject = sys.argv[i+1]
-      i += 2
-      haveCondition = True
-    elif sys.argv[i].lower() == u'haswords':
-      has_the_word = sys.argv[i+1]
-      i += 2
-      haveCondition = True
-    elif sys.argv[i].lower() == u'nowords':
-      does_not_have_the_word = sys.argv[i+1]
-      i += 2
-      haveCondition = True
-    elif sys.argv[i].lower() == u'musthaveattachment':
-      has_attachment = True
-      i += 1
-      haveCondition = True
-  if not haveCondition:
-    print u'ERROR: you must specifiy a condition for "gam <users> filter"'
-    sys.exit(2)
-  haveAction = False
+def _getUserGmailLabels(gmail, user, i, count, **kwargs):
+  try:
+    labels = callGAPI(gmail.users().labels(), u'list',
+                      throw_reasons=GAPI_GMAIL_THROW_REASONS,
+                      userId=u'me', **kwargs)
+    if not labels:
+      labels = {u'labels': []}
+    return labels
+  except GAPI_serviceNotAvailable:
+    entityServiceNotApplicableWarning(u'User', user, i, count)
+    return None
+
+def _getLabelId(labels, labelName):
+  for label in labels[u'labels']:
+    if label[u'id'] == labelName or label[u'name'] == labelName:
+      return label[u'id']
+  return labelName
+
+def _getLabelName(labels, labelId):
+  for label in labels[u'labels']:
+    if label[u'id'] == labelId:
+      return label[u'name']
+  return labelId
+
+FILTER_ADD_LABEL_TO_ARGUMENT_MAP = {
+  u'IMPORTANT': u'important',
+  u'STARRED': u'star',
+  u'TRASH': u'trash',
+  }
+
+FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP = {
+  u'IMPORTANT': u'notimportant',
+  u'UNREAD': u'markread',
+  u'INBOX': u'archive',
+  u'SPAM': u'neverspam',
+  }
+
+def _printFilter(user, userFilter, labels):
+  row = {u'User': user, u'id': userFilter[u'id']}
+  for item in userFilter[u'criteria']:
+    if item in [u'hasAttachment', u'excludeChats']:
+      row[item] = item
+    elif item == u'size':
+      row[item] = u'size {0} {1}'.format(userFilter[u'criteria'][u'sizeComparison'], userFilter[u'criteria'][item])
+    elif item == u'sizeComparison':
+      pass
+    else:
+      row[item] = u'{0} {1}'.format(item, userFilter[u'criteria'][item])
+  for labelId in userFilter[u'action'].get(u'addLabelIds', []):
+    if labelId in FILTER_ADD_LABEL_TO_ARGUMENT_MAP:
+      row[FILTER_ADD_LABEL_TO_ARGUMENT_MAP[labelId]] = FILTER_ADD_LABEL_TO_ARGUMENT_MAP[labelId]
+    else:
+      row[u'label'] = u'label {0}'.format(_getLabelName(labels, labelId))
+  for labelId in userFilter[u'action'].get(u'removeLabelIds', []):
+    if labelId in FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP:
+      row[FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP[labelId]] = FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP[labelId]
+  if userFilter[u'action'].get(u'forward'):
+    row[u'forward'] = u'forward {0}'.format(userFilter[u'action'][u'forward'])
+  return row
+
+def _showFilter(userFilter, j, jcount, labels):
+  print u'  Filter: {0}{1}'.format(userFilter[u'id'], currentCount(j, jcount))
+  print u'    Criteria:'
+  for item in userFilter[u'criteria']:
+    if item in [u'hasAttachment', u'excludeChats']:
+      print u'      {0}'.format(item)
+    elif item == u'size':
+      print u'      {0} {1} {2}'.format(item, userFilter[u'criteria'][u'sizeComparison'], userFilter[u'criteria'][item])
+    elif item == u'sizeComparison':
+      pass
+    else:
+      print convertUTF8(u'      {0} "{1}"'.format(item, userFilter[u'criteria'][item]))
+  print u'    Actions:'
+  for labelId in userFilter[u'action'].get(u'addLabelIds', []):
+    if labelId in FILTER_ADD_LABEL_TO_ARGUMENT_MAP:
+      print u'      {0}'.format(FILTER_ADD_LABEL_TO_ARGUMENT_MAP[labelId])
+    else:
+      print convertUTF8(u'      label "{0}"'.format(_getLabelName(labels, labelId)))
+  for labelId in userFilter[u'action'].get(u'removeLabelIds', []):
+    if labelId in FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP:
+      print u'      {0}'.format(FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP[labelId])
+  if userFilter[u'action'].get(u'forward'):
+    print u'    Forwarding Address: {0}'.format(userFilter[u'action'][u'forward'])
+#
+FILTER_CRITERIA_CHOICES_MAP = {
+  u'excludechats': u'excludeChats',
+  u'from': u'from',
+  u'hasattachment': u'hasAttachment',
+  u'haswords': u'query',
+  u'musthaveattachment': u'hasAttachment',
+  u'negatedquery': u'negatedQuery',
+  u'nowords': u'negatedQuery',
+  u'query': u'query',
+  u'size': u'size',
+  u'subject': u'subject',
+  u'to': u'to',
+  }
+FILTER_ACTION_CHOICES = [u'archive', u'forward', u'important', u'label', u'markread', u'neverspam', u'notimportant', u'star', u'trash',]
+
+def addFilter(users, i):
+  body = {}
+  addLabelName = None
+  addLabelIds = []
+  removeLabelIds = []
   while i < len(sys.argv):
-    if sys.argv[i].lower() == u'label':
-      label = sys.argv[i+1]
-      i += 2
-      haveAction = True
-    elif sys.argv[i].lower() == u'markread':
-      should_mark_as_read = True
-      i += 1
-      haveAction = True
-    elif sys.argv[i].lower() == u'archive':
-      should_archive = True
-      i += 1
-      haveAction = True
-    elif sys.argv[i].lower() == u'star':
-      should_star = True
-      i += 1
-      haveAction = True
-    elif sys.argv[i].lower() == u'forward':
-      forward_to = sys.argv[i+1]
-      i += 2
-      haveAction = True
-    elif sys.argv[i].lower() == u'trash':
-      should_trash = True
-      i += 1
-      haveAction = True
-    elif sys.argv[i].lower() == u'neverspam':
-      should_not_spam = True
-      i += 1
-      haveAction = True
+    myarg = sys.argv[i].lower()
+    if myarg in FILTER_CRITERIA_CHOICES_MAP:
+      myarg = FILTER_CRITERIA_CHOICES_MAP[myarg]
+      body.setdefault(u'criteria', {})
+      if myarg == u'from':
+        body[u'criteria'][myarg] = sys.argv[i+1]
+        i += 2
+      elif myarg == u'to':
+        body[u'criteria'][myarg] = sys.argv[i+1]
+        i += 2
+      elif myarg in [u'subject', u'query', u'negatedQuery']:
+        body[u'criteria'][myarg] = sys.argv[i+1]
+        i += 2
+      elif myarg in [u'hasAttachment', u'excludeChats']:
+        body[u'criteria'][myarg] = True
+        i += 1
+      elif myarg == u'size':
+        body[u'criteria'][u'sizeComparison'] = sys.argv[i+1].lower()
+        if body[u'criteria'][u'sizeComparison'] not in [u'larger', u'smaller']:
+          print u'ERROR: size must be followed by larger|smaller, got %s' % sys.argv[i+1].lower()
+          sys.exit(2)
+        body[u'criteria'][myarg] = sys.argv[i+2]
+        i += 3
+    elif myarg in FILTER_ACTION_CHOICES:
+      body.setdefault(u'action', {})
+      if myarg == u'label':
+        addLabelName = sys.argv[i+1]
+        i += 2
+      elif myarg == u'important':
+        addLabelIds.append(u'IMPORTANT')
+        if u'IMPORTANT' in removeLabelIds:
+          removeLabelIds.remove(u'IMPORTANT')
+        i += 1
+      elif myarg == u'star':
+        addLabelIds.append(u'STARRED')
+        i += 1
+      elif myarg == u'trash':
+        addLabelIds.append(u'TRASH')
+        i += 1
+      elif myarg == u'notimportant':
+        removeLabelIds.append(u'IMPORTANT')
+        if u'IMPORTANT' in addLabelIds:
+          addLabelIds.remove(u'IMPORTANT')
+        i += 1
+      elif myarg == u'markread':
+        removeLabelIds.append(u'UNREAD')
+        i += 1
+      elif myarg == u'archive':
+        removeLabelIds.append(u'INBOX')
+        i += 1
+      elif myarg == u'neverspam':
+        removeLabelIds.append(u'SPAM')
+        i += 1
+      elif sys.argv[i].lower() == u'forward':
+        body[u'action'][u'forward'] = sys.argv[i+1]
+        i += 2
     else:
       print u'ERROR: %s is not a valid argument for "gam <users> filter"' % sys.argv[i]
       sys.exit(2)
-  if not haveAction:
-    print u'ERROR: you must specifiy an action for "gam <users> filter"'
+  if u'criteria' not in body:
+    print u'ERROR: you must specify a crtieria <{0}> for "gam <users> filter"'.format(u'|'.join(FILTER_CRITERIA_CHOICES_MAP))
     sys.exit(2)
-  emailsettings = getEmailSettingsObject()
+  if u'action' not in body:
+    print u'ERROR: you must specify an action <{0}> for "gam <users> filter"'.format(u'|'.join(FILTER_ACTION_CHOICES))
+    sys.exit(2)
+  if removeLabelIds:
+    body[u'action'][u'removeLabelIds'] = removeLabelIds
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
-    if user.find(u'@') > 0:
-      emailsettings.domain = user[user.find(u'@')+1:]
-      user = user[:user.find(u'@')]
-    else:
-      emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Creating filter for %s (%s of %s)" % (user+u'@'+emailsettings.domain, i, count)
     i += 1
-    callGData(emailsettings, u'CreateFilter', soft_errors=True,
-              username=user, from_=from_, to=to, subject=subject, has_the_word=has_the_word, does_not_have_the_word=does_not_have_the_word,
-              has_attachment=has_attachment, label=label, should_mark_as_read=should_mark_as_read, should_archive=should_archive,
-              should_star=should_star, forward_to=forward_to, should_trash=should_trash, should_not_spam=should_not_spam)
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    labels = _getUserGmailLabels(gmail, user, i, count, fields=u'labels(id,name)')
+    if not labels:
+      continue
+    if addLabelIds:
+      body[u'action'][u'addLabelIds'] = addLabelIds[:]
+    if addLabelName:
+      if not addLabelIds:
+        body[u'action'][u'addLabelIds'] = []
+      body[u'action'][u'addLabelIds'].append(_getLabelId(labels, addLabelName))
+    print u"Adding filter for %s (%s/%s)" % (user, i, count)
+    result = callGAPI(gmail.users().settings().filters(), u'create',
+                      soft_errors=True,
+                      userId=u'me', body=body)
+    if result:
+      print u"User: %s, Filter: %s, Added (%s/%s)" % (user, result[u'id'], i, count)
+
+def deleteFilters(users):
+  filterId = sys.argv[5]
+  i = 0
+  count = len(users)
+  for user in users:
+    i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    print u"Deleting filter %s for %s (%s/%s)" % (filterId, user, i, count)
+    callGAPI(gmail.users().settings().filters(), u'delete',
+             soft_errors=True,
+             userId=u'me', id=filterId)
+
+def printShowFilters(users, csvFormat):
+  if csvFormat:
+    todrive = False
+    csvRows = []
+    titles = [u'User', u'id']
+  i = 5
+  while i < len(sys.argv):
+    myarg = sys.argv[i].lower()
+    if csvFormat and myarg == u'todrive':
+      todrive = True
+      i += 1
+    else:
+      print u'ERROR: %s is not a valid argument for "gam <users> %s filter"' % (myarg, [u'show', u'print'][csvFormat])
+      sys.exit(2)
+  i = 0
+  count = len(users)
+  for user in users:
+    i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    labels = callGAPI(gmail.users().labels(), u'list',
+                      soft_errors=True,
+                      userId=u'me', fields=u'labels(id,name)')
+    if not labels:
+      labels = {u'labels': []}
+    result = callGAPI(gmail.users().settings().filters(), u'list',
+                      soft_errors=True,
+                      userId=u'me')
+    jcount = len(result.get(u'filter', [])) if (result) else 0
+    if not csvFormat:
+      print u'User: {0}, Filters: ({1}/{2})'.format(user, i, count)
+      if jcount == 0:
+        continue
+      j = 0
+      for userFilter in result[u'filter']:
+        j += 1
+        _showFilter(userFilter, j, jcount, labels)
+    else:
+      if jcount == 0:
+        continue
+      for userFilter in result[u'filter']:
+        row = _printFilter(user, userFilter, labels)
+        for item in row:
+          if item not in titles:
+            titles.append(item)
+        csvRows.append(row)
+  if csvFormat:
+    sortCSVTitles([u'User', u'id'], titles)
+    writeCSVfile(csvRows, titles, u'Filters', todrive)
+
+def infoFilters(users):
+  filterId = sys.argv[5]
+  i = 0
+  count = len(users)
+  for user in users:
+    i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    labels = callGAPI(gmail.users().labels(), u'list',
+                      soft_errors=True,
+                      userId=u'me', fields=u'labels(id,name)')
+    if not labels:
+      labels = {u'labels': []}
+    result = callGAPI(gmail.users().settings().filters(), u'get',
+                      soft_errors=True,
+                      userId=u'me', id=filterId)
+    if result:
+      print u'User: {0}, Filter: ({1}/{2})'.format(user, i, count)
+      _showFilter(result, 1, 1, labels)
+
+EMAILSETTINGS_OLD_NEW_OLD_FORWARD_ACTION_MAP = {
+  u'ARCHIVE': u'archive',
+  u'DELETE': u'trash',
+  u'KEEP': u'leaveInInBox',
+  u'MARK_READ': u'markRead',
+  u'archive': u'ARCHIVE',
+  u'trash': u'DELETE',
+  u'leaveInInbox': u'KEEP',
+  u'markRead': u'MARK_READ',
+  }
 
 def doForward(users):
+  newAPI = False
   action = forward_to = None
-  gotAction = gotForward = False
   if sys.argv[4].lower() in true_values:
     enable = True
   elif sys.argv[4].lower() in false_values:
@@ -5032,73 +5856,232 @@ def doForward(users):
   else:
     print u'ERROR: value for "gam <users> forward" must be true or false, got %s' % sys.argv[4]
     sys.exit(2)
+  body = {u'enabled': enable}
   i = 5
   while i < len(sys.argv):
-    if sys.argv[i].lower() in [u'keep', u'archive', u'delete']:
-      action = sys.argv[i].upper()
+    myarg = sys.argv[i].lower()
+    if myarg in EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP:
+      body[u'disposition'] = EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP[myarg]
       i += 1
-      gotAction = True
-    elif sys.argv[i].lower() == u'confirm':
+    elif myarg == u'confirm':
       i += 1
-    elif sys.argv[i].find(u'@') != -1:
-      forward_to = sys.argv[i]
-      gotForward = True
+    elif myarg == u'newapi':
+      newAPI = True
+      i += 1
+    elif myarg.find(u'@') != -1:
+      body[u'emailAddress'] = sys.argv[i]
       i += 1
     else:
-      print u'ERROR: %s is not a valid argument for "gam <users> forward"' % sys.argv[i]
+      print u'ERROR: %s is not a valid argument for "gam <users> forward"' % myarg
       sys.exit(2)
-  if enable and (not gotAction or not gotForward):
+  if enable and (not body.get(u'disposition') or not body.get(u'emailAddress')):
     print u'ERROR: you must specify an action and a forwarding address for "gam <users> forward'
     sys.exit(2)
-  emailsettings = getEmailSettingsObject()
+  if not newAPI:
+    emailsettings = getEmailSettingsObject()
+    if enable:
+      action = EMAILSETTINGS_OLD_NEW_OLD_FORWARD_ACTION_MAP[body[u'disposition']]
+      forward_to = body[u'emailAddress']
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
-    if user.find(u'@') > 0:
-      emailsettings.domain = user[user.find(u'@')+1:]
-      user = user[:user.find(u'@')]
-    else:
-      emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Turning forward %s for %s, emails will be %s (%s of %s)" % (sys.argv[4], user+u'@'+emailsettings.domain, action, i, count)
     i += 1
-    callGData(emailsettings, u'UpdateForwarding', soft_errors=True, username=user, enable=enable, action=action, forward_to=forward_to)
+    if newAPI:
+      user, gmail = buildGmailGAPIObject(user)
+      if not gmail:
+        continue
+      if enable:
+        print u"User: %s, Forward Enabled: %s, Forwarding Address: %s, Action: %s (%s/%s)" % (user, enable, body[u'emailAddress'], body[u'disposition'], i, count)
+      else:
+        print u"User: %s, Forward Enabled: %s (%s/%s)" % (user, enable, i, count)
+      callGAPI(gmail.users().settings(), u'updateAutoForwarding',
+               soft_errors=True,
+               userId=u'me', body=body)
+    else:
+      if user.find(u'@') > 0:
+        emailsettings.domain = user[user.find(u'@')+1:]
+        username = user[:user.find(u'@')]
+      else:
+        emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
+        username = user
+      if enable:
+        print u"User: %s, Forward Enabled: %s, Forwarding Address: %s, Action: %s (%s/%s)" % (user, enable, body[u'emailAddress'], body[u'disposition'], i, count)
+      else:
+        print u"User: %s, Forward Enabled: %s (%s/%s)" % (user, enable, i, count)
+      callGData(emailsettings, u'UpdateForwarding', soft_errors=True, username=username, enable=enable, action=action, forward_to=forward_to)
 
-def getForward(users):
-  emailsettings = getEmailSettingsObject()
+def printShowForward(users, csvFormat):
+  def _showForward(user, i, count, result):
+    if u'enabled' in result:
+      enabled = result[u'enabled']
+      if enabled:
+        print u"User: %s, Forward Enabled: %s, Forwarding Address: %s, Action: %s (%s/%s)" % (user, enabled, result[u'emailAddress'], result[u'disposition'], i, count)
+      else:
+        print u"User: %s, Forward Enabled: %s (%s/%s)" % (user, enabled, i, count)
+    else:
+      enabled = result[u'enable'] == u'true'
+      if enabled:
+        print u"User: %s, Forward Enabled: %s, Forwarding Address: %s, Action: %s (%s/%s)" % (user, enabled, result[u'forwardTo'], EMAILSETTINGS_OLD_NEW_OLD_FORWARD_ACTION_MAP[result[u'action']], i, count)
+      else:
+        print u"User: %s, Forward Enabled: %s (%s/%s)" % (user, enabled, i, count)
+
+  def _printForward(user, result):
+    if u'enabled' in result:
+      row = {u'User': user, u'forwardEnabled': result[u'enabled']}
+      if result[u'enabled']:
+        row[u'forwardTo'] = result[u'emailAddress']
+        row[u'disposition'] = result[u'disposition']
+    else:
+      row = {u'User': user, u'forwardEnabled': result[u'enable']}
+      if result[u'enable'] == u'true':
+        row[u'forwardTo'] = result[u'forwardTo']
+        row[u'disposition'] = EMAILSETTINGS_OLD_NEW_OLD_FORWARD_ACTION_MAP[result[u'action']]
+    csvRows.append(row)
+
+  if csvFormat:
+    todrive = False
+    csvRows = []
+    titles = [u'User', u'forwardEnabled', u'forwardTo', u'disposition']
+  newAPI = False
+  i = 5
+  while i < len(sys.argv):
+    myarg = sys.argv[i].lower()
+    if csvFormat and myarg == u'todrive':
+      todrive = True
+      i += 1
+    elif myarg == u'newapi':
+      newAPI = True
+      i += 1
+    else:
+      print u'ERROR: %s is not a valid argument for "gam <users> %s forward"' % (myarg, [u'show', u'print'][csvFormat])
+      sys.exit(2)
+  if not newAPI:
+    emailsettings = getEmailSettingsObject()
+  i = 0
+  count = len(users)
   for user in users:
-    if user.find(u'@') > 0:
-      emailsettings.domain = user[user.find(u'@')+1:]
-      user = user[:user.find(u'@')]
+    i += 1
+    if newAPI:
+      user, gmail = buildGmailGAPIObject(user)
+      if not gmail:
+        continue
+      result = callGAPI(gmail.users().settings(), u'getAutoForwarding',
+                        soft_errors=True,
+                        userId=u'me')
+      if result:
+        if not csvFormat:
+          _showForward(user, i, count, result)
+        else:
+          _printForward(user, result)
     else:
-      emailsettings.domain = GC_Values[GC_DOMAIN]
-    forward = callGData(emailsettings, u'GetForward', soft_errors=True, username=user)
-    try:
-      print u"User %s:  Forward To:%s  Enabled:%s  Action:%s" % (user+u'@'+emailsettings.domain, forward[u'forwardTo'], forward[u'enable'], forward[u'action'])
-    except TypeError:
-      pass
+      if user.find(u'@') > 0:
+        emailsettings.domain = user[user.find(u'@')+1:]
+        username = user[:user.find(u'@')]
+      else:
+        emailsettings.domain = GC_Values[GC_DOMAIN]
+        username = user
+      result = callGData(emailsettings, u'GetForward',
+                         soft_errors=True,
+                         username=username)
+      if result:
+        if not csvFormat:
+          _showForward(user, i, count, result)
+        else:
+          _printForward(user, result)
+  if csvFormat:
+    writeCSVfile(csvRows, titles, u'Forward', todrive)
 
-RT_PATTERN = re.compile(r'(?s){RT}.*?{(.+?)}.*?{/RT}')
-RT_OPEN_PATTERN = re.compile(r'{RT}')
-RT_CLOSE_PATTERN = re.compile(r'{/RT}')
-RT_STRIP_PATTERN = re.compile(r'(?s){RT}.*?{/RT}')
-RT_TAG_REPLACE_PATTERN = re.compile(r'{(.*?)}')
+def addForwardingAddresses(users):
+  emailAddress = sys.argv[5]
+  if emailAddress.find(u'@') == -1:
+    emailAddress = u'%s@%s' % (emailAddress, GC_Values[GC_DOMAIN])
+  body = {u'forwardingEmail':  emailAddress}
+  i = 0
+  count = len(users)
+  for user in users:
+    i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    print u"Adding Forwarding Address %s for %s (%s/%s)" % (emailAddress, user, i, count)
+    callGAPI(gmail.users().settings().forwardingAddresses(), u'create',
+             soft_errors=True,
+             userId=u'me', body=body)
 
-def processTags(tagReplacements, message):
-  while True:
-    match = RT_PATTERN.search(message)
-    if not match:
-      break
-    if tagReplacements.get(match.group(1)):
-      message = RT_OPEN_PATTERN.sub(u'', message, count=1)
-      message = RT_CLOSE_PATTERN.sub(u'', message, count=1)
+def deleteForwardingAddresses(users):
+  emailAddress = sys.argv[5]
+  if emailAddress.find(u'@') == -1:
+    emailAddress = u'%s@%s' % (emailAddress, GC_Values[GC_DOMAIN])
+  i = 0
+  count = len(users)
+  for user in users:
+    i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    print u"Deleting Forwarding Address %s for %s (%s/%s)" % (emailAddress, user, i, count)
+    callGAPI(gmail.users().settings().forwardingAddresses(), u'delete',
+             soft_errors=True,
+             userId=u'me', forwardingEmail=emailAddress)
+
+def printShowForwardingAddresses(users, csvFormat):
+  if csvFormat:
+    todrive = False
+    csvRows = []
+    titles = [u'User', u'forwardingEmail', u'verificationStatus']
+  i = 5
+  while i < len(sys.argv):
+    myarg = sys.argv[i].lower()
+    if csvFormat and myarg == u'todrive':
+      todrive = True
+      i += 1
     else:
-      message = RT_STRIP_PATTERN.sub(u'', message, count=1)
-  while True:
-    match = RT_TAG_REPLACE_PATTERN.search(message)
-    if not match:
-      break
-    message = re.sub(match.group(0), tagReplacements.get(match.group(1), u''), message)
-  return message
+      print u'ERROR: %s is not a valid argument for "gam <users> %s forwardingaddresses"' % (myarg, [u'show', u'print'][csvFormat])
+      sys.exit(2)
+  i = 0
+  count = len(users)
+  for user in users:
+    i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    result = callGAPI(gmail.users().settings().forwardingAddresses(), u'list',
+                      soft_errors=True,
+                      userId=u'me')
+    jcount = len(result.get(u'forwardingAddresses', [])) if (result) else 0
+    if not csvFormat:
+      print u'User: {0}, Forwarding Addresses: ({1}/{2})'.format(user, i, count)
+      if jcount == 0:
+        continue
+      j = 0
+      for forward in result[u'forwardingAddresses']:
+        j += 1
+        print u'  Forwarding Address: {0}, Verification Status: {1} ({2}/{3})'.format(forward[u'forwardingEmail'], forward[u'verificationStatus'], j, jcount)
+    else:
+      if jcount == 0:
+        continue
+      for forward in result[u'forwardingAddresses']:
+        row = {u'User': user, u'forwardingEmail': forward[u'forwardingEmail'], u'verificationStatus': forward[u'verificationStatus']}
+        csvRows.append(row)
+  if csvFormat:
+    writeCSVfile(csvRows, titles, u'Forwarding Addresses', todrive)
+
+def infoForwardingAddresses(users):
+  emailAddress = sys.argv[5]
+  if emailAddress.find(u'@') == -1:
+    emailAddress = u'%s@%s' % (emailAddress, GC_Values[GC_DOMAIN])
+  i = 0
+  count = len(users)
+  for user in users:
+    i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    forward = callGAPI(gmail.users().settings().forwardingAddresses(), u'get',
+                       soft_errors=True,
+                       userId=u'me', forwardingEmail=emailAddress)
+    if forward:
+      print u'User: {0}, Forwarding Address: {1}, Verification Status: {2} ({3}/{4})'.format(user, forward[u'forwardingEmail'], forward[u'verificationStatus'], i, count)
 
 def doSignature(users):
   tagReplacements = {}
@@ -5111,32 +6094,40 @@ def doSignature(users):
   else:
     signature = getString(i, u'String', emptyOK=True).replace(u'\\n', u'<br/>').replace(u'\n', u'<br/>')
     i += 1
+  body = {u'sendAsEmail': None}
   while i < len(sys.argv):
-    if sys.argv[i].lower() == u'replace':
+    myarg = sys.argv[i].lower()
+    if myarg == u'replace':
       matchTag = getString(i+1, u'Tag')
       matchReplacement = getString(i+2, u'String', emptyOK=True)
       tagReplacements[matchTag] = matchReplacement
       i += 3
+    elif myarg == u'name':
+      body[u'displayName'] = sys.argv[i+1]
+      i += 2
+    elif myarg == u'replyto':
+      body[u'replyToAddress'] = sys.argv[i+1]
+      i += 2
     else:
       print u'ERROR: %s is not a valid argument for "gam <users> signature"' % sys.argv[i]
       sys.exit(2)
   if tagReplacements:
-    signature = processTags(tagReplacements, signature)
-  emailsettings = getEmailSettingsObject()
+    body[u'signature'] = _processTags(tagReplacements, signature)
+  else:
+    body[u'signature'] = signature
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
-    if user.find(u'@') > 0:
-      emailsettings.domain = user[user.find(u'@')+1:]
-      user = user[:user.find(u'@')]
-    else:
-      emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Setting Signature for %s (%s of %s)" % (user+u'@'+emailsettings.domain, i, count)
     i += 1
-    callGData(emailsettings, u'UpdateSignature', soft_errors=True, username=user, signature=signature)
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    print u'Setting Signature for {0} ({1}/{2})'.format(user, i, count)
+    callGAPI(gmail.users().settings().sendAs(), u'patch',
+             soft_errors=True,
+             userId=u'me', body=body, sendAsEmail=user)
 
 def getSignature(users):
-  emailsettings = getEmailSettingsObject()
   formatSig = False
   i = 5
   while i < len(sys.argv):
@@ -5146,21 +6137,21 @@ def getSignature(users):
     else:
       print u'ERROR: %s is not a valid argument for "gam <users> show signature"' % sys.argv[i]
       sys.exit(2)
+  i = 0
+  count = len(users)
   for user in users:
-    if user.find(u'@') > 0:
-      emailsettings.domain = user[user.find(u'@')+1:]
-      user = user[:user.find(u'@')]
-    else:
-      emailsettings.domain = GC_Values[GC_DOMAIN]
-    result = callGData(emailsettings, u'GetSignature', soft_errors=True, username=user)
-    signature = result.get(u'signature') if result else None
-    if not signature:
-      signature = u'None'
-    sys.stdout.write(u"User %s signature:\n  " % (user+u'@'+emailsettings.domain))
-    if formatSig:
-      print convertUTF8(indentMultiLineText(dehtml(signature), n=2))
-    else:
-      print convertUTF8(u" %s" % signature)
+    i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    result = callGAPI(gmail.users().settings().sendAs(), u'list',
+                      soft_errors=True,
+                      userId=u'me')
+    if result:
+      for sendas in result[u'sendAs']:
+        if sendas.get(u'isPrimary', False):
+          _showSendAs(sendas, i, count, formatSig)
+          break
 
 def doWebClips(users):
   if sys.argv[4].lower() in true_values:
@@ -5171,21 +6162,19 @@ def doWebClips(users):
     print u'ERROR: value for "gam <users> webclips" must be true or false, got %s' % sys.argv[4]
     sys.exit(2)
   emailsettings = getEmailSettingsObject()
+  i = 0
   count = len(users)
-  i = 1
   for user in users:
+    i += 1
     if user.find(u'@') > 0:
       emailsettings.domain = user[user.find(u'@')+1:]
       user = user[:user.find(u'@')]
     else:
       emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Turning Web Clips %s for %s (%s of %s)" % (sys.argv[4], user+u'@'+emailsettings.domain, i, count)
-    i += 1
+    print u"Turning Web Clips %s for %s (%s/%s)" % (sys.argv[4], user+u'@'+emailsettings.domain, i, count)
     callGData(emailsettings, u'UpdateWebClipSettings', soft_errors=True, username=user, enable=enable)
 
 def doVacation(users):
-  subject = message = u''
-  tagReplacements = {}
   if sys.argv[4].lower() in true_values:
     enable = True
   elif sys.argv[4].lower() in false_values:
@@ -5193,82 +6182,117 @@ def doVacation(users):
   else:
     print u'ERROR: value for "gam <users> vacation" must be true or false, got %s' % sys.argv[4]
     sys.exit(2)
-  contacts_only = domain_only = False
-  start_date = end_date = None
-  i = 5
-  while i < len(sys.argv):
-    if sys.argv[i].lower() == u'subject':
-      subject = sys.argv[i+1]
-      i += 2
-    elif sys.argv[i].lower() == u'message':
-      message = sys.argv[i+1]
-      i += 2
-    elif sys.argv[i].lower() == u'contactsonly':
-      contacts_only = True
-      i += 1
-    elif sys.argv[i].lower() == u'domainonly':
-      domain_only = True
-      i += 1
-    elif sys.argv[i].lower() == u'startdate':
-      start_date = sys.argv[i+1]
-      i += 2
-    elif sys.argv[i].lower() == u'enddate':
-      end_date = sys.argv[i+1]
-      i += 2
-    elif sys.argv[i].lower() == u'file':
-      filename = sys.argv[i+1]
-      i += 2
-      i, encoding = getCharSet(i)
-      message = readFile(filename, encoding=encoding)
-    elif sys.argv[i].lower() == u'replace':
-      matchTag = getString(i+1, u'Tag')
-      matchReplacement = getString(i+2, u'String', emptyOK=True)
-      tagReplacements[matchTag] = matchReplacement
-      i += 3
-    else:
-      print u'ERROR: %s is not a valid argument for "gam <users> vacation"' % sys.argv[i]
+  body = {u'enableAutoReply': enable}
+  if enable:
+    responseBodyType = u'responseBodyPlainText'
+    message = None
+    tagReplacements = {}
+    i = 5
+    while i < len(sys.argv):
+      myarg = sys.argv[i].lower()
+      if myarg == u'subject':
+        body[u'responseSubject'] = sys.argv[i+1]
+        i += 2
+      elif myarg == u'message':
+        message = sys.argv[i+1]
+        i += 2
+      elif myarg == u'file':
+        filename = sys.argv[i+1]
+        i += 2
+        i, encoding = getCharSet(i)
+        message = readFile(filename, encoding=encoding)
+      elif myarg == u'replace':
+        matchTag = getString(i+1, u'Tag')
+        matchReplacement = getString(i+2, u'String', emptyOK=True)
+        tagReplacements[matchTag] = matchReplacement
+        i += 3
+      elif myarg == u'html':
+        responseBodyType = u'responseBodyHtml'
+        i += 1
+      elif myarg == u'contactsonly':
+        body[u'restrictToContacts'] = True
+        i += 1
+      elif myarg == u'domainonly':
+        body[u'restrictToDomain'] = True
+        i += 1
+      elif myarg == u'startdate':
+        body[u'startTime'] = getYYYYMMDD(i+1, returnTimeStamp=True)
+        i += 2
+      elif myarg == u'enddate':
+        body[u'endTime'] = getYYYYMMDD(i+1, returnTimeStamp=True)
+        i += 2
+      else:
+        print u'ERROR: %s is not a valid argument for "gam <users> vacation"' % sys.argv[i]
+        sys.exit(2)
+    if message:
+      if responseBodyType == u'responseBodyHtml':
+        message = message.replace(u'\\n', u'<br/>').replace(u'\n', u'<br/>')
+      else:
+        message = message.replace(u'\\n', u'\n')
+      if tagReplacements:
+        message = _processTags(tagReplacements, message)
+      body[responseBodyType] = message
+    if not message and not body.get(u'responseSubject'):
+      print u'ERROR: You must specify a non-blank subject or message!'
       sys.exit(2)
-  i = 1
+  i = 0
   count = len(users)
-  emailsettings = getEmailSettingsObject()
-  message = message.replace(u'\\n', u'\n')
-  if tagReplacements:
-    message = processTags(tagReplacements, message)
   for user in users:
-    if user.find(u'@') > 0:
-      emailsettings.domain = user[user.find(u'@')+1:]
-      user = user[:user.find(u'@')]
-    else:
-      emailsettings.domain = GC_Values[GC_DOMAIN] #make sure it's back at default domain
-    print u"Setting Vacation for %s (%s of %s)" % (user+u'@'+emailsettings.domain, i, count)
     i += 1
-    callGData(emailsettings, u'UpdateVacation',
-              soft_errors=True,
-              username=user, enable=enable, subject=subject, message=message,
-              contacts_only=contacts_only, domain_only=domain_only, start_date=start_date, end_date=end_date)
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    print u"Setting Vacation for %s (%s/%s)" % (user, i, count)
+    callGAPI(gmail.users().settings(), u'updateVacation',
+             soft_errors=True,
+             userId=u'me', body=body)
 
 def getVacation(users):
-  emailsettings = getEmailSettingsObject()
-  for user in users:
-    if user.find(u'@') > 0:
-      emailsettings.domain = user[user.find(u'@')+1:]
-      user = user[:user.find(u'@')]
+  formatReply = False
+  i = 5
+  while i < len(sys.argv):
+    if sys.argv[i].lower() == u'format':
+      formatReply = True
+      i += 1
     else:
-      emailsettings.domain = GC_Values[GC_DOMAIN]
-    vacationsettings = callGData(emailsettings, u'GetVacation', soft_errors=True, username=user)
-    try:
-      print convertUTF8(u'''User %s
- Enabled: %s
- Contacts Only: %s
- Domain Only: %s
- Subject: %s
- Message: %s
- Start Date: %s
- End Date: %s
-''' % (user+u'@'+emailsettings.domain, vacationsettings[u'enable'], vacationsettings[u'contactsOnly'], vacationsettings[u'domainOnly'], vacationsettings[u'subject'],
-       vacationsettings[u'message'], vacationsettings[u'startDate'], vacationsettings[u'endDate']))
-    except TypeError:
-      pass
+      print u'ERROR: %s is not a valid argument for "gam <users> show vacation"' % sys.argv[i]
+      sys.exit(2)
+  i = 0
+  count = len(users)
+  for user in users:
+    i += 1
+    user, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+      continue
+    result = callGAPI(gmail.users().settings(), u'getVacation',
+                      soft_errors=True,
+                      userId=u'me')
+    if result:
+      enabled = result[u'enableAutoReply']
+      print u'User: {0}, Vacation: ({1}/{2})'.format(user, i, count)
+      print u'  Enabled: {0}'.format(enabled)
+      if enabled:
+        print u'  Contacts Only: {0}'.format(result[u'restrictToContacts'])
+        print u'  Domain Only: {0}'.format(result[u'restrictToDomain'])
+        if u'startTime' in result:
+          print u'  Start Date: {0}'.format(datetime.datetime.fromtimestamp(int(result[u'startTime'])/1000).strftime('%Y-%m-%d'))
+        else:
+          print u'  Start Date: Started'
+        if u'endTime' in result:
+          print u'  End Date: {0}'.format(datetime.datetime.fromtimestamp(int(result[u'endTime'])/1000).strftime('%Y-%m-%d'))
+        else:
+          print u'  End Date: Not specified'
+        print convertUTF8(u'  Subject: {0}'.format(result.get(u'responseSubject', u'None')))
+        sys.stdout.write(u'  Message:\n   ')
+        if result.get(u'responseBodyPlainText'):
+          print convertUTF8(indentMultiLineText(result[u'responseBodyPlainText'], n=4))
+        elif result.get(u'responseBodyHtml'):
+          if formatReply:
+            print convertUTF8(indentMultiLineText(dehtml(result[u'responseBodyHtml']), n=4))
+          else:
+            print convertUTF8(indentMultiLineText(result[u'responseBodyHtml'], n=4))
+        else:
+          print u'None'
 
 def doDelSchema():
   cd = buildGAPIObject(u'directory')
@@ -5276,7 +6300,7 @@ def doDelSchema():
   callGAPI(cd.schemas(), u'delete', customerId=GC_Values[GC_CUSTOMER_ID], schemaKey=schemaKey)
   print u'Deleted schema %s' % schemaKey
 
-def doCreateOrUpdateUserSchema():
+def doCreateOrUpdateUserSchema(function):
   cd = buildGAPIObject(u'directory')
   schemaName = sys.argv[3]
   body = {u'schemaName': schemaName, u'fields': []}
@@ -5314,72 +6338,117 @@ def doCreateOrUpdateUserSchema():
     else:
       print u'ERROR: %s is not a valid argument for "gam create schema"' % sys.argv[i]
       sys.exit(2)
-  if sys.argv[1].lower() == u'create':
-    result = callGAPI(cd.schemas(), u'insert', customerId=GC_Values[GC_CUSTOMER_ID], body=body)
+  if function == u'insert':
+    result = callGAPI(cd.schemas(), function, customerId=GC_Values[GC_CUSTOMER_ID], body=body)
     print u'Created user schema %s' % result[u'schemaName']
-  elif sys.argv[1].lower() == u'update':
-    result = callGAPI(cd.schemas(), u'update', customerId=GC_Values[GC_CUSTOMER_ID], body=body, schemaKey=schemaName)
+  else:
+    result = callGAPI(cd.schemas(), function, customerId=GC_Values[GC_CUSTOMER_ID], body=body, schemaKey=schemaName)
     print u'Updated user schema %s' % result[u'schemaName']
 
-def doPrintUserSchemas():
-  cd = buildGAPIObject(u'directory')
-  schemas = callGAPI(cd.schemas(), u'list', customerId=GC_Values[GC_CUSTOMER_ID])
-  if not schemas or u'schemas' not in schemas:
-    return
-  for schema in schemas[u'schemas']:
-    print u'Schema: %s' % schema[u'schemaName']
-    for a_key in schema:
-      if a_key not in [u'schemaName', u'fields', u'etag', u'kind']:
-        print u'%s: %s' % (a_key, schema[a_key])
-    print
-    for field in schema[u'fields']:
-      print u' Field: %s' % field[u'fieldName']
-      for a_key in field:
-        if a_key not in [u'fieldName', u'kind', u'etag']:
-          print u'  %s: %s' % (a_key, field[a_key])
-      print
-    print
-
-def doGetUserSchema():
-  cd = buildGAPIObject(u'directory')
-  schemaKey = sys.argv[3]
-  schema = callGAPI(cd.schemas(), u'get', customerId=GC_Values[GC_CUSTOMER_ID], schemaKey=schemaKey)
+def _showSchema(schema):
   print u'Schema: %s' % schema[u'schemaName']
   for a_key in schema:
     if a_key not in [u'schemaName', u'fields', u'etag', u'kind']:
-      print u'%s: %s' % (a_key, schema[a_key])
-  print
+      print u' %s: %s' % (a_key, schema[a_key])
   for field in schema[u'fields']:
     print u' Field: %s' % field[u'fieldName']
     for a_key in field:
       if a_key not in [u'fieldName', u'kind', u'etag']:
         print u'  %s: %s' % (a_key, field[a_key])
-    print
 
-def doCreateUser():
+def doPrintShowUserSchemas(csvFormat):
   cd = buildGAPIObject(u'directory')
-  body = dict()
-  body[u'name'] = dict()
-  body[u'primaryEmail'] = sys.argv[3]
-  if body[u'primaryEmail'].find(u'@') == -1:
-    body[u'primaryEmail'] = u'%s@%s' % (body[u'primaryEmail'], GC_Values[GC_DOMAIN])
-  gotFirstName = gotLastName = do_admin = False
-  need_to_hash_password = need_password = True
-  i = 4
+  if csvFormat:
+    todrive = False
+    csvRows = []
+    titles = []
+  i = 3
   while i < len(sys.argv):
-    if sys.argv[i].lower() == u'firstname':
+    myarg = sys.argv[i].lower()
+    if csvFormat and myarg == u'todrive':
+      todrive = True
+      i += 1
+    else:
+      print u'ERROR: %s is not a valid argument for "gam <users> %s schemas"' % (myarg, [u'show', u'print'][csvFormat])
+      sys.exit(2)
+  schemas = callGAPI(cd.schemas(), u'list', customerId=GC_Values[GC_CUSTOMER_ID])
+  if not schemas or u'schemas' not in schemas:
+    return
+  for schema in schemas[u'schemas']:
+    if not csvFormat:
+      _showSchema(schema)
+    else:
+      row = {u'fields.Count': len(schema[u'fields'])}
+      addRowTitlesToCSVfile(flatten_json(schema, flattened=row), csvRows, titles)
+  if csvFormat:
+    sortCSVTitles([u'schemaId', u'schemaName', u'fields.Count'], titles)
+    writeCSVfile(csvRows, titles, u'User Schemas', todrive)
+
+def doGetUserSchema():
+  cd = buildGAPIObject(u'directory')
+  schemaKey = sys.argv[3]
+  schema = callGAPI(cd.schemas(), u'get', customerId=GC_Values[GC_CUSTOMER_ID], schemaKey=schemaKey)
+  _showSchema(schema)
+
+def checkClearBodyList(i, body, itemName):
+  if sys.argv[i].lower() == u'clear':
+    if itemName in body:
+      del body[itemName]
+    body.setdefault(itemName, None)
+    return True
+  return False
+
+def appendItemToBodyList(body, itemName, itemValue):
+  if (itemName in body) and (body[itemName] == None):
+    del body[itemName]
+  body.setdefault(itemName, [])
+  body[itemName].append(itemValue)
+
+def getUserAttributes(i, updateCmd=False):
+  if not updateCmd:
+    body = {u'name': {u'givenName': u'Unknown', u'familyName': u'Unknown'}}
+    body[u'primaryEmail'] = sys.argv[i]
+    if body[u'primaryEmail'].find(u'@') == -1:
+      body[u'primaryEmail'] = u'%s@%s' % (body[u'primaryEmail'], GC_Values[GC_DOMAIN])
+    i += 1
+    need_password = True
+  else:
+    body = {}
+    need_password = False
+  need_to_hash_password = True
+  admin_body = {}
+  while i < len(sys.argv):
+    myarg = sys.argv[i].lower()
+    if myarg == u'firstname':
       body[u'name'][u'givenName'] = sys.argv[i+1]
-      gotFirstName = True
       i += 2
-    elif sys.argv[i].lower() == u'lastname':
+    elif myarg == u'lastname':
       body[u'name'][u'familyName'] = sys.argv[i+1]
-      gotLastName = True
       i += 2
-    elif sys.argv[i].lower() == u'password':
-      body[u'password'] = sys.argv[i+1]
+    elif myarg in [u'username', u'email', u'primaryemail'] and updateCmd:
+      body[u'primaryEmail'] = sys.argv[i+1]
+      if body[u'primaryEmail'].find(u'@') == -1:
+        body[u'primaryEmail'] = u'%s@%s' % (body[u'primaryEmail'], GC_Values[GC_DOMAIN])
+      i += 2
+    elif myarg == u'customerid' and updateCmd:
+      body[u'customerId'] = sys.argv[i+1]
+      i += 2
+    elif myarg == u'password':
       need_password = False
+      body[u'password'] = sys.argv[i+1]
+      if body[u'password'].lower() == u'random':
+        need_password = True
       i += 2
-    elif sys.argv[i].lower() == u'suspended':
+    elif myarg == u'admin':
+      if sys.argv[i+1].lower() in true_values:
+        admin_body[u'status'] = True
+      elif sys.argv[i+1].lower() in false_values:
+        admin_body[u'status'] = False
+      else:
+        print u'ERROR: admin should be on or off, not %s' % sys.argv[i+1]
+        sys.exit(2)
+      i += 2
+    elif myarg == u'suspended':
       if sys.argv[i+1].lower() in true_values:
         body[u'suspended'] = True
       elif sys.argv[i+1].lower() in false_values:
@@ -5388,31 +6457,31 @@ def doCreateUser():
         print u'ERROR: suspended should be on or off, not %s' % sys.argv[i+1]
         sys.exit(2)
       i += 2
-    elif sys.argv[i].lower() == u'gal':
+    elif myarg == u'gal':
       if sys.argv[i+1].lower() in true_values:
         body[u'includeInGlobalAddressList'] = True
       elif sys.argv[i+1].lower() in false_values:
         body[u'includeInGlobalAddressList'] = False
       else:
         print u'ERROR: gal should be on or off, not %s' % sys.argv[i+1]
-        sys.exit(52)
+        sys.exit(2)
       i += 2
-    elif sys.argv[i].lower() in [u'sha', u'sha1', u'sha-1']:
+    elif myarg in [u'sha', u'sha1', u'sha-1']:
       body[u'hashFunction'] = u'SHA-1'
       need_to_hash_password = False
       i += 1
-    elif sys.argv[i].lower() == u'md5':
+    elif myarg == u'md5':
       body[u'hashFunction'] = u'MD5'
       need_to_hash_password = False
       i += 1
-    elif sys.argv[i].lower() == u'crypt':
+    elif myarg == u'crypt':
       body[u'hashFunction'] = u'crypt'
       need_to_hash_password = False
       i += 1
-    elif sys.argv[i].lower() == u'nohash':
+    elif myarg == u'nohash':
       need_to_hash_password = False
       i += 1
-    elif sys.argv[i].lower() == u'changepassword':
+    elif myarg == u'changepassword':
       if sys.argv[i+1].lower() in true_values:
         body[u'changePasswordAtNextLogin'] = True
       elif sys.argv[i+1].lower() in false_values:
@@ -5421,7 +6490,7 @@ def doCreateUser():
         print u'ERROR: changepassword should be on or off, not %s' % sys.argv[i+1]
         sys.exit(2)
       i += 2
-    elif sys.argv[i].lower() == u'ipwhitelisted':
+    elif myarg == u'ipwhitelisted':
       if sys.argv[i+1].lower() in true_values:
         body[u'ipWhitelisted'] = True
       elif sys.argv[i+1].lower() in false_values:
@@ -5430,17 +6499,7 @@ def doCreateUser():
         print u'ERROR: ipwhitelisted should be on or off, not %s' % sys.argv[i+1]
         sys.exit(2)
       i += 2
-    elif sys.argv[i].lower() == u'admin':
-      do_admin = True
-      if sys.argv[i+1].lower() in true_values:
-        admin_body = {u'status': True}
-      elif sys.argv[i+1].lower() in false_values:
-        admin_body = {u'status': False}
-      else:
-        print u'ERROR: admin should be on or off, not %s' % sys.argv[i+1]
-        sys.exit(2)
-      i += 2
-    elif sys.argv[i].lower() == u'agreedtoterms':
+    elif myarg == u'agreedtoterms':
       if sys.argv[i+1].lower() in true_values:
         body[u'agreedToTerms'] = True
       elif sys.argv[i+1].lower() in false_values:
@@ -5449,15 +6508,91 @@ def doCreateUser():
         print u'ERROR: agreedtoterms should be on or off, not %s' % sys.argv[i+1]
         sys.exit(2)
       i += 2
-    elif sys.argv[i].lower() in [u'org', u'ou']:
-      org = sys.argv[i+1]
-      if org[0] != u'/':
-        org = u'/%s' % org
-      body[u'orgUnitPath'] = org
+    elif myarg in [u'org', u'ou']:
+      body[u'orgUnitPath'] = sys.argv[i+1]
+      if body[u'orgUnitPath'][0] != u'/':
+        body[u'orgUnitPath'] = u'/%s' % body[u'orgUnitPath']
       i += 2
-    elif sys.argv[i].lower() == u'im':
-      im = dict()
+    elif myarg in [u'address', u'addresses']:
       i += 1
+      if checkClearBodyList(i, body, u'addresses'):
+        i += 1
+        continue
+      address = {}
+      if sys.argv[i].lower() != u'type':
+        print u'ERROR: wrong format for account address details. Expected type got %s' % sys.argv[i]
+        sys.exit(2)
+      i += 1
+      address[u'type'] = sys.argv[i].lower()
+      if address[u'type'] not in [u'custom', u'home', u'other', u'work']:
+        print u'ERROR: wrong type should be custom, home, other or work. Got %s' % address[u'type']
+        sys.exit(2)
+      if address[u'type'] == u'custom':
+        i += 1
+        address[u'customType'] = sys.argv[i]
+      i += 1
+      if sys.argv[i].lower() == u'unstructured':
+        i += 1
+        address[u'sourceIsStructured'] = False
+        address[u'formatted'] = sys.argv[i]
+        i += 1
+      while True:
+        myopt = sys.argv[i].lower()
+        if myopt == u'pobox':
+          address[u'poBox'] = sys.argv[i+1]
+          i += 2
+        elif myopt == u'extendedaddress':
+          address[u'extendedAddress'] = sys.argv[i+1]
+          i += 2
+        elif myopt == u'streetaddress':
+          address[u'streetAddress'] = sys.argv[i+1]
+          i += 2
+        elif myopt == u'locality':
+          address[u'locality'] = sys.argv[i+1]
+          i += 2
+        elif myopt == u'region':
+          address[u'region'] = sys.argv[i+1]
+          i += 2
+        elif myopt == u'postalcode':
+          address[u'postalCode'] = sys.argv[i+1]
+          i += 2
+        elif myopt == u'country':
+          address[u'country'] = sys.argv[i+1]
+          i += 2
+        elif myopt == u'countrycode':
+          address[u'countryCode'] = sys.argv[i+1]
+          i += 2
+        elif myopt in [u'notprimary', u'primary']:
+          address[u'primary'] = myopt == u'primary'
+          i += 1
+          break
+        else:
+          print u'ERROR: invalid argument (%s) for account address details' % sys.argv[i]
+          sys.exit(2)
+      appendItemToBodyList(body, u'addresses', address)
+    elif myarg in [u'emails', u'otheremail', u'otheremails']:
+      i += 1
+      if checkClearBodyList(i, body, u'emails'):
+        i += 1
+        continue
+      an_email = {}
+      an_email[u'type'] = sys.argv[i].lower()
+      if an_email[u'type'] == u'custom':
+        i += 1
+        an_email[u'customType'] = sys.argv[i]
+      elif an_email[u'type'] not in [u'home', u'work', u'other']:
+        an_email[u'type'] = u'custom'
+        an_email[u'customType'] = sys.argv[i]
+      i += 1
+      an_email[u'address'] = sys.argv[i]
+      i += 1
+      appendItemToBodyList(body, u'emails', an_email)
+    elif myarg in [u'im', u'ims']:
+      i += 1
+      if checkClearBodyList(i, body, u'ims'):
+        i += 1
+        continue
+      im = {}
       if sys.argv[i].lower() != u'type':
         print u'ERROR: wrong format for account im details. Expected type got %s' % sys.argv[i]
         sys.exit(2)
@@ -5482,136 +6617,79 @@ def doCreateUser():
         i += 1
         im[u'customProtocol'] = sys.argv[i]
       i += 1
-      if sys.argv[i].lower() == u'primary':
-        im[u'primary'] = True
+      # Backwards compatability: notprimary|primary on either side of IM address
+      myopt = sys.argv[i].lower()
+      if myopt in [u'notprimary', u'primary']:
+        im[u'primary'] = myopt == u'primary'
         i += 1
       im[u'im'] = sys.argv[i]
-      try:
-        body[u'ims'].append(im)
-      except KeyError:
-        body[u'ims'] = [im,]
       i += 1
-    elif sys.argv[i].lower() == u'address':
-      address = dict()
-      i += 1
-      if sys.argv[i].lower() != u'type':
-        print u'ERROR: wrong format for account address details. Expected type got %s' % sys.argv[i]
-        sys.exit(2)
-      i += 1
-      address[u'type'] = sys.argv[i].lower()
-      if address[u'type'] not in [u'custom', u'home', u'other', u'work']:
-        print u'ERROR: wrong type should be custom, home, other or work. Got %s' % address[u'type']
-        sys.exit(2)
-      if address[u'type'] == u'custom':
+      myopt = sys.argv[i].lower()
+      if myopt in [u'notprimary', u'primary']:
+        im[u'primary'] = myopt == u'primary'
         i += 1
-        address[u'customType'] = sys.argv[i]
+      appendItemToBodyList(body, u'ims', im)
+    elif myarg in [u'organization', u'organizations']:
       i += 1
-      if sys.argv[i].lower() == u'unstructured':
-        i += 1
-        address[u'sourceIsStructured'] = False
-        address[u'formatted'] = sys.argv[i]
+      if checkClearBodyList(i, body, u'organizations'):
         i += 1
+        continue
+      organization = {}
       while True:
-        argument = sys.argv[i].lower()
-        if argument == u'pobox':
-          address[u'poBox'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'extendedaddress':
-          address[u'extendedAddress'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'streetaddress':
-          address[u'streetAddress'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'locality':
-          address[u'locality'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'region':
-          address[u'region'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'postalcode':
-          address[u'postalCode'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'country':
-          address[u'country'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'countrycode':
-          address[u'countryCode'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'notprimary':
-          i += 1
-          break
-        elif argument == u'primary':
-          address[u'primary'] = True
-          i += 1
-          break
-        else:
-          print u'ERROR: invalid argument (%s) for account address details' % sys.argv[i]
-          sys.exit(2)
-      try:
-        body[u'addresses'].append(address)
-      except KeyError:
-        body[u'addresses'] = [address,]
-    elif sys.argv[i].lower() == u'organization':
-      organization = dict()
-      i += 1
-      while True:
-        argument = sys.argv[i].lower()
-        if argument == u'name':
+        myopt = sys.argv[i].lower()
+        if myopt == u'name':
           organization[u'name'] = sys.argv[i+1]
           i += 2
-        elif argument == u'title':
+        elif myopt == u'title':
           organization[u'title'] = sys.argv[i+1]
           i += 2
-        elif argument == u'customtype':
+        elif myopt == u'customtype':
           organization[u'customType'] = sys.argv[i+1]
           i += 2
-        elif argument == u'type':
+        elif myopt == u'type':
           organization[u'type'] = sys.argv[i+1].lower()
           if organization[u'type'] not in [u'domain_only', u'school', u'unknown', u'work']:
             print u'ERROR: organization type must be domain_only, school, unknown or work. Got %s' % organization[u'type']
             sys.exit(2)
           i += 2
-        elif argument == u'department':
+        elif myopt == u'department':
           organization[u'department'] = sys.argv[i+1]
           i += 2
-        elif argument == u'symbol':
+        elif myopt == u'symbol':
           organization[u'symbol'] = sys.argv[i+1]
           i += 2
-        elif argument == u'costcenter':
+        elif myopt == u'costcenter':
           organization[u'costCenter'] = sys.argv[i+1]
           i += 2
-        elif argument == u'location':
+        elif myopt == u'location':
           organization[u'location'] = sys.argv[i+1]
           i += 2
-        elif argument == u'description':
+        elif myopt == u'description':
           organization[u'description'] = sys.argv[i+1]
           i += 2
-        elif argument == u'domain':
+        elif myopt == u'domain':
           organization[u'domain'] = sys.argv[i+1]
           i += 2
-        elif argument == u'notprimary':
-          i += 1
-          break
-        elif argument == u'primary':
-          organization[u'primary'] = True
+        elif myopt in [u'notprimary', u'primary']:
+          organization[u'primary'] = myopt == u'primary'
           i += 1
           break
         else:
           print u'ERROR: invalid argument (%s) for account organization details' % sys.argv[i]
           sys.exit(2)
-      try:
-        body[u'organizations'].append(organization)
-      except KeyError:
-        body[u'organizations'] = [organization,]
-    elif sys.argv[i].lower() == u'phone':
-      phone = dict()
+      appendItemToBodyList(body, u'organizations', organization)
+    elif myarg in [u'phone', u'phones']:
       i += 1
+      if checkClearBodyList(i, body, u'phones'):
+        i += 1
+        continue
+      phone = {}
       while True:
-        argument = sys.argv[i].lower()
-        if argument == u'value':
+        myopt = sys.argv[i].lower()
+        if myopt == u'value':
           phone[u'value'] = sys.argv[i+1]
           i += 2
-        elif argument == u'type':
+        elif myopt == u'type':
           phone[u'type'] = sys.argv[i+1].lower()
           if phone[u'type'] not in [u'assistant', u'callback', u'car', u'company_main', u'custom', u'grand_central', u'home', u'home_fax', u'isdn', u'main', u'mobile', u'other', u'other_fax', u'pager', u'radio', u'telex', u'tty_tdd', u'work', u'work_fax', u'work_mobile', u'work_pager']:
             print u'ERROR: phone type must be assistant, callback, car, company_main, custom, grand_central, home, home_fax, isdn, main, mobile, other, other_fax, pager, radio, telex, tty_tdd, work, work_fax, work_mobile, work_pager. Got %s' % phone[u'type']
@@ -5620,47 +6698,78 @@ def doCreateUser():
           if phone[u'type'] == u'custom':
             phone[u'customType'] = sys.argv[i]
             i += 1
-        elif argument == u'notprimary':
-          i += 1
-          break
-        elif argument == u'primary':
-          phone[u'primary'] = True
+        elif myopt in [u'notprimary', u'primary']:
+          phone[u'primary'] = myopt == u'primary'
           i += 1
           break
         else:
           print u'ERROR: invalid argument (%s) for account phone details' % sys.argv[i]
           sys.exit(2)
-      try:
-        body[u'phones'].append(phone)
-      except KeyError:
-        body[u'phones'] = [phone,]
-    elif sys.argv[i].lower() == u'relation':
-      relation = dict()
+      appendItemToBodyList(body, u'phones', phone)
+    elif myarg in [u'relation', u'relations']:
       i += 1
-      relation[u'type'] = sys.argv[i]
-      if relation[u'type'].lower() not in [u'mother', u'father', u'sister', u'brother', u'manager', u'assistant', u'partner']:
+      if checkClearBodyList(i, body, u'relations'):
+        i += 1
+        continue
+      relation = {}
+      relation[u'type'] = sys.argv[i].lower()
+      if relation[u'type'] not in [u'mother', u'father', u'sister', u'brother', u'manager', u'assistant', u'partner']:
         relation[u'type'] = u'custom'
         relation[u'customType'] = sys.argv[i]
       i += 1
       relation[u'value'] = sys.argv[i]
-      try:
-        body[u'relations'].append(relation)
-      except KeyError:
-        body[u'relations'] = [relation,]
       i += 1
-    elif sys.argv[i].lower() == u'externalid':
-      externalid = dict()
+      appendItemToBodyList(body, u'relations', relation)
+    elif myarg in [u'externalid', u'externalids']:
       i += 1
-      externalid[u'type'] = sys.argv[i]
-      if externalid[u'type'].lower() not in [u'account', u'customer', u'network', u'organization']:
+      if checkClearBodyList(i, body, u'externalIds'):
+        i += 1
+        continue
+      externalid = {}
+      externalid[u'type'] = sys.argv[i].lower()
+      if externalid[u'type'] not in [u'account', u'customer', u'network', u'organization']:
         externalid[u'type'] = u'custom'
         externalid[u'customType'] = sys.argv[i]
       i += 1
       externalid[u'value'] = sys.argv[i]
-      try:
-        body[u'externalIds'].append(externalid)
-      except KeyError:
-        body[u'externalIds'] = [externalid,]
+      i += 1
+      appendItemToBodyList(body, u'externalIds', externalid)
+    elif myarg in [u'website', u'websites']:
+      i += 1
+      if checkClearBodyList(i, body, u'websites'):
+        i += 1
+        continue
+      website = {}
+      website[u'type'] = sys.argv[i].lower()
+      if website[u'type'] == u'custom':
+        i += 1
+        website[u'customType'] = sys.argv[i]
+      elif website[u'type'] not in [u'home', u'work', u'home_page', u'ftp', u'blog', u'profile', u'other', u'reservations', u'app_install_page']:
+        website[u'type'] = u'custom'
+        website[u'customType'] = sys.argv[i]
+      i += 1
+      website[u'value'] = sys.argv[i]
+      i += 1
+      myopt = sys.argv[i].lower()
+      if myopt in [u'notprimary', u'primary']:
+        website[u'primary'] = myopt == u'primary'
+        i += 1
+      appendItemToBodyList(body, u'websites', website)
+    elif myarg in [u'note', u'notes']:
+      i += 1
+      if checkClearBodyList(i, body, u'notes'):
+        i += 1
+        continue
+      note = {}
+      if sys.argv[i].lower() in [u'text_plain', u'text_html']:
+        note[u'contentType'] = sys.argv[i].lower()
+        i += 1
+      if sys.argv[i].lower() == u'file':
+        i += 1
+        note[u'value'] = readFile(sys.argv[i], encoding=GM_Globals[GM_SYS_ENCODING])
+      else:
+        note[u'value'] = sys.argv[i].replace(u'\\n', u'\n')
+      body[u'notes'] = note
       i += 1
     else:
       if u'customSchemas' not in body:
@@ -5668,48 +6777,45 @@ def doCreateUser():
       try:
         (schemaName, fieldName) = sys.argv[i].split(u'.')
       except ValueError:
-        print u'ERROR: %s is not a valid create user argument or custom schema name.' % sys.argv[i]
+        print u'ERROR: %s is not a valid create/update user argument or custom schema name.' % sys.argv[i]
         sys.exit(2)
       field_value = sys.argv[i+1]
       is_multivalue = False
       if field_value.lower() in [u'multivalue', u'multivalued', u'value']:
         is_multivalue = True
-        field_value = sys.argv[i+2]
-      if schemaName not in body[u'customSchemas']:
-        body[u'customSchemas'][schemaName] = {}
+        i += 1
+        field_value = sys.argv[i+1]
+      body[u'customSchemas'].setdefault(schemaName, {})
       if is_multivalue:
-        if fieldName not in body[u'customSchemas'][schemaName]:
-          body[u'customSchemas'][schemaName][fieldName] = []
+        body[u'customSchemas'][schemaName].setdefault(fieldName, [])
         body[u'customSchemas'][schemaName][fieldName].append({u'value': field_value})
       else:
         body[u'customSchemas'][schemaName][fieldName] = field_value
       i += 2
-      if is_multivalue:
-        i += 1
-  if not gotFirstName:
-    body[u'name'][u'givenName'] = u'Unknown'
-  if not gotLastName:
-    body[u'name'][u'familyName'] = u'Unknown'
   if need_password:
     body[u'password'] = u''.join(random.sample(u'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~`!@#$%^&*()-=_+:;"\'{}[]\\|', 25))
-  if need_to_hash_password:
+  if u'password' in body and need_to_hash_password:
     body[u'password'] = gen_sha512_hash(body[u'password'])
     body[u'hashFunction'] = u'crypt'
+  return (body, admin_body)
+
+def doCreateUser():
+  cd = buildGAPIObject(u'directory')
+  body, admin_body = getUserAttributes(3, updateCmd=False)
   print u"Creating account for %s" % body[u'primaryEmail']
   callGAPI(cd.users(), u'insert', body=body, fields=u'primaryEmail')
-  if do_admin:
+  if admin_body:
     print u' Changing admin status for %s to %s' % (body[u'primaryEmail'], admin_body[u'status'])
     callGAPI(cd.users(), u'makeAdmin', userKey=body[u'primaryEmail'], body=admin_body)
 
 def doCreateGroup():
   cd = buildGAPIObject(u'directory')
-  body = dict()
-  body[u'email'] = sys.argv[3]
+  body = {u'email': sys.argv[3]}
   if body[u'email'].find(u'@') == -1:
     body[u'email'] = u'%s@%s' % (body[u'email'], GC_Values[GC_DOMAIN])
   got_name = False
   i = 4
-  gs_body = dict()
+  gs_body = {}
   gs = None
   while i < len(sys.argv):
     if sys.argv[i].lower() == u'name':
@@ -5765,8 +6871,7 @@ def doCreateGroup():
 
 def doCreateAlias():
   cd = buildGAPIObject(u'directory')
-  body = dict()
-  body[u'alias'] = sys.argv[3]
+  body = {u'alias': sys.argv[3]}
   if body[u'alias'].find(u'@') == -1:
     body[u'alias'] = u'%s@%s' % (body[u'alias'], GC_Values[GC_DOMAIN])
   target_type = sys.argv[4].lower()
@@ -5789,8 +6894,7 @@ def doCreateAlias():
 
 def doCreateOrg():
   cd = buildGAPIObject(u'directory')
-  body = dict()
-  body[u'name'] = sys.argv[3]
+  body = {u'name': sys.argv[3]}
   if body[u'name'][0] == u'/':
     body[u'name'] = body[u'name'][1:]
   i = 4
@@ -5834,370 +6938,7 @@ def doCreateResourceCalendar():
 
 def doUpdateUser(users, i):
   cd = buildGAPIObject(u'directory')
-  body = dict()
-  gotPassword = isMD5 = isSHA1 = isCrypt = False
-  is_admin = nohash = None
-  do_update_user = False
-  do_admin_user = False
-  while i < len(sys.argv):
-    if sys.argv[i].lower() == u'firstname':
-      do_update_user = True
-      if u'name' not in body:
-        body[u'name'] = dict()
-      body[u'name'][u'givenName'] = sys.argv[i+1]
-      i += 2
-    elif sys.argv[i].lower() == u'lastname':
-      do_update_user = True
-      if u'name' not in body:
-        body[u'name'] = dict()
-      body[u'name'][u'familyName'] = sys.argv[i+1]
-      i += 2
-    elif sys.argv[i].lower() in [u'username', u'email']:
-      do_update_user = True
-      body[u'primaryEmail'] = sys.argv[i+1]
-      if body[u'primaryEmail'].find(u'@') == -1:
-        body[u'primaryEmail'] = u'%s@%s' % (body[u'primaryEmail'], GC_Values[GC_DOMAIN])
-      i += 2
-    elif sys.argv[i].lower() == u'password':
-      do_update_user = True
-      body[u'password'] = sys.argv[i+1]
-      if body[u'password'].lower() == u'random':
-        body[u'password'] = u''.join(random.sample(u'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~`!@#$%^&*()-=_+:;"\'{}[]\\|', 50))
-      i += 2
-      gotPassword = True
-    elif sys.argv[i].lower() == u'admin':
-      do_admin_user = True
-      if sys.argv[i+1].lower() in true_values:
-        is_admin = True
-      elif sys.argv[i+1].lower() in false_values:
-        is_admin = False
-      i += 2
-    elif sys.argv[i].lower() == u'suspended':
-      do_update_user = True
-      if sys.argv[i+1].lower() in true_values:
-        body[u'suspended'] = True
-      elif sys.argv[i+1].lower() in false_values:
-        body[u'suspended'] = False
-      i += 2
-    elif sys.argv[i].lower() == u'gal':
-      do_update_user = True
-      if sys.argv[i+1].lower() in true_values:
-        body[u'includeInGlobalAddressList'] = True
-      elif sys.argv[i+1].lower() in false_values:
-        body[u'includeInGlobalAddressList'] = False
-      else:
-        print u'ERROR: gal should be on or off, not %s' % sys.argv[i+1]
-        sys.exit(2)
-      i += 2
-    elif sys.argv[i].lower() == u'ipwhitelisted':
-      do_update_user = True
-      if sys.argv[i+1].lower() in true_values:
-        body[u'ipWhitelisted'] = True
-      elif sys.argv[i+1].lower() in false_values:
-        body[u'ipWhitelisted'] = False
-      i += 2
-    elif sys.argv[i].lower() in [u'sha', u'sha1', u'sha-1']:
-      do_update_user = True
-      body[u'hashFunction'] = u'SHA-1'
-      i += 1
-      isSHA1 = True
-    elif sys.argv[i].lower() == u'md5':
-      do_update_user = True
-      body[u'hashFunction'] = u'MD5'
-      i += 1
-      isMD5 = True
-    elif sys.argv[i].lower() == u'crypt':
-      do_update_user = True
-      body[u'hashFunction'] = u'crypt'
-      i += 1
-      isCrypt = True
-    elif sys.argv[i].lower() == u'nohash':
-      nohash = True
-      i += 1
-    elif sys.argv[i].lower() == u'changepassword':
-      do_update_user = True
-      if sys.argv[i+1].lower() in true_values:
-        body[u'changePasswordAtNextLogin'] = True
-      elif sys.argv[i+1].lower() in false_values:
-        body[u'changePasswordAtNextLogin'] = False
-      i += 2
-    elif sys.argv[i].lower() in [u'org', u'ou']:
-      do_update_user = True
-      body[u'orgUnitPath'] = sys.argv[i+1]
-      if body[u'orgUnitPath'][0] != u'/':
-        body[u'orgUnitPath'] = u'/'+body[u'orgUnitPath']
-      i += 2
-    elif sys.argv[i].lower() == u'agreedtoterms':
-      do_update_user = True
-      if sys.argv[i+1].lower() in true_values:
-        body[u'agreedToTerms'] = True
-      elif sys.argv[i+1].lower() in false_values:
-        body[u'agreedToTerms'] = False
-      i += 2
-    elif sys.argv[i].lower() == u'customerid':
-      do_update_user = True
-      body[u'customerId'] = sys.argv[i+1]
-      i += 2
-    elif sys.argv[i].lower() == u'im':
-      do_update_user = True
-      im = dict()
-      i += 1
-      if sys.argv[i].lower() != u'type':
-        print u'ERROR: wrong format for account im details. Expected type got %s' % sys.argv[i]
-        sys.exit(2)
-      i += 1
-      im[u'type'] = sys.argv[i].lower()
-      if im[u'type'] not in [u'custom', u'home', u'other', u'work']:
-        print u'ERROR: type should be custom, home, other or work. Got %s' % im[u'type']
-        sys.exit(2)
-      if im[u'type'] == u'custom':
-        i += 1
-        im[u'customType'] = sys.argv[i]
-      i += 1
-      if sys.argv[i].lower() != u'protocol':
-        print u'ERROR: wrong format for account details. Expected protocol got %s' % sys.argv[i]
-        sys.exit(2)
-      i += 1
-      im[u'protocol'] = sys.argv[i].lower()
-      if im[u'protocol'] not in [u'custom_protocol', u'aim', u'gtalk', u'icq', u'jabber', u'msn', u'net_meeting', u'qq', u'skype', u'yahoo']:
-        print u'ERROR: protocol should be custom_protocol, aim, gtalk, icq, jabber, msn, net_meeting, qq, skype or yahoo. Got %s' % im[u'protocol']
-        sys.exit(2)
-      if im[u'protocol'] == u'custom_protocol':
-        i += 1
-        im[u'customProtocol'] = sys.argv[i]
-      i += 1
-      if sys.argv[i].lower() == u'primary':
-        im[u'primary'] = True
-        i += 1
-      im[u'im'] = sys.argv[i]
-      i += 1
-      try:
-        body[u'ims'].append(im)
-      except KeyError:
-        body[u'ims'] = [im,]
-    elif sys.argv[i].lower() == u'address':
-      do_update_user = True
-      address = dict()
-      i += 1
-      if sys.argv[i].lower() != u'type':
-        print u'ERROR: wrong format for account address details. Expected type got %s' % sys.argv[i]
-        sys.exit(2)
-      i += 1
-      address[u'type'] = sys.argv[i].lower()
-      if address[u'type'] not in [u'custom', u'home', u'other', u'work']:
-        print u'ERROR: wrong type should be custom, home, other or work. Got %s' % address[u'type']
-        sys.exit(2)
-      if address[u'type'] == u'custom':
-        i += 1
-        address[u'customType'] = sys.argv[i]
-      i += 1
-      if sys.argv[i].lower() == u'unstructured':
-        i += 1
-        address[u'sourceIsStructured'] = False
-        address[u'formatted'] = sys.argv[i]
-        i += 1
-      while True:
-        argument = sys.argv[i].lower()
-        if argument == u'pobox':
-          address[u'poBox'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'extendedaddress':
-          address[u'extendedAddress'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'streetaddress':
-          address[u'streetAddress'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'locality':
-          address[u'locality'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'region':
-          address[u'region'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'postalcode':
-          address[u'postalCode'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'country':
-          address[u'country'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'countrycode':
-          address[u'countryCode'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'notprimary':
-          i += 1
-          break
-        elif argument == u'primary':
-          address[u'primary'] = True
-          i += 1
-          break
-        else:
-          print u'ERROR: invalid argument (%s) for account address details' % sys.argv[i]
-          sys.exit(2)
-      try:
-        body[u'addresses'].append(address)
-      except KeyError:
-        body[u'addresses'] = [address,]
-    elif sys.argv[i].lower() == u'organization':
-      do_update_user = True
-      organization = dict()
-      i += 1
-      while True:
-        argument = sys.argv[i].lower()
-        if argument == u'name':
-          organization[u'name'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'title':
-          organization[u'title'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'customtype':
-          organization[u'customType'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'type':
-          organization[u'type'] = sys.argv[i+1].lower()
-          if organization[u'type'] not in [u'domain_only', u'school', u'unknown', u'work']:
-            print u'ERROR: organization type must be domain_only, school, unknown or work. Got %s' % organization[u'type']
-            sys.exit(2)
-          i += 2
-        elif argument == u'department':
-          organization[u'department'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'symbol':
-          organization[u'symbol'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'costcenter':
-          organization[u'costCenter'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'location':
-          organization[u'location'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'description':
-          organization[u'description'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'domain':
-          organization[u'domain'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'notprimary':
-          i += 1
-          break
-        elif argument == u'primary':
-          organization[u'primary'] = True
-          i += 1
-          break
-        else:
-          print u'ERROR: invalid argument (%s) for account organization details' % sys.argv[i]
-          sys.exit(2)
-      try:
-        body[u'organizations'].append(organization)
-      except KeyError:
-        body[u'organizations'] = [organization,]
-    elif sys.argv[i].lower() == u'phone':
-      do_update_user = True
-      phone = dict()
-      i += 1
-      while True:
-        argument = sys.argv[i].lower()
-        if argument == u'value':
-          phone[u'value'] = sys.argv[i+1]
-          i += 2
-        elif argument == u'type':
-          phone[u'type'] = sys.argv[i+1].lower()
-          if phone[u'type'] not in [u'assistant', u'callback', u'car', u'company_main', u'custom', u'grand_central', u'home', u'home_fax', u'isdn', u'main', u'mobile', u'other', u'other_fax', u'pager', u'radio', u'telex', u'tty_tdd', u'work', u'work_fax', u'work_mobile', u'work_pager']:
-            print u'ERROR: phone type must be assistant, callback, car, company_main, custom, grand_central, home, home_fax, isdn, main, mobile, other, other_fax, pager, radio, telex, tty_tdd, work, work_fax, work_mobile, work_pager. Got %s' % phone[u'type']
-            sys.exit(2)
-          i += 2
-          if phone[u'type'] == u'custom':
-            phone[u'customType'] = sys.argv[i]
-            i += 1
-        elif argument == u'notprimary':
-          i += 1
-          break
-        elif argument == u'primary':
-          phone[u'primary'] = True
-          i += 1
-          break
-        else:
-          print u'ERROR: invalid argument (%s) for account phone details' % sys.argv[i]
-          sys.exit(2)
-      try:
-        body[u'phones'].append(phone)
-      except KeyError:
-        body[u'phones'] = [phone,]
-    elif sys.argv[i].lower() == u'relation':
-      do_update_user = True
-      relation = dict()
-      i += 1
-      relation[u'type'] = sys.argv[i]
-      if relation[u'type'].lower() not in [u'mother', u'father', u'sister', u'brother', u'manager', u'assistant', u'partner']:
-        relation[u'type'] = u'custom'
-        relation[u'customType'] = sys.argv[i]
-      i += 1
-      relation[u'value'] = sys.argv[i]
-      try:
-        body[u'relations'].append(relation)
-      except KeyError:
-        body[u'relations'] = [relation,]
-      i += 1
-    elif sys.argv[i].lower() == u'otheremail':
-      do_update_user = True
-      an_email = dict()
-      i += 1
-      an_email[u'type'] = sys.argv[i]
-      if an_email[u'type'].lower() not in [u'custom', u'home', u'other', u'work']:
-        an_email[u'type'] = u'custom'
-        an_email[u'customType'] = sys.argv[i]
-      i += 1
-      an_email[u'address'] = sys.argv[i]
-      if u'emails' not in body:
-        body[u'emails'] = list()
-      body[u'emails'].append(an_email)
-      i += 1
-    elif sys.argv[i].lower() == u'externalid':
-      do_update_user = True
-      externalid = dict()
-      i += 1
-      externalid[u'type'] = sys.argv[i]
-      if externalid[u'type'].lower() not in [u'account', u'customer', u'network', u'organization']:
-        externalid[u'type'] = u'custom'
-        externalid[u'customType'] = sys.argv[i]
-      i += 1
-      externalid[u'value'] = sys.argv[i]
-      try:
-        body[u'externalIds'].append(externalid)
-      except KeyError:
-        body[u'externalIds'] = [externalid,]
-      i += 1
-#    else:
-#      showUsage()
-#      print u''
-#      print u'ERROR: didn\'t expect %s command at position %s' % (sys.argv[i], i)
-#      sys.exit(2)
-    else:
-      do_update_user = True
-      if u'customSchemas' not in body:
-        body[u'customSchemas'] = {}
-      try:
-        (schemaName, fieldName) = sys.argv[i].split(u'.')
-      except ValueError:
-        print u'ERROR: %s is not a valid user update argument or custom schema name' % sys.argv[i]
-        sys.exit(2)
-      field_value = sys.argv[i+1]
-      is_multivalue = False
-      if field_value.lower() in [u'multivalue', u'multivalued', u'value']:
-        is_multivalue = True
-        field_value = sys.argv[i+2]
-      if schemaName not in body[u'customSchemas']:
-        body[u'customSchemas'][schemaName] = {}
-      if is_multivalue:
-        if fieldName not in body[u'customSchemas'][schemaName]:
-          body[u'customSchemas'][schemaName][fieldName] = []
-        body[u'customSchemas'][schemaName][fieldName].append({u'value': field_value})
-      else:
-        body[u'customSchemas'][schemaName][fieldName] = field_value
-      i += 2
-      if is_multivalue:
-        i += 1
-  if gotPassword and not (isSHA1 or isMD5 or isCrypt or nohash):
-    body[u'password'] = gen_sha512_hash(body[u'password'])
-    body[u'hashFunction'] = u'crypt'
+  body, admin_body = getUserAttributes(i, updateCmd=True)
   for user in users:
     if user[:4].lower() == u'uid:':
       user = user[4:]
@@ -6212,10 +6953,10 @@ def doUpdateUser(users, i):
       body[u'primaryEmail'] = u'vfe.%s.%05d@%s' % (user_name, random.randint(1, 99999), user_domain)
       body[u'emails'] = [{u'type': u'custom', u'customType': u'former_employee', u'primary': False, u'address': user_primary}]
     sys.stdout.write(u'updating user %s...\n' % user)
-    if do_update_user:
+    if body:
       callGAPI(cd.users(), u'patch', userKey=user, body=body)
-    if do_admin_user:
-      callGAPI(cd.users(), u'makeAdmin', userKey=user, body={u'status': is_admin})
+    if admin_body:
+      callGAPI(cd.users(), u'makeAdmin', userKey=user, body=admin_body)
 
 def doRemoveUsersAliases(users):
   cd = buildGAPIObject(u'directory')
@@ -6231,24 +6972,26 @@ def doRemoveUsersAliases(users):
     else:
       print u'%s has no aliases' % user_primary
 
-def doRemoveUsersGroups(users):
+def deleteUserFromGroups(users):
   cd = buildGAPIObject(u'directory')
   for user in users:
     user_groups = callGAPIpages(cd.groups(), u'list', u'groups', userKey=user, fields=u'groups(id,email)')
     num_groups = len(user_groups)
     print u'%s is in %s groups' % (user, num_groups)
-    i = 1
+    j = 0
     for user_group in user_groups:
-      print u' removing %s from %s (%s/%s)' % (user, user_group[u'email'], i, num_groups)
+      j += 1
+      print u' removing %s from %s (%s/%s)' % (user, user_group[u'email'], j, num_groups)
       callGAPI(cd.members(), u'delete', soft_errors=True, groupKey=user_group[u'id'], memberKey=user)
-      i += 1
     print u''
 
+UPDATE_GROUP_SUBCMDS = [u'add', u'clear', u'delete', u'remove', u'sync', u'update']
+
 def doUpdateGroup():
   cd = buildGAPIObject(u'directory')
   group = sys.argv[3]
   myarg = sys.argv[4].lower()
-  if myarg in [u'add', u'update', u'sync', u'remove', u'clear']:
+  if myarg in UPDATE_GROUP_SUBCMDS:
     if group[0:3].lower() == u'uid:':
       group = group[4:]
     elif group.find(u'@') == -1:
@@ -6256,8 +6999,8 @@ def doUpdateGroup():
     if myarg in [u'add', u'update']:
       role = sys.argv[5].upper()
       i = 6
-      if role not in [u'OWNER', u'MANAGER', u'MEMBER']:
-        role = u'MEMBER'
+      if role not in [ROLE_OWNER, ROLE_MANAGER, ROLE_MEMBER]:
+        role = ROLE_MEMBER
         i = 5
       if sys.argv[i].lower() in usergroup_types:
         users_email = getUsersToModify(entity_type=sys.argv[i], entity=sys.argv[i+1])
@@ -6279,8 +7022,8 @@ def doUpdateGroup():
     elif myarg == u'sync':
       role = sys.argv[5].upper()
       i = 6
-      if role not in [u'OWNER', u'MANAGER', u'MEMBER']:
-        role = u'MEMBER'
+      if role not in [ROLE_OWNER, ROLE_MANAGER, ROLE_MEMBER]:
+        role = ROLE_MEMBER
         i = 5
       users_email = getUsersToModify(entity_type=sys.argv[i], entity=sys.argv[i+1])
       users_email = [x.lower() for x in users_email]
@@ -6295,7 +7038,7 @@ def doUpdateGroup():
       for user_email in to_remove:
         items.append([u'update', u'group', group, u'remove', user_email])
       run_batch(items)
-    elif myarg == u'remove':
+    elif myarg in [u'delete', u'remove']:
       i = 5
       if sys.argv[i].lower() in [u'member', u'manager', u'owner']:
         i += 1
@@ -6315,7 +7058,7 @@ def doUpdateGroup():
       i = 5
       while i < len(sys.argv):
         role = sys.argv[i].upper()
-        if role in [u'OWNER', u'MANAGER', u'MEMBER']:
+        if role in [ROLE_OWNER, ROLE_MANAGER, ROLE_MEMBER]:
           roles.append(role)
           i += 1
         else:
@@ -6324,7 +7067,7 @@ def doUpdateGroup():
       if roles:
         roles = u','.join(sorted(set(roles)))
       else:
-        roles = u'MEMBER'
+        roles = ROLE_MEMBER
       user_emails = getUsersToModify(entity_type=u'group', entity=group, member_type=roles)
       for user_email in user_emails:
         sys.stderr.write(u' removing %s\n' % user_email)
@@ -6333,8 +7076,8 @@ def doUpdateGroup():
     i = 4
     use_cd_api = False
     gs = None
-    gs_body = dict()
-    cd_body = dict()
+    gs_body = {}
+    cd_body = {}
     while i < len(sys.argv):
       if sys.argv[i].lower() == u'email':
         use_cd_api = True
@@ -6467,7 +7210,7 @@ def doUpdateCros():
   else:
     devices = [deviceId,]
   i = 4
-  body = dict()
+  body = {}
   while i < len(sys.argv):
     if sys.argv[i].lower() == u'user':
       body[u'annotatedUser'] = sys.argv[i + 1]
@@ -6496,18 +7239,19 @@ def doUpdateCros():
     else:
       print u'ERROR: %s is not a valid argument for "gam update cros"' % sys.argv[i]
       sys.exit(2)
+  i = 0
   device_count = len(devices)
-  i = 1
   for this_device in devices:
-    print u' updating %s (%s of %s)' % (this_device, i, device_count)
-    callGAPI(cd.chromeosdevices(), u'patch', deviceId=this_device, body=body, customerId=GC_Values[GC_CUSTOMER_ID])
     i += 1
+    print u' updating %s (%s/%s)' % (this_device, i, device_count)
+    callGAPI(cd.chromeosdevices(), u'patch', deviceId=this_device, body=body, customerId=GC_Values[GC_CUSTOMER_ID])
 
 def doUpdateMobile():
   cd = buildGAPIObject(u'directory')
   resourceId = sys.argv[3]
   i = 4
-  action_body = patch_body = dict()
+  action_body = {}
+  patch_body = {}
   doPatch = doAction = False
   while i < len(sys.argv):
     if sys.argv[i].lower() == u'action':
@@ -6555,27 +7299,27 @@ def doUpdateOrg():
     else:
       users = getUsersToModify(entity_type=u'user', entity=sys.argv[5])
     if (sys.argv[5].lower() == u'cros') or ((sys.argv[5].lower() == u'all') and (sys.argv[6].lower() == u'cros')):
+      current_cros = 0
       cros_count = len(users)
-      current_cros = 1
       for cros in users:
+        current_cros += 1
         sys.stderr.write(u' moving %s to %s (%s/%s)\n' % (cros, orgUnitPath, current_cros, cros_count))
         callGAPI(cd.chromeosdevices(), u'patch', soft_errors=True,
                  customerId=GC_Values[GC_CUSTOMER_ID], deviceId=cros, body={u'orgUnitPath': u'//%s' % orgUnitPath})
-        current_cros += 1
     else:
-      user_count = len(users)
-      current_user = 1
       if orgUnitPath != u'/' and orgUnitPath[0] != u'/': # we do want a / at the beginning for user updates
         orgUnitPath = u'/%s' % orgUnitPath
+      current_user = 0
+      user_count = len(users)
       for user in users:
+        current_user += 1
         sys.stderr.write(u' moving %s to %s (%s/%s)\n' % (user, orgUnitPath, current_user, user_count))
         try:
           callGAPI(cd.users(), u'patch', throw_reasons=[u'conditionNotMet'], userKey=user, body={u'orgUnitPath': orgUnitPath})
         except googleapiclient.errors.HttpError:
           pass
-        current_user += 1
   else:
-    body = dict()
+    body = {}
     i = 4
     while i < len(sys.argv):
       if sys.argv[i].lower() == u'name':
@@ -6718,7 +7462,7 @@ def doGetUserInfo(user_email=None):
   if u'creationTime' in user:
     print u'Creation Time: %s' % user[u'creationTime']
   if u'lastLoginTime' in user:
-    if user[u'lastLoginTime'] == u'1970-01-01T00:00:00.000Z':
+    if user[u'lastLoginTime'] == NEVER_TIME:
       print u'Last login time: Never'
     else:
       print u'Last login time: %s' % user[u'lastLoginTime']
@@ -6726,6 +7470,19 @@ def doGetUserInfo(user_email=None):
     print u'Google Org Unit Path: %s\n' % user[u'orgUnitPath']
   if u'thumbnailPhotoUrl' in user:
     print u'Photo URL: %s\n' % user[u'thumbnailPhotoUrl']
+  if u'notes' in user:
+    print u'Notes:'
+    notes = user[u'notes']
+    if isinstance(notes, dict):
+      contentType = notes.get(u'contentType', u'text_plain')
+      print u' %s: %s' % (u'contentType', contentType)
+      if contentType == u'text_html':
+        print convertUTF8(indentMultiLineText(u' value: {0}'.format(dehtml(notes[u'value'])), n=2))
+      else:
+        print convertUTF8(indentMultiLineText(u' value: {0}'.format(notes[u'value']), n=2))
+    else:
+      print convertUTF8(indentMultiLineText(u' value: {0}'.format(notes), n=2))
+    print u''
   if u'ims' in user:
     print u'IMs:'
     for im in user[u'ims']:
@@ -6788,13 +7545,24 @@ def doGetUserInfo(user_email=None):
         else:
           print convertUTF8(u' %s: %s' % (key, externalId[key]))
       print u''
+  if u'websites' in user:
+    print u'Websites:'
+    for website in user[u'websites']:
+      for key in website:
+        if key == u'type' and website[key] == u'custom':
+          continue
+        elif key == u'customType':
+          print convertUTF8(u' %s: %s' % (u'type', website[key]))
+        else:
+          print convertUTF8(u' %s: %s' % (key, website[key]))
+      print u''
   if getSchemas:
     if u'customSchemas' in user:
       print u'Custom Schemas:'
       for schema in user[u'customSchemas']:
         print u' Schema: %s' % schema
         for field in user[u'customSchemas'][schema]:
-          if type(user[u'customSchemas'][schema][field]) is list:
+          if isinstance(user[u'customSchemas'][schema][field], list):
             print u'  %s:' % field
             for an_item in user[u'customSchemas'][schema][field]:
               print convertUTF8(u'   %s' % an_item[u'value'])
@@ -6870,7 +7638,7 @@ def doGetGroupInfo(group_name=None):
   for key, value in basic_info.items():
     if (key in [u'kind', u'etag']) or ((key == u'aliases') and (not getAliases)):
       continue
-    if type(value) == type(list()):
+    if isinstance(value, list):
       print u' %s:' % key
       for val in value:
         print u'  %s' % val
@@ -6938,11 +7706,140 @@ def doGetResourceCalendarInfo():
       continue
     print u'%s: %s' % (key, value)
 
+CROS_ARGUMENT_TO_PROPERTY_MAP = {
+  u'activetimeranges': [u'activeTimeRanges.activeTime', u'activeTimeRanges.date'],
+  u'annotatedassetid': [u'annotatedAssetId',],
+  u'annotatedlocation': [u'annotatedLocation',],
+  u'annotateduser': [u'annotatedUser',],
+  u'asset': [u'annotatedAssetId',],
+  u'assetid': [u'annotatedAssetId',],
+  u'bootmode': [u'bootMode',],
+  u'deviceid': [u'deviceId',],
+  u'ethernetmacaddress': [u'ethernetMacAddress',],
+  u'firmwareversion': [u'firmwareVersion',],
+  u'lastenrollmenttime': [u'lastEnrollmentTime',],
+  u'lastsync': [u'lastSync',],
+  u'location': [u'annotatedLocation',],
+  u'macaddress': [u'macAddress',],
+  u'meid': [u'meid',],
+  u'model': [u'model',],
+  u'notes': [u'notes',],
+  u'ordernumber': [u'orderNumber',],
+  u'org': [u'orgUnitPath',],
+  u'orgunitpath': [u'orgUnitPath',],
+  u'osversion': [u'osVersion',],
+  u'ou': [u'orgUnitPath',],
+  u'platformversion': [u'platformVersion',],
+  u'recentusers': [u'recentUsers.email', u'recentUsers.type'],
+  u'serialnumber': [u'serialNumber',],
+  u'status': [u'status',],
+  u'supportenddate': [u'supportEndDate',],
+  u'tag': [u'annotatedAssetId',],
+  u'timeranges': [u'activeTimeRanges.activeTime', u'activeTimeRanges.date'],
+  u'user': [u'annotatedUser',],
+  u'willautorenew': [u'willAutoRenew',],
+  }
+
+CROS_BASIC_FIELDS_LIST = [u'deviceId', u'annotatedAssetId', u'annotatedLocation', u'annotatedUser', u'lastSync', u'notes', u'serialNumber', u'status']
+
+CROS_SCALAR_PROPERTY_PRINT_ORDER = [
+  u'orgUnitPath',
+  u'annotatedAssetId',
+  u'annotatedLocation',
+  u'annotatedUser',
+  u'lastSync',
+  u'notes',
+  u'serialNumber',
+  u'status',
+  u'model',
+  u'firmwareVersion',
+  u'platformVersion',
+  u'osVersion',
+  u'bootMode',
+  u'meid',
+  u'ethernetMacAddress',
+  u'macAddress',
+  u'lastEnrollmentTime',
+  u'orderNumber',
+  u'supportEndDate',
+  u'willAutoRenew',
+  ]
+
 def doGetCrosInfo():
   cd = buildGAPIObject(u'directory')
   deviceId = sys.argv[3]
-  info = callGAPI(cd.chromeosdevices(), u'get', customerId=GC_Values[GC_CUSTOMER_ID], deviceId=deviceId)
-  print_json(None, info)
+  projection = None
+  fieldsList = []
+  noLists = False
+  listLimit = 0
+  i = 4
+  while i < len(sys.argv):
+    myarg = sys.argv[i].lower().replace(u'_', u'')
+    if myarg == u'nolists':
+      noLists = True
+      i += 1
+    elif myarg == u'listlimit':
+      listLimit = int(sys.argv[i+1])
+      i += 2
+    elif myarg == u'allfields':
+      projection = u'FULL'
+      fieldsList = []
+      i += 1
+    elif myarg in PROJECTION_CHOICES_MAP:
+      projection = PROJECTION_CHOICES_MAP[myarg]
+      if projection == u'FULL':
+        fieldsList = []
+      else:
+        fieldsList = CROS_BASIC_FIELDS_LIST[:]
+      i += 1
+    elif myarg in CROS_ARGUMENT_TO_PROPERTY_MAP:
+      if not fieldsList:
+        fieldsList = [u'deviceId',]
+      fieldsList.extend(CROS_ARGUMENT_TO_PROPERTY_MAP[myarg])
+      i += 1
+    elif myarg == u'fields':
+      if not fieldsList:
+        fieldsList = [u'deviceId',]
+      fieldNameList = sys.argv[i+1]
+      for field in fieldNameList.lower().replace(u',', u' ').split():
+        if field in CROS_ARGUMENT_TO_PROPERTY_MAP:
+          fieldsList.extend(CROS_ARGUMENT_TO_PROPERTY_MAP[field])
+          if field in [u'recentusers', u'timeranges', u'activetimeranges']:
+            projection = u'FULL'
+            noLists = False
+        else:
+          print u'ERROR: %s is not a valid argument for "gam info cros fields"' % field
+          sys.exit(2)
+      i += 2
+    else:
+      print u'ERROR: %s is not a valid argument for "gam info cros"' % sys.argv[i]
+      sys.exit(2)
+  if fieldsList:
+    fields = u','.join(set(fieldsList)).replace(u'.', u'/')
+  else:
+    fields = None
+  cros = callGAPI(cd.chromeosdevices(), u'get', customerId=GC_Values[GC_CUSTOMER_ID],
+                  deviceId=deviceId, projection=projection, fields=fields)
+  print u'CrOS Device: {0}'.format(deviceId)
+  for up in CROS_SCALAR_PROPERTY_PRINT_ORDER:
+    if up in cros:
+      print u'  {0}: {1}'.format(up, cros[up])
+  if not noLists:
+    activeTimeRanges = cros.get(u'activeTimeRanges', [])
+    lenATR = len(activeTimeRanges)
+    if lenATR:
+      print u'  activeTimeRanges'
+      for i in xrange(min(listLimit, lenATR) if listLimit else lenATR):
+        print u'    date: {0}'.format(activeTimeRanges[i][u'date'])
+        print u'      activeTime: {0}'.format(str(activeTimeRanges[i][u'activeTime']))
+        print u'      duration: {0}'.format(formatMilliSeconds(activeTimeRanges[i][u'activeTime']))
+    recentUsers = cros.get(u'recentUsers', [])
+    lenRU = len(recentUsers)
+    if lenRU:
+      print u'  recentUsers'
+      for i in xrange(min(listLimit, lenRU) if listLimit else lenRU):
+        print u'    type: {0}'.format(recentUsers[i][u'type'])
+        print u'      email: {0}'.format(recentUsers[i].get(u'email', u''))
 
 def doGetMobileInfo():
   cd = buildGAPIObject(u'directory')
@@ -7096,7 +7993,7 @@ def doSiteVerifyAttempt():
   body = {u'site':{u'type':verify_type, u'identifier':identifier}, u'verificationMethod':verificationMethod}
   try:
     verify_result = callGAPI(verif.webResource(), u'insert', throw_reasons=[u'badRequest'], verificationMethod=verificationMethod, body=body)
-  except googleapiclient.errors.HttpError, e:
+  except googleapiclient.errors.HttpError as e:
     error = json.loads(e.content)
     message = error[u'error'][u'errors'][0][u'message']
     print u'ERROR: %s' % message
@@ -7280,49 +8177,6 @@ def commonClientIds(clientId):
     return u'1095133494869.apps.googleusercontent.com'
   return clientId
 
-def doGetTokens(users):
-  cd = buildGAPIObject(u'directory')
-  clientId = None
-  i = 5
-  while i < len(sys.argv):
-    if sys.argv[i].lower() == u'clientid':
-      clientId = sys.argv[i+1]
-      i += 2
-    else:
-      print u'ERROR: %s is not a valid argument for gam <users> show tokens' % sys.argv[i]
-      sys.exit(2)
-  if clientId:
-    clientId = commonClientIds(clientId)
-    for user in users:
-      try:
-        token = callGAPI(cd.tokens(), u'get', throw_reasons=[u'notFound',], userKey=user, clientId=clientId, fields=u'clientId')
-      except googleapiclient.errors.HttpError:
-        continue
-      print u'%s has allowed this token' % user
-    return
-  for user in users:
-    tokens = callGAPI(cd.tokens(), u'list', userKey=user)
-    print u'Tokens for %s:' % user
-    try:
-      for token in tokens[u'items']:
-        print u' Client ID: %s' % token[u'clientId']
-        for item in token:
-          if item in [u'etag', u'kind', u'clientId']:
-            continue
-          if type(token[item]) is list:
-            print u' %s:' % item
-            for it in token[item]:
-              print u'  %s' % it
-          if type(token[item]) in (unicode, bool):
-            try:
-              print u' %s: %s' % (item, token[item])
-            except UnicodeEncodeError:
-              print u' %s: %s' % (item, token[item][:-1])
-        print u''
-    except KeyError:
-      print u' no tokens for %s' % user
-    print u''
-
 def doDelTokens(users):
   cd = buildGAPIObject(u'directory')
   clientId = sys.argv[6]
@@ -7331,17 +8185,88 @@ def doDelTokens(users):
     callGAPI(cd.tokens(), u'delete', userKey=user, clientId=clientId)
     print u'Deleted token for %s' % user
 
+def printShowTokens(i, entityType, users, csvFormat):
+  def _showToken(token):
+    print u'  Client ID: %s' % token[u'clientId']
+    for item in [u'displayText', u'anonymous', u'nativeApp', u'userKey']:
+      print convertUTF8(u'    %s: %s' % (item, token.get(item, u'')))
+    item = u'scopes'
+    print u'    %s:' % item
+    for it in token.get(item, []):
+      print u'      %s' % it
+
+  cd = buildGAPIObject(u'directory')
+  if csvFormat:
+    todrive = False
+    titles = [u'user', u'clientId', u'displayText', u'anonymous', u'nativeApp', u'userKey', u'scopes']
+    csvRows = []
+  clientId = None
+  while i < len(sys.argv):
+    myarg = sys.argv[i].lower()
+    if csvFormat and myarg == u'todrive':
+      todrive = True
+      i += 1
+    elif myarg == u'clientid':
+      clientId = commonClientIds(sys.argv[i+1])
+      i += 2
+    elif not entityType:
+      entityType = myarg
+      users = getUsersToModify(entity_type=entityType, entity=sys.argv[i+1], silent=False)
+      i += 2
+    else:
+      print u'ERROR: %s is not a valid argument for "gam <users> %s tokens"' % (myarg, [u'show', u'print'][csvFormat])
+      sys.exit(2)
+  if not entityType:
+    users = getUsersToModify(entity_type=u'all', entity=u'users', silent=False)
+  fields = u','.join([u'clientId', u'displayText', u'anonymous', u'nativeApp', u'userKey', u'scopes'])
+  i = 0
+  count = len(users)
+  for user in users:
+    i += 1
+    try:
+      if csvFormat:
+        sys.stderr.write(u'Getting Access Tokens for %s\n' % (user))
+      if clientId:
+        token = callGAPI(cd.tokens(), u'get',
+                         throw_reasons=[GAPI_NOT_FOUND, GAPI_USER_NOT_FOUND],
+                         userKey=user, clientId=clientId, fields=fields)
+        results = {u'items': [token]}
+      else:
+        results = callGAPI(cd.tokens(), u'list',
+                           throw_reasons=[GAPI_USER_NOT_FOUND],
+                           userKey=user, fields=u'items({0})'.format(fields))
+      jcount = len(results[u'items']) if (results and (u'items' in results)) else 0
+      if not csvFormat:
+        print u'User: {0}, Access Tokens ({1}/{2})'.format(user, i, count)
+        if jcount == 0:
+          continue
+        for token in results[u'items']:
+          _showToken(token)
+      else:
+        if jcount == 0:
+          continue
+        for token in results[u'items']:
+          row = {u'user': user, u'scopes': u' '.join(token.get(u'scopes', []))}
+          for item in [u'displayText', u'anonymous', u'nativeApp', u'userKey']:
+            row[item] = token.get(item, u'')
+          csvRows.append(row)
+    except googleapiclient.errors.HttpError:
+      pass
+  if csvFormat:
+    writeCSVfile(csvRows, titles, u'OAuth Tokens', todrive)
+
 def doDeprovUser(users):
   cd = buildGAPIObject(u'directory')
   for user in users:
     print u'Getting Application Specific Passwords for %s' % user
     asps = callGAPI(cd.asps(), u'list', userKey=user, fields=u'items/codeId')
-    i = 1
+    j = 0
+    jcount = len(asps[u'items'])
     try:
       for asp in asps[u'items']:
-        print u' deleting ASP %s of %s' % (i, len(asps[u'items']))
+        j += 1
+        print u' deleting ASP %s of %s' % (j, jcount)
         callGAPI(cd.asps(), u'delete', userKey=user, codeId=asp[u'codeId'])
-        i += 1
     except KeyError:
       print u'No ASPs'
     print u'Invalidating 2SV Backup Codes for %s' % user
@@ -7351,12 +8276,13 @@ def doDeprovUser(users):
       print u'No 2SV Backup Codes'
     print u'Getting tokens for %s...' % user
     tokens = callGAPI(cd.tokens(), u'list', userKey=user, fields=u'items/clientId')
-    i = 1
+    j = 0
+    jcount = len(tokens[u'items'])
     try:
       for token in tokens[u'items']:
-        print u' deleting token %s of %s' % (i, len(tokens[u'items']))
+        j += 1
+        print u' deleting token %s of %s' % (j, jcount)
         callGAPI(cd.tokens(), u'delete', userKey=user, clientId=token[u'clientId'])
-        i += 1
     except KeyError:
       print u'No Tokens'
     print u'Done deprovisioning %s' % user
@@ -7510,7 +8436,7 @@ def doUndeleteUser():
         print u' uid:%s ' % matching_user[u'id']
         for attr_name in [u'creationTime', u'lastLoginTime', u'deletionTime']:
           try:
-            if matching_user[attr_name] == u'1970-01-01T00:00:00.000Z':
+            if matching_user[attr_name] == NEVER_TIME:
               matching_user[attr_name] = u'Never'
             print u'   %s: %s ' % (attr_name, matching_user[attr_name])
           except KeyError:
@@ -7550,7 +8476,7 @@ def doDeleteAlias(alias_email=None):
     try:
       callGAPI(cd.users().aliases(), u'delete', throw_reasons=[u'invalid', u'badRequest', u'notFound'], userKey=alias_email, alias=alias_email)
       return
-    except googleapiclient.errors.HttpError, e:
+    except googleapiclient.errors.HttpError as e:
       error = json.loads(e.content)
       reason = error[u'error'][u'errors'][0][u'reason']
       if reason == u'notFound':
@@ -7574,17 +8500,63 @@ def doDeleteOrg():
   print u"Deleting organization %s" % name
   callGAPI(cd.orgunits(), u'delete', customerId=GC_Values[GC_CUSTOMER_ID], orgUnitPath=name)
 
-def addSortedTitlesToCSV(csv_list, firstTitle, titles):
-  if firstTitle in titles:
-    titles.remove(firstTitle)
-  titles.sort()
-  titles.insert(0, firstTitle)
-  header = {}
-  for title in titles:
-    header[title] = title
-  csv_list.insert(0, header)
+# Write a CSV file
+def addTitleToCSVfile(title, titles):
+  titles.append(title)
 
-def output_csv(csv_list, titles, list_type, todrive):
+def addTitlesToCSVfile(addTitles, titles):
+  for title in addTitles:
+    if title not in titles:
+      addTitleToCSVfile(title, titles)
+
+def addRowTitlesToCSVfile(row, csvRows, titles):
+  csvRows.append(row)
+  for title in row:
+    if title not in titles:
+      addTitleToCSVfile(title, titles)
+
+# fieldName is command line argument
+# fieldNameMap maps fieldName to API field names; CSV file header will be API field name
+#ARGUMENT_TO_PROPERTY_MAP = {
+#  u'admincreated': [u'adminCreated'],
+#  u'aliases': [u'aliases', u'nonEditableAliases'],
+#  }
+# fieldsList is the list of API fields
+# fieldsTitles maps the API field name to the CSV file header
+def addFieldToCSVfile(fieldName, fieldNameMap, fieldsList, fieldsTitles, titles):
+  for ftList in fieldNameMap[fieldName]:
+    if ftList not in fieldsTitles:
+      fieldsList.append(ftList)
+      fieldsTitles[ftList] = ftList
+      addTitlesToCSVfile([ftList], titles)
+
+# fieldName is command line argument
+# fieldNameTitleMap maps fieldName to API field name and CSV file header
+#ARGUMENT_TO_PROPERTY_TITLE_MAP = {
+#  u'admincreated': [u'adminCreated', u'Admin_Created'],
+#  u'aliases': [u'aliases', u'Aliases', u'nonEditableAliases', u'NonEditableAliases'],
+#  }
+# fieldsList is the list of API fields
+# fieldsTitles maps the API field name to the CSV file header
+def addFieldTitleToCSVfile(fieldName, fieldNameTitleMap, fieldsList, fieldsTitles, titles):
+  ftList = fieldNameTitleMap[fieldName]
+  for i in range(0, len(ftList), 2):
+    if ftList[i] not in fieldsTitles:
+      fieldsList.append(ftList[i])
+      fieldsTitles[ftList[i]] = ftList[i+1]
+      addTitlesToCSVfile([ftList[i+1]], titles)
+
+def sortCSVTitles(firstTitle, titles):
+  restoreTitles = []
+  for title in firstTitle:
+    if title in titles:
+      titles.remove(title)
+      restoreTitles.append(title)
+  titles.sort()
+  for title in restoreTitles[::-1]:
+    titles.insert(0, title)
+
+def writeCSVfile(csvRows, titles, list_type, todrive):
   csv.register_dialect(u'nixstdout', lineterminator=u'\n')
   if todrive:
     string_file = StringIO.StringIO()
@@ -7592,12 +8564,13 @@ def output_csv(csv_list, titles, list_type, todrive):
   else:
     writer = csv.DictWriter(sys.stdout, fieldnames=titles, dialect=u'nixstdout', quoting=csv.QUOTE_MINIMAL)
   try:
-    writer.writerows(csv_list)
+    writer.writeheader()
+    writer.writerows(csvRows)
   except IOError as e:
     systemErrorExit(6, e)
   if todrive:
-    columns = len(csv_list[0])
-    rows = len(csv_list)
+    columns = len(csvRows[0])
+    rows = len(csvRows)
     cell_count = rows * columns
     convert = True
     if cell_count > 500000 or columns > 256:
@@ -7626,48 +8599,115 @@ def flatten_json(structure, key=u'', path=u'', flattened=None, listLimit=None):
     for i, item in enumerate(structure):
       if listLimit and (i >= listLimit):
         break
-      flatten_json(item, u'%d' % i, u'.'.join(filter(None, [path, key])), flattened=flattened, listLimit=listLimit)
+      flatten_json(item, u'{0}'.format(i), u'.'.join([item for item in [path, key] if item]), flattened=flattened, listLimit=listLimit)
   else:
     for new_key, value in structure.items():
       if new_key in [u'kind', u'etag']:
         continue
-      if value == u'1970-01-01T00:00:00.000Z':
+      if value == NEVER_TIME:
         value = u'Never'
-      flatten_json(value, new_key, u'.'.join(filter(None, [path, key])), flattened=flattened, listLimit=listLimit)
+      flatten_json(value, new_key, u'.'.join([item for item in [path, key] if item]), flattened=flattened, listLimit=listLimit)
   return flattened
 
+USER_ARGUMENT_TO_PROPERTY_MAP = {
+  u'address': [u'addresses',],
+  u'addresses': [u'addresses',],
+  u'admin': [u'isAdmin', u'isDelegatedAdmin',],
+  u'agreed2terms': [u'agreedToTerms',],
+  u'agreedtoterms': [u'agreedToTerms',],
+  u'aliases': [u'aliases', u'nonEditableAliases',],
+  u'changepassword': [u'changePasswordAtNextLogin',],
+  u'changepasswordatnextlogin': [u'changePasswordAtNextLogin',],
+  u'creationtime': [u'creationTime',],
+  u'deletiontime': [u'deletionTime',],
+  u'email': [u'emails',],
+  u'emails': [u'emails',],
+  u'externalid': [u'externalIds',],
+  u'externalids': [u'externalIds',],
+  u'familyname': [u'name.familyName',],
+  u'firstname': [u'name.givenName',],
+  u'fullname': [u'name.fullName',],
+  u'gal': [u'includeInGlobalAddressList',],
+  u'givenname': [u'name.givenName',],
+  u'id': [u'id',],
+  u'im': [u'ims',],
+  u'ims': [u'ims',],
+  u'includeinglobaladdresslist': [u'includeInGlobalAddressList',],
+  u'ipwhitelisted': [u'ipWhitelisted',],
+  u'isadmin': [u'isAdmin', u'isDelegatedAdmin',],
+  u'isdelegatedadmin': [u'isAdmin', u'isDelegatedAdmin',],
+  u'ismailboxsetup': [u'isMailboxSetup',],
+  u'lastlogintime': [u'lastLoginTime',],
+  u'lastname': [u'name.familyName',],
+  u'name': [u'name.givenName', u'name.familyName', u'name.fullName',],
+  u'nicknames': [u'aliases', u'nonEditableAliases',],
+  u'noneditablealiases': [u'aliases', u'nonEditableAliases',],
+  u'note': [u'notes',],
+  u'notes': [u'notes',],
+  u'org': [u'orgUnitPath',],
+  u'organization': [u'organizations',],
+  u'organizations': [u'organizations',],
+  u'orgunitpath': [u'orgUnitPath',],
+  u'otheremail': [u'emails',],
+  u'otheremails': [u'emails',],
+  u'ou': [u'orgUnitPath',],
+  u'phone': [u'phones',],
+  u'phones': [u'phones',],
+  u'photo': [u'thumbnailPhotoUrl',],
+  u'photourl': [u'thumbnailPhotoUrl',],
+  u'primaryemail': [u'primaryEmail',],
+  u'relation': [u'relations',],
+  u'relations': [u'relations',],
+  u'suspended': [u'suspended', u'suspensionReason',],
+  u'thumbnailphotourl': [u'thumbnailPhotoUrl',],
+  u'username': [u'primaryEmail',],
+  u'website': [u'websites',],
+  u'websites': [u'websites',],
+  }
+
 def doPrintUsers():
   cd = buildGAPIObject(u'directory')
-  user_fields = [u'primaryEmail',]
-  fields = u''
+  todrive = False
+  fieldsList = []
+  fieldsTitles = {}
+  titles = []
+  csvRows = []
+  addFieldToCSVfile(u'primaryemail', USER_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
   customer = GC_Values[GC_CUSTOMER_ID]
   domain = None
   query = None
   projection = u'basic'
   customFieldMask = None
-  getGroupFeed = getLicenseFeed = email_parts = False
-  todrive = False
+  sortHeaders = getGroupFeed = getLicenseFeed = email_parts = False
   viewType = deleted_only = orderBy = sortOrder = None
   i = 3
   while i < len(sys.argv):
-    if sys.argv[i].lower() == u'allfields':
-      fields = None
+    myarg = sys.argv[i].lower().replace(u'_', u'')
+    if myarg in PROJECTION_CHOICES_MAP:
+      projection = myarg
+      sortHeaders = True
+      fieldsList = []
       i += 1
-    elif sys.argv[i].lower() == u'custom':
-      user_fields.append(u'customSchemas')
+    elif myarg == u'allfields':
+      projection = u'basic'
+      sortHeaders = True
+      fieldsList = []
+      i += 1
+    elif myarg == u'custom':
+      fieldsList.append(u'customSchemas')
       if sys.argv[i+1].lower() == u'all':
         projection = u'full'
       else:
         projection = u'custom'
         customFieldMask = sys.argv[i+1]
       i += 2
-    elif sys.argv[i].lower() == u'todrive':
+    elif myarg == u'todrive':
       todrive = True
       i += 1
-    elif sys.argv[i].lower() in [u'deleted_only', u'only_deleted']:
+    elif myarg in [u'deleted_only', u'only_deleted']:
       deleted_only = True
       i += 1
-    elif sys.argv[i].lower() == u'orderby':
+    elif myarg == u'orderby':
       orderBy = sys.argv[i+1]
       if orderBy.lower() not in [u'email', u'familyname', u'givenname', u'firstname', u'lastname']:
         print u'ERROR: orderby should be email, familyName or givenName. Got %s' % orderBy
@@ -7677,105 +8717,57 @@ def doPrintUsers():
       elif orderBy.lower() in [u'givenname', u'firstname']:
         orderBy = u'givenName'
       i += 2
-    elif sys.argv[i].lower() == u'userview':
+    elif myarg == u'userview':
       viewType = u'domain_public'
       i += 1
-    elif sys.argv[i].lower() in [u'ascending', u'descending']:
-      sortOrder = sys.argv[i].upper()
+    elif myarg in SORTORDER_CHOICES_MAP:
+      sortOrder = SORTORDER_CHOICES_MAP[myarg]
       i += 1
-    elif sys.argv[i].lower() == u'domain':
+    elif myarg == u'domain':
       domain = sys.argv[i+1]
       customer = None
       i += 2
-    elif sys.argv[i].lower() == u'query':
+    elif myarg == u'query':
       query = sys.argv[i+1]
       i += 2
-    elif sys.argv[i].lower() in [u'firstname', u'givenname', u'lastname', u'familyName', u'fullname', u'name']:
-      user_fields.append(u'name')
+    elif myarg in USER_ARGUMENT_TO_PROPERTY_MAP:
+      if not fieldsList:
+        fieldsList = [u'primaryEmail',]
+      addFieldToCSVfile(myarg, USER_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
       i += 1
-    elif sys.argv[i].lower() == u'ou':
-      user_fields.append(u'orgUnitPath')
-      i += 1
-    elif sys.argv[i].lower() == u'suspended':
-      user_fields.append(u'suspended')
-      user_fields.append(u'suspensionReason')
-      i += 1
-    elif sys.argv[i].lower() == u'ismailboxsetup':
-      user_fields.append(u'isMailboxSetup')
-      i += 1
-    elif sys.argv[i].lower() == u'changepassword':
-      user_fields.append(u'changePasswordAtNextLogin')
-      i += 1
-    elif sys.argv[i].lower() == u'agreed2terms':
-      user_fields.append(u'agreedToTerms')
-      i += 1
-    elif sys.argv[i].lower() == u'admin':
-      user_fields.append(u'isAdmin')
-      user_fields.append(u'isDelegatedAdmin')
-      i += 1
-    elif sys.argv[i].lower() == u'gal':
-      user_fields.append(u'includeInGlobalAddressList')
-      i += 1
-    elif sys.argv[i].lower() in [u'photo', u'photourl']:
-      user_fields.append(u'thumbnailPhotoUrl')
-      i += 1
-    elif sys.argv[i].lower() == u'id':
-      user_fields.append(u'id')
-      i += 1
-    elif sys.argv[i].lower() == u'creationtime':
-      user_fields.append(u'creationTime')
-      i += 1
-    elif sys.argv[i].lower() == u'lastlogintime':
-      user_fields.append(u'lastLoginTime')
-      i += 1
-    elif sys.argv[i].lower() in [u'nicknames', u'aliases']:
-      user_fields.append(u'aliases')
-      user_fields.append(u'nonEditableAliases')
-      i += 1
-    elif sys.argv[i].lower() in [u'im', u'ims']:
-      user_fields.append(u'ims')
-      i += 1
-    elif sys.argv[i].lower() in [u'emails', u'email']:
-      user_fields.append(u'emails')
-      i += 1
-    elif sys.argv[i].lower().replace(u'_', u'') in [u'externalids', u'externalid']:
-      user_fields.append(u'externalIds')
-      i += 1
-    elif sys.argv[i].lower() in [u'relation', u'relations']:
-      user_fields.append(u'relations')
-      i += 1
-    elif sys.argv[i].lower() in [u'address', u'addresses']:
-      user_fields.append(u'addresses')
-      i += 1
-    elif sys.argv[i].lower() in [u'organization', u'organizations']:
-      user_fields.append(u'organizations')
-      i += 1
-    elif sys.argv[i].lower() in [u'phone', u'phones']:
-      user_fields.append(u'phones')
-      i += 1
-    elif sys.argv[i].lower() == u'groups':
+    elif myarg == u'fields':
+      if not fieldsList:
+        fieldsList = [u'primaryEmail',]
+      fieldNameList = sys.argv[i+1]
+      for field in fieldNameList.lower().replace(u',', u' ').split():
+        if field in USER_ARGUMENT_TO_PROPERTY_MAP:
+          addFieldToCSVfile(field, USER_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
+        else:
+          print u'ERROR: %s is not a valid argument for "gam print users fields"' % field
+          sys.exit(2)
+      i += 2
+    elif myarg == u'groups':
       getGroupFeed = True
       i += 1
-    elif sys.argv[i].lower() in [u'license', u'licenses', u'licence', u'licences']:
+    elif myarg in [u'license', u'licenses', u'licence', u'licences']:
       getLicenseFeed = True
       i += 1
-    elif sys.argv[i].lower() in [u'emailpart', u'emailparts', u'username']:
+    elif myarg in [u'emailpart', u'emailparts', u'username']:
       email_parts = True
       i += 1
     else:
       print u'ERROR: %s is not a valid argument for "gam print users"' % sys.argv[i]
       sys.exit(2)
-  if fields != None:
-    user_fields = set(user_fields)
-    fields = u'nextPageToken,users(%s)' % u','.join(user_fields)
+  if fieldsList:
+    fields = u'nextPageToken,users(%s)' % u','.join(set(fieldsList)).replace(u'.', u'/')
+  else:
+    fields = None
   sys.stderr.write(u"Getting all users in Google Apps account (may take some time on a large account)...\n")
   page_message = u'Got %%total_items%% users: %%first_item%% - %%last_item%%\n'
   all_users = callGAPIpages(cd.users(), u'list', u'users', page_message=page_message,
                             message_attribute=u'primaryEmail', customer=customer, domain=domain, fields=fields,
                             showDeleted=deleted_only, orderBy=orderBy, sortOrder=sortOrder, viewType=viewType,
                             query=query, projection=projection, customFieldMask=customFieldMask, maxResults=GC_Values[GC_USER_MAX_RESULTS])
-  titles = [u'primaryEmail',]
-  attributes = []
   for user in all_users:
     if email_parts:
       try:
@@ -7785,17 +8777,14 @@ def doPrintUsers():
           user[u'primaryEmailDomain'] = user_email[user_email.find(u'@')+1:]
       except KeyError:
         pass
-    attributes.append(flatten_json(user))
-    for item in attributes[-1]:
-      if item not in titles:
-        titles.append(item)
-  addSortedTitlesToCSV(attributes, u'primaryEmail', titles)
+    addRowTitlesToCSVfile(flatten_json(user), csvRows, titles)
+  if sortHeaders:
+    sortCSVTitles([u'primaryEmail',], titles)
   if getGroupFeed:
-    total_users = len(attributes) - 1
+    total_users = len(csvRows)
     user_count = 1
     titles.append(u'Groups')
-    attributes[0].update(Groups=u'Groups')
-    for user in attributes[1:]:
+    for user in csvRows:
       user_email = user[u'primaryEmail']
       sys.stderr.write(u"Getting Group Membership for %s (%s/%s)\r\n" % (user_email, user_count, total_users))
       groups = callGAPIpages(cd.groups(), u'list', u'groups', userKey=user_email)
@@ -7808,181 +8797,200 @@ def doPrintUsers():
       user_count += 1
   if getLicenseFeed:
     titles.append(u'Licenses')
-    attributes[0].update(Licenses=u'Licenses')
     licenses = doPrintLicenses(return_list=True)
     if len(licenses) > 1:
-      for user in attributes[1:]:
+      for user in csvRows:
         user_licenses = []
         for u_license in licenses:
           if u_license[u'userId'].lower() == user[u'primaryEmail'].lower():
             user_licenses.append(u_license[u'skuId'])
         user.update(Licenses=u' '.join(user_licenses))
-  output_csv(attributes, titles, u'Users', todrive)
+  writeCSVfile(csvRows, titles, u'Users', todrive)
+
+GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP = {
+  u'admincreated': [u'adminCreated', u'Admin_Created'],
+  u'aliases': [u'aliases', u'Aliases', u'nonEditableAliases', u'NonEditableAliases'],
+  u'description': [u'description', u'Description'],
+  u'email': [u'email', u'Email'],
+  u'id': [u'id', u'ID'],
+  u'name': [u'name', u'Name'],
+  }
+
+GROUP_ATTRIBUTES_ARGUMENT_TO_PROPERTY_MAP = {
+  u'allowexternalmembers': u'allowExternalMembers',
+  u'allowgooglecommunication': u'allowGoogleCommunication',
+  u'allowwebposting': u'allowWebPosting',
+  u'archiveonly': u'archiveOnly',
+  u'customreplyto': u'customReplyTo',
+  u'defaultmessagedenynotificationtext': u'defaultMessageDenyNotificationText',
+  u'gal': u'includeInGlobalAddressList',
+  u'includeinglobaladdresslist': u'includeInGlobalAddressList',
+  u'isarchived': u'isArchived',
+  u'maxmessagebytes': u'maxMessageBytes',
+  u'memberscanpostasthegroup': u'membersCanPostAsTheGroup',
+  u'messagedisplayfont': u'messageDisplayFont',
+  u'messagemoderationlevel': u'messageModerationLevel',
+  u'primarylanguage': u'primaryLanguage',
+  u'replyto': u'replyTo',
+  u'sendmessagedenynotification': u'sendMessageDenyNotification',
+  u'showingroupdirectory': u'showInGroupDirectory',
+  u'spammoderationlevel': u'spamModerationLevel',
+  u'whocanadd': u'whoCanAdd',
+  u'whocancontactowner': u'whoCanContactOwner',
+  u'whocaninvite': u'whoCanInvite',
+  u'whocanjoin': u'whoCanJoin',
+  u'whocanleavegroup': u'whoCanLeaveGroup',
+  u'whocanpostmessage': u'whoCanPostMessage',
+  u'whocanviewgroup': u'whoCanViewGroup',
+  u'whocanviewmembership': u'whoCanViewMembership',
+  }
 
 def doPrintGroups():
   cd = buildGAPIObject(u'directory')
   i = 3
-  printname = printdesc = printid = members = owners = managers = settings = admin_created = aliases = todrive = False
+  members = owners = managers = False
   customer = GC_Values[GC_CUSTOMER_ID]
   usedomain = usemember = None
-  listDelimiter = u'\n'
-  group_attributes = [{u'Email': u'Email'}]
-  titles = [u'Email']
-  fields = u'nextPageToken,groups(email)'
+  aliasDelimiter = u' '
+  memberDelimiter = u'\n'
+  todrive = False
+  cdfieldsList = []
+  gsfieldsList = []
+  fieldsTitles = {}
+  titles = []
+  csvRows = []
+  addFieldTitleToCSVfile(u'email', GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP, cdfieldsList, fieldsTitles, titles)
   maxResults = None
+  roles = []
+  getSettings = False
   while i < len(sys.argv):
-    if sys.argv[i].lower() == u'domain':
+    myarg = sys.argv[i].lower()
+    if myarg == u'todrive':
+      todrive = True
+      i += 1
+    elif myarg == u'domain':
       usedomain = sys.argv[i+1].lower()
       customer = None
       i += 2
-    elif sys.argv[i].lower() == u'todrive':
-      todrive = True
-      i += 1
-    elif sys.argv[i].lower() == u'maxresults':
-      maxResults = int(sys.argv[i+1])
-      i += 2
-    elif sys.argv[i].lower() == u'delimiter':
-      listDelimiter = sys.argv[i+1]
-      i += 2
-    elif sys.argv[i].lower() == u'member':
+    elif myarg == u'member':
       usemember = sys.argv[i+1].lower()
       customer = None
       i += 2
-    elif sys.argv[i].lower() == u'name':
-      fields += u',groups(name)'
-      printname = True
-      group_attributes[0].update(Name=u'Name')
-      titles.append(u'Name')
+    elif myarg == u'maxresults':
+      maxResults = int(sys.argv[i+1])
+      i += 2
+    elif myarg == u'delimiter':
+      aliasDelimiter = memberDelimiter = sys.argv[i+1]
+      i += 2
+    elif myarg in GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP:
+      addFieldTitleToCSVfile(myarg, GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP, cdfieldsList, fieldsTitles, titles)
       i += 1
-    elif sys.argv[i].lower() == u'admincreated':
-      fields += u',groups(adminCreated)'
-      admin_created = True
-      group_attributes[0].update(Admin_Created=u'Admin_Created')
-      titles.append(u'Admin_Created')
+    elif myarg == u'fields':
+      fieldNameList = sys.argv[i+1]
+      for field in fieldNameList.lower().replace(u',', u' ').split():
+        if field in GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP:
+          addFieldTitleToCSVfile(field, GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP, cdfieldsList, fieldsTitles, titles)
+        elif field in GROUP_ATTRIBUTES_ARGUMENT_TO_PROPERTY_MAP:
+          addFieldToCSVfile(field, {field: [GROUP_ATTRIBUTES_ARGUMENT_TO_PROPERTY_MAP[field]]}, gsfieldsList, fieldsTitles, titles)
+          gsfieldsList.extend([GROUP_ATTRIBUTES_ARGUMENT_TO_PROPERTY_MAP[field],])
+        else:
+          print u'ERROR: %s is not a valid argument for "gam print groups fields"' % field
+          sys.exit(2)
+      i += 2
+    elif myarg == u'members':
+      if myarg not in roles:
+        roles.append(ROLE_MEMBER)
+        addTitleToCSVfile(u'Members', titles)
+        members = True
       i += 1
-    elif sys.argv[i].lower() == u'description':
-      fields += u',groups(description)'
-      group_attributes[0].update(Description=u'Description')
-      titles.append(u'Description')
-      printdesc = True
+    elif myarg == u'owners':
+      if myarg not in roles:
+        roles.append(ROLE_OWNER)
+        addTitleToCSVfile(u'Owners', titles)
+        owners = True
       i += 1
-    elif sys.argv[i].lower() == u'id':
-      fields += u',groups(id)'
-      group_attributes[0].update(ID=u'ID')
-      titles.append(u'ID')
-      printid = True
+    elif myarg == u'managers':
+      if myarg not in roles:
+        roles.append(ROLE_MANAGER)
+        addTitleToCSVfile(u'Managers', titles)
+        managers = True
       i += 1
-    elif sys.argv[i].lower() == u'aliases':
-      fields += u',groups(aliases,nonEditableAliases)'
-      group_attributes[0].update(Aliases=u'Aliases')
-      group_attributes[0].update(NonEditableAliases=u'NonEditableAliases')
-      titles.append(u'Aliases')
-      titles.append(u'NonEditableAliases')
-      aliases = True
-      i += 1
-    elif sys.argv[i].lower() == u'members':
-      group_attributes[0].update(Members=u'Members')
-      titles.append(u'Members')
-      members = True
-      i += 1
-    elif sys.argv[i].lower() == u'owners':
-      group_attributes[0].update(Owners=u'Owners')
-      titles.append(u'Owners')
-      owners = True
-      i += 1
-    elif sys.argv[i].lower() == u'managers':
-      group_attributes[0].update(Managers=u'Managers')
-      titles.append(u'Managers')
-      managers = True
-      i += 1
-    elif sys.argv[i].lower() == u'settings':
-      settings = True
+    elif myarg == u'settings':
+      getSettings = True
       i += 1
     else:
       print u'ERROR: %s is not a valid argument for "gam print groups"' % sys.argv[i]
       sys.exit(2)
+  cdfields = u','.join(set(cdfieldsList))
+  if len(gsfieldsList) > 0:
+    getSettings = True
+    gsfields = u','.join(set(gsfieldsList))
+  elif getSettings:
+    gsfields = None
+  roles = u','.join(sorted(set(roles)))
   sys.stderr.write(u"Retrieving All Groups for Google Apps account (may take some time on a large account)...\n")
   page_message = u'Got %%num_items%% groups: %%first_item%% - %%last_item%%\n'
-  all_groups = callGAPIpages(cd.groups(), u'list', u'groups', page_message=page_message, maxResults=maxResults,
-                             message_attribute=u'email', customer=customer, domain=usedomain, userKey=usemember, fields=fields)
-  total_groups = len(all_groups)
-  count = 0
-  for group_vals in all_groups:
-    count += 1
+  entityList = callGAPIpages(cd.groups(), u'list', u'groups',
+                             page_message=page_message, message_attribute=u'email',
+                             customer=customer, domain=usedomain, userKey=usemember,
+                             fields=u'nextPageToken,groups({0})'.format(cdfields),
+                             maxResults=maxResults)
+  i = 0
+  count = len(entityList)
+  for groupEntity in entityList:
+    i += 1
+    groupEmail = groupEntity[u'email']
     group = {}
-    group.update({u'Email': group_vals[u'email']})
-    if printname:
-      try:
-        group.update({u'Name': group_vals[u'name']})
-      except KeyError:
-        pass
-    if printdesc:
-      try:
-        group.update({u'Description': group_vals[u'description']})
-      except KeyError:
-        pass
-    if printid:
-      try:
-        group.update({u'ID': group_vals[u'id']})
-      except KeyError:
-        pass
-    if admin_created:
-      try:
-        group.update({u'Admin_Created': group_vals[u'adminCreated']})
-      except KeyError:
-        pass
-    if aliases:
-      try:
-        group.update({u'Aliases': u' '.join(group_vals[u'aliases'])})
-      except KeyError:
-        pass
-      try:
-        group.update({u'NonEditableAliases': u' '.join(group_vals[u'nonEditableAliases'])})
-      except KeyError:
-        pass
-    if members or owners or managers:
-      roles = list()
-      if members:
-        roles.append(u'members')
-      if owners:
-        roles.append(u'owners')
-      if managers:
-        roles.append(u'managers')
-      roles = u','.join(roles)
-      sys.stderr.write(u' Getting %s for %s (%s of %s)\n' % (roles, group_vals[u'email'], count, total_groups))
+    for field in cdfieldsList:
+      if field in groupEntity:
+        if isinstance(groupEntity[field], list):
+          group[fieldsTitles[field]] = aliasDelimiter.join(groupEntity[field])
+        else:
+          group[fieldsTitles[field]] = groupEntity[field]
+    if roles:
+      sys.stderr.write(u' Getting %s for %s (%s/%s)\n' % (roles, groupEmail, i, count))
       page_message = u'Got %%num_items%% members: %%first_item%% - %%last_item%%\n'
-      all_group_members = callGAPIpages(cd.members(), u'list', u'members', page_message=page_message,
-                                        message_attribute=u'email', groupKey=group_vals[u'email'], roles=roles, fields=u'nextPageToken,members(email,id,role)')
+      groupMembers = callGAPIpages(cd.members(), u'list', u'members',
+                                   page_message=page_message, message_attribute=u'email',
+                                   groupKey=groupEmail, roles=roles, fields=u'nextPageToken,members(email,id,role)')
       if members:
-        all_true_members = list()
+        allMembers = list()
       if managers:
-        all_managers = list()
+        allManagers = list()
       if owners:
-        all_owners = list()
-      for member in all_group_members:
+        allOwners = list()
+      for member in groupMembers:
         member_email = member.get(u'email', member.get(u'id', None))
         if not member_email:
           sys.stderr.write(u' Not sure what to do with: %s' % member)
           continue
-        try:
-          if members and member[u'role'] == u'MEMBER':
-            all_true_members.append(member_email)
-          elif managers and member[u'role'] == u'MANAGER':
-            all_managers.append(member_email)
-          elif owners and member[u'role'] == u'OWNER':
-            all_owners.append(member_email)
-        except KeyError:
-          all_true_members.append(member_email)
+        role = member.get(u'role', None)
+        if role:
+          if role == ROLE_MEMBER:
+            if members:
+              allMembers.append(member_email)
+          elif role == ROLE_MANAGER:
+            if managers:
+              allManagers.append(member_email)
+          elif role == ROLE_OWNER:
+            if owners:
+              allOwners.append(member_email)
+          elif members:
+            allMembers.append(member_email)
+        elif members:
+          allMembers.append(member_email)
       if members:
-        group.update({u'Members': listDelimiter.join(all_true_members)})
+        group[u'Members'] = memberDelimiter.join(allMembers)
       if managers:
-        group.update({u'Managers': listDelimiter.join(all_managers)})
+        group[u'Managers'] = memberDelimiter.join(allManagers)
       if owners:
-        group.update({u'Owners': listDelimiter.join(all_owners)})
-    if settings:
-      sys.stderr.write(u" Retrieving Settings for group %s (%s of %s)...\r\n" % (group_vals[u'email'], count, total_groups))
+        group[u'Owners'] = memberDelimiter.join(allOwners)
+    if getSettings:
+      sys.stderr.write(u" Retrieving Settings for group %s (%s/%s)...\r\n" % (groupEmail, i, count))
       gs = buildGAPIObject(u'groupssettings')
-      settings = callGAPI(gs.groups(), u'get', retry_reasons=[u'serviceLimit'], groupUniqueId=group_vals[u'email'])
+      settings = callGAPI(gs.groups(), u'get',
+                          retry_reasons=[u'serviceLimit'],
+                          groupUniqueId=groupEmail, fields=gsfields)
       for key in settings:
         if key in [u'email', u'name', u'description', u'kind', u'etag']:
           continue
@@ -7990,109 +8998,78 @@ def doPrintGroups():
         if setting_value == None:
           setting_value = u''
         if key not in titles:
-          group_attributes[0][key] = key
-          titles.append(key)
-        group.update({key: setting_value})
-    group_attributes.append(group)
-  output_csv(group_attributes, titles, u'Groups', todrive)
+          addTitleToCSVfile(key, titles)
+        group[key] = setting_value
+    csvRows.append(group)
+  writeCSVfile(csvRows, titles, u'Groups', todrive)
+
+ORG_ARGUMENT_TO_PROPERTY_TITLE_MAP = {
+  u'description': [u'description', u'Description'],
+  u'id': [u'orgUnitId', u'ID'],
+  u'inherit': [u'blockInheritance', u'InheritanceBlocked'],
+  u'orgunitpath': [u'orgUnitPath', u'Path'],
+  u'path': [u'orgUnitPath', u'Path'],
+  u'name': [u'name', u'Name'],
+  u'parent': [u'parentOrgUnitPath', u'Parent'],
+  u'parentid': [u'parentOrgUnitId', u'ParentID'],
+  }
+ORG_FIELD_PRINT_ORDER = [u'orgunitpath', u'id', u'name', u'description', u'parent', u'parentid', u'inherit']
 
 def doPrintOrgs():
   cd = buildGAPIObject(u'directory')
-  i = 3
-  printname = printdesc = printparent = printinherit = todrive = False
   listType = u'all'
   orgUnitPath = u"/"
-  org_attributes = [{}]
-  fields = u'organizationUnits(orgUnitPath)'
+  todrive = False
+  fieldsList = []
+  fieldsTitles = {}
   titles = []
+  csvRows = []
+  i = 3
   while i < len(sys.argv):
-    if sys.argv[i].lower() == u'allfields':
-      fields = None
-      i += 1
-    elif sys.argv[i].lower() == u'name':
-      printname = True
-      org_attributes[0].update(Name=u'Name')
-      fields += u',organizationUnits(name)'
-      titles.append(u'Name')
-      i += 1
-    elif sys.argv[i].lower() == u'toplevelonly':
-      listType = u'children'
-      i += 1
-    elif sys.argv[i].lower() == u'from_parent':
-      orgUnitPath = sys.argv[i+1]
-      i += 2
-    elif sys.argv[i].lower() == u'todrive':
+    myarg = sys.argv[i].lower().replace(u'_', u'')
+    if myarg == u'todrive':
       todrive = True
       i += 1
-    elif sys.argv[i].lower() == u'description':
-      printdesc = True
-      fields += u',organizationUnits(description)'
-      org_attributes[0].update(Description=u'Description')
-      titles.append(u'Description')
+    elif myarg == u'toplevelonly':
+      listType = u'children'
       i += 1
-    elif sys.argv[i].lower() == u'parent':
-      printparent = True
-      fields += u',organizationUnits(parentOrgUnitPath)'
-      org_attributes[0].update(Parent=u'Parent')
-      titles.append(u'Parent')
+    elif myarg == u'fromparent':
+      orgUnitPath = sys.argv[i+1]
+      i += 2
+    elif myarg == u'allfields':
+      fieldsList = []
+      fieldsTitles = {}
+      titles = []
+      for field in ORG_FIELD_PRINT_ORDER:
+        addFieldTitleToCSVfile(field, ORG_ARGUMENT_TO_PROPERTY_TITLE_MAP, fieldsList, fieldsTitles, titles)
       i += 1
-    elif sys.argv[i].lower() == u'inherit':
-      printinherit = True
-      fields += u',organizationUnits(blockInheritance)'
-      org_attributes[0].update(InheritanceBlocked=u'InheritanceBlocked')
-      titles.append(u'InheritanceBlocked')
+    elif myarg in ORG_ARGUMENT_TO_PROPERTY_TITLE_MAP:
+      addFieldTitleToCSVfile(myarg, ORG_ARGUMENT_TO_PROPERTY_TITLE_MAP, fieldsList, fieldsTitles, titles)
       i += 1
     else:
       print u'ERROR: %s is not a valid argument for "gam print orgs"' % sys.argv[i]
       sys.exit(2)
-  if fields:
-    org_attributes[0][u'Path'] = u'Path'
-    titles.append(u'Path')
+  if not fieldsList:
+    addFieldTitleToCSVfile(u'orgunitpath', ORG_ARGUMENT_TO_PROPERTY_TITLE_MAP, fieldsList, fieldsTitles, titles)
   sys.stderr.write(u"Retrieving All Organizational Units for your account (may take some time on large domain)...")
-  orgs = callGAPI(cd.orgunits(), u'list', customerId=GC_Values[GC_CUSTOMER_ID], fields=fields, type=listType, orgUnitPath=orgUnitPath)
+  orgs = callGAPI(cd.orgunits(), u'list',
+                  customerId=GC_Values[GC_CUSTOMER_ID], type=listType, orgUnitPath=orgUnitPath, fields=u'organizationUnits({0})'.format(u','.join(set(fieldsList))))
   sys.stderr.write(u"done\n")
   if not u'organizationUnits' in orgs:
     print u'0 org units in this Google Apps instance...'
     return
-  for org_vals in orgs[u'organizationUnits']:
+  for orgEntity in orgs[u'organizationUnits']:
     orgUnit = {}
-    if not fields:
-      orgUnit = flatten_json(org_vals)
-      for row in orgUnit:
-        if row not in titles:
-          titles.append(row)
-          org_attributes[0][row] = row
-    else:
-      orgUnit.update({u'Path': org_vals[u'orgUnitPath']})
-      if printname:
-        name = org_vals[u'name']
-        if name == None:
-          name = u''
-        orgUnit.update({u'Name': name})
-      if printdesc:
-        try:
-          desc = org_vals[u'description']
-          if desc == None:
-            desc = u''
-        except KeyError:
-          pass
-        orgUnit.update({u'Description': desc})
-      if printparent:
-        parent = org_vals[u'parentOrgUnitPath']
-        if parent == None:
-          parent = u''
-        orgUnit.update({u'Parent': parent})
-      if printinherit:
-        try:
-          orgUnit.update({u'InheritanceBlocked': org_vals[u'blockInheritance']})
-        except KeyError:
-          pass
-    org_attributes.append(orgUnit)
-  output_csv(org_attributes, titles, u'Orgs', todrive)
+    for field in fieldsList:
+      orgUnit[fieldsTitles[field]] = orgEntity.get(field, u'')
+    csvRows.append(orgUnit)
+  writeCSVfile(csvRows, titles, u'Orgs', todrive)
 
 def doPrintAliases():
   cd = buildGAPIObject(u'directory')
   todrive = False
+  titles = [u'Alias', u'Target', u'TargetType']
+  csvRows = []
   i = 3
   while i < len(sys.argv):
     if sys.argv[i].lower() == u'todrive':
@@ -8101,11 +9078,6 @@ def doPrintAliases():
     else:
       print u'ERROR: %s is not a valid argument for "gam print aliases"' % sys.argv[i]
       sys.exit(2)
-  alias_attributes = []
-  alias_attributes.append({u'Alias': u'Alias'})
-  alias_attributes[0].update(Target=u'Target')
-  alias_attributes[0].update(TargetType=u'TargetType')
-  titles = [u'Alias', u'Target', u'TargetType']
   sys.stderr.write(u"Retrieving All User Aliases for %s organization (may take some time on large domain)...\n" % GC_Values[GC_DOMAIN])
   page_message = u'Got %%num_items%% users %%first_item%% - %%last_item%%\n'
   all_users = callGAPIpages(cd.users(), u'list', u'users', page_message=page_message,
@@ -8114,7 +9086,7 @@ def doPrintAliases():
   for user in all_users:
     try:
       for alias in user[u'aliases']:
-        alias_attributes.append({u'Alias': alias, u'Target': user[u'primaryEmail'], u'TargetType': u'User'})
+        csvRows.append({u'Alias': alias, u'Target': user[u'primaryEmail'], u'TargetType': u'User'})
     except KeyError:
       continue
   sys.stderr.write(u"Retrieving All User Aliases for %s organization (may take some time on large domain)...\n" % GC_Values[GC_DOMAIN])
@@ -8125,10 +9097,10 @@ def doPrintAliases():
   for group in all_groups:
     try:
       for alias in group[u'aliases']:
-        alias_attributes.append({u'Alias': alias, u'Target': group[u'email'], u'TargetType': u'Group'})
+        csvRows.append({u'Alias': alias, u'Target': group[u'email'], u'TargetType': u'Group'})
     except KeyError:
       continue
-  output_csv(alias_attributes, titles, u'Aliases', todrive)
+  writeCSVfile(csvRows, titles, u'Aliases', todrive)
 
 MEMBERS_FIELD_NAMES = [u'group', u'id', u'email', u'role', u'type', u'name',]
 
@@ -8139,6 +9111,7 @@ def doPrintGroupMembers():
   usedomain = usemember = None
   fieldsList = []
   titles = []
+  csvRows = []
   all_groups = []
   i = 3
   while i < len(sys.argv):
@@ -8175,18 +9148,13 @@ def doPrintGroupMembers():
     else:
       print u'ERROR: %s is not a valid argument for "gam print group-members"' % sys.argv[i]
       sys.exit(2)
-  member_attributes = [{}]
   if not fieldsList:
     for field in [u'id', u'role', u'group', u'email', u'type']:
       fieldsList.append(field)
       titles.append(field)
-      member_attributes[0][field] = field
     if membernames:
       titles.append(u'name')
-      member_attributes[0][u'name'] = u'name'
   else:
-    for field in fieldsList:
-      member_attributes[0][field] = field
     if u'name'in fieldsList:
       membernames = True
       fieldsList.remove(u'name')
@@ -8229,24 +9197,25 @@ def doPrintGroupMembers():
         else:
           memberName = u'Unknown'
         member_attr[u'name'] = memberName
-      member_attributes.append(member_attr)
-  output_csv(member_attributes, titles, u'Group Members', todrive)
+      csvRows.append(member_attr)
+  writeCSVfile(csvRows, titles, u'Group Members', todrive)
 
 def doPrintMobileDevices():
   cd = buildGAPIObject(u'directory')
-  mobile_attributes = [{}]
-  titles = []
   todrive = False
+  titles = [u'resourceId',]
+  csvRows = []
   query = orderBy = sortOrder = None
   i = 3
   while i < len(sys.argv):
-    if sys.argv[i].lower() == u'query':
+    myarg = sys.argv[i].lower()
+    if myarg == u'query':
       query = sys.argv[i+1]
       i += 2
-    elif sys.argv[i].lower() == u'todrive':
+    elif myarg == u'todrive':
       todrive = True
       i += 1
-    elif sys.argv[i].lower() == u'orderby':
+    elif myarg == u'orderby':
       orderBy = sys.argv[i+1].lower()
       allowed_values = [u'deviceid', u'email', u'lastsync', u'model', u'name', u'os', u'status', u'type']
       if orderBy.lower() not in allowed_values:
@@ -8257,8 +9226,8 @@ def doPrintMobileDevices():
       elif orderBy == u'deviceid':
         orderBy = u'deviceId'
       i += 2
-    elif sys.argv[i].lower() in [u'ascending', u'descending']:
-      sortOrder = sys.argv[i].upper()
+    elif myarg in SORTORDER_CHOICES_MAP:
+      sortOrder = SORTORDER_CHOICES_MAP[myarg]
       i += 1
     else:
       print u'ERROR: %s is not a valid argument for "gam print mobile"' % sys.argv[i]
@@ -8269,58 +9238,64 @@ def doPrintMobileDevices():
                              customerId=GC_Values[GC_CUSTOMER_ID], query=query,
                              orderBy=orderBy, sortOrder=sortOrder, maxResults=GC_Values[GC_DEVICE_MAX_RESULTS])
   for mobile in all_mobile:
-    mobiledevice = dict()
-    for title in mobile:
-      try:
-        if title in [u'kind', u'etag', u'applications']:
-          continue
-        try:
-          mobile_attributes[0][title]
-        except KeyError:
-          mobile_attributes[0][title] = title
-          titles.append(title)
-        if title in [u'name', u'email']:
-          mobiledevice[title] = mobile[title][0]
-        else:
-          mobiledevice[title] = mobile[title]
-      except KeyError:
-        pass
-    mobile_attributes.append(mobiledevice)
-  output_csv(mobile_attributes, titles, u'Mobile', todrive)
+    mobiledevice = {}
+    for attrib in mobile:
+      if attrib in [u'kind', u'etag', u'applications']:
+        continue
+      if attrib not in titles:
+        titles.append(attrib)
+      if attrib in [u'name', u'email']:
+        if mobile[attrib]:
+          mobiledevice[attrib] = mobile[attrib][0]
+      else:
+        mobiledevice[attrib] = mobile[attrib]
+    csvRows.append(mobiledevice)
+  writeCSVfile(csvRows, titles, u'Mobile', todrive)
 
 def doPrintCrosDevices():
   cd = buildGAPIObject(u'directory')
-  cros_attributes = [{u'deviceId': u'deviceId'}]
-  titles = [u'deviceId',]
   todrive = False
+  fieldsList = []
+  fieldsTitles = {}
+  titles = []
+  csvRows = []
+  addFieldToCSVfile(u'deviceid', CROS_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
+  sortHeaders = False
   query = projection = orderBy = sortOrder = None
   noLists = False
-  listLimit = selectAttrib = None
+  listLimit = 0
+  selectActiveTimeRanges = selectRecentUsers = None
   i = 3
   while i < len(sys.argv):
-    my_arg = sys.argv[i].lower().replace(u'_', u'')
-    if my_arg == u'query':
+    myarg = sys.argv[i].lower().replace(u'_', u'')
+    if myarg == u'query':
       query = sys.argv[i+1]
       i += 2
-    elif my_arg == u'todrive':
+    elif myarg == u'todrive':
       todrive = True
       i += 1
-    elif my_arg == u'nolists':
+    elif myarg == u'nolists':
       noLists = True
-      selectAttrib = None
+      selectActiveTimeRanges = selectRecentUsers = None
       i += 1
-    elif my_arg == u'recentusers':
-      selectAttrib = u'recentUsers'
+    elif myarg == u'recentusers':
+      projection = u'FULL'
+      selectRecentUsers = u'recentUsers'
       noLists = False
+      if fieldsList:
+        fieldsList.append(selectRecentUsers)
       i += 1
-    elif my_arg in [u'timeranges', u'activetimeranges']:
-      selectAttrib = u'activeTimeRanges'
+    elif myarg in [u'timeranges', u'activetimeranges']:
+      projection = u'FULL'
+      selectActiveTimeRanges = u'activeTimeRanges'
       noLists = False
+      if fieldsList:
+        fieldsList.append(selectActiveTimeRanges)
       i += 1
-    elif my_arg == u'listlimit':
+    elif myarg == u'listlimit':
       listLimit = int(sys.argv[i+1])
       i += 2
-    elif my_arg == u'orderby':
+    elif myarg == u'orderby':
       orderBy = sys.argv[i+1].lower().replace(u'_', u'')
       allowed_values = [u'location', u'user', u'lastsync', u'notes', u'serialnumber', u'status', u'supportenddate']
       if orderBy not in allowed_values:
@@ -8337,68 +9312,104 @@ def doPrintCrosDevices():
       elif orderBy == u'supportEndDate':
         orderBy = u'supportEndDate'
       i += 2
-    elif my_arg in [u'ascending', u'descending']:
-      sortOrder = my_arg.upper()
+    elif myarg in SORTORDER_CHOICES_MAP:
+      sortOrder = SORTORDER_CHOICES_MAP[myarg]
       i += 1
-    elif my_arg in [u'basic', u'full']:
-      projection = my_arg.upper()
+    elif myarg in PROJECTION_CHOICES_MAP:
+      projection = PROJECTION_CHOICES_MAP[myarg]
+      sortHeaders = True
+      if projection == u'FULL':
+        fieldsList = []
+      else:
+        fieldsList = CROS_BASIC_FIELDS_LIST[:]
       i += 1
+    elif myarg == u'allfields':
+      projection = u'FULL'
+      sortHeaders = True
+      fieldsList = []
+      i += 1
+    elif myarg in CROS_ARGUMENT_TO_PROPERTY_MAP:
+      if not fieldsList:
+        fieldsList = [u'deviceId',]
+      addFieldToCSVfile(myarg, CROS_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
+      i += 1
+    elif myarg == u'fields':
+      if not fieldsList:
+        fieldsList = [u'deviceId',]
+      fieldNameList = sys.argv[i+1]
+      for field in fieldNameList.lower().replace(u',', u' ').split():
+        if field in CROS_ARGUMENT_TO_PROPERTY_MAP:
+          addFieldToCSVfile(field, CROS_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
+          if field == u'recentusers':
+            projection = u'FULL'
+            selectRecentUsers = u'recentUsers'
+            noLists = False
+          elif field in [u'timeranges', u'activetimeranges']:
+            projection = u'FULL'
+            selectActiveTimeRanges = u'activeTimeRanges'
+            noLists = False
+        else:
+          print u'ERROR: %s is not a valid argument for "gam print cros fields"' % field
+          sys.exit(2)
+      i += 2
     else:
       print u'ERROR: %s is not a valid argument for "gam print cros"' % sys.argv[i]
       sys.exit(2)
-  if selectAttrib:
-    projection = u'FULL'
+  if fieldsList:
+    fields = u'nextPageToken,chromeosdevices({0})'.format(u','.join(set(fieldsList))).replace(u'.', u'/')
+  else:
+    fields = None
   sys.stderr.write(u'Retrieving All Chrome OS Devices for organization (may take some time for large accounts)...\n')
   page_message = u'Got %%num_items%% Chrome devices...\n'
   all_cros = callGAPIpages(cd.chromeosdevices(), u'list', u'chromeosdevices', page_message=page_message,
                            query=query, customerId=GC_Values[GC_CUSTOMER_ID], projection=projection,
-                           orderBy=orderBy, sortOrder=sortOrder, maxResults=GC_Values[GC_DEVICE_MAX_RESULTS])
+                           orderBy=orderBy, sortOrder=sortOrder, fields=fields, maxResults=GC_Values[GC_DEVICE_MAX_RESULTS])
   if all_cros:
-    if (not noLists) and (not selectAttrib):
+    if (not noLists) and (not selectActiveTimeRanges) and (not selectRecentUsers):
       for cros in all_cros:
-        cros_attributes.append(flatten_json(cros, listLimit=listLimit))
-        for item in cros_attributes[-1]:
-          if item not in cros_attributes[0]:
-            cros_attributes[0][item] = item
-            titles.append(item)
+        addRowTitlesToCSVfile(flatten_json(cros, listLimit=listLimit), csvRows, titles)
     else:
-      attribMap = dict()
+      if not noLists:
+        if selectActiveTimeRanges:
+          for attrib in [u'activeTimeRanges.activeTime', u'activeTimeRanges.date']:
+            titles.append(attrib)
+        if selectRecentUsers:
+          for attrib in [u'recentUsers.email', u'recentUsers.type']:
+            titles.append(attrib)
       for cros in all_cros:
-        row = dict()
+        row = {}
         for attrib in cros:
           if attrib in [u'kind', u'etag', u'recentUsers', u'activeTimeRanges']:
             continue
-          if attrib not in cros_attributes[0]:
-            cros_attributes[0][attrib] = attrib
+          if attrib not in titles:
             titles.append(attrib)
           row[attrib] = cros[attrib]
-        if noLists or (selectAttrib not in cros) or (not cros[selectAttrib]):
-          cros_attributes.append(row)
+        activeTimeRanges = cros.get(selectActiveTimeRanges, []) if selectActiveTimeRanges else []
+        recentUsers = cros.get(selectRecentUsers, []) if selectRecentUsers else []
+        if noLists or (not activeTimeRanges and not recentUsers):
+          csvRows.append(row)
         else:
-          if not attribMap:
-            for attrib in cros[selectAttrib][0]:
-              xattrib = u'%s.%s' % (selectAttrib, attrib)
-              if xattrib not in cros_attributes[0]:
-                cros_attributes[0][xattrib] = xattrib
-                titles.append(xattrib)
-              attribMap[attrib] = xattrib
-          for i, item in enumerate(cros[selectAttrib]):
-            if listLimit and(i >= listLimit):
-              break
+          lenATR = len(activeTimeRanges)
+          lenRU = len(recentUsers)
+          for i in xrange(min(listLimit, max(lenATR, lenRU)) if listLimit else max(lenATR, lenRU)):
             new_row = row.copy()
-            for attrib in item:
-              if isinstance(item[attrib], (bool, int)):
-                new_row[attribMap[attrib]] = str(item[attrib])
-              else:
-                new_row[attribMap[attrib]] = item[attrib]
-            cros_attributes.append(new_row)
-  output_csv(cros_attributes, titles, u'CrOS', todrive)
+            if i < lenATR:
+              new_row[u'activeTimeRanges.activeTime'] = str(activeTimeRanges[i][u'activeTime'])
+              new_row[u'activeTimeRanges.date'] = activeTimeRanges[i][u'date']
+            if i < lenRU:
+              new_row[u'recentUsers.email'] = recentUsers[i].get(u'email', u'')
+              new_row[u'recentUsers.type'] = recentUsers[i][u'type']
+            csvRows.append(new_row)
+  if sortHeaders:
+    sortCSVTitles([u'deviceId',], titles)
+  writeCSVfile(csvRows, titles, u'CrOS', todrive)
 
 def doPrintLicenses(return_list=False, skus=None):
   lic = buildGAPIObject(u'licensing')
   products = [u'Google-Apps', u'Google-Vault']
   licenses = []
-  lic_attributes = [{}]
+  titles = [u'userId', u'productId', u'skuId']
+  csvRows = []
   todrive = False
   i = 3
   while i < len(sys.argv) and not return_list:
@@ -8432,105 +9443,68 @@ def doPrintLicenses(return_list=False, skus=None):
       except googleapiclient.errors.HttpError:
         pass
   for u_license in licenses:
-    a_license = dict()
+    a_license = {}
     for title in u_license:
       if title in [u'kind', u'etags', u'selfLink']:
         continue
-      if title not in lic_attributes[0]:
-        lic_attributes[0][title] = title
+      if title not in titles:
+        titles.append(title)
       a_license[title] = u_license[title]
-    lic_attributes.append(a_license)
+    csvRows.append(a_license)
   if return_list:
-    return lic_attributes
-  output_csv(lic_attributes, lic_attributes[0], u'Licenses', todrive)
+    return csvRows
+  writeCSVfile(csvRows, titles, u'Licenses', todrive)
 
-def doPrintTokens():
-  cd = buildGAPIObject(u'directory')
-  todrive = False
-  i = 3
-  entity_type = u'all'
-  entity = u'users'
-  while i < len(sys.argv):
-    if sys.argv[i].lower() == u'todrive':
-      todrive = True
-      i += 1
-    elif sys.argv[i].lower() in usergroup_types:
-      entity_type = sys.argv[i].lower()
-      entity = sys.argv[i+1].lower()
-      i += 2
-    else:
-      print u'ERROR: %s is not a valid argument for "gam print tokens"' % sys.argv[i]
-      sys.exit(2)
-  all_users = getUsersToModify(entity_type=entity_type, entity=entity, silent=False)
-  titles = [u'user', u'displayText', u'clientId', u'nativeApp', u'anonymous', u'scopes']
-  token_attributes = [{}]
-  for title in titles:
-    token_attributes[0][title] = title
-  for user in all_users:
-    sys.stderr.write(u' getting tokens for %s\n' % user)
-    user_tokens = callGAPI(cd.tokens(), u'list', userKey=user)
-    try:
-      for user_token in user_tokens[u'items']:
-        this_token = dict()
-        this_token[u'user'] = user
-        this_token[u'scopes'] = u' '.join(user_token[u'scopes'])
-        for token_item in user_token:
-          if token_item in [u'kind', u'etag', u'scopes']:
-            continue
-          this_token[token_item] = user_token[token_item]
-          if token_item not in titles:
-            titles.append(token_item)
-            token_attributes[0][token_item] = token_item
-        token_attributes.append(this_token)
-    except KeyError:
-      pass
-  output_csv(token_attributes, titles, u'OAuth Tokens', todrive)
+RESCAL_DFLTFIELDS = [u'id', u'name', u'email',]
+RESCAL_ALLFIELDS = [u'id', u'name', u'email', u'description', u'type',]
+
+RESCAL_ARGUMENT_TO_PROPERTY_MAP = {
+  u'description': [u'resourceDescription'],
+  u'email': [u'resourceEmail'],
+  u'id': [u'resourceId'],
+  u'name': [u'resourceName'],
+  u'type': [u'resourceType'],
+  }
 
 def doPrintResourceCalendars():
   cd = buildGAPIObject(u'directory')
   todrive = False
-  fields = [u'resourceId', u'resourceName', u'resourceEmail']
+  fieldsList = []
+  fieldsTitles = {}
+  titles = []
+  csvRows = []
+  for field in RESCAL_DFLTFIELDS:
+    addFieldToCSVfile(field, RESCAL_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
   i = 3
   while i < len(sys.argv):
-    if sys.argv[i].lower() == u'allfields':
-      fields = None
-      i += 1
-    elif sys.argv[i].lower() == u'todrive':
+    myarg = sys.argv[i].lower()
+    if myarg == u'todrive':
       todrive = True
       i += 1
-    elif sys.argv[i].lower() == u'id':
+    elif myarg == u'allfields':
+      fieldsList = []
+      fieldsTitles = {}
+      titles = []
+      for field in RESCAL_ALLFIELDS:
+        addFieldToCSVfile(field, RESCAL_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
       i += 1
-    elif sys.argv[i].lower() == u'description':
-      fields.append(u'resourceDescription')
-      i += 1
-    elif sys.argv[i].lower() == u'email':
-      i += 1
-    elif sys.argv[i].lower() == u'type':
-      fields.append(u'resourceType')
+    elif myarg in RESCAL_ARGUMENT_TO_PROPERTY_MAP:
+      addFieldToCSVfile(myarg, RESCAL_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
       i += 1
     else:
       print u'ERROR: %s is not a valid argument for "gam print resources"' % sys.argv[i]
       sys.exit(2)
-  if fields:
-    fields = u'nextPageToken,items(%s)' % u','.join(fields)
   sys.stderr.write(u"Retrieving All Resource Calendars for your account (may take some time on a large domain)\n")
   page_message = u'Got %%total_items%% resources: %%first_item%% - %%last_item%%\n'
   resources = callGAPIpages(cd.resources().calendars(), u'list', u'items',
                             page_message=page_message, message_attribute=u'resourceId',
-                            customer=GC_Values[GC_CUSTOMER_ID], fields=fields, maxResults=500)
-  resources_attrib = [{u'resourceId':u'resourceId',
-                       u'resourceEmail': u'resourceEmail',
-                       u'resourceName': u'resourceName'}]
+                            customer=GC_Values[GC_CUSTOMER_ID], fields=u'nextPageToken,items({0})'.format(u','.join(set(fieldsList))))
   for resource in resources:
-    resource_attrib = {}
-    for key, value in resource.items():
-      if key in [u'kind', u'etags']:
-        continue
-      if key not in resources_attrib[0]:
-        resources_attrib[0][key] = key
-      resource_attrib[key] = value
-    resources_attrib.append(resource_attrib)
-  output_csv(resources_attrib, resources_attrib[0], u'Resources', todrive)
+    resUnit = {}
+    for field in fieldsList:
+      resUnit[fieldsTitles[field]] = resource.get(field, u'')
+    csvRows.append(resUnit)
+  writeCSVfile(csvRows, titles, u'Resources', todrive)
 
 def doCreateMonitor():
   source_user = sys.argv[4].lower()
@@ -8964,7 +9938,7 @@ def getUsersToModify(entity_type=None, entity=None, silent=False, return_uids=Fa
   elif entity_type in [u'license', u'licenses', u'licence', u'licences']:
     users = []
     licenses = doPrintLicenses(return_list=True, skus=entity.split(u','))
-    for row in licenses[1:]: # skip header
+    for row in licenses:
       try:
         users.append(row[u'userId'])
       except KeyError:
@@ -9116,7 +10090,7 @@ def doDeleteOAuth():
   sys.stderr.write(u'boom!\n')
   try:
     credentials.revoke(http)
-  except oauth2client.client.TokenRevokeError, e:
+  except oauth2client.client.TokenRevokeError as e:
     stderrErrorMsg(e.message)
     os.remove(GC_Values[GC_OAUTH2_TXT])
 
@@ -9385,6 +10359,681 @@ def processSubFields(GAM_argv, row, subFields):
     argv[GAM_argvI] = argv[GAM_argvI].encode(GM_Globals[GM_SYS_ENCODING])
   return argv
 
+# Process GAM command
+def ProcessGAMCommand(args):
+  if args != sys.argv:
+    sys.argv = args[:]
+  GM_Globals[GM_SYSEXITRC] = 0
+  try:
+    SetGlobalVariables()
+    command = sys.argv[1].lower()
+    if command == u'batch':
+      import shlex
+      f = openFile(sys.argv[2])
+      items = []
+      for line in f:
+        argv = shlex.split(line)
+        if not argv:
+          continue
+        cmd = argv[0].strip().lower()
+        if (not cmd) or cmd.startswith(u'#') or ((len(argv) == 1) and (cmd != u'commit-batch')):
+          continue
+        if cmd == u'gam':
+          items.append([arg.encode(GM_Globals[GM_SYS_ENCODING]) for arg in argv[1:]])
+        elif cmd == u'commit-batch':
+          items.append([cmd])
+        else:
+          print u'ERROR: "%s" is not a valid gam command' % line.strip()
+      closeFile(f)
+      run_batch(items)
+      sys.exit(0)
+    elif command == u'csv':
+      if httplib2.debuglevel > 0:
+        print u'Sorry, CSV commands are not compatible with debug. Delete debug.gam and try again.'
+        sys.exit(1)
+      i = 2
+      filename = sys.argv[i]
+      i += 1
+      f = openFile(filename)
+      csvFile = csv.DictReader(f)
+      if (i == len(sys.argv)) or (sys.argv[i].lower() != u'gam') or (i+1 == len(sys.argv)):
+        print u'ERROR: "gam csv <filename>" should be followed by a full GAM command...'
+        sys.exit(3)
+      i += 1
+      GAM_argv, subFields = getSubFields(i, csvFile.fieldnames)
+      items = []
+      for row in csvFile:
+        items.append(processSubFields(GAM_argv, row, subFields))
+      closeFile(f)
+      run_batch(items)
+      sys.exit(0)
+    elif command == u'version':
+      doGAMVersion()
+      sys.exit(0)
+    elif command == u'create':
+      argument = sys.argv[2].lower()
+      if argument == u'user':
+        doCreateUser()
+      elif argument == u'group':
+        doCreateGroup()
+      elif argument in [u'nickname', u'alias']:
+        doCreateAlias()
+      elif argument in [u'org', u'ou']:
+        doCreateOrg()
+      elif argument == u'resource':
+        doCreateResourceCalendar()
+      elif argument in [u'verify', u'verification']:
+        doSiteVerifyShow()
+      elif argument == u'schema':
+        doCreateOrUpdateUserSchema(u'insert')
+      elif argument in [u'course', u'class']:
+        doCreateCourse()
+      elif argument in [u'transfer', u'datatransfer']:
+        doCreateDataTranfer()
+      elif argument == u'domain':
+        doCreateDomain()
+      elif argument in [u'domainalias', u'aliasdomain']:
+        doCreateDomainAlias()
+      elif argument == u'admin':
+        doCreateAdmin()
+      else:
+        print u'ERROR: %s is not a valid argument for "gam create"' % argument
+        sys.exit(2)
+      sys.exit(0)
+    elif command == u'update':
+      argument = sys.argv[2].lower()
+      if argument == u'user':
+        doUpdateUser([sys.argv[3],], 4)
+      elif argument == u'group':
+        doUpdateGroup()
+      elif argument in [u'nickname', u'alias']:
+        doUpdateAlias()
+      elif argument in [u'ou', u'org']:
+        doUpdateOrg()
+      elif argument == u'resource':
+        doUpdateResourceCalendar()
+      elif argument == u'instance':
+        doUpdateInstance()
+      elif argument == u'cros':
+        doUpdateCros()
+      elif argument == u'mobile':
+        doUpdateMobile()
+      elif argument in [u'notification', u'notifications']:
+        doUpdateNotification()
+      elif argument in [u'verify', u'verification']:
+        doSiteVerifyAttempt()
+      elif argument in [u'schema', u'schemas']:
+        doCreateOrUpdateUserSchema(u'update')
+      elif argument in [u'course', u'class']:
+        doUpdateCourse()
+      elif argument in [u'printer', u'print']:
+        doUpdatePrinter()
+      elif argument == u'domain':
+        doUpdateDomain()
+      elif argument == u'customer':
+        doUpdateCustomer()
+      else:
+        print u'ERROR: %s is not a valid argument for "gam update"' % argument
+        sys.exit(2)
+      sys.exit(0)
+    elif command == u'info':
+      argument = sys.argv[2].lower()
+      if argument == u'user':
+        doGetUserInfo()
+      elif argument == u'group':
+        doGetGroupInfo()
+      elif argument in [u'nickname', u'alias']:
+        doGetAliasInfo()
+      elif argument == u'instance':
+        doGetInstanceInfo()
+      elif argument in [u'org', u'ou']:
+        doGetOrgInfo()
+      elif argument == u'resource':
+        doGetResourceCalendarInfo()
+      elif argument == u'cros':
+        doGetCrosInfo()
+      elif argument == u'mobile':
+        doGetMobileInfo()
+      elif argument in [u'notifications', u'notification']:
+        doGetNotifications()
+      elif argument in [u'verify', u'verification']:
+        doGetSiteVerifications()
+      elif argument in [u'schema', u'schemas']:
+        doGetUserSchema()
+      elif argument in [u'course', u'class']:
+        doGetCourseInfo()
+      elif argument in [u'printer', u'print']:
+        doGetPrinterInfo()
+      elif argument in [u'transfer', u'datatransfer']:
+        doGetDataTransferInfo()
+      elif argument == u'customer':
+        doGetCustomerInfo()
+      elif argument == u'domain':
+        doGetDomainInfo()
+      elif argument in [u'domainalias', u'aliasdomain']:
+        doGetDomainAliasInfo()
+      else:
+        print u'ERROR: %s is not a valid argument for "gam info"' % argument
+        sys.exit(2)
+      sys.exit(0)
+    elif command == u'delete':
+      argument = sys.argv[2].lower()
+      if argument == u'user':
+        doDeleteUser()
+      elif argument == u'group':
+        doDeleteGroup()
+      elif argument in [u'nickname', u'alias']:
+        doDeleteAlias()
+      elif argument == u'org':
+        doDeleteOrg()
+      elif argument == u'resource':
+        doDeleteResourceCalendar()
+      elif argument == u'mobile':
+        doDeleteMobile()
+      elif argument in [u'notification', u'notifications']:
+        doDeleteNotification()
+      elif argument in [u'schema', u'schemas']:
+        doDelSchema()
+      elif argument in [u'course', u'class']:
+        doDelCourse()
+      elif argument in [u'printer', u'printers']:
+        doDelPrinter()
+      elif argument == u'domain':
+        doDelDomain()
+      elif argument in [u'domainalias', u'aliasdomain']:
+        doDelDomainAlias()
+      elif argument == u'admin':
+        doDelAdmin()
+      else:
+        print u'ERROR: %s is not a valid argument for "gam delete"' % argument
+        sys.exit(2)
+      sys.exit(0)
+    elif command == u'undelete':
+      argument = sys.argv[2].lower()
+      if argument == u'user':
+        doUndeleteUser()
+      else:
+        print u'ERROR: %s is not a valid argument for "gam undelete"' % argument
+        sys.exit(2)
+      sys.exit(0)
+    elif command == u'audit':
+      argument = sys.argv[2].lower()
+      if argument == u'monitor':
+        auditWhat = sys.argv[3].lower()
+        if auditWhat == u'create':
+          doCreateMonitor()
+        elif auditWhat == u'list':
+          doShowMonitors()
+        elif auditWhat == u'delete':
+          doDeleteMonitor()
+        else:
+          print u'ERROR: %s is not a valid argument for "gam audit monitor"' % auditWhat
+          sys.exit(2)
+      elif argument == u'activity':
+        auditWhat = sys.argv[3].lower()
+        if auditWhat == u'request':
+          doRequestActivity()
+        elif auditWhat == u'status':
+          doStatusActivityRequests()
+        elif auditWhat == u'download':
+          doDownloadActivityRequest()
+        elif auditWhat == u'delete':
+          doDeleteActivityRequest()
+        else:
+          print u'ERROR: %s is not a valid argument for "gam audit activity"' % auditWhat
+          sys.exit(2)
+      elif argument == u'export':
+        auditWhat = sys.argv[3].lower()
+        if auditWhat == u'status':
+          doStatusExportRequests()
+        elif auditWhat == u'watch':
+          doWatchExportRequest()
+        elif auditWhat == u'download':
+          doDownloadExportRequest()
+        elif auditWhat == u'request':
+          doRequestExport()
+        elif auditWhat == u'delete':
+          doDeleteExport()
+        else:
+          print u'ERROR: %s is not a valid argument for "gam audit export"' % auditWhat
+          sys.exit(2)
+      elif argument == u'uploadkey':
+        doUploadAuditKey()
+      else:
+        print u'ERROR: %s is not a valid argument for "gam audit"' % argument
+        sys.exit(2)
+      sys.exit(0)
+    elif command == u'print':
+      argument = sys.argv[2].lower()
+      if argument == u'users':
+        doPrintUsers()
+      elif argument in [u'nicknames', u'aliases']:
+        doPrintAliases()
+      elif argument == u'groups':
+        doPrintGroups()
+      elif argument in [u'group-members', u'groups-members']:
+        doPrintGroupMembers()
+      elif argument in [u'orgs', u'ous']:
+        doPrintOrgs()
+      elif argument == u'resources':
+        doPrintResourceCalendars()
+      elif argument == u'cros':
+        doPrintCrosDevices()
+      elif argument == u'mobile':
+        doPrintMobileDevices()
+      elif argument in [u'license', u'licenses', u'licence', u'licences']:
+        doPrintLicenses()
+      elif argument in [u'token', u'tokens', u'oauth', u'3lo']:
+        printShowTokens(3, None, None, True)
+      elif argument in [u'schema', u'schemas']:
+        doPrintShowUserSchemas(True)
+      elif argument in [u'courses', u'classes']:
+        doPrintCourses()
+      elif argument in [u'course-participants', u'class-participants']:
+        doPrintCourseParticipants()
+      elif argument == u'printers':
+        doPrintPrinters()
+      elif argument == u'printjobs':
+        doPrintPrintJobs()
+      elif argument in [u'transfers', u'datatransfers']:
+        doPrintDataTransfers()
+      elif argument == u'transferapps':
+        doPrintTransferApps()
+      elif argument == u'domains':
+        doPrintDomains()
+      elif argument in [u'domainaliases', u'aliasdomains']:
+        doPrintDomainAliases()
+      elif argument == u'admins':
+        doPrintAdmins()
+      elif argument in [u'roles', u'adminroles']:
+        doPrintAdminRoles()
+      else:
+        print u'ERROR: %s is not a valid argument for "gam print"' % argument
+        sys.exit(2)
+      sys.exit(0)
+    elif command == u'show':
+      argument = sys.argv[2].lower()
+      if argument in [u'schema', u'schemas']:
+        doPrintShowUserSchemas(False)
+      else:
+        print u'ERROR: %s is not a valid argument for "gam show"' % argument
+        sys.exit(2)
+      sys.exit(0)
+    elif command in [u'oauth', u'oauth2']:
+      argument = sys.argv[2].lower()
+      if argument in [u'request', u'create']:
+        doRequestOAuth()
+      elif argument in [u'info', u'verify']:
+        OAuthInfo()
+      elif argument in [u'delete', u'revoke']:
+        doDeleteOAuth()
+      else:
+        print u'ERROR: %s is not a valid argument for "gam oauth"' % argument
+        sys.exit(2)
+      sys.exit(0)
+    elif command == u'calendar':
+      argument = sys.argv[3].lower()
+      if argument == u'showacl':
+        doCalendarShowACL()
+      elif argument == u'add':
+        doCalendarAddACL()
+      elif argument in [u'del', u'delete']:
+        doCalendarDelACL()
+      elif argument == u'update':
+        doCalendarUpdateACL()
+      elif argument == u'wipe':
+        doCalendarWipeData()
+      elif argument == u'addevent':
+        doCalendarAddEvent()
+      else:
+        print u'ERROR: %s is not a valid argument for "gam calendar"' % argument
+        sys.exit(2)
+      sys.exit(0)
+    elif command == u'printer':
+      argument = sys.argv[3].lower()
+      if argument == u'showacl':
+        doPrinterShowACL()
+      elif argument == u'add':
+        doPrinterAddACL()
+      elif argument in [u'del', u'delete', u'remove']:
+        doPrinterDelACL()
+      elif argument == u'register':
+        doPrinterRegister()
+      else:
+        print u'ERROR: %s is not a valid argument for "gam printer..."' % argument
+        sys.exit(2)
+      sys.exit(0)
+    elif command == u'printjob':
+      argument = sys.argv[3].lower()
+      if argument == u'delete':
+        doDeletePrintJob()
+      elif argument == u'cancel':
+        doCancelPrintJob()
+      elif argument == u'submit':
+        doPrintJobSubmit()
+      elif argument == u'fetch':
+        doPrintJobFetch()
+      elif argument == u'resubmit':
+        doPrintJobResubmit()
+      else:
+        print u'ERROR: %s is not a valid argument for "gam printjob"' % argument
+        sys.exit(2)
+      sys.exit(0)
+    elif command == u'report':
+      showReport()
+      sys.exit(0)
+    elif command == u'whatis':
+      doWhatIs()
+      sys.exit(0)
+    elif command in [u'course', u'class']:
+      argument = sys.argv[3].lower()
+      if argument in [u'add', u'create']:
+        doAddCourseParticipant()
+      elif argument in [u'del', u'delete', u'remove']:
+        doDelCourseParticipant()
+      elif argument == u'sync':
+        doSyncCourseParticipants()
+      else:
+        print u'ERROR: %s is not a valid argument for "gam course"' % argument
+        sys.exit(2)
+      sys.exit(0)
+    users = getUsersToModify()
+    command = sys.argv[3].lower()
+    if command == u'print' and len(sys.argv) == 4:
+      for user in users:
+        print user
+      sys.exit(0)
+    try:
+      if (GC_Values[GC_AUTO_BATCH_MIN] > 0) and (len(users) > GC_Values[GC_AUTO_BATCH_MIN]):
+        items = []
+        for user in users:
+          items.append([u'user', user] + sys.argv[3:])
+        run_batch(items)
+        sys.exit(0)
+    except TypeError:
+      pass
+    if command == u'transfer':
+      transferWhat = sys.argv[4].lower()
+      if transferWhat == u'drive':
+        transferDriveFiles(users)
+      elif transferWhat == u'seccals':
+        transferSecCals(users)
+      else:
+        print u'ERROR: %s is not a valid argument for "gam <users> transfer"' % transferWhat
+        sys.exit(2)
+    elif command == u'show':
+      showWhat = sys.argv[4].lower()
+      if showWhat in [u'labels', u'label']:
+        showLabels(users)
+      elif showWhat == u'profile':
+        showProfile(users)
+      elif showWhat == u'calendars':
+        printShowCalendars(users, False)
+      elif showWhat == u'calsettings':
+        showCalSettings(users)
+      elif showWhat == u'drivesettings':
+        printDriveSettings(users)
+      elif showWhat == u'drivefileacl':
+        showDriveFileACL(users)
+      elif showWhat == u'filelist':
+        printDriveFileList(users)
+      elif showWhat == u'filetree':
+        showDriveFileTree(users)
+      elif showWhat == u'fileinfo':
+        showDriveFileInfo(users)
+      elif showWhat == u'filerevisions':
+        showDriveFileRevisions(users)
+      elif showWhat == u'sendas':
+        printShowSendAs(users, False)
+      elif showWhat == u'gmailprofile':
+        showGmailProfile(users)
+      elif showWhat == u'gplusprofile':
+        showGplusProfile(users)
+      elif showWhat in [u'sig', u'signature']:
+        getSignature(users)
+      elif showWhat == u'forward':
+        printShowForward(users, False)
+      elif showWhat in [u'pop', u'pop3']:
+        getPop(users)
+      elif showWhat in [u'imap', u'imap4']:
+        getImap(users)
+      elif showWhat == u'vacation':
+        getVacation(users)
+      elif showWhat in [u'delegate', u'delegates']:
+        printShowDelegates(users, False)
+      elif showWhat in [u'backupcode', u'backupcodes', u'verificationcodes']:
+        doGetBackupCodes(users)
+      elif showWhat in [u'asp', u'asps', u'applicationspecificpasswords']:
+        doGetASPs(users)
+      elif showWhat in [u'token', u'tokens', u'oauth', u'3lo']:
+        printShowTokens(5, u'users', users, False)
+      elif showWhat == u'driveactivity':
+        printDriveActivity(users)
+      elif showWhat in [u'filter', u'filters']:
+        printShowFilters(users, False)
+      elif showWhat in [u'forwardingaddress', u'forwardingaddresses']:
+        printShowForwardingAddresses(users, False)
+      else:
+        print u'ERROR: %s is not a valid argument for "gam <users> show"' % showWhat
+        sys.exit(2)
+    elif command == u'print':
+      printWhat = sys.argv[4].lower()
+      if printWhat == u'calendars':
+        printShowCalendars(users, True)
+      elif printWhat in [u'delegate', u'delegates']:
+        printShowDelegates(users, True)
+      elif printWhat == u'driveactivity':
+        printDriveActivity(users)
+      elif printWhat == u'drivesettings':
+        printDriveSettings(users)
+      elif printWhat == u'filelist':
+        printDriveFileList(users)
+      elif printWhat in [u'filter', u'filters']:
+        printShowFilters(users, True)
+      elif printWhat == u'forward':
+        printShowForward(users, True)
+      elif printWhat in [u'forwardingaddress', u'forwardingaddresses']:
+        printShowForwardingAddresses(users, True)
+      elif printWhat == u'sendas':
+        printShowSendAs(users, True)
+      elif printWhat in [u'token', u'tokens', u'oauth', u'3lo']:
+        printShowTokens(5, u'users', users, True)
+      else:
+        print u'ERROR: %s is not a valid argument for "gam <users> print"' % printWhat
+        sys.exit(2)
+    elif command == u'modify':
+      modifyWhat = sys.argv[4].lower()
+      if modifyWhat in [u'message', u'messages']:
+        doProcessMessages(users, u'modify')
+      else:
+        print u'ERROR: %s is not a valid argument for "gam <users> modify"' % modifyWhat
+        sys.exit(2)
+    elif command == u'trash':
+      trashWhat = sys.argv[4].lower()
+      if trashWhat in [u'message', u'messages']:
+        doProcessMessages(users, u'trash')
+      else:
+        print u'ERROR: %s is not a valid argument for "gam <users> trash"' % trashWhat
+        sys.exit(2)
+    elif command == u'untrash':
+      untrashWhat = sys.argv[4].lower()
+      if untrashWhat in [u'message', u'messages']:
+        doProcessMessages(users, u'untrash')
+      else:
+        print u'ERROR: %s is not a valid argument for "gam <users> untrash"' % untrashWhat
+        sys.exit(2)
+    elif command in [u'delete', u'del']:
+      delWhat = sys.argv[4].lower()
+      if delWhat == u'delegate':
+        deleteDelegate(users)
+      elif delWhat == u'calendar':
+        deleteCalendar(users)
+      elif delWhat == u'label':
+        doDeleteLabel(users)
+      elif delWhat in [u'message', u'messages']:
+        doProcessMessages(users, u'delete')
+      elif delWhat == u'photo':
+        deletePhoto(users)
+      elif delWhat in [u'license', u'licence']:
+        doLicense(users, u'delete')
+      elif delWhat in [u'backupcode', u'backupcodes', u'verificationcodes']:
+        doDelBackupCodes(users)
+      elif delWhat in [u'asp', u'asps', u'applicationspecificpasswords']:
+        doDelASP(users)
+      elif delWhat in [u'token', u'tokens', u'oauth', u'3lo']:
+        doDelTokens(users)
+      elif delWhat in [u'group', u'groups']:
+        deleteUserFromGroups(users)
+      elif delWhat in [u'alias', u'aliases']:
+        doRemoveUsersAliases(users)
+      elif delWhat == u'emptydrivefolders':
+        deleteEmptyDriveFolders(users)
+      elif delWhat == u'drivefile':
+        deleteDriveFile(users)
+      elif delWhat in [u'drivefileacl', u'drivefileacls']:
+        delDriveFileACL(users)
+      elif delWhat in [u'filter', u'filters']:
+        deleteFilters(users)
+      elif delWhat in [u'forwardingaddress', u'forwardingaddresses']:
+        deleteForwardingAddresses(users)
+      elif delWhat == u'sendas':
+        deleteSendAs(users)
+      else:
+        print u'ERROR: %s is not a valid argument for "gam <users> delete"' % delWhat
+        sys.exit(2)
+    elif command == u'add':
+      addWhat = sys.argv[4].lower()
+      if addWhat == u'calendar':
+        addCalendar(users)
+      elif addWhat == u'drivefile':
+        createDriveFile(users)
+      elif addWhat in [u'license', u'licence']:
+        doLicense(users, u'insert')
+      elif addWhat in [u'drivefileacl', u'drivefileacls']:
+        addDriveFileACL(users)
+      elif addWhat in [u'label', u'labels']:
+        doLabel(users, 5)
+      elif addWhat in [u'delegate', u'delegates']:
+        addDelegates(users, 5)
+      elif addWhat in [u'filter', u'filters']:
+        addFilter(users, 5)
+      elif addWhat in [u'forwardingaddress', u'forwardingaddresses']:
+        addForwardingAddresses(users)
+      elif addWhat == u'sendas':
+        addUpdateSendAs(users, 5, True)
+      else:
+        print u'ERROR: %s is not a valid argument for "gam <users> add"' % addWhat
+        sys.exit(2)
+    elif command == u'update':
+      updateWhat = sys.argv[4].lower()
+      if updateWhat == u'calendar':
+        updateCalendar(users)
+      elif updateWhat == u'calattendees':
+        changeCalendarAttendees(users)
+      elif updateWhat == u'photo':
+        doPhoto(users)
+      elif updateWhat in [u'license', u'licence']:
+        doLicense(users, u'patch')
+      elif updateWhat == u'user':
+        doUpdateUser(users, 5)
+      elif updateWhat in [u'backupcode', u'backupcodes', u'verificationcodes']:
+        doGenBackupCodes(users)
+      elif updateWhat == u'drivefile':
+        doUpdateDriveFile(users)
+      elif updateWhat in [u'drivefileacls', u'drivefileacl']:
+        updateDriveFileACL(users)
+      elif updateWhat in [u'label', u'labels']:
+        renameLabels(users)
+      elif updateWhat == u'labelsettings':
+        updateLabels(users)
+      elif updateWhat == u'sendas':
+        addUpdateSendAs(users, 5, False)
+      else:
+        print u'ERROR: %s is not a valid argument for "gam <users> update"' % updateWhat
+        sys.exit(2)
+    elif command in [u'deprov', u'deprovision']:
+      doDeprovUser(users)
+    elif command == u'get':
+      getWhat = sys.argv[4].lower()
+      if getWhat == u'photo':
+        getPhoto(users)
+      elif getWhat == u'drivefile':
+        downloadDriveFile(users)
+      else:
+        print u'ERROR: %s is not a valid argument for "gam <users> get"' % getWhat
+        sys.exit(2)
+    elif command == u'empty':
+      emptyWhat = sys.argv[4].lower()
+      if emptyWhat == u'drivetrash':
+        doEmptyDriveTrash(users)
+      else:
+        print u'ERROR: %s is not a valid argument for "gam <users> empty"' % emptyWhat
+        sys.exit(2)
+    elif command == u'info':
+      infoWhat = sys.argv[4].lower()
+      if infoWhat == u'calendar':
+        infoCalendar(users)
+      elif infoWhat in [u'filter', u'filters']:
+        infoFilters(users)
+      elif infoWhat in [u'forwardingaddress', u'forwardingaddresses']:
+        infoForwardingAddresses(users)
+      elif infoWhat == u'sendas':
+        infoSendAs(users)
+      else:
+        print u'ERROR: %s is not a valid argument for "gam <users> info"' % infoWhat
+        sys.exit(2)
+    elif command == u'profile':
+      doProfile(users)
+    elif command == u'imap':
+      doImap(users)
+    elif command in [u'pop', u'pop3']:
+      doPop(users)
+    elif command == u'sendas':
+      addUpdateSendAs(users, 4, True)
+    elif command == u'language':
+      doLanguage(users)
+    elif command in [u'utf', u'utf8', u'utf-8', u'unicode']:
+      doUTF(users)
+    elif command == u'pagesize':
+      doPageSize(users)
+    elif command == u'shortcuts':
+      doShortCuts(users)
+    elif command == u'arrows':
+      doArrows(users)
+    elif command == u'snippets':
+      doSnippets(users)
+    elif command == u'label':
+      doLabel(users, 4)
+    elif command == u'filter':
+      addFilter(users, 4)
+    elif command == u'forward':
+      doForward(users)
+    elif command in [u'sig', u'signature']:
+      doSignature(users)
+    elif command == u'vacation':
+      doVacation(users)
+    elif command == u'webclips':
+      doWebClips(users)
+    elif command in [u'delegate', u'delegates']:
+      addDelegates(users, 4)
+    else:
+      print u'ERROR: %s is not a valid argument for "gam"' % command
+      sys.exit(2)
+  except IndexError:
+    showUsage()
+    sys.exit(2)
+  except KeyboardInterrupt:
+    sys.exit(50)
+  except socket.error as e:
+    stderrErrorMsg(e)
+    sys.exit(3)
+  except MemoryError:
+    stderrErrorMsg(MESSAGE_GAM_OUT_OF_MEMORY)
+    sys.exit(99)
+  except SystemExit as e:
+    GM_Globals[GM_SYSEXITRC] = e.code
+  return GM_Globals[GM_SYSEXITRC]
+
 def win32_unicode_argv():
   from ctypes import POINTER, byref, cdll, c_int, windll
   from ctypes.wintypes import LPCWSTR, LPWSTR
@@ -9404,578 +11053,11 @@ def win32_unicode_argv():
     # Remove Python executable and commands if present
     sys.argv = argv[argc.value-len(sys.argv):argc.value]
 
-# Main
-reload(sys)
-if hasattr(sys, u'setdefaultencoding'):
-  sys.setdefaultencoding(u'UTF-8')
-try:
+# Run from command line
+if __name__ == "__main__":
+  reload(sys)
+  if hasattr(sys, u'setdefaultencoding'):
+    sys.setdefaultencoding(u'UTF-8')
   if GM_Globals[GM_WINDOWS]:
     win32_unicode_argv() # cleanup sys.argv on Windows
-  SetGlobalVariables()
-  if sys.argv[1].lower() == u'batch':
-    import shlex
-    f = openFile(sys.argv[2])
-    items = []
-    for line in f:
-      argv = shlex.split(line)
-      if not argv:
-        continue
-      cmd = argv[0].strip().lower()
-      if (not cmd) or cmd.startswith(u'#') or ((len(argv) == 1) and (cmd != u'commit-batch')):
-        continue
-      if cmd == u'gam':
-        items.append([arg.encode(GM_Globals[GM_SYS_ENCODING]) for arg in argv[1:]])
-      elif cmd == u'commit-batch':
-        items.append([cmd])
-      else:
-        print u'ERROR: "%s" is not a valid gam command' % line.strip()
-    closeFile(f)
-    run_batch(items)
-    sys.exit(0)
-  elif sys.argv[1].lower() == u'csv':
-    if httplib2.debuglevel > 0:
-      print u'Sorry, CSV commands are not compatible with debug. Delete debug.gam and try again.'
-      sys.exit(1)
-    i = 2
-    filename = sys.argv[i]
-    i += 1
-    f = openFile(filename)
-    csvFile = csv.DictReader(f)
-    if (i == len(sys.argv)) or (sys.argv[i].lower() != u'gam') or (i+1 == len(sys.argv)):
-      print u'ERROR: "gam csv <filename>" should be followed by a full GAM command...'
-      sys.exit(3)
-    i += 1
-    GAM_argv, subFields = getSubFields(i, csvFile.fieldnames)
-    items = []
-    for row in csvFile:
-      items.append(processSubFields(GAM_argv, row, subFields))
-    closeFile(f)
-    run_batch(items)
-    sys.exit(0)
-  elif sys.argv[1].lower() == u'version':
-    doGAMVersion()
-    sys.exit(0)
-  elif sys.argv[1].lower() == u'create':
-    if sys.argv[2].lower() == u'user':
-      doCreateUser()
-    elif sys.argv[2].lower() == u'group':
-      doCreateGroup()
-    elif sys.argv[2].lower() in [u'nickname', u'alias']:
-      doCreateAlias()
-    elif sys.argv[2].lower() in [u'org', u'ou']:
-      doCreateOrg()
-    elif sys.argv[2].lower() == u'resource':
-      doCreateResourceCalendar()
-    elif sys.argv[2].lower() in [u'verify', u'verification']:
-      doSiteVerifyShow()
-    elif sys.argv[2].lower() in [u'schema']:
-      doCreateOrUpdateUserSchema()
-    elif sys.argv[2].lower() in [u'course', u'class']:
-      doCreateCourse()
-    elif sys.argv[2].lower() in [u'transfer', u'datatransfer']:
-      doCreateDataTranfer()
-    elif sys.argv[2].lower() in [u'domain',]:
-      doCreateDomain()
-    elif sys.argv[2].lower() in [u'domainalias', u'aliasdomain']:
-      doCreateDomainAlias()
-    elif sys.argv[2].lower() in [u'admin']:
-      doCreateAdmin()
-    else:
-      print u'ERROR: %s is not a valid argument for "gam create"' % sys.argv[2]
-      sys.exit(2)
-    sys.exit(0)
-  elif sys.argv[1].lower() == u'update':
-    if sys.argv[2].lower() == u'user':
-      doUpdateUser([sys.argv[3],], 4)
-    elif sys.argv[2].lower() == u'group':
-      doUpdateGroup()
-    elif sys.argv[2].lower() in [u'nickname', u'alias']:
-      doUpdateAlias()
-    elif sys.argv[2].lower() in [u'ou', u'org']:
-      doUpdateOrg()
-    elif sys.argv[2].lower() == u'resource':
-      doUpdateResourceCalendar()
-    elif sys.argv[2].lower() == u'instance':
-      doUpdateInstance()
-    elif sys.argv[2].lower() == u'cros':
-      doUpdateCros()
-    elif sys.argv[2].lower() == u'mobile':
-      doUpdateMobile()
-    elif sys.argv[2].lower() in [u'notification', u'notifications']:
-      doUpdateNotification()
-    elif sys.argv[2].lower() in [u'verify', u'verification']:
-      doSiteVerifyAttempt()
-    elif sys.argv[2].lower() in [u'schema', u'schemas']:
-      doCreateOrUpdateUserSchema()
-    elif sys.argv[2].lower() in [u'course', u'class']:
-      doUpdateCourse()
-    elif sys.argv[2].lower() in [u'printer', u'print']:
-      doUpdatePrinter()
-    elif sys.argv[2].lower() in [u'domain',]:
-      doUpdateDomain()
-    elif sys.argv[2].lower() in [u'customer',]:
-      doUpdateCustomer()
-    else:
-      print u'ERROR: %s is not a valid argument for "gam update"' % sys.argv[2]
-      sys.exit(2)
-    sys.exit(0)
-  elif sys.argv[1].lower() == u'info':
-    if sys.argv[2].lower() == u'user':
-      doGetUserInfo()
-    elif sys.argv[2].lower() == u'group':
-      doGetGroupInfo()
-    elif sys.argv[2].lower() in [u'nickname', u'alias']:
-      doGetAliasInfo()
-    elif sys.argv[2].lower() == u'instance':
-      doGetInstanceInfo()
-    elif sys.argv[2].lower() in [u'org', u'ou']:
-      doGetOrgInfo()
-    elif sys.argv[2].lower() == u'resource':
-      doGetResourceCalendarInfo()
-    elif sys.argv[2].lower() == u'cros':
-      doGetCrosInfo()
-    elif sys.argv[2].lower() == u'mobile':
-      doGetMobileInfo()
-    elif sys.argv[2].lower() in [u'notifications', u'notification']:
-      doGetNotifications()
-    elif sys.argv[2].lower() in [u'verify', u'verification']:
-      doGetSiteVerifications()
-    elif sys.argv[2].lower() in [u'schema', u'schemas']:
-      doGetUserSchema()
-    elif sys.argv[2].lower() in [u'course', u'class']:
-      doGetCourseInfo()
-    elif sys.argv[2].lower() in [u'printer', u'print']:
-      doGetPrinterInfo()
-    elif sys.argv[2].lower() in [u'transfer', u'datatransfer']:
-      doGetDataTransferInfo()
-    elif sys.argv[2].lower() in [u'customer',]:
-      doGetCustomerInfo()
-    elif sys.argv[2].lower() in [u'domain',]:
-      doGetDomainInfo()
-    elif sys.argv[2].lower() in [u'domainalias', u'aliasdomain']:
-      doGetDomainAliasInfo()
-    else:
-      print u'ERROR: %s is not a valid argument for "gam info"' % sys.argv[2]
-      sys.exit(2)
-    sys.exit(0)
-  elif sys.argv[1].lower() == u'delete':
-    if sys.argv[2].lower() == u'user':
-      doDeleteUser()
-    elif sys.argv[2].lower() == u'group':
-      doDeleteGroup()
-    elif sys.argv[2].lower() in [u'nickname', u'alias']:
-      doDeleteAlias()
-    elif sys.argv[2].lower() == u'org':
-      doDeleteOrg()
-    elif sys.argv[2].lower() == u'resource':
-      doDeleteResourceCalendar()
-    elif sys.argv[2].lower() == u'mobile':
-      doDeleteMobile()
-    elif sys.argv[2].lower() in [u'notification', u'notifications']:
-      doDeleteNotification()
-    elif sys.argv[2].lower() in [u'schema', u'schemas']:
-      doDelSchema()
-    elif sys.argv[2].lower() in [u'course', u'class']:
-      doDelCourse()
-    elif sys.argv[2].lower() in [u'printer', u'printers']:
-      doDelPrinter()
-    elif sys.argv[2].lower() in [u'domain',]:
-      doDelDomain()
-    elif sys.argv[2].lower() in [u'domainalias', u'aliasdomain']:
-      doDelDomainAlias()
-    elif sys.argv[2].lower() in [u'admin',]:
-      doDelAdmin()
-    else:
-      print u'ERROR: %s is not a valid argument for "gam delete"' % sys.argv[2]
-      sys.exit(2)
-    sys.exit(0)
-  elif sys.argv[1].lower() == u'undelete':
-    if sys.argv[2].lower() == u'user':
-      doUndeleteUser()
-    else:
-      print u'ERROR: %s is not a valid argument for "gam undelete"' % sys.argv[2]
-      sys.exit(2)
-    sys.exit(0)
-  elif sys.argv[1].lower() == u'audit':
-    if sys.argv[2].lower() == u'monitor':
-      if sys.argv[3].lower() == u'create':
-        doCreateMonitor()
-      elif sys.argv[3].lower() == u'list':
-        doShowMonitors()
-      elif sys.argv[3].lower() == u'delete':
-        doDeleteMonitor()
-      else:
-        print u'ERROR: %s is not a valid argument for "gam audit monitor"' % sys.argv[3]
-        sys.exit(2)
-    elif sys.argv[2].lower() == u'activity':
-      if sys.argv[3].lower() == u'request':
-        doRequestActivity()
-      elif sys.argv[3].lower() == u'status':
-        doStatusActivityRequests()
-      elif sys.argv[3].lower() == u'download':
-        doDownloadActivityRequest()
-      elif sys.argv[3].lower() == u'delete':
-        doDeleteActivityRequest()
-      else:
-        print u'ERROR: %s is not a valid argument for "gam audit activity"' % sys.argv[3]
-        sys.exit(2)
-    elif sys.argv[2].lower() == u'export':
-      if sys.argv[3].lower() == u'status':
-        doStatusExportRequests()
-      elif sys.argv[3].lower() == u'watch':
-        doWatchExportRequest()
-      elif sys.argv[3].lower() == u'download':
-        doDownloadExportRequest()
-      elif sys.argv[3].lower() == u'request':
-        doRequestExport()
-      elif sys.argv[3].lower() == u'delete':
-        doDeleteExport()
-      else:
-        print u'ERROR: %s is not a valid argument for "gam audit export"' % sys.argv[3]
-        sys.exit(2)
-    elif sys.argv[2].lower() == u'uploadkey':
-      doUploadAuditKey()
-    else:
-      print u'ERROR: %s is not a valid argument for "gam audit"' % sys.argv[2]
-      sys.exit(2)
-    sys.exit(0)
-  elif sys.argv[1].lower() == u'print':
-    if sys.argv[2].lower() == u'users':
-      doPrintUsers()
-    elif sys.argv[2].lower() == u'nicknames' or sys.argv[2].lower() == u'aliases':
-      doPrintAliases()
-    elif sys.argv[2].lower() == u'groups':
-      doPrintGroups()
-    elif sys.argv[2].lower() in [u'group-members', u'groups-members']:
-      doPrintGroupMembers()
-    elif sys.argv[2].lower() in [u'orgs', u'ous']:
-      doPrintOrgs()
-    elif sys.argv[2].lower() == u'resources':
-      doPrintResourceCalendars()
-    elif sys.argv[2].lower() == u'cros':
-      doPrintCrosDevices()
-    elif sys.argv[2].lower() == u'mobile':
-      doPrintMobileDevices()
-    elif sys.argv[2].lower() in [u'license', u'licenses', u'licence', u'licences']:
-      doPrintLicenses()
-    elif sys.argv[2].lower() in [u'token', u'tokens']:
-      doPrintTokens()
-    elif sys.argv[2].lower() in [u'schema', u'schemas']:
-      doPrintUserSchemas()
-    elif sys.argv[2].lower() in [u'courses', u'classes']:
-      doPrintCourses()
-    elif sys.argv[2].lower() in [u'course-participants', u'class-participants']:
-      doPrintCourseParticipants()
-    elif sys.argv[2].lower() in [u'printers']:
-      doPrintPrinters()
-    elif sys.argv[2].lower() in [u'printjobs']:
-      doPrintPrintJobs()
-    elif sys.argv[2].lower() in [u'transfers', u'datatransfers']:
-      doPrintDataTransfers()
-    elif sys.argv[2].lower() in [u'transferapps']:
-      doPrintTransferApps()
-    elif sys.argv[2].lower() in [u'domains']:
-      doPrintDomains()
-    elif sys.argv[2].lower() in [u'admins']:
-      doPrintAdmins()
-    elif sys.argv[2].lower() in [u'roles', u'adminroles']:
-      doPrintAdminRoles()
-    else:
-      print u'ERROR: %s is not a valid argument for "gam print"' % sys.argv[2]
-      sys.exit(2)
-    sys.exit(0)
-  elif sys.argv[1].lower() in [u'oauth', u'oauth2']:
-    if sys.argv[2].lower() in [u'request', u'create']:
-      doRequestOAuth()
-    elif sys.argv[2].lower() in [u'info', u'verify']:
-      OAuthInfo()
-    elif sys.argv[2].lower() in [u'delete', u'revoke']:
-      doDeleteOAuth()
-    else:
-      print u'ERROR: %s is not a valid argument for "gam oauth"' % sys.argv[2]
-      sys.exit(2)
-    sys.exit(0)
-  elif sys.argv[1].lower() == u'calendar':
-    if sys.argv[3].lower() == u'showacl':
-      doCalendarShowACL()
-    elif sys.argv[3].lower() == u'add':
-      doCalendarAddACL()
-    elif sys.argv[3].lower() in [u'del', u'delete']:
-      doCalendarDelACL()
-    elif sys.argv[3].lower() == u'update':
-      doCalendarUpdateACL()
-    elif sys.argv[3].lower() == u'wipe':
-      doCalendarWipeData()
-    elif sys.argv[3].lower() == u'addevent':
-      doCalendarAddEvent()
-    else:
-      print u'ERROR: %s is not a valid argument for "gam calendar"' % sys.argv[3]
-      sys.exit(2)
-    sys.exit(0)
-  elif sys.argv[1].lower() == u'printer':
-    if sys.argv[3].lower() == u'showacl':
-      doPrinterShowACL()
-    elif sys.argv[3].lower() == u'add':
-      doPrinterAddACL()
-    elif sys.argv[3].lower() in [u'del', u'delete', u'remove']:
-      doPrinterDelACL()
-    elif sys.argv[3].lower() == u'register':
-      doPrinterRegister()
-    else:
-      print u'ERROR: invalid argument for "gam printer..."'
-      sys.exit(2)
-    sys.exit(0)
-  elif sys.argv[1].lower() == u'printjob':
-    if sys.argv[3].lower() == u'delete':
-      doDeletePrintJob()
-    elif sys.argv[3].lower() == u'cancel':
-      doCancelPrintJob()
-    elif sys.argv[3].lower() == u'submit':
-      doPrintJobSubmit()
-    elif sys.argv[3].lower() == u'fetch':
-      doPrintJobFetch()
-    elif sys.argv[3].lower() == u'resubmit':
-      doPrintJobResubmit()
-    else:
-      print u'ERROR: %s is not a valid argument for "gam printjob"' % sys.argv[3]
-      sys.exit(2)
-    sys.exit(0)
-  elif sys.argv[1].lower() == u'report':
-    showReport()
-    sys.exit(0)
-  elif sys.argv[1].lower() == u'whatis':
-    doWhatIs()
-    sys.exit(0)
-  elif sys.argv[1].lower() in [u'course', u'class']:
-    if sys.argv[3].lower() in [u'add', u'create']:
-      doAddCourseParticipant()
-      sys.exit(0)
-    elif sys.argv[3].lower() in [u'del', u'delete', u'remove']:
-      doDelCourseParticipant()
-      sys.exit(0)
-    elif sys.argv[3].lower() == u'sync':
-      doSyncCourseParticipants()
-      sys.exit(0)
-    else:
-      print u'ERROR: %s is not a valid argument for "gam course"' % sys.argv[3]
-      sys.exit(2)
-  users = getUsersToModify()
-  command = sys.argv[3].lower()
-  if command == u'print':
-    for user in users:
-      print user
-    sys.exit(0)
-  try:
-    if (GC_Values[GC_AUTO_BATCH_MIN] > 0) and (len(users) > GC_Values[GC_AUTO_BATCH_MIN]):
-      items = []
-      for user in users:
-        items.append([u'user', user] + sys.argv[3:])
-      run_batch(items)
-      sys.exit(0)
-  except TypeError:
-    pass
-  if command == u'transfer':
-    transferWhat = sys.argv[4].lower()
-    if transferWhat == u'drive':
-      transferDriveFiles(users)
-    elif transferWhat == u'seccals':
-      transferSecCals(users)
-    else:
-      print u'ERROR: %s is not a valid argument for "gam <users> transfer"' % sys.argv[4]
-      sys.exit(2)
-  elif command == u'show':
-    readWhat = sys.argv[4].lower()
-    if readWhat in [u'labels', u'label']:
-      showLabels(users)
-    elif readWhat == u'profile':
-      showProfile(users)
-    elif readWhat == u'calendars':
-      showCalendars(users)
-    elif readWhat == u'calsettings':
-      showCalSettings(users)
-    elif readWhat == u'drivesettings':
-      showDriveSettings(users)
-    elif readWhat == u'drivefileacl':
-      showDriveFileACL(users)
-    elif readWhat == u'filelist':
-      showDriveFiles(users)
-    elif readWhat == u'filetree':
-      showDriveFileTree(users)
-    elif readWhat == u'fileinfo':
-      showDriveFileInfo(users)
-    elif readWhat == u'filerevisions':
-      showDriveFileRevisions(users)
-    elif readWhat == u'sendas':
-      showSendAs(users)
-    elif readWhat == u'gmailprofile':
-      showGmailProfile(users)
-    elif readWhat == u'gplusprofile':
-      showGplusProfile(users)
-    elif readWhat in [u'sig', u'signature']:
-      getSignature(users)
-    elif readWhat == u'forward':
-      getForward(users)
-    elif readWhat in [u'pop', u'pop3']:
-      getPop(users)
-    elif readWhat in [u'imap', u'imap4']:
-      getImap(users)
-    elif readWhat == u'vacation':
-      getVacation(users)
-    elif readWhat in [u'delegate', u'delegates']:
-      getDelegates(users)
-    elif readWhat in [u'backupcode', u'backupcodes', u'verificationcodes']:
-      doGetBackupCodes(users)
-    elif readWhat in [u'asp', u'asps', u'applicationspecificpasswords']:
-      doGetASPs(users)
-    elif readWhat in [u'token', u'tokens', u'oauth', u'3lo']:
-      doGetTokens(users)
-    elif readWhat in [u'driveactivity']:
-      doDriveActivity(users)
-    else:
-      print u'ERROR: %s is not a valid argument for "gam <users> show"' % sys.argv[4]
-      sys.exit(2)
-  elif command == u'modify':
-    if sys.argv[4].lower() in [u'message', u'messages']:
-      doProcessMessages(users, u'modify')
-    else:
-      print u'ERROR: %s is not a valid argument for "gam <users> modify"' % sys.argv[4]
-      sys.exit(2)
-  elif command == u'trash':
-    if sys.argv[4].lower() in [u'message', u'messages']:
-      doProcessMessages(users, u'trash')
-    else:
-      print u'ERROR: %s is not a valid argument for "gam <users> trash"' % sys.argv[4]
-      sys.exit(2)
-  elif command == u'untrash':
-    if sys.argv[4].lower() in [u'message', u'messages']:
-      doProcessMessages(users, u'untrash')
-    else:
-      print u'ERROR: %s is not a valid argument for "gam <users> untrash"' % sys.argv[4]
-      sys.exit(2)
-  elif command == u'delete' or command == u'del':
-    delWhat = sys.argv[4].lower()
-    if delWhat == u'delegate':
-      deleteDelegate(users)
-    elif delWhat == u'calendar':
-      deleteCalendar(users)
-    elif delWhat == u'label':
-      doDeleteLabel(users)
-    elif delWhat in [u'message', u'messages']:
-      doProcessMessages(users, u'delete')
-    elif delWhat == u'photo':
-      deletePhoto(users)
-    elif delWhat in [u'license', u'licence']:
-      doLicense(users, u'delete')
-    elif delWhat in [u'backupcode', u'backupcodes', u'verificationcodes']:
-      doDelBackupCodes(users)
-    elif delWhat in [u'asp', u'asps', u'applicationspecificpasswords']:
-      doDelASP(users)
-    elif delWhat in [u'token', u'tokens', u'oauth', u'3lo']:
-      doDelTokens(users)
-    elif delWhat in [u'group', u'groups']:
-      doRemoveUsersGroups(users)
-    elif delWhat in [u'alias', u'aliases']:
-      doRemoveUsersAliases(users)
-    elif delWhat in [u'emptydrivefolders']:
-      deleteEmptyDriveFolders(users)
-    elif delWhat in [u'drivefile']:
-      deleteDriveFile(users)
-    elif delWhat in [u'drivefileacl', u'drivefileacls']:
-      delDriveFileACL(users)
-    else:
-      print u'ERROR: %s is not a valid argument for "gam <users> delete"' % sys.argv[4]
-      sys.exit(2)
-  elif command == u'add':
-    addWhat = sys.argv[4].lower()
-    if addWhat == u'calendar':
-      addCalendar(users)
-    elif addWhat == u'drivefile':
-      createDriveFile(users)
-    elif addWhat in [u'license', u'licence']:
-      doLicense(users, u'insert')
-    elif addWhat in [u'drivefileacl', u'drivefileacls']:
-      addDriveFileACL(users)
-    elif addWhat in [u'label', u'labels']:
-      doLabel(users, 5)
-    else:
-      print u'ERROR: %s is not a valid argument for "gam <users> add"' % sys.argv[4]
-      sys.exit(2)
-  elif command == u'update':
-    if sys.argv[4].lower() == u'calendar':
-      updateCalendar(users)
-    elif sys.argv[4].lower() == u'calattendees':
-      changeCalendarAttendees(users)
-    elif sys.argv[4].lower() == u'photo':
-      doPhoto(users)
-    elif sys.argv[4].lower() in [u'license', u'licence']:
-      doLicense(users, u'patch')
-    elif sys.argv[4].lower() == u'user':
-      doUpdateUser(users, 5)
-    elif sys.argv[4].lower() in [u'backupcode', u'backupcodes', u'verificationcodes']:
-      doGenBackupCodes(users)
-    elif sys.argv[4].lower() in [u'drivefile']:
-      doUpdateDriveFile(users)
-    elif sys.argv[4].lower() in [u'drivefileacls', u'drivefileacl']:
-      updateDriveFileACL(users)
-    elif sys.argv[4].lower() in [u'label', u'labels']:
-      renameLabels(users)
-    elif sys.argv[4].lower() in [u'labelsettings']:
-      updateLabels(users)
-    else:
-      print u'ERROR: %s is not a valid argument for "gam <users> update"' % sys.argv[4]
-      sys.exit(2)
-  elif command in [u'deprov', u'deprovision']:
-    doDeprovUser(users)
-  elif command == u'get':
-    if sys.argv[4].lower() == u'photo':
-      getPhoto(users)
-    elif sys.argv[4].lower() == u'drivefile':
-      downloadDriveFile(users)
-  elif command == u'profile':
-    doProfile(users)
-  elif command == u'imap':
-    doImap(users)
-  elif command in [u'pop', u'pop3']:
-    doPop(users)
-  elif command == u'sendas':
-    doSendAs(users)
-  elif command == u'language':
-    doLanguage(users)
-  elif command in [u'utf', u'utf8', u'utf-8', u'unicode']:
-    doUTF(users)
-  elif command == u'pagesize':
-    doPageSize(users)
-  elif command == u'shortcuts':
-    doShortCuts(users)
-  elif command == u'arrows':
-    doArrows(users)
-  elif command == u'snippets':
-    doSnippets(users)
-  elif command == u'label':
-    doLabel(users, 4)
-  elif command == u'filter':
-    doFilter(users)
-  elif command == u'forward':
-    doForward(users)
-  elif command in [u'sig', u'signature']:
-    doSignature(users)
-  elif command == u'vacation':
-    doVacation(users)
-  elif command == u'webclips':
-    doWebClips(users)
-  elif command in [u'delegate', u'delegates']:
-    doDelegates(users)
-  else:
-    print u'ERROR: %s is not a valid argument for "gam"' % command
-    sys.exit(2)
-except IndexError:
-  showUsage()
-  sys.exit(2)
-except KeyboardInterrupt:
-  sys.exit(50)
-except socket.error, e:
-  stderrErrorMsg(e)
-  sys.exit(3)
-except MemoryError:
-  stderrErrorMsg(MESSAGE_GAM_OUT_OF_MEMORY)
-  sys.exit(99)
+  sys.exit(ProcessGAMCommand(sys.argv))
diff --git a/src/whatsnew.txt b/src/whatsnew.txt
index d748d769..44219ba3 100644
--- a/src/whatsnew.txt
+++ b/src/whatsnew.txt
@@ -7,25 +7,25 @@ Added arguments to gam info group to suppress aliases listing and include groups
 Added argument to gam print cros to limit number of activeTimeRanges and recentUsers entries
 `gam print cros ... [listlimit <Number>]`
 
-Added argument to `gam <Users> signature` and `gam <Users> vacation` to allow specification of file character set so that extended characters can be read.
+Added argument to `gam <UserTypeEntity> signature` and `gam <UserTypeEntity> vacation` to allow specification of file character set so that extended characters can be read.
 Credit to Steve Main for suggesting the following enhancement.
-Added argument to `gam <Users> signature` and `gam <Users> vacation` to allow pattern substitution in the signature and vacation message.
-`gam <Users> signature <String>|(file <FileName> [charset <Charset>]) (replace <Tag> <String>)*`
-`gam <Users> vacation <TrueValues> subject <String> (message <String>)|(file <FileName> [charset <CharSet>]) (replace <Tag> <String>)*
+Added argument to `gam <UserTypeEntity> signature` and `gam <UserTypeEntity> vacation` to allow pattern substitution in the signature and vacation message.
+`gam <UserTypeEntity> signature <String>|(file <FileName> [charset <Charset>]) (replace <Tag> <String>)*`
+`gam <UserTypeEntity> vacation <TrueValues> subject <String> (message <String>)|(file <FileName> [charset <CharSet>]) (replace <Tag> <String>)*
 	[contactsonly] [domainonly] [startdate <Date>] [enddate <Date>]`
 Every instance of `{<Tag>}` in the signature/message will be replaced by `<String>`. Instances of the form `{RT}...{Text}...{/RT}` will be eliminated
 if there was no `<Tag>` specified that matches `Text` or if a `<Tag>` matching `Text` was specified but the matching `<String>` is empty.
 This is especially useful with CSV files.
 `gam csv Users.csv gam user "~User" signature file SignatureTemplate.txt replace "#User#" "~User" replace "#Title#" "~Title"`
 
-Added argument to `gam <Users> show signature` to format the signature.
-`gam <Users> show signature [format]`
+Added argument to `gam <UserTypeEntity> show signature` to format the signature.
+`gam <UserTypeEntity> show signature [format]`
 
 Added argument to gam add/update calendar to allow specification of event notifications
-`gam <Users> add/update calendar <Calendar> notification email|sms eventcreation|eventchange|eventcancellation|eventresponce|agenda`
+`gam <UserTypeEntity> add/update calendar <Calendar> notification email|sms eventcreation|eventchange|eventcancellation|eventresponce|agenda`
 
 Added option to reminder and notification arguments of update calendar to allowing clearing of reminders/notifications.
-`gam <Users> update calendar <Calendar> [reminder clear] [notification clear]`
+`gam <UserTypeEntity> update calendar <Calendar> [reminder clear] [notification clear]`
 
 Added arguments to `gam print group-members` to allow selecting subsets of groups.
 Added argument to `gam print group-members` to add member full name to output,
@@ -42,10 +42,10 @@ Added argument to `gam print printjobs` and `gam printjob <PrinterID> fetch` to
 `limit <Number>` specifies the maximum number of print jobs to retrieve; defaults to 25, set limit to 0 to retrieve all print jobs.
 
 Credit to Seth Stein for the following enhancements.
-Added argument to `gam <Users> get drivefile` to allow downloading a specific revision of a drive file.
-`gam <Users> get drivefile (id <DriveFileID>)|(query <Query>) [format <FileFormatList>] [targetfolder <FilePath>] [revision <Number>]`
+Added argument to `gam <UserTypeEntity> get drivefile` to allow downloading a specific revision of a drive file.
+`gam <UserTypeEntity> get drivefile (id <DriveFileID>)|(query <Query>) [format <FileFormatList>] [targetfolder <FilePath>] [revision <Number>]`
 Added command to show drive file revisions.
-`gam <Users> show filerevisions <DriveFileID>`
+`gam <UserTypeEntity> show filerevisions <DriveFileID>`
 
 Added argument to `gam print adminroles` to allow uploading to Google Drive.
 `gam print adminroles [todrive]`
@@ -54,16 +54,16 @@ Added `group, groups, mobile` arguments to `gam report`.
 `gam report admin|calendar|calendars|drive|docs|doc|groups|group|logins|login|mobile|tokens|token ...`
 
 Added command to show user Google+ profile.
-`gam <Users> show gplusprofile [todrive]`
+`gam <UserTypeEntity> show gplusprofile [todrive]`
 To enable this command, visit: https://github.com/jay0lee/GAM/wiki/CreatingClientSecretsFile
 In step 3.v, enable the Google+ API
 In step 6.iii.d, add `https://www.googleapis.com/auth/plus.me` to the API scopes - Service Account list, then remove and re-add the authorization.
 
-Added argument to `gam <Users> show labels` to allow seeing message counts for each label.
-`gam <Users> show labels|label [onlyuser] [showcounts]`
+Added argument to `gam <UserTypeEntity> show labels` to allow seeing message counts for each label.
+`gam <UserTypeEntity> show labels|label [onlyuser] [showcounts]`
 
-Added argument to `gam <Users> show fileinfo` to allow field selection.
-`gam <Users> show fileinfo <DriveFileID> [allfields|<DriveFieldName>*]`
+Added argument to `gam <UserTypeEntity> show fileinfo` to allow field selection.
+`gam <UserTypeEntity> show fileinfo <DriveFileID> [allfields|<DriveFieldName>*]`
 
 Added argument to `gam update group` to allow removing members by role.
 `gam update group <Group> clear [members] [managers] [owners]`
@@ -73,12 +73,104 @@ Changed `gam print admins` to include 'id:' in OrgUnitID column as with other `g
 
 Fixed GAM to handle both future date error messages in `gam report`
 
-Fixed `gam <Users> show delegates` to handle Unicode characters in delagator name.
+Fixed `gam <UserTypeEntity> show delegates` to handle Unicode characters in delagator name.
 
-Fixed `gam <Users> get drivefile` to properly handle file extension.
+Fixed `gam <UserTypeEntity> get drivefile` to properly handle file extension.
 
 Fixed `gam create alias <Name> target <Group>`.
 
+2016/07/29
+
+Added command to empty drive drive trash.
+`gam <UserTypeEntity> empty drivetrash`
+
+Added alternative command to add delegates and command to print delegates.
+`gam <UserTypeEntity> add delegate|delegates <UserEntity>`
+`gam <UserTypeEntity> print delegates [todrive]`
+
+Improved Gmail filter processing.
+`gam <UserTypeEntity> [add] filter [from <EmailAddress>] [to <EmailAddress>] [subject <String>] [haswords|query <List>] [nowords|negatedquery <List>] [musthaveattachment|hasattachment] [excludechats] [size larger|smaller <ByteCount>]
+	[label <LabelID>] [important|notimportant] [star] [trash] [markread] [archive] [neverspam] [forward <EmailAddress>]`
+`gam <UserTypeEntity> delete filters <FilterIDEntity>`
+`gam <UserTypeEntity> show filters`
+`gam <UserTypeEntity> info filters <FilterIDEntity>`
+`gam <UserTypeEntity> print filters [todrive]`
+
+Added commands to process Gmail forwarding addresses.
+`gam <UserTypeEntity> add forwardingaddress|forwardingaddresses <EmailAddressEntity>`
+`gam <UserTypeEntity> delete forwardingaddress|forwardingaddresses <EmailAddressEntity>`
+`gam <UserTypeEntity> show forwardingaddress|forwardingaddresses`
+`gam <UserTypeEntity> info forwardingaddress|forwardingaddresses <EmailAddressEntity>`
+`gam <UserTypeEntity> print forwardingaddress|forwardingaddresses [todrive]`
+
+Improved Gmail forward processing.
+`gam <UserTypeEntity> forward <FalseValues>`
+`gam <UserTypeEntity> forward <TrueValues> keep|leaveininbox|archive|delete|trash|markread <EmailAddress>`
+`gam <UserTypeEntity> show forward`
+`gam <UserTypeEntity> print forward [todrive]`
+
+Improved Gmail sendas processing.
+`gam <UserTypeEntity> [add] sendas <EmailAddress> <Name> [replyto <EmailAddress>] [default] [treatasalias <Boolean>] [signature|sig <String>|(file <FileName> [charset <CharSet>]) (replace <REPattern> <String>)*]`
+`gam <UserTypeEntity> update sendas <EmailAddress> [name <Name>] [replyto <EmailAddress>] [default] [treatasalias <Boolean>] [signature|sig <String>|(file <FileName> [charset <CharSet>]) (replace <REPattern> <String>)*]`
+`gam <UserTypeEntity> delete sendas <EmailAddressEntity>`
+`gam <UserTypeEntity> show sendas [format]`
+`gam <UserTypeEntity> info sendas <EmailAddressEntity> [format]`
+`gam <UserTypeEntity> print sendas [todrive]`
+
+Improved Gmail signature processing.
+`gam <UserTypeEntity> signature|sig <String>|(file <FileName> [charset <Charset>]) (replace <Tag> <String>)* [name <String>] [replyto <EmailAddress>] `
+`gam <UserTypeEntity> show signature|sig [format]`
+
+Use Gmail API for POP/IMAP/Vacation processing.
+`gam <UserTypeEntity> imap|imap4 <Boolean> [noautoexpunge] [expungebehavior archive|deleteforever|trash] [maxfoldersize 0|1000|2000|5000|10000]`
+`gam <UserTypeEntity> pop|pop3 <Boolean> [for allmail|newmail|mailfromnowon|fromnowown] [action keep|leaveininbox|archive|delete|trash|markread]`
+`gam <UserTypeEntity> vacation <FalseValues>`
+`gam <UserTypeEntity> vacation <TrueValues> subject <String> (message <String>)|(file <FileName> [charset <CharSet>]) (replace <Tag> <String>)* [html]
+	[contactsonly] [domainonly] [startdate <Date>] [enddate <Date>]`
+`gam <UserTypeEntity> show vacation [format]`
+
+Added command toGet information about a specific calendar.
+`gam <UserTypeEntity> info calendar <EmailAddress>`
+
+Added command to print calendars to CSV file, dropped all arguments from gam show calendars.
+`gam <UserTypeEntity> print calendars [todrive]`
+`gam <UserTypeEntity> show calendars`
+
+Added command to print Gmail Profiles to CSV file, dropped all arguments from gam show gmailprofile.
+`gam <UserTypeEntity> print gmailprofile [todrive]`
+`gam <UserTypeEntity> show gmailprofile`
+
+Added command to print Gplus Profiles to CSV file, dropped all arguments from gam show gplusprofile.
+`gam <UserTypeEntity> print gplusprofile [todrive]`
+`gam <UserTypeEntity> show gplusprofile`
+
+Added command to print user schemas to CSV file, renamed command to display formatted user schemas to gam show schemas.
+`gam print schemas [todrive]`
+`gam show schemas`
+
+Added command to print user access tokens to CSV file.
+`gam <UserTypeEntity> print tokens|token|3lo|oauth [todrive]`
+
+Added arguments to gam info cros to allow specification of desired output fields.
+`gam info cros <CrosDeviceEntity> [nolists] [listlimit <Number>]
+	[basic|full|allfields] <CrOSFieldName>* [fields <CrOSFieldNameList>]`
+
+Added drivedir and targetfolder <FilePath> arguments to gam printjob fetch and gam get photo to
+allow specification of the destination folder for the file retrieved from Google. The default
+location for these commands is the current working directory, drivedir specifies the value of the environment variable GAMDRIVEDIR and
+targetfolder <FilePath> specifies a user-choosen path.
+`gam printjob <PrinterID>|any fetch
+	[olderthan|newerthan <PrintJobAge>] [query <QueryPrintJob>]
+	[status <PrintJobStatus>]
+	[orderby <PrintJobOrderByFieldName> [ascending|descending]]
+	[owner|user <EmailAddress>]
+	[limit <Number>] [drivedir|(targetfolder <FilePath>)]`
+`gam <UserTypeEntity> get photo [drivedir|(targetfolder <FilePath>)]`
+
+Commands that produce CSV file output have been changed to make the leftmost column(s) be the key fields.
+If you have scripts that process the CSV files as flat files, expecting the columns to be in a particular
+order, they will have to be updated. If your scripts process the CSV files by column header, no changes should be required.
+
 GAM 3.65
   -fix vacation issues (Ross)
   -fix Windows path issues (Ross)