mass refactoring -- Grid is a type that handles grid logic
Merge pull request #2 from aberke/master

pull from aberke: mass refactoring -- Grid is a type that handles grid logic