Made a client class instead of storing information in a list