Added new object oriented client, half finished