Adding client code - archived some test code