Waiting for  JM review. If he blocks on this I gladly try to lazy load this.