That might be better for a different PR though I suppose.