EdgeBasedNode refactoring

Never mind, I meant to submit a pull request for the develop branch.