ADD: Basic client infrastructure.