* Moving to new BuddyClient model

can we make a class for this, just so it's more explicit?  The Item1/Item2 thing is a bit opaque.