Made a bit more OO
Refactored Grid