Client side code working - #16