Improved client implementation

No longer have to manually enter address