diff --git a/.gitignore b/.gitignore
index ea8c4bf..5b325cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /target
+shell.nix
+.vscode/
\ No newline at end of file
diff --git a/src/activities/house.rs b/src/activities/house.rs
index 8043a2d..849cafd 100644
--- a/src/activities/house.rs
+++ b/src/activities/house.rs
@@ -1,7 +1,97 @@
 use comfy::*;
 
-pub fn draw(_state: &crate::State, _engine: &comfy::EngineContext) {
-	draw_circle(vec2(0.0, 0.0), 0.5, RED, 0);
+#[derive(Debug, Default)]
+pub struct HouseState {
+	grid: Grid,
+	player: Player
 }
 
-pub fn update(_state: &mut crate::State, _engine: &mut comfy::EngineContext) {}
+#[derive(Debug)]
+struct Grid {
+	nodes: Vec<Vec2>,
+	connections: Vec<(usize, usize)>,
+}
+
+#[derive(Debug, Default)]
+struct Player {
+	position: Vec2
+}
+
+impl Default for Grid {
+	fn default() -> Self {
+		Grid::load() //Just for testing purposes
+	}
+}
+
+impl Grid {
+	fn load() -> Self {
+		let mut grid = Self {
+			nodes: vec![
+				vec2(10.0, 0.0),
+				vec2(0.0, 0.0),
+				vec2(0.0, 10.0),
+				vec2(-10.0, 0.0),
+				vec2(10.0, 10.0),
+			],
+			connections: vec![(0, 1), (1, 2), (1, 3), (0, 4), (0, 5), (5, 1), (6, 7)],
+		};
+
+		grid.sanitize();
+
+		grid
+	}
+
+	fn sanitize(&mut self) {
+		let mut len = self.nodes.len();
+		let connections = self.connections.iter().filter(|(conn_i1, conn_i2)| {
+			if conn_i1 >= &mut len || conn_i2 >= &mut len{
+				error!("Connection in grid not possible {:?}", (conn_i1, conn_i2));
+				false
+			} else {
+				true
+			}
+		}).map(|(conn_i1, conn_i2)| (*conn_i1, *conn_i2)).collect();
+
+		self.connections = connections;
+	}
+}
+
+pub fn draw(state: &crate::State, _engine: &comfy::EngineContext) {
+	//Draw Grid
+	for pos in &state.house.grid.nodes {
+		draw_circle(*pos, 0.25, BLUE, 0);
+	}
+	for (conn_i1, conn_i2) in &state.house.grid.connections {
+		let p1 = state.house.grid.nodes.get(*conn_i1);
+		let p2 = state.house.grid.nodes.get(*conn_i2);
+
+		if p1.is_none() || p2.is_none() {
+			error!("Connection in grid not available {:?}", (conn_i1, conn_i2));
+			continue;
+		}
+		
+		draw_line(*p1.unwrap(), *p2.unwrap(), 0.1, BLUE, 0);
+	}
+
+	//Draw Player
+	draw_circle(state.house.player.position, 0.5, RED, 0);
+}
+
+pub fn update(state: &mut crate::State, _engine: &mut comfy::EngineContext) {
+	if is_key_down(KeyCode::Up) {
+		error!("KEY UPPPPPPPPP");
+		state.house.player.position += vec2(0.0, 1.0) * delta();
+	}
+
+	if is_key_down(KeyCode::Down) {
+		state.house.player.position += vec2(0.0, -1.0) * delta();
+	}
+
+	if is_key_down(KeyCode::Right) {
+		state.house.player.position += vec2(1.0, 0.0) * delta();
+	}
+
+	if is_key_down(KeyCode::Left) {
+		state.house.player.position += vec2(-1.0, 0.0) * delta();
+	}
+}
diff --git a/src/activities/mod.rs b/src/activities/mod.rs
index 5d0b11f..906af6e 100644
--- a/src/activities/mod.rs
+++ b/src/activities/mod.rs
@@ -1,8 +1,9 @@
 pub mod house;
 pub mod overworld;
 
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub enum Activity {
+	#[default]
 	House,
-	Overworld
+	Overworld,
 }
diff --git a/src/game.rs b/src/game.rs
index a91fe39..01e7f4d 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -2,19 +2,19 @@ use comfy::*;
 
 use crate::{
 	activities::{house, overworld, Activity},
-	State
+	State,
 };
 
 pub fn update(state: &mut State, engine: &mut EngineContext) {
 	match state.activity {
 		Activity::House => house::update(state, engine),
-		Activity::Overworld => overworld::update(state, engine)
+		Activity::Overworld => overworld::update(state, engine),
 	}
 }
 
 pub fn draw(state: &State, engine: &EngineContext) {
 	match state.activity {
 		Activity::House => house::draw(state, engine),
-		Activity::Overworld => overworld::draw(state, engine)
+		Activity::Overworld => overworld::draw(state, engine),
 	}
 }
diff --git a/src/main.rs b/src/main.rs
index 4992bdf..23315bd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,22 +1,16 @@
 mod activities;
 mod game;
 
+use activities::house::HouseState;
 use activities::Activity;
 use comfy::*;
 
 const GAME_NAME: &str = "Powercreep";
 
-#[derive(Debug)]
+#[derive(Debug, Default)]
 struct State {
-	activity: Activity
-}
-
-impl Default for State {
-	fn default() -> Self {
-		Self {
-			activity: Activity::House
-		}
-	}
+	activity: Activity,
+	house: HouseState,
 }
 
 impl GameLoop for State {