Move a bunch of objects around. Separate search functionality from User object. Remove unnecssary headers.
Make settings default to looking in the environment for account credentials.