Working on calclient integration