Initial move of client into generator