made grid more object-like