@bp323: Happy for that to be a separate ticket that we can tackle once this is all merged. Can you create the ticket?