Initial Grid

After refactoriing