Moved Grid proxy stuff to separate file.