Help with setting up appropriate endpoints.

thanks for jumping in @himanshu ?