New buddy client

let's move this elsewhere and I don't think it shoudl be public?