Wedge functionality 80% working