Wayward Endpoints

Apologies for the trouble, @Tim_Green

Please see our updates on this here: