Made Client Actually Work