Sorta progress on this.