Move grid info into struct