More gumby integration
Merge