WIP ENH: Add deconvolution
FIX: qa