Edges

Hey, I have created a new branch with the same changes - please merge when you can