refactoring
Adding first client code