Added basic Grid and Square data structures