Lightning Framework Fake Pull Request

I made this PR to myself so that Ioan/Mark can add comments inline if desired.
This can be private, since we do not have a virtual destructor and do not anticipate inheritance?