lotsa work on consuming/offer following from the client side
after client/master work merge