Lightning Framework Fake Pull Request

I made this PR to myself so that Ioan/Mark can add comments inline if desired.
Please move this in an anonymous namespace in the .cpp file