Adding diffusion. WIP2