Started refactoring into OO. List of clients is first.