Kind of issue: Enhancement R and D Additional context merge of work in #77 and #136 Suggested Labels (If you don't know, that's ok): kind/enhancement