Refactor Client to not handle token initiation or creation