almost there with grid changes