Refactor, starting on glacier client.