Begin adding grid generation support