Take a look at this?

Will, please review — I was unable to push changed to the LF fork so pushed what I had up to this one.

Let me know if anything looks off.