Merge "More grid changes, closer to final specs." into sc-dev