* Move to BuddyClient model

same here i think. return something that implements the client protocol