Whatever we end up doing for #30 will require bugfixes from this issue.
Whatever we end up doing for #30 will require bugfixes from this issue.