* Moving to new BuddyClient model