Lightning Framework Fake Pull Request

I made this PR to myself so that Ioan/Mark can add comments inline if desired.
This method and the next one can probably be eliminated.