Lightning Framework Fake Pull Request

I made this PR to myself so that Ioan/Mark can add comments inline if desired.
Not sure if you got my other comments, my suggestion would be to simplify the API for this class, for the sake of clarity, and add a bit more complexity at the call site (for the interpolation stuff)