Fearing my old hd, I began
Merge git://github.com/taipanjlavinne/laskin