Another patch from Chris Moore implementing two more grid types, both