Refactor client, add logged_in? method