Added grid class, untested