quirk add
code rework, hmm... seems ok...