diff --git a/src/app/app.rs b/src/app/app.rs
index 6dcbf1d..5dd47a2 100644
--- a/src/app/app.rs
+++ b/src/app/app.rs
@@ -10,16 +10,16 @@ use std::{
     time::Duration,
 };
 
-pub struct App {
+pub struct App<'a> {
     pub exit: bool,
     pub view: View,
     pub window_area: Rect,
     pub args: Cli,
-    pub states: Option<GameStates>,
+    pub states: Option<GameStates<'a>>,
     pub audio_tx: Sender<AudioCmd>,
 }
 
-impl App {
+impl<'a> App<'a> {
     pub fn new(args: Cli, audio_tx: Sender<AudioCmd>) -> Self {
         Self {
             exit: false,
@@ -31,11 +31,11 @@ impl App {
         }
     }
 
-    pub fn states(&self) -> Option<&GameStates> {
+    pub fn states_ref(&self) -> Option<&GameStates<'a>> {
         self.states.as_ref()
     }
 
-    pub fn states_mut(&mut self) -> Option<&mut GameStates> {
+    pub fn states_mut(&mut self) -> Option<&mut GameStates<'a>> {
         self.states.as_mut()
     }
 
diff --git a/src/app/keybindings/skirmish.rs b/src/app/keybindings/skirmish.rs
index 044208f..e586b79 100644
--- a/src/app/keybindings/skirmish.rs
+++ b/src/app/keybindings/skirmish.rs
@@ -85,7 +85,7 @@ pub fn skirmish_keybindings(app: &mut App, key_event: &KeyEvent) {
             Action::Space => board.toggle_marking(),
             Action::Backspace => board.undo_marked_cell(),
             Action::Delete => {
-                board.marking_cells = false;
+                board.marked_cells.marking_cells = false;
                 board.clear_marked_cells()
             }
             Action::Tab => {
diff --git a/src/app/state.rs b/src/app/state.rs
index 8eed5ba..5e1c78a 100644
--- a/src/app/state.rs
+++ b/src/app/state.rs
@@ -8,15 +8,15 @@ use crate::{
 use ratatui::layout::Rect;
 
 #[derive(Debug, Clone, PartialEq)]
-pub struct GameStates {
+pub struct GameStates<'a> {
     pub main_menu: MainMenuState,
-    pub skirmish: SkirmishState,
+    pub skirmish: SkirmishState<'a>,
     pub perk_decks: PerkDecksState,
     pub skills_config: SkillsConfigState,
     pub settings: SettingsState,
 }
 
-impl GameStates {
+impl GameStates<'_> {
     pub fn new(args: &Cli, area: &Rect) -> Self {
         Self {
             main_menu: MainMenuState {
diff --git a/src/app/states/skirmish.rs b/src/app/states/skirmish.rs
index 4e89fc0..0d98b81 100644
--- a/src/app/states/skirmish.rs
+++ b/src/app/states/skirmish.rs
@@ -1,15 +1,15 @@
 use crate::app::states::skirmish_states::BoardState;
 
 #[derive(Debug, Clone, PartialEq)]
-pub struct SkirmishState {
+pub struct SkirmishState<'a> {
     pub id: usize,
     pub name: &'static str,
-    pub board: BoardState,
+    pub board: BoardState<'a>,
     pub side_panel: bool,
     pub turn_counter: u64,
 }
 
-impl SkirmishState {
+impl SkirmishState<'_> {
     pub fn tick_update(&mut self) {
         // self.board.advance_turn();
 
diff --git a/src/app/states/skirmish_states/board.rs b/src/app/states/skirmish_states/board.rs
index ed63768..b2a0f23 100644
--- a/src/app/states/skirmish_states/board.rs
+++ b/src/app/states/skirmish_states/board.rs
@@ -3,7 +3,7 @@ use crate::app::{
     states::{
         FocusedCell, Offset,
         skirmish_states::{
-            CellSizes, MoveFocusedCell, Players, ZoomLevel,
+            CellSizes, MarkedCells, MoveFocusedCell, Players, ZoomLevel,
             structures::{BaseBuilding, Ore, Stone, Structures},
             units::{MinerUnit, Units},
         },
@@ -14,7 +14,7 @@ use ratatui::layout::Rect;
 use std::collections::VecDeque;
 
 #[derive(Debug, Clone, PartialEq)]
-pub struct BoardState {
+pub struct BoardState<'a> {
     cells_area: Rect,
     pub cell_width: usize,
     pub cell_height: usize,
@@ -29,11 +29,12 @@ pub struct BoardState {
     focused_cell: FocusedCell,
     player_base_coords: (usize, usize),
     enemy_base_coords: (usize, usize),
-    pub marking_cells: bool,
-    marked_cells: VecDeque<(usize, usize)>,
+    // pub marking_cells: bool,
+    // marked_cells: VecDeque<(usize, usize)>,
+    pub marked_cells: MarkedCells<'a>,
 }
 
-impl BoardState {
+impl BoardState<'_> {
     pub fn new(
         area: &Rect,
         map_width: usize,
@@ -105,8 +106,7 @@ impl BoardState {
             cells.push(rows);
         }
 
-        let marking_cells: bool = false;
-        let marked_cells: VecDeque<(usize, usize)> = VecDeque::new();
+        let marked_cells: MarkedCells<'_> = MarkedCells::new();
 
         Self {
             cells_area,
@@ -123,7 +123,6 @@ impl BoardState {
             focused_cell,
             player_base_coords,
             enemy_base_coords,
-            marking_cells,
             marked_cells,
         }
     }
@@ -136,17 +135,22 @@ impl BoardState {
         &mut self.cells[row][col]
     }
 
-    pub fn get_marked_cells(&self) -> Vec<&CellWidget> {
+    pub fn get_marked_cells_widgets(&self) -> VecDeque<&CellWidget> {
         self.marked_cells
+            .marked_cells
             .iter()
             .map(move |&(row, col)| &self.cells[row][col])
             .collect()
     }
 
-    pub fn toggle_marking(&mut self) {
-        self.marking_cells = !self.marking_cells;
+    pub fn get_marked_cells(&self) -> VecDeque<(usize, usize)> {
+        self.marked_cells.marked_cells.clone()
+    }
 
-        if self.marking_cells {
+    pub fn toggle_marking(&mut self) {
+        self.marked_cells.marking_cells = !self.marked_cells.marking_cells;
+
+        if self.marked_cells.marking_cells {
             self.start_marking_cells();
         } else {
             self.clear_marked_cells();
@@ -160,17 +164,27 @@ impl BoardState {
             cell.set_marked(true);
         }
 
-        self.marked_cells.push_back((new_cell.0, new_cell.1));
+        self.marked_cells
+            .marked_cells
+            .push_back((new_cell.0, new_cell.1));
     }
 
     pub fn undo_marked_cell(&mut self) {
-        if self.marked_cells.len() < 2 {
+        if self.marked_cells.marked_cells.len() < 2 {
             return;
         }
 
-        let old: (usize, usize) = self.marked_cells[self.marked_cells.len() - 1];
-        let new: (usize, usize) = self.marked_cells[self.marked_cells.len() - 2];
-        let old_is_unique: bool = self.marked_cells.iter().filter(|x| **x == old).count() == 1;
+        let old: (usize, usize) =
+            self.marked_cells.marked_cells[self.marked_cells.marked_cells.len() - 1];
+        let new: (usize, usize) =
+            self.marked_cells.marked_cells[self.marked_cells.marked_cells.len() - 2];
+        let old_is_unique: bool = self
+            .marked_cells
+            .marked_cells
+            .iter()
+            .filter(|x| **x == old)
+            .count()
+            == 1;
 
         let old_cell: &mut CellWidget = self.get_mut_cell(old.0, old.1).set_selected(false);
         if old_is_unique {
@@ -179,7 +193,7 @@ impl BoardState {
 
         self.get_mut_cell(new.0, new.1).set_selected(true);
 
-        self.marked_cells.pop_back();
+        self.marked_cells.marked_cells.pop_back();
 
         self.focused_cell.set_focused_cell(new);
     }
@@ -191,15 +205,15 @@ impl BoardState {
         let cell: &mut CellWidget = self.get_mut_cell(row, col);
         cell.set_marked(true);
 
-        self.marked_cells.push_back((row, col));
+        self.marked_cells.marked_cells.push_back((row, col));
     }
 
     pub fn clear_marked_cells(&mut self) {
-        for (row, col) in self.marked_cells.clone() {
+        for (row, col) in self.marked_cells.marked_cells.clone() {
             self.get_mut_cell(row, col).set_marked(false);
         }
 
-        self.marked_cells.clear();
+        self.marked_cells.marked_cells.clear();
     }
 
     fn max_offset(map_size: usize, size: usize) -> usize {
@@ -285,7 +299,7 @@ impl BoardState {
             .set_selected(false);
         self.get_mut_cell(new_cell.0, new_cell.1).set_selected(true);
 
-        if self.marking_cells {
+        if self.marked_cells.marking_cells {
             self.set_marked_cell(new_cell);
         }
     }
diff --git a/src/app/states/skirmish_states/marked_cells.rs b/src/app/states/skirmish_states/marked_cells.rs
new file mode 100644
index 0000000..c8245b9
--- /dev/null
+++ b/src/app/states/skirmish_states/marked_cells.rs
@@ -0,0 +1,19 @@
+use crate::app::states::skirmish_states::units::Units;
+use std::collections::VecDeque;
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct MarkedCells<'a> {
+    pub marking_cells: bool,
+    pub marked_cells: VecDeque<(usize, usize)>,
+    pub selected_unit: &'a Option<Units>,
+}
+
+impl MarkedCells<'_> {
+    pub fn new() -> Self {
+        Self {
+            marking_cells: false,
+            marked_cells: VecDeque::new(),
+            selected_unit: &None,
+        }
+    }
+}
diff --git a/src/app/states/skirmish_states/mod.rs b/src/app/states/skirmish_states/mod.rs
index c2ddbe4..11a1c65 100644
--- a/src/app/states/skirmish_states/mod.rs
+++ b/src/app/states/skirmish_states/mod.rs
@@ -1,6 +1,7 @@
 mod board;
 mod focused_cell;
 mod game_mode;
+mod marked_cells;
 mod offset;
 mod players;
 pub mod structures;
@@ -11,6 +12,7 @@ pub mod zoom_level;
 pub use board::BoardState;
 pub use focused_cell::{FocusedCell, MoveFocusedCell};
 pub use game_mode::GameMode;
+pub use marked_cells::MarkedCells;
 pub use offset::Offset;
 pub use players::Players;
 pub use zoom_level::{CellSizes, ZoomLevel};
diff --git a/src/app/view.rs b/src/app/view.rs
index b7d29b5..a2c8f2a 100644
--- a/src/app/view.rs
+++ b/src/app/view.rs
@@ -13,7 +13,7 @@ pub enum View {
     SkillsConfig,
 }
 
-impl Widget for &mut App {
+impl Widget for &mut App<'_> {
     fn render(self, area: Rect, buf: &mut Buffer)
     where
         Self: Sized,
diff --git a/src/app/views/main_menu.rs b/src/app/views/main_menu.rs
index 8e7a5cf..a3a63b6 100644
--- a/src/app/views/main_menu.rs
+++ b/src/app/views/main_menu.rs
@@ -33,7 +33,9 @@ fn main_menu_layout(area: Rect) -> [Rect; 2] {
 }
 
 pub fn main_menu_view(app: &App, area: Rect, buf: &mut Buffer) {
-    let Some(states) = app.states() else { return };
+    let Some(states) = app.states_ref() else {
+        return;
+    };
 
     let [main_menu_area, keybindings_area] = main_menu_layout(area);
 
diff --git a/src/app/views/skirmish.rs b/src/app/views/skirmish.rs
index c3e61a4..c4f4bb4 100644
--- a/src/app/views/skirmish.rs
+++ b/src/app/views/skirmish.rs
@@ -56,7 +56,10 @@ pub fn skirmish_main_area_layout(area: Rect, side_panel: bool) -> [Rect; 2] {
 }
 
 pub fn skirmish_view(app: &App, area: Rect, buf: &mut Buffer) {
-    let Some(states) = app.states() else { return };
+    let Some(states) = app.states_ref() else {
+        return;
+    };
+
     let board: &BoardState = &states.skirmish.board;
 
     let [title_area, main_area, keybindings_area] = skirmish_layout(area);
diff --git a/src/app/widgets/board.rs b/src/app/widgets/board.rs
index d4bdb85..303d798 100644
--- a/src/app/widgets/board.rs
+++ b/src/app/widgets/board.rs
@@ -7,7 +7,7 @@ use ratatui::{
 use std::rc::Rc;
 
 pub struct BoardWidget<'a> {
-    state: &'a BoardState,
+    state: &'a BoardState<'a>,
 }
 
 impl<'a> BoardWidget<'a> {