Removed vectorization for now, changed self/self grid interaction to allow it to compute ealier