That's easy enough to do. I'd like to do that *after* this PR and the previews-refactor have gone trough though as there are a bunch of changes in there that I'd like to re-use.