Removed commented code; some experiments with composing edges