Prototype / WIP for SPARK-3215.