Added a bit of gridlink stuff