Big cleanup underway.  Moving non-administrative work out to word functions to avoid overhead for internal functions.