woooooo looks like client provided addresses are a go! Protocol getting a bit fat, tho