fixed bug with disconnected shelf
starting implementing convolution.
merge conv and master