Added GridPoint class