Flexible grid initial commit