Fixed Variables in DrawGrid b/c robert has OCD
Resolved Merge Conflicts