Dynamic features on Wedges

More or less working... still some work to do