@cl334 I pushed this into an MR b/c I was working on 1.0.5. If this work isn't ready yet, we can straighten it out.