Resilient client

Big refactor.