Added further methods for grid, and tests