Temporarily assigning all stabs to Haddock
Merge branch 'puzzle'