diff --git a/Cargo.lock b/Cargo.lock
index 6fc6b84..9ef0a43 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7,8 +7,10 @@ name = "Flower"
 version = "0.1.0"
 dependencies = [
  "bevy",
+ "bevy-inspector-egui",
  "bevy_egui 0.27.0",
  "bevy_pancam",
+ "bevy_vector_shapes",
  "meval",
 ]
 
@@ -179,6 +181,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "any_vec"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e78f17bacc1bc7b91fef7b1885c10772eb2b9e4e989356f6f0f6a972240f97cd"
+
 [[package]]
 name = "approx"
 version = "0.5.1"
@@ -324,6 +332,48 @@ dependencies = [
  "bevy_internal",
 ]
 
+[[package]]
+name = "bevy-inspector-egui"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a437cb56d4ca4d3b770889e0bd9c464cfd8e68ef370e232bd39cb4f40d880a7f"
+dependencies = [
+ "bevy-inspector-egui-derive",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_core_pipeline",
+ "bevy_ecs",
+ "bevy_egui 0.27.0",
+ "bevy_hierarchy",
+ "bevy_log",
+ "bevy_math",
+ "bevy_pbr",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_time",
+ "bevy_utils",
+ "bevy_window",
+ "egui 0.27.2",
+ "egui-dropdown",
+ "fuzzy-matcher",
+ "image 0.24.9",
+ "once_cell",
+ "pretty-type-name",
+ "smallvec",
+]
+
+[[package]]
+name = "bevy-inspector-egui-derive"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "975d905908c2d621b5a55a6925ac331feac19df430e4c8818b35ef1b95142b14"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.61",
+]
+
 [[package]]
 name = "bevy_a11y"
 version = "0.13.2"
@@ -1064,6 +1114,20 @@ dependencies = [
  "syn 2.0.61",
 ]
 
+[[package]]
+name = "bevy_vector_shapes"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9db0755f3ecacdca38e1add345b1838eba81bd21714fbdbc1966ea28a5219ca6"
+dependencies = [
+ "any_vec",
+ "bevy",
+ "bitfield",
+ "bitflags 2.5.0",
+ "smallvec",
+ "wgpu",
+]
+
 [[package]]
 name = "bevy_window"
 version = "0.13.2"
@@ -1141,6 +1205,12 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
+[[package]]
+name = "bitfield"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -1685,6 +1755,15 @@ dependencies = [
  "nohash-hasher",
 ]
 
+[[package]]
+name = "egui-dropdown"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240e9423d44c6fd18a72208b442b1101ac871f9636c06d30cc6555d125f57db0"
+dependencies = [
+ "egui 0.27.2",
+]
+
 [[package]]
 name = "either"
 version = "1.11.0"
@@ -1957,6 +2036,15 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "fuzzy-matcher"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
+dependencies = [
+ "thread_local",
+]
+
 [[package]]
 name = "gethostname"
 version = "0.4.3"
@@ -3055,6 +3143,12 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
 
+[[package]]
+name = "pretty-type-name"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f73cdaf19b52e6143685c3606206e114a4dfa969d6b14ec3894c88eb38bd4b"
+
 [[package]]
 name = "proc-macro-crate"
 version = "3.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 9ff0f3f..3e26b2f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,6 +20,8 @@ bevy = { version = "0.13.2" }
 bevy_egui = "0.27"
 bevy_pancam = { version = "0.11.1", features = ["bevy_egui"] }
 meval = "0.2"
+bevy_vector_shapes = "0.7.0"
+bevy-inspector-egui = "0.24"
 
 [features]
 block_input = ["bevy_pancam/bevy_egui"]
\ No newline at end of file
diff --git a/src/flower.rs b/src/flower.rs
index 29f3283..b1624d2 100644
--- a/src/flower.rs
+++ b/src/flower.rs
@@ -1,7 +1,8 @@
 use std::{f32::consts::PI, ops::Deref};
-use bevy::{prelude::*, sprite::{Mesh2dHandle, MaterialMesh2dBundle}};
+use bevy::{prelude::*, render::{render_resource::encase::rts_array::Truncate}, sprite::{MaterialMesh2dBundle, Mesh2dHandle}};
+use bevy_vector_shapes::{painter::{ShapeCommands, ShapePainter}, shapes::{LinePainter, LineSpawner}};
 
-use crate::{constants::PHI, ui::UiState};
+use crate::{constants::PHI, ui::UiState, Callback, FlowerComponent};
 
 pub struct FlowerSeedPlugin;
 
