Edge features

Merging edge_features into master then I'm going to try to merge multi_driver