Merging with shooks

YEAH