minor question... do we want to move to using keys instead of login/password?