Abstracted away Grid creation, added RectangularGrid and ToroidalGrid classes