Added all the functionality bridging
Merge stuff