this would be nice, trying it after this has merged.