First version of deconvolution #34, need to review design and check