Re-implemented the grid. Much better :)