Moved some stuff into utilities (for 2D precomputed kernels); working overlap