merge of basicClient and secureClient (now the secure can functions as nonsecure)
- still needs to add the newest functions of the basicClient