diff --git a/src/game/net.rs b/src/game/net.rs
index 2c68886..5eb3538 100644
--- a/src/game/net.rs
+++ b/src/game/net.rs
@@ -2,28 +2,20 @@ use bevy::prelude::*;
 
 use crate::net::prelude::*;
 
-pub fn handle_new_peer(new_peers: Query<&PeerID, Added<Peer>>) {
-    for peer in new_peers {
-        info!("Peer {} was added", peer.id);
-    }
+pub fn handle_new_peer(add: On<Add, PeerID>, peers: Query<&PeerID>) -> Result {
+    let peer = peers.get(add.entity)?;
+    info!("Game: Peer {} was added", peer.id);
+    Ok(())
 }
 
-pub fn handle_deleted_peer(
-    mut old_peers: RemovedComponents<Peer>,
-    peers: Query<&PeerID>,
-) -> Result {
-    for entity in old_peers.read() {
-        if let Ok(peer) = peers.get(entity) {
-            info!("Peer {} was removed", peer.id);
-        } else {
-            info!("Peer {} was removed", entity);
-        }
-    }
+pub fn handle_deleted_peer(remove: On<Remove, PeerID>, peers: Query<&PeerID>) -> Result {
+    let peer = peers.get(remove.entity)?;
+    info!("Game: Peer {} was removed", peer.id);
     Ok(())
 }
 
 pub fn handle_incoming_packets(mut packets: MessageReader<InboundPacket>) {
     for InboundPacket(packet) in packets.read() {
-        info!("Packet received: {:?}", packet.message);
+        info!("Game: Packet received: {:?}", packet.message);
     }
 }
diff --git a/src/game/plugin.rs b/src/game/plugin.rs
index a7fdf48..586dd48 100644
--- a/src/game/plugin.rs
+++ b/src/game/plugin.rs
@@ -74,20 +74,13 @@ impl Plugin for GamePlugin {
         )
         .add_systems(
             OnEnter(AppState::InGame),
-            (
-                setup_from_seed,
-                (setup_player, setup_balls, setup_walls).after(setup_from_seed),
-            ),
+            (setup_from_seed, (setup_player, setup_balls, setup_walls)).chain(),
         )
         .add_systems(
             FixedUpdate,
             (
                 check_for_seed.run_if(in_state(AppState::Loading)),
-                (
-                    handle_new_peer,
-                    handle_deleted_peer,
-                    handle_incoming_packets,
-                ),
+                handle_incoming_packets,
             ),
         )
         .add_systems(
@@ -103,7 +96,9 @@ impl Plugin for GamePlugin {
                 ),
                 quit.run_if(input_pressed(KeyCode::KeyQ)),
             ),
-        );
+        )
+        .add_observer(handle_new_peer)
+        .add_observer(handle_deleted_peer);
 
         match self.source {
             DataSource::Address(peer) => {
diff --git a/src/game/ui.rs b/src/game/ui.rs
index 60f17a1..a809f29 100644
--- a/src/game/ui.rs
+++ b/src/game/ui.rs
@@ -104,7 +104,7 @@ pub struct PotentialPeerUI;
 pub fn setup_potential_peer_ui(mut commands: Commands) {
     commands
         .spawn((
-            Text::new("Potential peers:"),
+            Text::new("Potential peers:\n"),
             Node {
                 position_type: PositionType::Absolute,
                 bottom: Val::Px(5.0),
diff --git a/src/net/distribution.rs b/src/net/distribution.rs
index d4d285b..70f2061 100644
--- a/src/net/distribution.rs
+++ b/src/net/distribution.rs
@@ -2,32 +2,51 @@ use bevy::prelude::*;
 
 use super::{
     packet::{InboundPacket, OutboundPacket, Packet},
-    peer::{Peer, PeerID},
+    peer::PeerID,
 };
 
+#[derive(Component)]
+pub struct PeerOwned;
+
 fn spawner<T: TryFrom<Vec<u8>> + Component>(
     mut inbound: MessageReader<InboundPacket>,
     mut commands: Commands,
 ) {
     for InboundPacket(packet) in inbound.read() {
-        if let Ok(entity) = T::try_from(packet.message.clone()) {
-            commands.spawn(entity);
+        if let Ok(component) = T::try_from(packet.message.clone()) {
+            commands.spawn((component, PeerOwned));
         }
     }
 }
 
-fn sender<T: Into<Vec<u8>> + Component + Clone>(
-    peers: Query<&PeerID, Added<Peer>>,
-    entities: Query<&T>,
+fn new_peer<T: Into<Vec<u8>> + Component + Clone>(
+    add: On<Add, PeerID>,
+    peers: Query<&PeerID>,
+    components: Query<&T, Without<PeerOwned>>,
+    mut outbound: MessageWriter<OutboundPacket>,
+) -> Result {
+    let peer = peers.get(add.entity)?;
+    for component in components {
+        outbound.write(Packet::create(component.clone().into(), peer.id));
+    }
+    Ok(())
+}
+
+fn new_entity<T: Into<Vec<u8>> + Component + Clone>(
+    add: On<Add, T>,
+    peers: Query<&PeerID>,
+    components: Query<&T, Without<PeerOwned>>,
     mut outbound: MessageWriter<OutboundPacket>,
 ) {
-    for peer in peers {
-        for entity in entities {
-            outbound.write(Packet::create((*entity).clone().into(), peer.id));
+    if let Ok(component) = components.get(add.entity) {
+        for peer in peers {
+            outbound.write(Packet::create(component.clone().into(), peer.id));
         }
     }
 }
 
 pub fn distribution_plugin<T: Into<Vec<u8>> + TryFrom<Vec<u8>> + Component + Clone>(app: &mut App) {
-    app.add_systems(FixedUpdate, (sender::<T>, spawner::<T>));
+    app.add_systems(FixedUpdate, spawner::<T>)
+        .add_observer(new_peer::<T>)
+        .add_observer(new_entity::<T>);
 }
diff --git a/src/net/heartbeat.rs b/src/net/heartbeat.rs
index 0d2f279..3e2003e 100644
--- a/src/net/heartbeat.rs
+++ b/src/net/heartbeat.rs
@@ -11,11 +11,9 @@ use super::{
     queues::NetworkSend,
 };
 
-const PING_FREQUENCY: Duration = Duration::from_secs(3);
-const MISSED_PINGS: u32 = 3;
+pub const PING_FREQUENCY: Duration = Duration::from_secs(1);
+const MISSED_PINGS: u32 = 5;
 
-// TODO: Perhaps this needs a state rethink, is Single/Multiplayer actually useful vs Disconnected, Connecting, Connected?
-// Would also help to state-scope some of these things, like InitialAddresses vs PeerMap
 pub fn heartbeat(
     peers: Query<(&PeerID, &PeerSendTiming)>,
     time: Res<Time>,
@@ -44,34 +42,16 @@ pub fn timeout(
     }
 }
 
-#[derive(Debug, Resource)]
-pub struct PotentialPeerTimer {
-    timer: Timer,
-}
-
-impl Default for PotentialPeerTimer {
-    fn default() -> Self {
-        Self {
-            timer: Timer::new(PING_FREQUENCY, TimerMode::Repeating),
-        }
-    }
-}
-
 pub fn ping_potential_peers(
-    mut timer: ResMut<PotentialPeerTimer>,
-    time: Res<Time>,
     peers: Res<PotentialPeers>,
     to_socket: Res<NetworkSend>,
     config: Res<Config>,
 ) -> Result {
-    timer.timer.tick(time.delta());
-    if timer.timer.is_finished() {
-        for peer in &peers.addresses {
-            to_socket.send(
-                format_message(&Vec::new(), PacketType::Peer, config.id),
-                *peer,
-            )?;
-        }
+    for peer in &peers.addresses {
+        to_socket.send(
+            format_message(&Vec::new(), PacketType::Peer, config.id),
+            *peer,
+        )?;
     }
     Ok(())
 }
diff --git a/src/net/peer.rs b/src/net/peer.rs
index 90aef23..3b7bbfc 100644
--- a/src/net/peer.rs
+++ b/src/net/peer.rs
@@ -210,11 +210,23 @@ pub fn handle_peer_change(
                 } else {
                     warn!("Peer {} doesn't exist (just added?)", change.peer);
                 }
+                potential_peers.addresses.remove(&addr);
             }
             // Peer deletion
             (Some(entity), None) => {
                 commands.get_entity(*entity)?.despawn();
-                peer_map.remove(&change.peer);
+                if let Ok(peer) = peers.get(*entity) {
+                    potential_peers.addresses.insert(peer.addr.into());
+                } else {
+                    warn!(
+                        "Peer {} could not be saved as a potential peer",
+                        change.peer
+                    )
+                }
+                peer_map.remove(&change.peer).ok_or(format!(
+                    "Peer {} could not be removed from the peer map",
+                    change.peer
+                ))?;
             }
             // Peer addition
             (None, Some(addr)) => {
@@ -230,13 +242,11 @@ pub fn handle_peer_change(
                         ))
                         .id(),
                 );
+                potential_peers.addresses.remove(&addr);
             }
             // Double peer deletion
             (None, None) => warn!("Peer {} already deleted", change.peer),
         }
-        if let Some(addr) = change.addr {
-            potential_peers.addresses.remove(&addr);
-        }
     }
     Ok(())
 }
diff --git a/src/net/plugin.rs b/src/net/plugin.rs
index f825e56..ca7aba1 100644
--- a/src/net/plugin.rs
+++ b/src/net/plugin.rs
@@ -1,9 +1,9 @@
 use std::net::SocketAddr;
 
-use bevy::prelude::*;
+use bevy::{prelude::*, time::common_conditions::on_timer};
 
 use super::{
-    heartbeat::{PotentialPeerTimer, heartbeat, ping_potential_peers, timeout},
+    heartbeat::{PING_FREQUENCY, heartbeat, ping_potential_peers, timeout},
     io::{Config, handle_network_input, handle_network_output},
     packet::{InboundPacket, OutboundPacket},
     peer::{
@@ -39,12 +39,16 @@ impl Plugin for NetIOPlugin {
         )
         .add_systems(
             FixedUpdate,
-            (heartbeat, timeout, handle_new_peer, ping_potential_peers),
+            (
+                heartbeat,
+                timeout,
+                handle_new_peer,
+                ping_potential_peers.run_if(on_timer(PING_FREQUENCY)),
+            ),
         )
         .add_systems(FixedPostUpdate, handle_network_output)
         .init_resource::<Config>()
         .init_resource::<PeerMap>()
-        .init_resource::<PotentialPeerTimer>()
         .insert_resource(PotentialPeers::new(self.initial_peers.clone()))
         .add_message::<PeerChangeMessage>()
         .add_message::<InboundPacket>()