Working version
Added client