added midje plumbing
fixed merge