Began to refactor code and created the Client class
Final Refactor using singleton class