Refactors client input to now be attached to terminal