@@ -9,8 +10,8 @@ impl Plugin for FlowerSeedPlugin {
     fn build(&self, app: &mut App) {
         app
             .init_resource::<SeedSettings>()
-            .add_systems(Startup, spawn_initial_flowers)
-            .add_systems(Update, animate_flowers);
+            .add_systems(Startup, (register_systems, spawn_flower_seeds))
+            .add_systems(Update, animate_flower_seeds);
     }
 }
 
@@ -25,13 +26,15 @@ pub struct SeedSettings {
     pub radius: f32,
     pub amount: i32,
     pub color: Color,
+    pub material_handle: Option<Handle<ColorMaterial>>,
+    pub mesh_handle: Option<Mesh2dHandle>
     
 }
 
 impl Default for SeedSettings {
     
     fn default() -> Self {
-        Self { rotation: 0., distance: 4.0, radius: 4.0, amount: 50, color: Color::ORANGE}
+        Self { rotation: 0., distance: 4.0, radius: 4.0, amount: 50, color: Color::ORANGE, material_handle: None, mesh_handle: None }
     }
     
 }
@@ -39,11 +42,22 @@ impl Default for SeedSettings {
 impl SeedSettings {
         
     pub fn default_petal() -> Self {
-        Self { rotation: 0., distance: 50.0, radius: 4.0, amount: 1, color: Color::ORANGE}        
+        Self { rotation: 0., distance: 50.0, radius: 4.0, amount: 1, color: Color::ORANGE, material_handle: None, mesh_handle: None }        
     }
     
 }
 
+#[derive(Component)]
+pub struct ResetFlowerSeeds;
+
+fn register_systems(
+    world: &mut World
+) {
+    let spawn_id = world.register_system(spawn_flower_seeds);
+    world.spawn((Callback(spawn_id), ResetFlowerSeeds));
+}
+
+/*
 fn spawn_initial_flowers(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
@@ -51,53 +65,74 @@ fn spawn_initial_flowers(
     seed_settings: Res<SeedSettings>
 ) {
     spawn_flowers(&mut commands, &mut meshes, &mut materials, seed_settings.deref());
-}
+}*/
 
-fn animate_flowers(
+fn animate_flower_seeds(
     mut commands: Commands,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<ColorMaterial>>,
     mut seed_settings: ResMut<SeedSettings>,
     ui_state: Res<UiState>,
     time: Res<Time>,  
-    flowers: Query<Entity, With<FlowerSeed>>,
+    reset_seeds: Query<&Callback, With<ResetFlowerSeeds>>
 ) {
     if !ui_state.animate {
         return;
     }
     seed_settings.rotation = seed_settings.rotation + (ui_state.step_size * time.delta_seconds());
-    clear_flowers(&mut commands, flowers);
-    spawn_flowers(&mut commands, &mut meshes, &mut materials, seed_settings.deref());
+    commands.run_system(reset_seeds.single().0);
 }
 
-pub fn spawn_flowers(
-    commands: &mut Commands,
-    meshes: &mut ResMut<Assets<Mesh>>,
-    materials: &mut ResMut<Assets<ColorMaterial>>,
-    settings: &SeedSettings
+fn spawn_flower_seeds(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<ColorMaterial>>,
+    mut settings: ResMut<SeedSettings>,
+    flowers: Query<Entity, With<FlowerComponent>>
 ) {    
-
+    for e in &flowers {
+        commands.entity(e).despawn_recursive();
+    }
+    if settings.mesh_handle.is_none() {
+        settings.mesh_handle = Some(Mesh2dHandle(meshes.add(Circle { radius: settings.radius })))
+    }
+    if settings.material_handle.is_none() {
+        settings.material_handle = Some(materials.add(settings.color));
+    }
     for i in 1..settings.amount+1  {
         let angle = 2.0 * PI * settings.rotation * (i as f32);
         let radius = 5.0 * (i as f32).sqrt(); 
         let x = angle.cos() * radius * settings.distance; 
         let y = angle.sin() * radius * settings.distance;
-    
         commands.spawn(MaterialMesh2dBundle {
-            mesh: Mesh2dHandle(meshes.add(Circle { radius: settings.radius })), 
-            material: materials.add(settings.color),
+            mesh: settings.mesh_handle.clone().unwrap().clone(), 
+            material: settings.material_handle.clone().unwrap(),
             transform: Transform::from_xyz(x, y, 0.0),
             ..Default::default()
         })
-        .insert(FlowerSeed);
+        .insert(FlowerSeed)
+        .insert(FlowerComponent);
+    }
+} 
+
+/*
+pub fn draw_connections(query: Query<&Transform, With<FlowerSeed>>, mut shapes: ShapeCommands, seed_settings: Res<SeedSettings>) {
+    let positions: Vec<Vec3> = query.iter().map(|t| t.translation).collect();
+    let mut trun_pos = positions.clone();
+    trun_pos.reverse();
+    trun_pos.truncate((seed_settings.amount as f32 / 1.6) as usize);
+
+    for i in 1..trun_pos.len() {
+        let start = trun_pos[i - 1];
+        shapes.line(start, nearest_point(start, &positions));
+       // gizmos.linestrip_2d(positions, color)
     }
 }
 
-pub fn clear_flowers(
-    commands: &mut Commands,
-    flowers: Query<Entity, With<FlowerSeed>>
-) {
-    for entity in flowers.iter() {
-        commands.entity(entity).despawn_recursive();
+fn nearest_point(point: Vec3, points: &Vec<Vec3>) -> Vec3 {
+    let mut nearest = *points.first().unwrap();
+    for p in points {
+        if p != &point && p.distance(point) < nearest.distance(point) {
+            nearest = p.clone();
+        }
     }
-}
\ No newline at end of file
+    return nearest
+}*/
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index 6454300..d8b2b61 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,19 +6,27 @@ mod egui_block_input;
 mod petal;
 
 use bevy::{
-    prelude::*,
-    render::{
+    ecs::system::SystemId, prelude::*, render::{
         settings::{Backends, RenderCreation, WgpuSettings},
         RenderPlugin,
-    }, window::PresentMode,
+    }, window::PresentMode
 };
 use bevy_egui::EguiPlugin;
+use bevy_inspector_egui::quick::WorldInspectorPlugin;
 use bevy_pancam::PanCamPlugin;
+use bevy_vector_shapes::Shape2dPlugin;
 use egui_block_input::BlockInputPlugin;
 use flower::FlowerSeedPlugin;
+use petal::FlowerPetalPlugin;
 use setup::SetupPlugin;
 use ui::UiPlugin;
 
+#[derive(Component)]
+pub struct Callback(SystemId);
+
+#[derive(Component)]
+pub struct FlowerComponent;
+
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins
@@ -31,9 +39,12 @@ fn main() {
                 ..default()
             }) 
         )   
+        .add_plugins(Shape2dPlugin::default())
+      //  .add_plugins(WorldInspectorPlugin::new())
         .add_plugins(PanCamPlugin::default())
         .add_plugins(UiPlugin)
         .add_plugins(SetupPlugin)
+        .add_plugins(FlowerPetalPlugin)
         .add_plugins(FlowerSeedPlugin)
         .add_plugins(EguiPlugin)        
         .add_plugins(BlockInputPlugin)
diff --git a/src/petal.rs b/src/petal.rs
index fd3f9c4..28b25b6 100644
--- a/src/petal.rs
+++ b/src/petal.rs
@@ -1,13 +1,14 @@
 use std::{f32::consts::PI, ops::Deref};
 use bevy::{prelude::*, sprite::{Mesh2dHandle, MaterialMesh2dBundle}};
 
-use crate::{constants::PHI, flower::SeedSettings, ui::UiState};
+use crate::{constants::PHI, flower::SeedSettings, ui::UiState, Callback, FlowerComponent};
 
 pub struct FlowerPetalPlugin;
 
 impl Plugin for FlowerPetalPlugin {
     fn build(&self, app: &mut App) {
-    //    app
+        app
+           .add_systems(Startup, register_systems);
            // .init_resource::<SeedSettings>()
          //   .add_systems(Startup, spawn_initial_flowers)
          //   .add_systems(Update, animate_flowers);
@@ -17,32 +18,44 @@ impl Plugin for FlowerPetalPlugin {
 #[derive(Component)]
 pub struct FlowerPetal;
 
+#[derive(Component)]
+pub struct ResetFlowerPetals;
+
+fn register_systems(
+    world: &mut World
+) {
+    let spawn_id = world.register_system(spawn_petals);
+    world.spawn((Callback(spawn_id), ResetFlowerPetals));
+}
+
 pub fn spawn_petals(
-    commands: &mut Commands,
-    meshes: &mut ResMut<Assets<Mesh>>,
-    materials: &mut ResMut<Assets<ColorMaterial>>,
-    settings: &SeedSettings
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<ColorMaterial>>,
+    mut settings: ResMut<SeedSettings>,
+    flowers: Query<Entity, With<FlowerComponent>>
 ) {    
+    for entity in flowers.iter() {
+        commands.entity(entity).despawn_recursive();
+    }
+    if settings.mesh_handle.is_none() {
+        settings.mesh_handle = Some(Mesh2dHandle(meshes.add(Ellipse::new(5.0 * settings.radius,10.0 * settings.radius))))
+    }
+    if settings.material_handle.is_none() {
+        settings.material_handle = Some(materials.add(settings.color));
+    }
     for i in 1..settings.amount +1 {
         let angle = 2.0 * PI * settings.rotation * (i as f32);
         let x = angle.cos() * settings.distance;
         let y = angle.sin() * settings.distance;
         let rotation = Quat::from_rotation_z(angle + PI / 2.0); // Adjust by 90 degrees (PI/2) to align the petal
         commands.spawn(MaterialMesh2dBundle {
-            mesh: Mesh2dHandle(meshes.add(Ellipse::new(5.0 * settings.radius,10.0 * settings.radius))), 
-            material: materials.add(settings.color),
+            mesh: settings.mesh_handle.clone().unwrap(), 
+            material: settings.material_handle.clone().unwrap(),
             transform: Transform::from_xyz(x, y, 0.0).with_rotation(rotation),
             ..Default::default()
         })
-        .insert(FlowerPetal);
-    }
-}
-
-pub fn clear_petals(
-    commands: &mut Commands,
-    flowers: Query<Entity, With<FlowerPetal>>
-) {
-    for entity in flowers.iter() {
-        commands.entity(entity).despawn_recursive();
+        .insert(FlowerPetal)
+        .insert(FlowerComponent);
     }
 }
\ No newline at end of file
diff --git a/src/ui.rs b/src/ui.rs
index 04775ab..d698f14 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,6 +1,6 @@
 use std::{f32::consts::PI, ops::Deref};
-use bevy::{prelude::*, sprite::{Mesh2dHandle, MaterialMesh2dBundle}};
-use crate::{constants::PHI, flower::{clear_flowers, spawn_flowers, FlowerSeed, SeedSettings}, petal::{clear_petals, spawn_petals, FlowerPetal}};
+use bevy::{ecs::system::RunSystemOnce, prelude::*, sprite::{MaterialMesh2dBundle, Mesh2dHandle}};
+use crate::{constants::PHI, flower::{FlowerSeed, ResetFlowerSeeds, SeedSettings}, petal::{spawn_petals, FlowerPetal, ResetFlowerPetals}, Callback};
 use bevy_egui::{egui::{self, InnerResponse, Response, ScrollArea, Ui}, EguiContexts, EguiSettings};
 
 pub struct UiPlugin;
@@ -39,7 +39,7 @@ impl FlowerMode {
     
     fn max_amount(self) -> i32 {
         match self {
-            FlowerMode::Seed => 1000,
+            FlowerMode::Seed => 4000,
             FlowerMode::Petal => 40
         }
     }
@@ -66,11 +66,11 @@ pub fn settings_ui(
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<ColorMaterial>>,
     mut seed_settings: ResMut<SeedSettings>,
-    flowers: Query<Entity, With<FlowerSeed>>,
-    petals: Query<Entity, With<FlowerPetal>>,
     mut egui_settings: ResMut<EguiSettings>,
     keys: Res<ButtonInput<KeyCode>>,
-    mut ui_state: ResMut<UiState>
+    mut ui_state: ResMut<UiState>,
+    reset_seeds: Query<&Callback, With<ResetFlowerSeeds>>,
+    reset_petals: Query<&Callback, With<ResetFlowerPetals>>
 ) {
     let mut changed = false;
     let mode = ui_state.flower_mode.clone();    
@@ -153,7 +153,13 @@ pub fn settings_ui(
                             changed = true;
                         }
                         seed_settings.color = Color::rgb(rgb[0], rgb[1], rgb[2]);
+                        seed_settings.material_handle = None;
                     });
+                    /*if mode == FlowerMode::Seed {
+                        if ui.button("Draw connections").clicked() {
+                            commands.run_system(connection_system.single().0);
+                        }
+                    }*/
                     if ui.button("Reset Settings").clicked() {
                         match mode.clone() {
                             FlowerMode::Seed => {
@@ -168,6 +174,7 @@ pub fn settings_ui(
             });
         });
     if mode != ui_state.flower_mode {
+        ui_state.animate = false;
         match ui_state.flower_mode.clone() {
             FlowerMode::Seed => {
                 *seed_settings = SeedSettings::default();
@@ -178,14 +185,14 @@ pub fn settings_ui(
         }
     }    
     if changed || mode != ui_state.flower_mode {
-        clear_flowers(&mut commands, flowers);
-        clear_petals(&mut commands, petals);
         match ui_state.flower_mode {
             FlowerMode::Seed => {
-                spawn_flowers(&mut commands, &mut meshes, &mut materials, seed_settings.deref());
+                seed_settings.mesh_handle = None;
+                commands.run_system(reset_seeds.single().0);
             },
             FlowerMode::Petal => {
-                spawn_petals(&mut commands, &mut meshes, &mut materials, seed_settings.deref());
+                seed_settings.mesh_handle = None;
+                commands.run_system(reset_petals.single().0);
             }
         }
     }