diff --git a/assets/unknown-tile.png b/assets/unknown-tile.png
new file mode 100644
index 0000000..f2746d7
Binary files /dev/null and b/assets/unknown-tile.png differ
diff --git a/src/input.rs b/src/input.rs
new file mode 100644
index 0000000..57810ee
--- /dev/null
+++ b/src/input.rs
@@ -0,0 +1,59 @@
+use bevy::{
+    input::{keyboard::KeyCode, Input},
+    prelude::*,
+};
+
+#[derive(Default, Debug)]
+pub struct PlayerInput {
+    pub up:    ButtonState,
+    pub down:  ButtonState,
+    pub left:  ButtonState,
+    pub right: ButtonState,
+}
+
+impl PlayerInput {
+    pub fn clear(&mut self) {
+        self.up.release();
+        self.down.release();
+        self.left.release();
+        self.right.release();
+    }
+
+    pub fn update(&mut self, input: &Input<KeyCode>) {
+        self.clear();
+        self.up.set_from(&input, KeyCode::W);
+        self.up.set_from(&input, KeyCode::Up);
+        self.left.set_from(&input, KeyCode::A);
+        self.left.set_from(&input, KeyCode::Left);
+        self.down.set_from(&input, KeyCode::S);
+        self.down.set_from(&input, KeyCode::Down);
+        self.right.set_from(&input, KeyCode::D);
+        self.right.set_from(&input, KeyCode::Right);
+    }
+
+}
+
+#[derive(Default, Debug)]
+pub struct ButtonState {
+    pub pressed: bool,
+    pub held:    bool,
+}
+
+impl ButtonState {
+    fn release(&mut self) {
+        self.pressed = false;
+        self.held = false;
+    }
+
+    fn set_from(&mut self, input: &Input<KeyCode>, key: KeyCode) {
+        if input.just_pressed(key) {
+            self.pressed = true;
+            self.held = true;
+        }
+
+        if input.pressed(key) {
+            self.held = true;
+        }
+    }
+}
+
diff --git a/src/main.rs b/src/main.rs
index 921be08..ce9fa95 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,12 @@
+mod input;
+
 use bevy::{
     input::{keyboard::KeyCode, Input},
     prelude::*,
 };
 
+use input::{PlayerInput, ButtonState};
+
 #[derive(Component)]
 struct Player;
 
@@ -51,44 +55,29 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 
 }
 
-
-fn map_key(now: &Res<Input<KeyCode>>, key: KeyCode, handler: &mut bool) {
-    *handler = now.just_pressed(key);
-    // if now.just_pressed(key)  { *handler = true; }
-    // if now.just_released(key) { *handler = false; }
+/// player_keyboard_input is a system that maps keyboard key presses to the player's input state
+fn player_keyboard_input(now: Res<Input<KeyCode>>, mut input_state: ResMut<PlayerInput>) {
+    input_state.update(&now);
 }
 
-fn keyboard_input(now: Res<Input<KeyCode>>, mut input_state: ResMut<PlayerInput>) {
-    map_key(&now, KeyCode::W, &mut input_state.up);
-    map_key(&now, KeyCode::Up, &mut input_state.up);
-
-    map_key(&now, KeyCode::A, &mut input_state.left);
-    map_key(&now, KeyCode::Left, &mut input_state.left);
-
-    map_key(&now, KeyCode::S, &mut input_state.down);
-    map_key(&now, KeyCode::Down, &mut input_state.down);
-
-    map_key(&now, KeyCode::D, &mut input_state.right);
-    map_key(&now, KeyCode::Right, &mut input_state.right);
+fn debug_input(now: Res<Input<KeyCode>>, mut debug_state: ResMut<DebugView>) {
 }
 
 fn player_movement(
     mut query: Query<&mut Transform, With<Player>>,
-    input_state: Res<PlayerInput>
+    input_state: Res<PlayerInput>,
+    tile: Res<TileSize>,
 ) {
     let mut player_t = query.single_mut();
-    if input_state.up    { player_t.translation.y += 32.0; }
-    if input_state.down  { player_t.translation.y -= 32.0; }
-    if input_state.left  { player_t.translation.x -= 32.0; }
-    if input_state.right { player_t.translation.x += 32.0; }
+    if input_state.up.pressed    { player_t.translation.y += tile.height as f32; }
+    if input_state.down.pressed  { player_t.translation.y -= tile.height as f32; }
+    if input_state.left.pressed  { player_t.translation.x -= tile.width as f32; }
+    if input_state.right.pressed { player_t.translation.x += tile.width as f32; }
 }
 
 #[derive(Default, Debug)]
-struct PlayerInput {
-    up:    bool,
-    down:  bool,
-    left:  bool,
-    right: bool,
+struct DebugView {
+    enabled: bool,
 }
 
 fn main() {
@@ -96,9 +85,10 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .insert_resource(ClearColor(BACKGROUND_COLOR))
         .insert_resource(PlayerInput::default())
+        .insert_resource(DebugView::default())
         .insert_resource(TileSize{width: TILE_WIDTH, height: TILE_HEIGHT})
         .add_startup_system(setup)
-        .add_system(keyboard_input)
+        .add_system(player_keyboard_input)
         .add_system(player_movement)
         .add_system(bevy::window::close_on_esc)
         .run();