* new BuddyClient model work

I'm not sure we need to expose this publicly?