Added Client to project. Closed #19