Strike connection and update loop

.cargo/config.toml

···
+[target.x86_64-unknown-linux-gnu]
+linker = "clang"
+rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold"]
+
+[profile.dev.build-override]
+opt-level = 1
+
+[env]
+RUST_LOG = "info"

Cargo.lock

···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
  "parking_lot",
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
  "toml_edit",
 ]
 
···
  "indexmap",
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
  "uuid",
 ]
 
···
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
 
 [[package]]
 name = "blake3"
-version = "1.8.2"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0"
+checksum = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d"
 dependencies = [
  "arrayref",
  "arrayvec",
  "cc",
  "cfg-if",
  "constant_time_eq",
+ "cpufeatures",
 ]
 
 [[package]]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
 
 [[package]]
 name = "cc"
-version = "1.2.51"
+version = "1.2.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203"
+checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
···
 
 [[package]]
 name = "constant_time_eq"
-version = "0.3.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
+checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b"
 
 [[package]]
 name = "constgebra"
···
 
 [[package]]
 name = "darling"
-version = "0.20.11"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
 dependencies = [
  "darling_core",
  "darling_macro",
···
 
 [[package]]
 name = "darling_core"
-version = "0.20.11"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
+checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0"
 dependencies = [
- "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.11"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.112",
+ "syn 2.0.114",
  "unicode-xid",
 ]
 
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff"
+checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41"
 
 [[package]]
 name = "finl_unicode"
···
 
 [[package]]
 name = "glam"
-version = "0.30.9"
+version = "0.30.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd47b05dddf0005d850e5644cae7f2b14ac3df487979dbfff3b56f20b1a6ae46"
+checksum = "19fc433e8437a212d1b6f1e68c7824af3aed907da60afa994e7f542d18d12aa9"
 dependencies = [
  "bytemuck",
  "libm",
···
 
 [[package]]
 name = "indexmap"
-version = "2.12.1"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
 dependencies = [
  "equivalent",
  "hashbrown",
···
 
 [[package]]
 name = "instability"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6778b0196eefee7df739db78758e5cf9b37412268bfa5650bfeed028aed20d9c"
+checksum = "357b7205c6cd18dd2c86ed312d1e70add149aea98e7ef72b9fdf0270e555c11d"
 dependencies = [
  "darling",
  "indoc",
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
 checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 
 [[package]]
+name = "jiff"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e67e8da4c49d6d9909fe03361f9b620f58898859f5c7aded68351e85e71ecf50"
+dependencies = [
+ "jiff-static",
+ "jiff-tzdb-platform",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde_core",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0c84ee7f197eca9a86c6fd6cb771e55eb991632f15f2bc3ca6ec838929e6e78"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.114",
+]
+
+[[package]]
+name = "jiff-tzdb"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68971ebff725b9e2ca27a601c5eb38a4c5d64422c4cbab0c535f248087eda5c2"
+
+[[package]]
+name = "jiff-tzdb-platform"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8"
+dependencies = [
+ "jiff-tzdb",
+]
+
+[[package]]
 name = "jni"
 version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 
 [[package]]
 name = "libc"
-version = "0.2.178"
+version = "0.2.180"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
+checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
 
 [[package]]
 name = "libm"
···
 
 [[package]]
 name = "lru"
-version = "0.16.2"
+version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f"
+checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593"
 dependencies = [
  "hashbrown",
 ]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
 
 [[package]]
 name = "pest"
-version = "2.8.4"
+version = "2.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbcfd20a6d4eeba40179f05735784ad32bdaef05ce8e8af05f180d45bb3e7e22"
+checksum = "2c9eb05c21a464ea704b53158d358a31e6425db2f63a1a7312268b05fe2b75f7"
 dependencies = [
  "memchr",
  "ucd-trie",
···
 
 [[package]]
 name = "pest_derive"
-version = "2.8.4"
+version = "2.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51f72981ade67b1ca6adc26ec221be9f463f2b5839c7508998daa17c23d94d7f"
+checksum = "68f9dbced329c441fa79d80472764b1a2c7e57123553b8519b36663a2fb234ed"
 dependencies = [
  "pest",
  "pest_generator",
···
 
 [[package]]
 name = "pest_generator"
-version = "2.8.4"
+version = "2.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee9efd8cdb50d719a80088b76f81aec7c41ed6d522ee750178f83883d271625"
+checksum = "3bb96d5051a78f44f43c8f712d8e810adb0ebf923fc9ed2655a7f66f63ba8ee5"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.8.4"
+version = "2.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf1d70880e76bdc13ba52eafa6239ce793d85c8e43896507e43dd8984ff05b82"
+checksum = "602113b5b5e8621770cfd490cfd90b9f84ab29bd2b0e49ad83eb6d186cef2365"
 dependencies = [
  "pest",
  "sha2",
···
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.104"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0"
+checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7"
 dependencies = [
  "unicode-ident",
 ]
···
 
 [[package]]
 name = "quote"
-version = "1.0.42"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
+checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a"
 dependencies = [
  "proc-macro2",
 ]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
  "color-eyre",
  "crossterm",
  "futures-concurrency",
+ "jiff",
+ "postcard",
  "rapidhash",
  "ratatui",
  "sachy-mdns",
+ "serde",
  "socket2",
  "striker-proto",
 ]
···
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
 
 [[package]]
 name = "syn"
-version = "2.0.112"
+version = "2.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21f182278bf2d2bcb3c88b1b08a37df029d71ce3d3ae26168e3c653b213b99d4"
+checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
 dependencies = [
  "proc-macro2",
  "quote",
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]
 
 [[package]]
···
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
  "wasm-bindgen-shared",
 ]
 
···
 
 [[package]]
 name = "zerocopy"
-version = "0.8.31"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3"
+checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.31"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
+checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.112",
+ "syn 2.0.114",
 ]

Cargo.toml

···
 sachy-mdns = { git = "https://tangled.org/sachy.dev/sachy-embed-core", package = "sachy-mdns", features = [
     "client",
 ] }
+serde.workspace = true
+postcard.workspace = true
+jiff = "0.2.18"
 
 [lib]
 path = "src/lib.rs"
···
 [[bin]]
 path = "src/main.rs"
 name = "striker"
+
+[profile.release]
+codegen-units = 1
+lto = true
+strip = true
+panic = "abort"

src/device.rs

···
         system::{Commands, Res, ResMut},
         world::DeferredWorld,
     },
+    prelude::Deref,
 };
 use rapidhash::RapidHashSet;
 
···
 
 #[derive(Debug, Component)]
 #[component(immutable)]
-pub struct Timestamp(pub i64);
+pub struct Timestamp(pub jiff::Timestamp);
 
 #[derive(Debug, Component)]
 #[relationship(relationship_target = StormLevels)]
-pub struct Source(pub Entity);
+pub struct StormSource(pub Entity);
 
-#[derive(Component, Debug)]
-#[relationship_target(relationship = Source)]
+#[derive(Component, Debug, Deref)]
+#[relationship_target(relationship = StormSource)]
 pub struct StormLevels {
     levels: Vec<Entity>,
 }

src/net.rs

···
 use core::net::IpAddr;
 use std::{
-    net::{Ipv4Addr, SocketAddr, SocketAddrV4, UdpSocket},
+    io::Read,
+    net::{Ipv4Addr, SocketAddr, SocketAddrV4, TcpStream, UdpSocket},
     time::Duration,
 };
 
···
 
 #[derive(Debug, Resource)]
 pub struct DiscoverResponse(pub Receiver<InstanceDetails>);
+
+#[derive(Debug, Resource)]
+pub struct StrikeUpdates(pub Receiver<striker_proto::StrikerResponse>);
+
+#[derive(Debug, Resource)]
+pub struct StrikeConnect(pub Sender<StrikeConnection>);
+
+pub enum StrikeConnection {
+    Connect(SocketAddr),
+    Disconnect,
+}
 
 pub struct InstanceDetails {
     pub host: String,
···
     Ok(())
 }
 
+pub fn setup_strike_connection(mut commands: Commands) {
+    let io = IoTaskPool::get();
+
+    let (signal_tx, signal_rx) = async_channel::bounded(1);
+    let (resp_tx, resp_rx) = async_channel::bounded(64);
+
+    io.spawn(async move {
+        let mut buf = vec![0u8; 4096];
+
+        while let Ok(StrikeConnection::Connect(addr)) = signal_rx.recv().await {
+            let net_fut = async {
+                loop {
+                    let Ok(stream) = Async::<TcpStream>::connect(addr).await else {
+                        Timer::after(Duration::from_secs(1)).await;
+                        continue;
+                    };
+
+                    while let Ok(read) = stream.read_with(|mut a| a.read(&mut buf)).await {
+                        resp_tx
+                            .send(postcard::from_bytes(&buf[..read]).unwrap())
+                            .await
+                            .ok();
+                    }
+                }
+            };
+
+            let cancel_fut = async {
+                while signal_rx
+                    .recv()
+                    .await
+                    .is_ok_and(|strike| !matches!(strike, StrikeConnection::Disconnect))
+                {
+                }
+            };
+
+            (net_fut, cancel_fut).race().await;
+        }
+    })
+    .detach();
+
+    commands.insert_resource(StrikeConnect(signal_tx));
+    commands.insert_resource(StrikeUpdates(resp_rx));
+}
+
 pub struct NetPlugin;
 
 impl Plugin for NetPlugin {
     fn build(&self, app: &mut bevy::app::App) {
-        app.add_systems(Startup, setup_mdns_task);
+        app.add_systems(Startup, (setup_mdns_task, setup_strike_connection));
     }
 }

src/views.rs

···
 
 impl Plugin for MonitoringViewPlugin {
     fn build(&self, app: &mut bevy::app::App) {
-        app.add_systems(
-            PostUpdate,
-            (
-                monitoring::monitoring_message_handler,
-                monitoring::monitoring_view,
-            )
-                .chain()
-                .run_if(in_state(AppState::Monitoring)),
-        );
+        app.add_systems(OnEnter(AppState::Monitoring), monitoring::enter_monitoring)
+            .add_systems(OnExit(AppState::Monitoring), monitoring::exit_monitoring)
+            .add_systems(
+                PostUpdate,
+                (
+                    monitoring::monitoring_message_handler,
+                    (
+                        monitoring::update_device_data,
+                        monitoring::clear_device_data,
+                    ),
+                    monitoring::monitoring_view,
+                )
+                    .chain()
+                    .run_if(in_state(AppState::Monitoring)),
+            );
     }
 }

src/views/home.rs

···
 use bevy_ratatui::RatatuiContext;
 use ratatui::{
     layout::{Constraint, HorizontalAlignment, Layout},
-    style::Color,
+    style::{Color, Style},
     widgets::{Block, List, ListDirection, ListItem, ListState, Padding, Paragraph},
 };
 
···
     q_devices: Query<(&Name, &DeviceSocket), With<Device>>,
 ) -> Result {
     context.draw(|frame| {
-        let [top, mid, bottom] =
-            Layout::vertical([Constraint::Length(3), Constraint::Fill(1), Constraint::Length(3)]).areas(frame.area());
+        let [top, mid, bottom] = Layout::vertical([
+            Constraint::Length(3),
+            Constraint::Fill(1),
+            Constraint::Length(3),
+        ])
+        .areas(frame.area());
 
         let searching = if is_searching.searching.is_some() {
             "Searching..."
···
             ))
         });
 
-        let help = Paragraph::new("Keys: 'q'/ESC Quit, 's' Toggle Search, UP/DOWN Choose Device(s), ENTER/SPACE Connect to Device").block(
+        let help_text = "Keys: 'q'/ESC Quit, 's' Toggle Search, UP/DOWN Choose Device(s), ENTER/SPACE Connect to Device";
+
+        let help = Paragraph::new(help_text).block(
             Block::bordered()
                 .padding(Padding::horizontal(2))
                 .border_style(Color::LightBlue),
···
 
         let list = List::new(items)
             .highlight_symbol(">> ")
+            .highlight_spacing(ratatui::widgets::HighlightSpacing::Always)
+            .highlight_style(Style::new().bg(Color::DarkGray))
             .direction(ListDirection::TopToBottom)
             .block(
                 Block::bordered()

src/views/monitoring.rs

···
+use core::net::SocketAddr;
+
 use bevy::{
     ecs::{
+        entity::Entity,
         error::Result,
         message::MessageReader,
         name::Name,
         query::With,
+        resource::Resource,
         system::{Commands, Query, Res, ResMut},
         world::World,
     },
     state::state::NextState,
+    time::{Real, Time, Timer},
 };
 use bevy_ratatui::RatatuiContext;
+use jiff::SignedDuration;
 use ratatui::{
     layout::{Constraint, HorizontalAlignment, Layout},
     style::Color,
+    text::{Line, Span},
     widgets::{Block, Padding, Paragraph},
 };
+use striker_proto::{StrikerResponse, Update};
 
 use crate::{
-    device::{ConnectedDevice, Device},
+    device::{
+        ConnectedDevice, Device, DeviceSocket, StormLevel, StormLevels, StormSource, Timestamp,
+    },
     messages::StrikeMessage,
+    net::{StrikeConnect, StrikeConnection, StrikeUpdates},
     state::AppState,
 };
+
+#[derive(Debug, Resource)]
+pub struct DataClear(pub Timer);
 
 pub fn monitoring_message_handler(
     mut strike_reader: MessageReader<StrikeMessage>,
···
     }
 }
 
+pub fn enter_monitoring(
+    connected: Res<ConnectedDevice>,
+    signal: Res<StrikeConnect>,
+    q_devices: Query<&DeviceSocket, With<Device>>,
+    mut commands: Commands,
+) -> Result {
+    let addr = q_devices.get(connected.0)?;
+
+    signal
+        .0
+        .try_send(StrikeConnection::Connect(SocketAddr::new(
+            addr.ip, addr.port,
+        )))?;
+
+    commands.insert_resource(DataClear(Timer::from_seconds(
+        60.0 * 1.0,
+        bevy::time::TimerMode::Repeating,
+    )));
+
+    Ok(())
+}
+
+pub fn exit_monitoring(signal: Res<StrikeConnect>, mut commands: Commands) -> Result {
+    signal.0.try_send(StrikeConnection::Disconnect)?;
+    commands.remove_resource::<DataClear>();
+
+    Ok(())
+}
+
+pub fn clear_device_data(
+    mut timer: ResMut<DataClear>,
+    time: Res<Time<Real>>,
+    mut commands: Commands,
+) {
+    timer.0.tick(time.delta());
+
+    if timer.0.just_finished() {
+        commands.queue(|world: &mut World| {
+            let now = jiff::Timestamp::now();
+            let to_remove: Vec<_> = world
+                .query_filtered::<(Entity, &Timestamp), With<StormLevel>>()
+                .iter(world)
+                .filter_map(|(entity, time)| {
+                    (time.0.duration_since(now) > SignedDuration::from_mins(5)).then_some(entity)
+                })
+                .collect();
+
+            for remove in to_remove {
+                world.despawn(remove);
+            }
+        });
+    }
+}
+
+pub fn update_device_data(
+    updates: Res<StrikeUpdates>,
+    connected: Res<ConnectedDevice>,
+    mut commands: Commands,
+) -> Result {
+    let mut entity = commands.entity(connected.0);
+
+    while let Ok(StrikerResponse::Update(Update::Warning { timestamp, level })) =
+        updates.0.try_recv()
+    {
+        entity.with_related::<StormSource>((
+            Timestamp(jiff::Timestamp::from_second(timestamp)?),
+            StormLevel(level),
+        ));
+    }
+
+    Ok(())
+}
+
 pub fn monitoring_view(
     mut context: ResMut<RatatuiContext>,
     connected: Res<ConnectedDevice>,
-    q_devices: Query<&Name, With<Device>>,
+    q_devices: Query<(&Name, Option<&StormLevels>), With<Device>>,
+    q_levels: Query<(&Timestamp, &StormLevel)>,
 ) -> Result {
     context.draw(|frame| {
-        let [top, bottom] =
-            Layout::vertical([Constraint::Length(3), Constraint::Fill(1)]).areas(frame.area());
+        let [top, mid, bottom] = Layout::vertical([
+            Constraint::Length(3),
+            Constraint::Fill(1),
+            Constraint::Length(3),
+        ])
+        .areas(frame.area());
 
-        let device = q_devices.get(connected.0).unwrap();
+        let [left, center, right] = Layout::horizontal([
+            Constraint::Fill(1),
+            Constraint::Fill(1),
+            Constraint::Fill(1),
+        ])
+        .areas(top);
+
+        let (device, children) = q_devices.get(connected.0).unwrap();
+
+        let latest = children.and_then(|c| c.last().copied().and_then(|a| q_levels.get(a).ok()));
 
-        let paragraph = Paragraph::new(device.as_str()).block(
+        let name = Paragraph::new(device.as_str()).block(
             Block::bordered()
                 .padding(Padding::horizontal(2))
                 .title("Device")
···
                 .border_style(Color::LightGreen),
         );
 
+        let timestamp = Paragraph::new(Line::from_iter(
+            latest.map(|(t, _)| Span::from(format!("{}", t.0))),
+        ))
+        .block(
+            Block::bordered()
+                .padding(Padding::horizontal(2))
+                .title("Timestamp")
+                .title_alignment(HorizontalAlignment::Center)
+                .border_style(Color::LightGreen),
+        );
+
+        let warn_level = Paragraph::new(Line::from_iter(
+            Some(Span::raw("Level: "))
+                .into_iter()
+                .chain(latest.map(|(_, s)| Span::from(format!("{}", s.0)))),
+        ))
+        .block(
+            Block::bordered()
+                .padding(Padding::horizontal(2))
+                .title("Storm Warning")
+                .title_alignment(HorizontalAlignment::Center)
+                .border_style(Color::LightGreen),
+        );
+
         let block = Block::bordered()
             .title("Details")
             .padding(Padding::new(2, 2, 1, 1))
             .border_style(Color::LightGreen);
 
-        frame.render_widget(paragraph, top);
-        frame.render_widget(block, bottom);
+        let help = Paragraph::new("Keys: 'q'/ESC Quit, BACKSPACE Return to Device select").block(
+            Block::bordered()
+                .padding(Padding::horizontal(2))
+                .border_style(Color::LightGreen),
+        );
+
+        frame.render_widget(name, left);
+        frame.render_widget(timestamp, center);
+        frame.render_widget(warn_level, right);
+        frame.render_widget(block, mid);
+        frame.render_widget(help, bottom);
     })?;
 
     Ok(())