Outside the scope of this pull request, but we probably need to flesh this out a little in future.