Discussed in #97 - breaking out into a separate issue.
Discussed in #97 - breaking out into a separate issue.