24. Added Grid class