Stub issue. This is foundational to #37 and the 2.0 part of #44.
Stub issue. This is foundational to #37 and the 2.0 part of #44.