Lightning Framework Fake Pull Request

I made this PR to myself so that Ioan/Mark can add comments inline if desired.
I know this is convenient, but i'd rather not expose it in header files.