4 files changed, 22 insertions, 15 deletions
diff --git a/src/engine/components/ComponentNames.ts b/src/engine/components/ComponentNames.ts
index bfeb101..032d08a 100644
--- a/src/engine/components/ComponentNames.ts
+++ b/src/engine/components/ComponentNames.ts
@@ -1,7 +1,7 @@
 export namespace ComponentNames {
   export const Sprite = "Sprite";
   export const FacingDirection = "FacingDirection";
-  export const GridPosition = "GridPosition";
+  export const Grid = "Grid";
   export const BoundingBox = "BoundingBox";
   export const Control = "Control";
 }
diff --git a/src/engine/components/Grid.ts b/src/engine/components/Grid.ts
new file mode 100644
index 0000000..0c18a65
--- /dev/null
+++ b/src/engine/components/Grid.ts
@@ -0,0 +1,20 @@
+import { Component, ComponentNames } from ".";
+import { Coord2D, Direction } from "../interfaces";
+
+export class Grid extends Component {
+  public initialized: boolean;
+
+  public gridPosition: Coord2D;
+  public movingDirection: Direction;
+  public pushable: boolean = false;
+
+  constructor(pushable: boolean = false, position: Coord2D = { x: 0, y: 0 }) {
+    super(ComponentNames.Grid);
+
+    this.initialized = false;
+
+    this.gridPosition = position;
+    this.movingDirection = Direction.NONE;
+    this.pushable = pushable;
+  }
+}
diff --git a/src/engine/components/GridPosition.ts b/src/engine/components/GridPosition.ts
deleted file mode 100644
index b5acf3b..0000000
--- a/src/engine/components/GridPosition.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Component, ComponentNames } from ".";
-
-export class GridPosition extends Component {
-  public x: number;
-  public y: number;
-
-  constructor(x: number, y: number) {
-    super(ComponentNames.GridPosition);
-
-    this.x = x;
-    this.y = y;
-  }
-}
diff --git a/src/engine/components/index.ts b/src/engine/components/index.ts
index d3a32ad..e9f8de9 100644
--- a/src/engine/components/index.ts
+++ b/src/engine/components/index.ts
@@ -2,6 +2,6 @@ export * from "./Component";
 export * from "./ComponentNames";
 export * from "./Sprite";
 export * from "./FacingDirection";
-export * from "./GridPosition";
+export * from "./Grid";
 export * from "./BoundingBox";
 export * from "./Control";