This.  I'm hesitant to go near that stack again until I sufficiently review the code.  Samourai wasn't reproducible to build.  Lots of holes in that stack IIRC