New proposal here - https://docs.google.com/document/d/1EeDSxCk9dN5NqUsvPkjfHuWa1rn0sEpjPiVziksmQVc/edit