Lightning Framework Fake Pull Request

I made this PR to myself so that Ioan/Mark can add comments inline if desired.
the member variable names don't seem to be aligned with anything (at least not on github.com).