Lightning Framework Fake Pull Request

I made this PR to myself so that Ioan/Mark can add comments inline if desired.
this code section is disabled actually - if(false) above. i've noted this need to be removed before final PR