Endpoint rewrite, work in progress. Synchronous pipeline changes.