* Move to BuddyClient model

We also need to remove this as BPUser is going away. I am happy to tackle that though as part of "the next phase"