diff --git a/Classes/Note.cs b/Classes/Note.cs
deleted file mode 100644
index 193bbc3f..00000000
--- a/Classes/Note.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using Godot;
-
-/**
- * @class Note
- * @brief Data structure class for holding data and methods for a battle time note. WIP
- */
-public partial class Note : Resource
-{
-    public int Beat;
-    public NoteArrow.ArrowType Type;
-
-    public Note(NoteArrow.ArrowType type = NoteArrow.ArrowType.Up, int beat = 0)
-    {
-        Beat = beat;
-        Type = type;
-    }
-}
diff --git a/Classes/Notes/Note.cs b/Classes/Notes/Note.cs
new file mode 100644
index 00000000..f5ac1ea4
--- /dev/null
+++ b/Classes/Notes/Note.cs
@@ -0,0 +1,47 @@
+using System;
+using FunkEngine;
+using Godot;
+
+/**
+ * @class Note
+ * @brief Data structure class for holding data and methods for a battle time note. WIP
+ */
+public partial class Note : Resource
+{
+    public PuppetTemplate Owner;
+    public string Name;
+    private int _baseVal;
+    private Action<BattleDirector, Note, Timing> NoteEffect; //TODO: Where/How to deal with timing.
+
+    //public string Tooltip;
+
+    public Note(
+        string name,
+        PuppetTemplate owner = null,
+        int baseVal = 1,
+        Action<BattleDirector, Note, Timing> noteEffect = null
+    )
+    {
+        Name = name;
+        Owner = owner;
+        NoteEffect =
+            noteEffect
+            ?? (
+                (BD, source, Timing) =>
+                {
+                    BD.GetTarget(this).TakeDamage(source._baseVal);
+                }
+            );
+        _baseVal = baseVal;
+    }
+
+    public void OnHit(BattleDirector BD, Timing timing)
+    {
+        NoteEffect(BD, this, timing);
+    }
+
+    public Note Clone()
+    {
+        return (Note)MemberwiseClone();
+    }
+}
diff --git a/Classes/Relics/RelicEffect.cs b/Classes/Relics/RelicEffect.cs
new file mode 100644
index 00000000..93ade4f0
--- /dev/null
+++ b/Classes/Relics/RelicEffect.cs
@@ -0,0 +1,31 @@
+using System;
+using FunkEngine;
+using Godot;
+
+public partial class RelicEffect : IBattleEvent
+{
+    private BattleEffectTrigger Trigger { get; set; }
+    public int BaseValue;
+    private Action<BattleDirector, int> OnRelicEffect;
+
+    public RelicEffect(
+        BattleEffectTrigger trigger,
+        int val,
+        Action<BattleDirector, int> onRelicEffect
+    )
+    {
+        BaseValue = val;
+        Trigger = trigger;
+        OnRelicEffect = onRelicEffect;
+    }
+
+    public void OnTrigger(BattleDirector battleDirector)
+    {
+        OnRelicEffect(battleDirector, BaseValue);
+    }
+
+    public BattleEffectTrigger GetTrigger()
+    {
+        return Trigger;
+    }
+}
diff --git a/Classes/Relics/RelicTemplate.cs b/Classes/Relics/RelicTemplate.cs
new file mode 100644
index 00000000..892e1bdf
--- /dev/null
+++ b/Classes/Relics/RelicTemplate.cs
@@ -0,0 +1,22 @@
+using System;
+using FunkEngine;
+using Godot;
+
+public partial class RelicTemplate : Resource
+{
+    public RelicEffect[] Effects;
+    public string Name;
+
+    //public Texture2D Texture
+    //public string Tooltip
+    public RelicTemplate(string Name = "", RelicEffect[] EffectTags = null)
+    {
+        Effects = EffectTags;
+        this.Name = Name;
+    }
+
+    public RelicTemplate Clone()
+    {
+        return (RelicTemplate)MemberwiseClone();
+    }
+}
diff --git a/Globals/FunkEngineNameSpace.cs b/Globals/FunkEngineNameSpace.cs
new file mode 100644
index 00000000..6bf17004
--- /dev/null
+++ b/Globals/FunkEngineNameSpace.cs
@@ -0,0 +1,56 @@
+using Godot;
+
+namespace FunkEngine;
+
+public enum ArrowType
+{
+    Up = 0,
+    Down = 1,
+    Left = 2,
+    Right = 3,
+}
+
+public enum BattleEffectTrigger
+{
+    NotePlaced,
+    NoteHit,
+    SelfNoteHit,
+}
+
+public enum Timing
+{
+    Miss = 0,
+    Bad = 1,
+    Okay = 2,
+    Good = 3,
+    Perfect = 4,
+}
+
+public enum Stages
+{
+    Title,
+    Battle,
+    Quit,
+    Map,
+}
+
+public struct SongData
+{
+    public int Bpm;
+    public double SongLength;
+    public int NumLoops;
+}
+
+public struct ArrowData
+{
+    public Color Color;
+    public string Key;
+    public NoteChecker Node;
+    public ArrowType Type;
+}
+
+public interface IBattleEvent
+{
+    void OnTrigger(BattleDirector BD);
+    BattleEffectTrigger GetTrigger();
+}
diff --git a/Globals/Scribe.cs b/Globals/Scribe.cs
new file mode 100644
index 00000000..b1b9884a
--- /dev/null
+++ b/Globals/Scribe.cs
@@ -0,0 +1,49 @@
+using System;
+using FunkEngine;
+using Godot;
+
+/**
+ * Global for storing defined data, e.g. Notes and Relic Dictionaries.
+ */
+public partial class Scribe : Node
+{
+    public static readonly Note[] NoteDictionary = new[]
+    {
+        new Note(
+            "EnemyBase",
+            null,
+            1,
+            (director, note, timing) =>
+            {
+                director.Player.TakeDamage(4 - (int)timing);
+            }
+        ),
+        new Note(
+            "PlayerBase",
+            null,
+            1,
+            (director, note, timing) =>
+            {
+                director.Enemy.TakeDamage((int)timing);
+            }
+        ),
+    };
+
+    public static readonly RelicTemplate[] RelicDictionary = new[]
+    {
+        new RelicTemplate(
+            "Good Vibes",
+            new RelicEffect[]
+            {
+                new RelicEffect(
+                    BattleEffectTrigger.NotePlaced,
+                    5,
+                    (director, val) =>
+                    {
+                        director.Player.Heal(val);
+                    }
+                ),
+            }
+        ),
+    };
+}
diff --git a/Globals/StageProducer.cs b/Globals/StageProducer.cs
new file mode 100644
index 00000000..6b34afe1
--- /dev/null
+++ b/Globals/StageProducer.cs
@@ -0,0 +1,128 @@
+using System;
+using System.Linq;
+using FunkEngine;
+using Godot;
+
+public partial class StageProducer : Node
+{
+    //Generate a map, starting as a width x height grid, pick a starting spot and do (path) paths from that to the last
+    //row, connecting the path, then connect all at the end to the boss room.
+    public static RandomNumberGenerator GlobalRng = new RandomNumberGenerator();
+    private ulong _seed;
+    private ulong _lastRngState;
+
+    private Stages _curStage = Stages.Title;
+    private Node _curScene;
+
+    private MapGrid _map = new MapGrid();
+
+    public class MapGrid
+    {
+        private int[,] _map;
+        private Room[] _rooms;
+        private int _curIdx = 0;
+        private int _curRoom = 0;
+
+        public class Room
+        {
+            public Room(int idx, int x, int y)
+            {
+                Idx = idx;
+                X = x;
+                Y = y;
+            }
+
+            public void SetType(string type)
+            {
+                Type = type;
+            }
+
+            public void AddChild(int newIdx)
+            {
+                if (Children.Contains(newIdx))
+                    return;
+                Children = Children.Append(newIdx).ToArray();
+            }
+
+            private int Idx;
+            private int[] Children = Array.Empty<int>();
+            private int X;
+            private int Y;
+            private string Type;
+        }
+
+        public void InitMapGrid(int width, int height, int paths)
+        {
+            _curIdx = 0;
+            _rooms = Array.Empty<Room>();
+            _map = new int[width, height]; //x,y
+
+            int startX = GlobalRng.RandiRange(0, width - 1); //TODO: Replace with seeding
+            _rooms = _rooms.Append(new Room(_curIdx, startX, 0)).ToArray();
+            _map[startX, 0] = _curIdx++;
+
+            for (int i = 0; i < paths; i++)
+            {
+                GeneratePath_r(startX, 0, width, height);
+            }
+
+            AddBossRoom(width, height);
+        }
+
+        //Start at x, y, assume prev room exists. Picks new x pos within +/- 1, attaches recursively
+        private void GeneratePath_r(int x, int y, int width, int height)
+        {
+            int nextX = GlobalRng.RandiRange(Math.Max(x - 1, 0), Math.Min(x + 1, width - 1));
+            if (_map[nextX, y + 1] == 0)
+            {
+                _rooms = _rooms.Append(new Room(_curIdx, nextX, y + 1)).ToArray();
+                _map[nextX, y + 1] = _curIdx;
+                _rooms[_map[x, y]].AddChild(_curIdx++);
+            }
+            else
+            {
+                _rooms[_map[x, y]].AddChild(_map[nextX, y + 1]);
+            }
+            if (y < height - 2)
+            {
+                GeneratePath_r(nextX, y + 1, width, height);
+            }
+        }
+
+        private void AddBossRoom(int width, int height)
+        {
+            _rooms = _rooms.Append(new Room(_curIdx, 0, height)).ToArray();
+            _rooms[_curIdx].SetType("Boss");
+            for (int i = 0; i < width; i++) //Attach all last rooms to a boss room
+            {
+                if (_map[i, height - 1] != 0)
+                {
+                    _rooms[_map[i, height - 1]].AddChild(_curIdx);
+                }
+            }
+        }
+    }
+
+    public void StartGame()
+    {
+        _map.InitMapGrid(2, 2, 1);
+        _seed = GlobalRng.Seed;
+        _lastRngState = GlobalRng.State;
+    }
+
+    public void TransitionStage(Stages nextStage)
+    {
+        GD.Print(GetTree().CurrentScene);
+        switch (nextStage)
+        {
+            case Stages.Title:
+                GetTree().ChangeSceneToFile("res://scenes/SceneTransitions/TitleScreen.tscn");
+                break;
+            case Stages.Battle:
+                GetTree().ChangeSceneToFile("res://scenes/BattleDirector/test_battle_scene.tscn");
+                break;
+        }
+
+        _curStage = nextStage;
+    }
+}
diff --git a/scripts/TimeKeeper.cs b/Globals/TimeKeeper.cs
similarity index 100%
rename from scripts/TimeKeeper.cs
rename to Globals/TimeKeeper.cs
diff --git a/README.md b/README.md
index 727c86ea..65055df1 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,6 @@ Current team members include:
 
 
 #### Attributions:
-Note icon: <a href="https://www.flaticon.com/free-icons/next" title="next icons">Next icons created by Pixel perfect - Flaticon</a>
-
 First Song: <a href="https://freesound.org/people/Magntron/sounds/335571/" title="gameMusic">gameMusic by Magntron - freesound.org</a>
 
 
diff --git a/project.godot b/project.godot
index ba8f8e20..76f74626 100644
--- a/project.godot
+++ b/project.godot
@@ -11,13 +11,15 @@ config_version=5
 [application]
 
 config/name="Funk Engine"
-run/main_scene="res://scenes/BattleDirector/test_battle_scene.tscn"
+run/main_scene="res://scenes/SceneTransitions/TitleScreen.tscn"
 config/features=PackedStringArray("4.3", "C#", "Forward Plus")
 config/icon="res://icon.svg"
 
 [autoload]
 
-TimeKeeper="*res://scripts/TimeKeeper.cs"
+TimeKeeper="*res://Globals/TimeKeeper.cs"
+Scribe="*res://Globals/Scribe.cs"
+StageProducer="*res://Globals/StageProducer.cs"
 
 [display]
 
diff --git a/scenes/BattleDirector/BattleDirector.cs b/scenes/BattleDirector/BattleDirector.cs
deleted file mode 100644
index 6de6518c..00000000
--- a/scenes/BattleDirector/BattleDirector.cs
+++ /dev/null
@@ -1,277 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Godot;
-
-/**
- * @class BattleDirector
- * @brief Higher priority director to manage battle effects. Can directly access managers, which should signal up to Director WIP
- */
-public partial class BattleDirector : Node2D
-{
-    #region Declarations
-    private HealthBar Player;
-    private HealthBar Enemy;
-
-    [Export]
-    private ChartManager CM;
-
-    [Export]
-    private InputHandler IH;
-
-    [Export]
-    private NotePlacementBar NotePlacementBar;
-
-    [Export]
-    private AudioStreamPlayer Audio;
-
-    private double _timingInterval = .1; //secs
-
-    [Signal]
-    public delegate void PlayerDamageEventHandler(int damage);
-
-    [Signal]
-    public delegate void EnemyDamageEventHandler(int damage);
-
-    private SongData _curSong;
-
-    public struct SongData
-    {
-        public int Bpm;
-        public double SongLength;
-        public int NumLoops;
-    }
-    #endregion
-
-    #region Note Handling
-    //Assume queue structure for notes in each lane.
-    //Can eventually make this its own structure
-    private NoteArrow[][] _laneData = Array.Empty<NoteArrow[]>();
-    private int[] _laneLastBeat = new int[]
-    { //Temporary (hopefully) measure to bridge from note queue structure to ordered array
-        0,
-        0,
-        0,
-        0,
-    };
-    private Note[] _notes = Array.Empty<Note>();
-
-    //Returns first note of lane without modifying lane data
-    private Note GetNoteAt(NoteArrow.ArrowType dir, int beat)
-    {
-        return GetNote(_laneData[(int)dir][beat]);
-    }
-
-    //Get note of a note arrow
-    private Note GetNote(NoteArrow arrow)
-    {
-        return _notes[arrow.NoteIdx];
-    }
-
-    private bool AddNoteToLane(Note note, bool isActive = true)
-    {
-        note.Beat %= CM.BeatsPerLoop;
-        //Don't add dupe notes
-        if (note.Beat == 0 || _notes.Any(nt => nt.Type == note.Type && nt.Beat == note.Beat))
-        {
-            return false; //Beat at 0 is too messy.
-        }
-        _notes = _notes.Append(note).ToArray();
-        //Get noteArrow from CM
-        var arrow = CM.AddArrowToLane(note, _notes.Length - 1);
-        arrow.IsActive = isActive;
-        _laneData[(int)note.Type][note.Beat] = arrow;
-        return true;
-    }
-    #endregion
-
-    //Creeate dummy notes
-    private void AddExampleNotes()
-    {
-        GD.Print(CM.BeatsPerLoop);
-        for (int i = 1; i < 15; i++)
-        {
-            Note exampleNote = new Note(NoteArrow.ArrowType.Up, i * 4);
-            AddNoteToLane(exampleNote);
-        }
-        for (int i = 1; i < 15; i++)
-        {
-            Note exampleNote = new Note(NoteArrow.ArrowType.Left, 4 * i + 1);
-            AddNoteToLane(exampleNote);
-        }
-        for (int i = 0; i < 10; i++)
-        {
-            Note exampleNote = new Note(NoteArrow.ArrowType.Right, 3 * i + 32);
-            AddNoteToLane(exampleNote);
-        }
-        for (int i = 0; i < 3; i++)
-        {
-            Note exampleNote = new Note(NoteArrow.ArrowType.Down, 8 * i + 16);
-            AddNoteToLane(exampleNote);
-        }
-    }
-
-    public override void _Ready()
-    {
-        _curSong = new SongData
-        {
-            Bpm = 120,
-            SongLength = Audio.Stream.GetLength(),
-            NumLoops = 5,
-        };
-
-        var timer = GetTree().CreateTimer(AudioServer.GetTimeToNextMix());
-        timer.Timeout += Begin;
-    }
-
-    private void Begin()
-    {
-        CM.PrepChart(_curSong);
-        _laneData = new NoteArrow[][]
-        {
-            new NoteArrow[CM.BeatsPerLoop],
-            new NoteArrow[CM.BeatsPerLoop],
-            new NoteArrow[CM.BeatsPerLoop],
-            new NoteArrow[CM.BeatsPerLoop],
-        };
-        AddExampleNotes();
-
-        Player = GetNode<HealthBar>("PlayerHP");
-        Player.GetNode<Sprite2D>("Sprite2D").Scale *= .5f; //TEMP
-        Player.GetNode<Sprite2D>("Sprite2D").Position += Vector2.Down * 30; //TEMP
-        Enemy = GetNode<HealthBar>("EnemyHP");
-
-        //TEMP
-        var enemTween = CreateTween();
-        enemTween
-            .TweenProperty(Enemy.GetNode<Sprite2D>("Sprite2D"), "position", Vector2.Down * 5, 1f)
-            .AsRelative();
-        enemTween
-            .TweenProperty(Enemy.GetNode<Sprite2D>("Sprite2D"), "position", Vector2.Up * 5, 1f)
-            .AsRelative();
-        enemTween.SetTrans(Tween.TransitionType.Spring);
-        enemTween.SetEase(Tween.EaseType.In);
-        enemTween.SetLoops();
-        enemTween.Play();
-
-        CM.Connect(nameof(InputHandler.NotePressed), new Callable(this, nameof(OnNotePressed)));
-        CM.Connect(nameof(InputHandler.NoteReleased), new Callable(this, nameof(OnNoteReleased)));
-
-        Audio.Play();
-    }
-
-    public override void _Process(double delta)
-    {
-        TimeKeeper.CurrentTime = Audio.GetPlaybackPosition();
-        CheckMiss();
-    }
-
-    #region Input&Timing
-    private void OnNotePressed(NoteArrow.ArrowType type)
-    {
-        CheckNoteTiming(type);
-    }
-
-    private void OnNoteReleased(NoteArrow.ArrowType arrowType) { }
-
-    //Check all lanes for misses from missed inputs
-    private void CheckMiss()
-    {
-        //On current beat, if prev beat is active and not inputted
-        double realBeat = TimeKeeper.CurrentTime / (60 / (double)_curSong.Bpm) % CM.BeatsPerLoop;
-        for (int i = 0; i < _laneData.Length; i++)
-        {
-            if (
-                _laneLastBeat[i] < Math.Floor(realBeat)
-                || (_laneLastBeat[i] == CM.BeatsPerLoop - 1 && Math.Floor(realBeat) == 0)
-            )
-            { //If above, a note has been missed
-                //GD.Print("Last beat " + _laneLastBeat[i]);
-                if (
-                    _laneData[i][_laneLastBeat[i]] == null
-                    || !_laneData[i][_laneLastBeat[i]].IsActive
-                )
-                {
-                    _laneLastBeat[i] = (_laneLastBeat[i] + 1) % CM.BeatsPerLoop;
-                    continue;
-                }
-                //Note exists and has been missed
-                _laneData[i][_laneLastBeat[i]].NoteHit();
-                HandleTiming((NoteArrow.ArrowType)i, 1);
-                _laneLastBeat[i] = (_laneLastBeat[i] + 1) % CM.BeatsPerLoop;
-            }
-        }
-    }
-
-    private void CheckNoteTiming(NoteArrow.ArrowType type)
-    {
-        double realBeat = TimeKeeper.CurrentTime / (60 / (double)_curSong.Bpm) % CM.BeatsPerLoop;
-        int curBeat = (int)Math.Round(realBeat);
-        GD.Print("Cur beat " + curBeat + "Real: " + realBeat.ToString("#.###"));
-        if (
-            _laneData[(int)type][curBeat % CM.BeatsPerLoop] == null
-            || !_laneData[(int)type][curBeat % CM.BeatsPerLoop].IsActive
-        )
-        {
-            _laneLastBeat[(int)type] = (curBeat) % CM.BeatsPerLoop;
-            PlayerAddNote(type, curBeat);
-            return;
-        }
-        double beatDif = Math.Abs(realBeat - curBeat);
-        _laneData[(int)type][curBeat % CM.BeatsPerLoop].NoteHit();
-        _laneLastBeat[(int)type] = (curBeat) % CM.BeatsPerLoop;
-        HandleTiming(type, beatDif);
-    }
-
-    private void HandleTiming(NoteArrow.ArrowType type, double beatDif)
-    {
-        if (beatDif < _timingInterval * 1)
-        {
-            GD.Print("Perfect");
-            Enemy.TakeDamage(3);
-            NotePlacementBar.HitNote();
-            NotePlacementBar.ComboText("Perfect!");
-        }
-        else if (beatDif < _timingInterval * 2)
-        {
-            GD.Print("Good");
-            Enemy.TakeDamage(1);
-            NotePlacementBar.HitNote();
-            NotePlacementBar.ComboText("Good");
-        }
-        else if (beatDif < _timingInterval * 3)
-        {
-            GD.Print("Ok");
-            Player.TakeDamage(1);
-            NotePlacementBar.HitNote();
-            NotePlacementBar.ComboText("Okay");
-        }
-        else
-        {
-            GD.Print("Miss");
-            Player.TakeDamage(2);
-            NotePlacementBar.MissNote();
-            NotePlacementBar.ComboText("Miss");
-        }
-    }
-    #endregion
-
-    private void PlayerAddNote(NoteArrow.ArrowType type, int beat)
-    {
-        // can also add some sort of keybind here to also have pressed
-        // in case the user just presses the note too early and spawns a note
-        GD.Print(
-            $"Player trying to place {type} typed note at beat: "
-                + beat
-                + " Verdict: "
-                + NotePlacementBar.CanPlaceNote()
-        );
-        if (NotePlacementBar.CanPlaceNote())
-        {
-            Note exampleNote = new Note(type, beat % CM.BeatsPerLoop);
-            if (AddNoteToLane(exampleNote, false))
-                NotePlacementBar.PlacedNote();
-        }
-    }
-}
diff --git a/scenes/BattleDirector/HealthBar.cs b/scenes/BattleDirector/HealthBar.cs
deleted file mode 100644
index c0ad3e2e..00000000
--- a/scenes/BattleDirector/HealthBar.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using Godot;
-
-public partial class HealthBar : Control
-{
-    const int MaxHealth = 100;
-    int _health = MaxHealth;
-
-    [Export]
-    public TextureProgressBar PlayerHealthBar;
-
-    [Export]
-    public Texture2D SpriteText;
-
-    //we can change this to a Texture Progress bar once we have art assets for it
-
-
-    public override void _Ready()
-    {
-        if (PlayerHealthBar != null)
-        {
-            SetHealth(MaxHealth, MaxHealth);
-        }
-        GetNode<Sprite2D>("Sprite2D").Texture = SpriteText;
-    }
-
-    public void SetHealth(int max, int current)
-    {
-        PlayerHealthBar.MaxValue = max;
-        PlayerHealthBar.Value = current;
-        _updateHealthBar();
-    }
-
-    private void _updateHealthBar()
-    {
-        PlayerHealthBar.Value = _health;
-    }
-
-    public void TakeDamage(int damage)
-    {
-        _health -= damage;
-        if (_health <= 0)
-        {
-            GD.Print("You are dead");
-        }
-        _updateHealthBar();
-    }
-}
diff --git a/scenes/BattleDirector/HealthBar.tscn b/scenes/BattleDirector/HealthBar.tscn
deleted file mode 100644
index 0f72abd7..00000000
--- a/scenes/BattleDirector/HealthBar.tscn
+++ /dev/null
@@ -1,47 +0,0 @@
-[gd_scene load_steps=8 format=3 uid="uid://bgomxovxs7sr8"]
-
-[ext_resource type="Script" path="res://scenes/BattleDirector/HealthBar.cs" id="1_b1t4i"]
-
-[sub_resource type="Gradient" id="Gradient_ve5ki"]
-colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1)
-
-[sub_resource type="GradientTexture2D" id="GradientTexture2D_ti0cv"]
-gradient = SubResource("Gradient_ve5ki")
-width = 150
-height = 20
-
-[sub_resource type="Gradient" id="Gradient_soqhm"]
-colors = PackedColorArray(0, 1, 0.0999999, 1, 1, 1, 1, 1)
-
-[sub_resource type="GradientTexture2D" id="GradientTexture2D_r4hau"]
-gradient = SubResource("Gradient_soqhm")
-width = 146
-height = 16
-
-[sub_resource type="Gradient" id="Gradient_58kj0"]
-offsets = PackedFloat32Array(1)
-colors = PackedColorArray(1, 1, 1, 1)
-
-[sub_resource type="GradientTexture2D" id="GradientTexture2D_wwca1"]
-gradient = SubResource("Gradient_58kj0")
-
-[node name="Control" type="Control" node_paths=PackedStringArray("PlayerHealthBar")]
-layout_mode = 3
-anchors_preset = 0
-offset_right = 40.0
-offset_bottom = 40.0
-script = ExtResource("1_b1t4i")
-PlayerHealthBar = NodePath("ProgressBar")
-
-[node name="ProgressBar" type="TextureProgressBar" parent="."]
-layout_mode = 0
-offset_right = 150.0
-offset_bottom = 20.0
-texture_under = SubResource("GradientTexture2D_ti0cv")
-texture_progress = SubResource("GradientTexture2D_r4hau")
-texture_progress_offset = Vector2(2, 2)
-
-[node name="Sprite2D" type="Sprite2D" parent="."]
-position = Vector2(75, 86)
-scale = Vector2(2, 2)
-texture = SubResource("GradientTexture2D_wwca1")
diff --git a/scenes/BattleDirector/NotePlacementBar.tscn b/scenes/BattleDirector/NotePlacementBar.tscn
index c8dc9577..2b61556e 100644
--- a/scenes/BattleDirector/NotePlacementBar.tscn
+++ b/scenes/BattleDirector/NotePlacementBar.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=6 format=3 uid="uid://duhiilcv4tat3"]
 
-[ext_resource type="Script" path="res://scenes/BattleDirector/NotePlacementBar.cs" id="1_456es"]
+[ext_resource type="Script" path="res://scenes/BattleDirector/scripts/NotePlacementBar.cs" id="1_456es"]
 
 [sub_resource type="Gradient" id="Gradient_0u6yv"]
 colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1)
diff --git a/scenes/BattleDirector/TextParticle.tscn b/scenes/BattleDirector/TextParticle.tscn
deleted file mode 100644
index 6491a671..00000000
--- a/scenes/BattleDirector/TextParticle.tscn
+++ /dev/null
@@ -1,9 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://bd23wwbv7i4gg"]
-
-[ext_resource type="Script" path="res://scenes/BattleDirector/TextParticle.cs" id="1_j0ufq"]
-
-[node name="Control" type="Label"]
-anchors_preset = -1
-anchor_right = 0.08
-text = "900000"
-script = ExtResource("1_j0ufq")
diff --git a/scenes/BattleDirector/assets/Character1.png b/scenes/BattleDirector/assets/Character1.png
index 2175831d..f416d5d2 100644
Binary files a/scenes/BattleDirector/assets/Character1.png and b/scenes/BattleDirector/assets/Character1.png differ
diff --git a/scenes/BattleDirector/scripts/BattleDirector.cs b/scenes/BattleDirector/scripts/BattleDirector.cs
new file mode 100644
index 00000000..8338ddfb
--- /dev/null
+++ b/scenes/BattleDirector/scripts/BattleDirector.cs
@@ -0,0 +1,201 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using FunkEngine;
+using Godot;
+
+/**
+ * @class BattleDirector
+ * @brief Higher priority director to manage battle effects. Can directly access managers, which should signal up to Director WIP
+ */
+public partial class BattleDirector : Node2D
+{ //TODO: Maybe move some Director functionality to a sub node.
+    #region Declarations
+
+    public PlayerPuppet Player;
+    public PuppetTemplate Enemy;
+
+    [Export]
+    private ChartManager CM;
+
+    [Export]
+    private NotePlacementBar NotePlacementBar;
+
+    [Export]
+    private Conductor CD;
+
+    [Export]
+    private AudioStreamPlayer Audio;
+
+    private double _timingInterval = .1; //secs, maybe make somewhat note dependent
+
+    private SongData _curSong;
+
+    #endregion
+
+    #region Note Handling
+    private void PlayerAddNote(ArrowType type, int beat)
+    {
+        GD.Print($"Player trying to place {type} typed note at beat: " + beat);
+        if (!NotePlacementBar.CanPlaceNote())
+            return;
+        if (CD.AddNoteToLane(type, beat % CM.BeatsPerLoop, false))
+        {
+            NotePlacementBar.PlacedNote();
+            NotePlaced?.Invoke(this);
+            GD.Print("Note Placed.");
+        }
+    }
+
+    public PuppetTemplate GetTarget(Note note)
+    {
+        if (note.Owner == Player)
+        {
+            return Enemy;
+        }
+
+        return Player;
+    }
+    #endregion
+
+    #region Initialization
+    public override void _Ready()
+    {
+        _curSong = new SongData
+        {
+            Bpm = 120,
+            SongLength = Audio.Stream.GetLength(),
+            NumLoops = 5,
+        };
+        TimeKeeper.Bpm = _curSong.Bpm;
+
+        Player = new PlayerPuppet();
+        AddChild(Player);
+        EventizeRelics();
+        //TODO: Refine
+        foreach (var note in Player.Stats.CurNotes)
+        {
+            note.Owner = Player;
+            CD.Notes = CD.Notes.Append(note).ToArray();
+        }
+        Note enemNote = Scribe.NoteDictionary[0].Clone();
+        CD.Notes = CD.Notes.Append(enemNote).ToArray();
+
+        Enemy = new PuppetTemplate();
+        Enemy.SetPosition(new Vector2(400, 0));
+        AddChild(Enemy);
+        Enemy.Init(GD.Load<Texture2D>("res://scenes/BattleDirector/assets/Enemy1.png"), "Enemy");
+        Enemy.Sprite.Scale *= 2;
+
+        var timer = GetTree().CreateTimer(AudioServer.GetTimeToNextMix());
+        timer.Timeout += Begin;
+    }
+
+    //TODO: This will all change
+    private void Begin()
+    {
+        CM.PrepChart(_curSong);
+        CD.Prep();
+        CD.TimedInput += OnTimedInput;
+
+        //TEMP TODO: Make enemies, can put this in an enemy subclass
+        var enemTween = CreateTween();
+        enemTween.TweenProperty(Enemy.Sprite, "position", Vector2.Down * 5, 1f).AsRelative();
+        enemTween.TweenProperty(Enemy.Sprite, "position", Vector2.Up * 5, 1f).AsRelative();
+        enemTween.SetTrans(Tween.TransitionType.Spring);
+        enemTween.SetEase(Tween.EaseType.In);
+        enemTween.SetLoops();
+        enemTween.Play();
+
+        CM.Connect(nameof(InputHandler.NotePressed), new Callable(this, nameof(OnNotePressed)));
+        CM.Connect(nameof(InputHandler.NoteReleased), new Callable(this, nameof(OnNoteReleased)));
+
+        Audio.Play();
+    }
+
+    public override void _Process(double delta)
+    {
+        TimeKeeper.CurrentTime = Audio.GetPlaybackPosition();
+        CD.CheckMiss();
+    }
+    #endregion
+
+    #region Input&Timing
+    private void OnNotePressed(ArrowType type)
+    {
+        CD.CheckNoteTiming(type);
+    }
+
+    private void OnNoteReleased(ArrowType arrowType) { }
+
+    private void OnTimedInput(Note note, ArrowType arrowType, int beat, double beatDif)
+    {
+        GD.Print(arrowType + " " + beat + " difference: " + beatDif);
+        if (note == null)
+        {
+            PlayerAddNote(arrowType, beat);
+            return;
+        }
+        //TODO: Evaluate Timing as a function
+        Timing timed = CheckTiming(beatDif);
+        GD.Print(timed);
+
+        if (timed == Timing.Miss)
+        {
+            note.OnHit(this, timed);
+            NotePlacementBar.MissNote();
+        }
+        else
+        {
+            note.OnHit(this, timed);
+            NotePlacementBar.HitNote();
+        }
+        NotePlacementBar.ComboText(timed.ToString());
+    }
+
+    private Timing CheckTiming(double beatDif)
+    {
+        if (beatDif < _timingInterval * 1)
+        {
+            return Timing.Perfect;
+        }
+
+        if (beatDif < _timingInterval * 2)
+        {
+            return Timing.Good;
+        }
+
+        if (beatDif < _timingInterval * 3)
+        {
+            return Timing.Okay;
+        }
+
+        return Timing.Miss;
+    }
+
+    #endregion
+
+    #region BattleEffect Handling
+
+    private delegate void NotePlacedHandler(BattleDirector BD);
+    private event NotePlacedHandler NotePlaced;
+
+    private void EventizeRelics()
+    {
+        foreach (var relic in Player.Stats.CurRelics)
+        {
+            GetNode<Label>("TempRelicList").Text += "\n" + relic.Name;
+            foreach (var effect in relic.Effects)
+            {
+                switch (effect.GetTrigger()) //TODO: Look into a way to get eventhandler from string
+                {
+                    case BattleEffectTrigger.NotePlaced:
+                        NotePlaced += effect.OnTrigger;
+                        break;
+                }
+            }
+        }
+    }
+    #endregion
+}
diff --git a/scenes/BattleDirector/scripts/Conductor.cs b/scenes/BattleDirector/scripts/Conductor.cs
new file mode 100644
index 00000000..e62ece9e
--- /dev/null
+++ b/scenes/BattleDirector/scripts/Conductor.cs
@@ -0,0 +1,155 @@
+using System;
+using FunkEngine;
+using Godot;
+
+public partial class Conductor : Node
+{
+    [Export]
+    private ChartManager CM;
+
+    public delegate void TimedInputHandler(Note note, ArrowType type, int beat, double beatDif);
+    public event TimedInputHandler TimedInput;
+
+    //Assume queue structure for notes in each lane.
+    //Can eventually make this its own structure
+    private NoteArrow[][] _laneData = Array.Empty<NoteArrow[]>();
+
+    private int[] _laneLastBeat = new int[]
+    {
+        //Temporary (hopefully) measure to bridge from note queue structure to ordered array
+        0,
+        0,
+        0,
+        0,
+    };
+
+    public Note[] Notes = Array.Empty<Note>();
+
+    //Returns first note of lane without modifying lane data
+    private Note GetNoteAt(ArrowType dir, int beat)
+    {
+        return GetNote(_laneData[(int)dir][beat]);
+    }
+
+    //Get note of a note arrow
+    private Note GetNote(NoteArrow arrow)
+    {
+        return Notes[arrow.NoteIdx];
+    }
+
+    private bool IsNoteActive(ArrowType type, int beat)
+    {
+        return _laneData[(int)type][beat] != null && _laneData[(int)type][beat].IsActive;
+    }
+
+    public bool AddNoteToLane(ArrowType type, int beat, bool isActive = true)
+    {
+        beat %= CM.BeatsPerLoop;
+        //Don't add dupe notes //Beat at 0 is too messy.
+        if (beat == 0 || _laneData[(int)type][beat] != null)
+        {
+            return false;
+        }
+
+        NoteArrow arrow;
+        if (isActive)
+        {
+            arrow = CM.AddArrowToLane(type, beat, Notes.Length - 1);
+            arrow.NoteIdx = 1;
+        }
+        else
+        {
+            arrow = CM.AddArrowToLane(type, beat, Notes.Length - 1, new Color(1, 0.43f, 0.26f));
+            arrow.NoteIdx = 0;
+        }
+
+        arrow.IsActive = isActive;
+        _laneData[(int)type][beat] = arrow;
+        return true;
+    }
+
+    public void Prep() //TODO: Streamline battle initialization
+    {
+        _laneData = new NoteArrow[][]
+        {
+            new NoteArrow[CM.BeatsPerLoop],
+            new NoteArrow[CM.BeatsPerLoop],
+            new NoteArrow[CM.BeatsPerLoop],
+            new NoteArrow[CM.BeatsPerLoop],
+        };
+        AddExampleNotes();
+    }
+
+    private void AddExampleNotes()
+    {
+        GD.Print(CM.BeatsPerLoop);
+        for (int i = 1; i < 15; i++)
+        {
+            AddNoteToLane(ArrowType.Up, i * 4);
+        }
+
+        for (int i = 1; i < 15; i++)
+        {
+            AddNoteToLane(ArrowType.Left, 4 * i + 1);
+        }
+
+        for (int i = 0; i < 10; i++)
+        {
+            AddNoteToLane(ArrowType.Right, 3 * i + 32);
+        }
+
+        for (int i = 0; i < 3; i++)
+        {
+            AddNoteToLane(ArrowType.Down, 8 * i + 16);
+        }
+    }
+
+    //Check all lanes for misses from missed inputs
+    public void CheckMiss()
+    {
+        //On current beat, if prev beat is active and not inputted
+        double realBeat = TimeKeeper.CurrentTime / (60 / (double)TimeKeeper.Bpm) % CM.BeatsPerLoop;
+        for (int i = 0; i < _laneData.Length; i++)
+        {
+            if (
+                !(_laneLastBeat[i] < Math.Floor(realBeat))
+                && (_laneLastBeat[i] != CM.BeatsPerLoop - 1 || Math.Floor(realBeat) != 0)
+            )
+                continue;
+            if (_laneData[i][_laneLastBeat[i]] == null || !_laneData[i][_laneLastBeat[i]].IsActive)
+            {
+                _laneLastBeat[i] = (_laneLastBeat[i] + 1) % CM.BeatsPerLoop;
+                continue;
+            }
+
+            //Note exists and has been missed
+            _laneData[i][_laneLastBeat[i]].NoteHit();
+            TimedInput?.Invoke(
+                GetNoteAt((ArrowType)i, _laneLastBeat[i]),
+                (ArrowType)i,
+                _laneLastBeat[i],
+                1
+            );
+            _laneLastBeat[i] = (_laneLastBeat[i] + 1) % CM.BeatsPerLoop;
+        }
+    }
+
+    public void CheckNoteTiming(ArrowType type)
+    {
+        double realBeat = TimeKeeper.CurrentTime / (60 / (double)TimeKeeper.Bpm) % CM.BeatsPerLoop;
+        int curBeat = (int)Math.Round(realBeat);
+        GD.Print("Cur beat " + curBeat + "Real: " + realBeat.ToString("#.###"));
+        if (_laneData[(int)type][curBeat % CM.BeatsPerLoop] == null)
+        {
+            TimedInput?.Invoke(null, type, curBeat, Math.Abs(realBeat - curBeat));
+            return;
+        }
+
+        if (!_laneData[(int)type][curBeat % CM.BeatsPerLoop].IsActive)
+            return;
+        double beatDif = Math.Abs(realBeat - curBeat);
+        _laneData[(int)type][curBeat % CM.BeatsPerLoop].NoteHit();
+        _laneLastBeat[(int)type] = (curBeat) % CM.BeatsPerLoop;
+        TimedInput?.Invoke(GetNoteAt(type, curBeat), type, curBeat, beatDif);
+    }
+}
diff --git a/scenes/BattleDirector/NotePlacementBar.cs b/scenes/BattleDirector/scripts/NotePlacementBar.cs
similarity index 60%
rename from scenes/BattleDirector/NotePlacementBar.cs
rename to scenes/BattleDirector/scripts/NotePlacementBar.cs
index d86a3c9a..4313979f 100644
--- a/scenes/BattleDirector/NotePlacementBar.cs
+++ b/scenes/BattleDirector/scripts/NotePlacementBar.cs
@@ -4,8 +4,8 @@
 public partial class NotePlacementBar : Node
 {
     const int MaxValue = 80;
-    int currentBarValue;
-    int currentCombo;
+    private int _currentBarValue;
+    private int _currentCombo;
     int comboMult;
     int notesToIncreaseCombo;
 
@@ -19,36 +19,33 @@ public partial class NotePlacementBar : Node
     public override void _Ready()
     {
         notePlacementBar.MaxValue = MaxValue;
-        currentBarValue = 0;
-        currentCombo = 0;
+        _currentBarValue = 0;
+        _currentCombo = 0;
         comboMult = 1;
         notesToIncreaseCombo = 4;
     }
 
     public void ComboText(string text)
     {
-        var feedbackScene = ResourceLoader.Load<PackedScene>(
-            "res://scenes/BattleDirector/TextParticle.tscn"
-        );
-        TextParticle newText = feedbackScene.Instantiate<TextParticle>();
+        TextParticle newText = new TextParticle();
         AddChild(newText);
-        newText.Text = text + $" {currentCombo}";
+        newText.Text = text + $" {_currentCombo}";
     }
 
     // Hitting a note increases combo, combo mult, and note placement bar
     public void HitNote()
     {
-        currentCombo++;
+        _currentCombo++;
         DetermineComboMult();
-        currentBarValue += comboMult;
-        UpdateNotePlacementBar(currentBarValue);
+        _currentBarValue += comboMult;
+        UpdateNotePlacementBar(_currentBarValue);
         UpdateComboMultText();
     }
 
     // Missing a note resets combo
     public void MissNote()
     {
-        currentCombo = 0;
+        _currentCombo = 0;
         DetermineComboMult();
         UpdateComboMultText();
     }
@@ -56,26 +53,26 @@ public void MissNote()
     // Placing a note resets the note placement bar
     public void PlacedNote()
     {
-        currentBarValue = 0;
-        UpdateNotePlacementBar(currentBarValue);
+        _currentBarValue = 0;
+        UpdateNotePlacementBar(_currentBarValue);
     }
 
     public bool CanPlaceNote()
     {
-        return currentBarValue >= MaxValue;
+        return _currentBarValue >= MaxValue;
     }
 
     private void DetermineComboMult()
     {
-        comboMult = currentCombo / notesToIncreaseCombo + 1;
+        comboMult = _currentCombo / notesToIncreaseCombo + 1;
     }
 
-    public void UpdateNotePlacementBar(int newValue)
+    private void UpdateNotePlacementBar(int newValue)
     {
         notePlacementBar.Value = newValue;
     }
 
-    public void UpdateComboMultText()
+    private void UpdateComboMultText()
     {
         currentComboMultText.Text = $"x{comboMult.ToString()}";
     }
diff --git a/scenes/BattleDirector/TextParticle.cs b/scenes/BattleDirector/scripts/TextParticle.cs
similarity index 84%
rename from scenes/BattleDirector/TextParticle.cs
rename to scenes/BattleDirector/scripts/TextParticle.cs
index 273d4967..905c93a2 100644
--- a/scenes/BattleDirector/TextParticle.cs
+++ b/scenes/BattleDirector/scripts/TextParticle.cs
@@ -17,7 +17,4 @@ public override void _Ready()
         tween.SetParallel(false);
         tween.TweenCallback(Callable.From(QueueFree));
     }
-
-    // Called every frame. 'delta' is the elapsed time since the previous frame.
-    public override void _Process(double delta) { }
 }
diff --git a/scenes/BattleDirector/test_battle_scene.tscn b/scenes/BattleDirector/test_battle_scene.tscn
index 772d4487..5fb1a81c 100644
--- a/scenes/BattleDirector/test_battle_scene.tscn
+++ b/scenes/BattleDirector/test_battle_scene.tscn
@@ -1,21 +1,24 @@
-[gd_scene load_steps=9 format=3 uid="uid://b0mrgr7h0ty1y"]
+[gd_scene load_steps=8 format=3 uid="uid://b0mrgr7h0ty1y"]
 
-[ext_resource type="Script" path="res://scenes/BattleDirector/BattleDirector.cs" id="1_cwqqr"]
+[ext_resource type="Script" path="res://scenes/BattleDirector/scripts/BattleDirector.cs" id="1_cwqqr"]
 [ext_resource type="PackedScene" uid="uid://dfevfib11kou1" path="res://scenes/ChartViewport/ChartViewport.tscn" id="2_cupb3"]
-[ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://scenes/BattleDirector/HealthBar.tscn" id="3_pp0u0"]
+[ext_resource type="Script" path="res://scenes/BattleDirector/scripts/Conductor.cs" id="2_pcp76"]
 [ext_resource type="Texture2D" uid="uid://ci0g72j8q4ec2" path="res://scenes/BattleDirector/assets/CoolBG.jpg" id="4_13o87"]
-[ext_resource type="Texture2D" uid="uid://b6fkei0i83vte" path="res://scenes/BattleDirector/assets/Character1.png" id="5_elveq"]
-[ext_resource type="Texture2D" uid="uid://veedngaorx3l" path="res://scenes/BattleDirector/assets/Enemy1.png" id="6_0k4pw"]
 [ext_resource type="PackedScene" uid="uid://duhiilcv4tat3" path="res://scenes/BattleDirector/NotePlacementBar.tscn" id="7_3ko4g"]
 [ext_resource type="AudioStream" uid="uid://cv6lqjj6lu36h" path="res://Audio/335571__magntron__gamemusic_120bpm.mp3" id="8_caqms"]
+[ext_resource type="Script" path="res://scenes/SceneTransitions/scripts/SceneChange.cs" id="9_bxa6e"]
 
-[node name="ProtoBattleDirector" type="Node2D" node_paths=PackedStringArray("CM", "IH", "NotePlacementBar", "Audio")]
+[node name="ProtoBattleDirector" type="Node2D" node_paths=PackedStringArray("CM", "NotePlacementBar", "CD", "Audio")]
 script = ExtResource("1_cwqqr")
 CM = NodePath("SubViewport")
-IH = NodePath("SubViewport/SubViewport/noteManager")
 NotePlacementBar = NodePath("NotePlacementBar")
+CD = NodePath("Conductor")
 Audio = NodePath("AudioStreamPlayer")
 
+[node name="Conductor" type="Node" parent="." node_paths=PackedStringArray("CM")]
+script = ExtResource("2_pcp76")
+CM = NodePath("../SubViewport")
+
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("8_caqms")
 
@@ -40,22 +43,22 @@ offset_right = 673.0
 offset_bottom = 360.0
 color = Color(0.165656, 0.165656, 0.165656, 1)
 
-[node name="PlayerHP" parent="." instance=ExtResource("3_pp0u0")]
-offset_left = 92.0
-offset_top = 8.0
-offset_right = 132.0
-offset_bottom = 48.0
-SpriteText = ExtResource("5_elveq")
-
-[node name="EnemyHP" parent="." instance=ExtResource("3_pp0u0")]
-offset_left = 403.0
-offset_top = 8.0
-offset_right = 443.0
-offset_bottom = 52.0
-SpriteText = ExtResource("6_0k4pw")
-
 [node name="NotePlacementBar" parent="." instance=ExtResource("7_3ko4g")]
 offset_left = 16.0
 offset_top = 164.0
 offset_right = 16.0
 offset_bottom = 164.0
+
+[node name="LeaveButton" type="Button" parent="."]
+offset_right = 119.0
+offset_bottom = 31.0
+text = "Return to Title"
+script = ExtResource("9_bxa6e")
+
+[node name="TempRelicList" type="Label" parent="."]
+offset_left = 564.0
+offset_top = 165.0
+offset_right = 613.0
+offset_bottom = 188.0
+theme_override_font_sizes/font_size = 10
+text = "Relics:"
diff --git a/scenes/ChartViewport/ChartManager.cs b/scenes/ChartViewport/ChartManager.cs
index 4ecae9e4..c44c3a2c 100644
--- a/scenes/ChartViewport/ChartManager.cs
+++ b/scenes/ChartViewport/ChartManager.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
+using FunkEngine;
 using Godot;
-using ArrowType = NoteArrow.ArrowType;
 
 /**
  * @class ChartManager
@@ -39,7 +39,7 @@ public void OnNoteReleased(ArrowType type)
         EmitSignal(nameof(NoteReleased), (int)type);
     }
 
-    public void PrepChart(BattleDirector.SongData songData)
+    public void PrepChart(SongData songData)
     {
         _loopLen = songData.SongLength / songData.NumLoops;
         TimeKeeper.LoopLength = (float)_loopLen;
@@ -59,16 +59,16 @@ public void PrepChart(BattleDirector.SongData songData)
         tween
             .TweenMethod(
                 Callable.From((Vector2 scale) => TweenArrows(scale)),
-                new Vector2(0.07f, 0.07f),
-                new Vector2(0.07f, 0.07f) * 1.25f,
+                Vector2.One * .8f,
+                Vector2.One,
                 60f / TimeKeeper.Bpm / 2
             )
             .SetEase(Tween.EaseType.Out)
             .SetTrans(Tween.TransitionType.Elastic);
         tween.TweenMethod(
             Callable.From((Vector2 scale) => TweenArrows(scale)),
-            new Vector2(0.07f, 0.07f) * 1.25f,
-            new Vector2(0.07f, 0.07f),
+            Vector2.One,
+            Vector2.One * .8f,
             60f / TimeKeeper.Bpm / 2
         );
         tween.SetLoops().Play();
@@ -98,10 +98,20 @@ private void TweenArrows(Vector2 scale)
         }
     }
 
-    public NoteArrow AddArrowToLane(Note note, int noteIdx)
+    public NoteArrow AddArrowToLane(
+        ArrowType type,
+        int beat,
+        int noteIdx,
+        Color colorOverride = default
+    )
     {
-        var newNote = CreateNote(note.Type, note.Beat);
-        CreateNote(note.Type, note.Beat + BeatsPerLoop); //Create a dummy arrow for looping visuals
+        var newNote = CreateNote(type, beat);
+        var loopArrow = CreateNote(type, beat + BeatsPerLoop); //Create a dummy arrow for looping visuals
+        if (colorOverride != default)
+        {
+            newNote.Modulate = colorOverride;
+            loopArrow.Modulate = colorOverride;
+        }
         newNote.NoteIdx = noteIdx;
         return newNote;
     }
@@ -110,11 +120,22 @@ private NoteArrow CreateNote(ArrowType arrow, int beat = 0)
     {
         var noteScene = ResourceLoader.Load<PackedScene>("res://scenes/NoteManager/note.tscn");
         NoteArrow newArrow = noteScene.Instantiate<NoteArrow>();
-        newArrow.Init(IH.Arrows[(int)arrow]);
+        newArrow.Init(IH.Arrows[(int)arrow], beat);
 
         _arrowGroup.AddChild(newArrow);
         newArrow.Bounds = (float)((double)beat / BeatsPerLoop * (ChartLength / 2));
         newArrow.Position += Vector2.Right * newArrow.Bounds * 10; //temporary fix for notes spawning and instantly calling loop from originating at 0,0
         return newArrow;
     }
+
+    public override void _ExitTree()
+    {
+        GD.Print("[DEBUG] Stopping tweens before exiting the scene...");
+
+        foreach (var tween in GetTree().GetProcessedTweens())
+        {
+            tween.Stop();
+            GD.Print("[DEBUG] Stopped tween.");
+        }
+    }
 }
diff --git a/scenes/Maps/cartographer.tscn b/scenes/Maps/cartographer.tscn
new file mode 100644
index 00000000..79f03ea9
--- /dev/null
+++ b/scenes/Maps/cartographer.tscn
@@ -0,0 +1,3 @@
+[gd_scene format=3 uid="uid://cydmo2lbnj1de"]
+
+[node name="Cartographer" type="Node2D"]
diff --git a/scenes/NoteManager/assets/outline_white.png b/scenes/NoteManager/assets/outline_white.png
new file mode 100644
index 00000000..8dfe2e4e
Binary files /dev/null and b/scenes/NoteManager/assets/outline_white.png differ
diff --git a/scenes/NoteManager/assets/right-arrow.png.import b/scenes/NoteManager/assets/outline_white.png.import
similarity index 66%
rename from scenes/NoteManager/assets/right-arrow.png.import
rename to scenes/NoteManager/assets/outline_white.png.import
index 5a9baa01..b8324285 100644
--- a/scenes/NoteManager/assets/right-arrow.png.import
+++ b/scenes/NoteManager/assets/outline_white.png.import
@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bucvj4fquqpkr"
-path="res://.godot/imported/right-arrow.png-b3005485b42777a77a9d39fbba48875d.ctex"
+uid="uid://xtygvpk7s8e4"
+path="res://.godot/imported/outline_white.png-eff17a86b93281db885f81fdb608ab83.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://scenes/NoteManager/assets/right-arrow.png"
-dest_files=["res://.godot/imported/right-arrow.png-b3005485b42777a77a9d39fbba48875d.ctex"]
+source_file="res://scenes/NoteManager/assets/outline_white.png"
+dest_files=["res://.godot/imported/outline_white.png-eff17a86b93281db885f81fdb608ab83.ctex"]
 
 [params]
 
diff --git a/scenes/NoteManager/assets/right-arrow.png b/scenes/NoteManager/assets/right-arrow.png
deleted file mode 100644
index d5c416b7..00000000
Binary files a/scenes/NoteManager/assets/right-arrow.png and /dev/null differ
diff --git a/scenes/NoteManager/note.tscn b/scenes/NoteManager/note.tscn
index e0b2aa76..7c95c57c 100644
--- a/scenes/NoteManager/note.tscn
+++ b/scenes/NoteManager/note.tscn
@@ -1,9 +1,8 @@
 [gd_scene load_steps=3 format=3 uid="uid://ck3bfqy30rjbq"]
 
-[ext_resource type="Texture2D" uid="uid://bucvj4fquqpkr" path="res://scenes/NoteManager/assets/right-arrow.png" id="1_kubiy"]
+[ext_resource type="Texture2D" uid="uid://xtygvpk7s8e4" path="res://scenes/NoteManager/assets/outline_white.png" id="1_vs4mw"]
 [ext_resource type="Script" path="res://scenes/NoteManager/scripts/NoteArrow.cs" id="2_lbl4b"]
 
 [node name="Right-arrow" type="Sprite2D"]
-scale = Vector2(0.07, 0.07)
-texture = ExtResource("1_kubiy")
+texture = ExtResource("1_vs4mw")
 script = ExtResource("2_lbl4b")
diff --git a/scenes/NoteManager/note_manager.tscn b/scenes/NoteManager/note_manager.tscn
index 82ab15fd..d6b1b6ca 100644
--- a/scenes/NoteManager/note_manager.tscn
+++ b/scenes/NoteManager/note_manager.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=3 uid="uid://bn8txx53xlguw"]
 
 [ext_resource type="Script" path="res://scenes/NoteManager/scripts/InputHandler.cs" id="1_2oeuf"]
-[ext_resource type="Texture2D" uid="uid://bucvj4fquqpkr" path="res://scenes/NoteManager/assets/right-arrow.png" id="2_ldmuy"]
+[ext_resource type="Texture2D" uid="uid://xtygvpk7s8e4" path="res://scenes/NoteManager/assets/outline_white.png" id="2_7ue4e"]
 [ext_resource type="Script" path="res://scenes/NoteManager/scripts/NoteChecker.cs" id="3_0cioe"]
 [ext_resource type="Texture2D" uid="uid://b0tvsewgnf2x7" path="res://icon.svg" id="4_foklt"]
 
@@ -13,28 +13,24 @@ script = ExtResource("1_2oeuf")
 [node name="arrowUp" type="Sprite2D" parent="noteCheckers"]
 position = Vector2(0, 24)
 rotation = -1.5708
-scale = Vector2(0.09, 0.09)
-texture = ExtResource("2_ldmuy")
+texture = ExtResource("2_7ue4e")
 script = ExtResource("3_0cioe")
 
 [node name="arrowLeft" type="Sprite2D" parent="noteCheckers"]
 position = Vector2(0, 76)
 rotation = 3.14159
-scale = Vector2(0.09, 0.09)
-texture = ExtResource("2_ldmuy")
+texture = ExtResource("2_7ue4e")
 script = ExtResource("3_0cioe")
 
 [node name="arrowDown" type="Sprite2D" parent="noteCheckers"]
 position = Vector2(0, 129)
 rotation = 1.5708
-scale = Vector2(0.09, 0.09)
-texture = ExtResource("2_ldmuy")
+texture = ExtResource("2_7ue4e")
 script = ExtResource("3_0cioe")
 
 [node name="arrowRight" type="Sprite2D" parent="noteCheckers"]
 position = Vector2(0, 181)
-scale = Vector2(0.09, 0.09)
-texture = ExtResource("2_ldmuy")
+texture = ExtResource("2_7ue4e")
 script = ExtResource("3_0cioe")
 
 [node name="ui" type="Node2D" parent="."]
diff --git a/scenes/NoteManager/scripts/InputHandler.cs b/scenes/NoteManager/scripts/InputHandler.cs
index 466c346a..b1961d4d 100644
--- a/scenes/NoteManager/scripts/InputHandler.cs
+++ b/scenes/NoteManager/scripts/InputHandler.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
+using FunkEngine;
 using Godot;
-using ArrowType = NoteArrow.ArrowType;
 
 /**
  * @class InputHandler
@@ -15,14 +15,6 @@ public partial class InputHandler : Node2D
     [Signal]
     public delegate void NoteReleasedEventHandler(ArrowType arrowType);
 
-    public struct ArrowData
-    {
-        public Color Color;
-        public string Key;
-        public NoteChecker Node;
-        public ArrowType Type;
-    }
-
     public ArrowData[] Arrows = new ArrowData[]
     {
         new ArrowData()
diff --git a/scenes/NoteManager/scripts/NoteArrow.cs b/scenes/NoteManager/scripts/NoteArrow.cs
index 934ed28b..71105b6b 100644
--- a/scenes/NoteManager/scripts/NoteArrow.cs
+++ b/scenes/NoteManager/scripts/NoteArrow.cs
@@ -1,3 +1,4 @@
+using FunkEngine;
 using Godot;
 
 /**
@@ -6,23 +7,19 @@
  */
 public partial class NoteArrow : Sprite2D
 { //TextRect caused issues later :)
-    public enum ArrowType
-    {
-        Up = 0,
-        Down = 1,
-        Left = 2,
-        Right = 3,
-    }
-
     public int NoteIdx;
+    public ArrowType Type;
+    public int Beat;
     public float Bounds;
     public bool IsActive;
 
-    public void Init(InputHandler.ArrowData parentArrowData)
+    public void Init(ArrowData parentArrowData, int beat)
     {
         ZIndex = 1;
 
-        SelfModulate = parentArrowData.Color;
+        Type = parentArrowData.Type;
+        Beat = beat;
+
         Position += Vector2.Down * (parentArrowData.Node.GlobalPosition.Y);
         RotationDegrees = parentArrowData.Node.RotationDegrees;
     }
diff --git a/scenes/Puppets/HealthBar.tscn b/scenes/Puppets/HealthBar.tscn
new file mode 100644
index 00000000..203235a8
--- /dev/null
+++ b/scenes/Puppets/HealthBar.tscn
@@ -0,0 +1,27 @@
+[gd_scene load_steps=6 format=3 uid="uid://bgomxovxs7sr8"]
+
+[ext_resource type="Script" path="res://scenes/Puppets/scripts/HealthBar.cs" id="1_b1t4i"]
+
+[sub_resource type="Gradient" id="Gradient_ve5ki"]
+colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_ti0cv"]
+gradient = SubResource("Gradient_ve5ki")
+width = 150
+height = 20
+
+[sub_resource type="Gradient" id="Gradient_soqhm"]
+colors = PackedColorArray(0, 1, 0.0999999, 1, 1, 1, 1, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_r4hau"]
+gradient = SubResource("Gradient_soqhm")
+width = 146
+height = 16
+
+[node name="ProgressBar" type="TextureProgressBar"]
+offset_right = 150.0
+offset_bottom = 20.0
+texture_under = SubResource("GradientTexture2D_ti0cv")
+texture_progress = SubResource("GradientTexture2D_r4hau")
+texture_progress_offset = Vector2(2, 2)
+script = ExtResource("1_b1t4i")
diff --git a/scenes/Puppets/scripts/HealthBar.cs b/scenes/Puppets/scripts/HealthBar.cs
new file mode 100644
index 00000000..cfd757ba
--- /dev/null
+++ b/scenes/Puppets/scripts/HealthBar.cs
@@ -0,0 +1,31 @@
+using System;
+using Godot;
+
+public partial class HealthBar : TextureProgressBar
+{
+    public override void _Ready()
+    {
+        Value = MaxValue;
+    }
+
+    //initializes health
+    public void SetHealth(int max, int current)
+    {
+        MaxValue = max;
+        Value = current;
+    }
+
+    //For effects changes max hp, and changes hp by a similar amount
+    public void ChangeMax(int change)
+    {
+        MaxValue += change;
+        Value += change;
+    }
+
+    //Changes hp value, for damage or heal, returns resulting hp.
+    public int ChangeHP(int amount)
+    {
+        Value += amount;
+        return (int)Value;
+    }
+}
diff --git a/scenes/Puppets/scripts/PlayerPuppet.cs b/scenes/Puppets/scripts/PlayerPuppet.cs
new file mode 100644
index 00000000..7e98170f
--- /dev/null
+++ b/scenes/Puppets/scripts/PlayerPuppet.cs
@@ -0,0 +1,15 @@
+using System;
+using Godot;
+
+public partial class PlayerPuppet : PuppetTemplate
+{
+    public PlayerStats Stats = new PlayerStats();
+
+    public override void _Ready()
+    {
+        base._Ready();
+        Init(GD.Load<Texture2D>("res://scenes/BattleDirector/assets/Character1.png"), "Player");
+        SetPosition(new Vector2(80, 0));
+        Sprite.Position += Vector2.Down * 30; //TEMP
+    }
+}
diff --git a/scenes/Puppets/scripts/PlayerStats.cs b/scenes/Puppets/scripts/PlayerStats.cs
new file mode 100644
index 00000000..c788ff59
--- /dev/null
+++ b/scenes/Puppets/scripts/PlayerStats.cs
@@ -0,0 +1,11 @@
+using System;
+using Godot;
+
+public partial class PlayerStats : Resource
+{
+    public int MaxHealth = 300;
+    public Note[] CurNotes = new Note[] { Scribe.NoteDictionary[1].Clone() };
+
+    public RelicTemplate[] CurRelics = new[] { Scribe.RelicDictionary[0].Clone() };
+    public int Attack = 1;
+}
diff --git a/scenes/Puppets/scripts/PuppetTemplate.cs b/scenes/Puppets/scripts/PuppetTemplate.cs
new file mode 100644
index 00000000..249638a9
--- /dev/null
+++ b/scenes/Puppets/scripts/PuppetTemplate.cs
@@ -0,0 +1,46 @@
+using System;
+using Godot;
+
+/** Essentially a battle entity. Has HP and can be healed or damaged.
+ * TODO: Look into interfaces
+ */
+public partial class PuppetTemplate : Node2D
+{
+    protected HealthBar _healthBar;
+    public Sprite2D Sprite = new Sprite2D();
+
+    protected int _maxHealth = 100;
+    protected int _currentHealth = 100;
+
+    //Stats would go here.
+
+    public string UniqName = ""; //Eventually make subclasses/scenes/real stuff
+
+    public override void _Ready()
+    {
+        _healthBar = GD.Load<PackedScene>("res://scenes/Puppets/HealthBar.tscn")
+            .Instantiate<HealthBar>();
+        AddChild(_healthBar);
+
+        Sprite.Position = new Vector2(75, 86);
+        AddChild(Sprite); //TODO: DECIDE Whether to replace with packedscenes/robust subclasses
+
+        _healthBar.SetHealth(_maxHealth, _currentHealth);
+    }
+
+    public void Init(Texture2D texture, string name)
+    {
+        Sprite.Texture = texture;
+        UniqName = name;
+    }
+
+    public void TakeDamage(int amount)
+    {
+        _healthBar.ChangeHP(-amount);
+    }
+
+    public void Heal(int amount)
+    {
+        _healthBar.ChangeHP(amount);
+    }
+}
diff --git a/scenes/SceneTransitions/TitleScreen.tscn b/scenes/SceneTransitions/TitleScreen.tscn
new file mode 100644
index 00000000..9f438122
--- /dev/null
+++ b/scenes/SceneTransitions/TitleScreen.tscn
@@ -0,0 +1,105 @@
+[gd_scene load_steps=4 format=3 uid="uid://bm41yti6ij2j"]
+
+[ext_resource type="Texture2D" uid="uid://b0tvsewgnf2x7" path="res://icon.svg" id="1_r5xy8"]
+[ext_resource type="Script" path="res://scenes/SceneTransitions/scripts/SceneChange.cs" id="2_7f3m6"]
+[ext_resource type="Texture2D" uid="uid://b6fkei0i83vte" path="res://scenes/BattleDirector/assets/Character1.png" id="2_cf582"]
+
+[node name="Title" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+
+[node name="SecretLabel" type="Label" parent="."]
+visible = false
+layout_mode = 0
+offset_right = 49.0
+offset_bottom = 23.0
+text = "(Control nodes are fucking weird weird.)"
+
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+size_flags_stretch_ratio = 0.5
+
+[node name="Control" type="CenterContainer" parent="VBoxContainer/MarginContainer"]
+layout_mode = 2
+
+[node name="Control" type="Control" parent="VBoxContainer/MarginContainer/Control"]
+layout_mode = 2
+
+[node name="Godot" type="Sprite2D" parent="VBoxContainer/MarginContainer/Control/Control"]
+texture = ExtResource("1_r5xy8")
+
+[node name="Rabb" type="Sprite2D" parent="VBoxContainer/MarginContainer/Control/Control"]
+texture = ExtResource("2_cf582")
+
+[node name="Label" type="Label" parent="VBoxContainer/MarginContainer/Control"]
+layout_mode = 2
+text = "Project Funk engine"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+size_flags_stretch_ratio = 0.3
+
+[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_stretch_ratio = 0.5
+theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 20
+theme_override_constants/margin_bottom = 20
+
+[node name="Button" type="Button" parent="VBoxContainer/HBoxContainer/MarginContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Start Game"
+script = ExtResource("2_7f3m6")
+ScenePath = 1
+
+[node name="MarginContainer3" type="MarginContainer" parent="VBoxContainer/HBoxContainer"]
+visible = false
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_stretch_ratio = 0.5
+theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 20
+theme_override_constants/margin_bottom = 20
+
+[node name="Button" type="Button" parent="VBoxContainer/HBoxContainer/MarginContainer3"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Load Game (Experimental)"
+script = ExtResource("2_7f3m6")
+ScenePath = 1
+
+[node name="MarginContainer2" type="MarginContainer" parent="VBoxContainer/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_stretch_ratio = 0.5
+theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 20
+theme_override_constants/margin_bottom = 20
+
+[node name="Button" type="Button" parent="VBoxContainer/HBoxContainer/MarginContainer2"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Quit Game"
+script = ExtResource("2_7f3m6")
+ScenePath = 2
diff --git a/scenes/SceneTransitions/scripts/SceneChange.cs b/scenes/SceneTransitions/scripts/SceneChange.cs
new file mode 100644
index 00000000..adeb1d8f
--- /dev/null
+++ b/scenes/SceneTransitions/scripts/SceneChange.cs
@@ -0,0 +1,28 @@
+using System;
+using FunkEngine;
+using Godot;
+
+public partial class SceneChange : Button
+{
+    [Export]
+    public Stages ScenePath;
+
+    public override void _Ready()
+    {
+        Pressed += OnButtonPressed;
+        GD.Print($"[DEBUG] Scene Path: '{ScenePath}'");
+    }
+
+    private void OnButtonPressed()
+    {
+        if (ScenePath == Stages.Quit)
+        {
+            GD.Print("Exiting game");
+            GetTree().Quit();
+            return;
+        }
+
+        GD.Print($"✅ Loading scene: {ScenePath}");
+        GetNode<StageProducer>("/root/StageProducer").TransitionStage(ScenePath);
+    }
+}
diff --git a/scenes/SceneTransitions/testTransition.tscn b/scenes/SceneTransitions/testTransition.tscn
new file mode 100644
index 00000000..e9bce855
--- /dev/null
+++ b/scenes/SceneTransitions/testTransition.tscn
@@ -0,0 +1,33 @@
+[gd_scene load_steps=2 format=3 uid="uid://dbeplni2du158"]
+
+[ext_resource type="Script" path="res://scenes/SceneTransitions/scripts/SceneChange.cs" id="1_n6d5u"]
+
+[node name="Control" type="Control"]
+layout_mode = 3
+anchors_preset = 0
+offset_right = 40.0
+offset_bottom = 40.0
+
+[node name="Node2D" type="Node2D" parent="."]
+
+[node name="StartButton" type="Button" parent="."]
+layout_mode = 0
+offset_left = 120.0
+offset_top = 56.0
+offset_right = 128.0
+offset_bottom = 64.0
+scale = Vector2(2.48, 2.48)
+text = "start battle"
+script = ExtResource("1_n6d5u")
+ScenePath = "res://scenes/BattleDirector/test_battle_scene.tscn"
+
+[node name="ExitButton" type="Button" parent="."]
+layout_mode = 0
+offset_left = 471.0
+offset_top = 95.0
+offset_right = 508.0
+offset_bottom = 126.0
+scale = Vector2(2.56, 2.56)
+text = "exit"
+script = ExtResource("1_n6d5u")
+ScenePath = "exit"
diff --git a/scenes/main.tscn b/scenes/main.tscn
deleted file mode 100644
index 03a5f3fa..00000000
--- a/scenes/main.tscn
+++ /dev/null
@@ -1,3 +0,0 @@
-[gd_scene format=3 uid="uid://diq2m6va1x52k"]
-
-[node name="Main" type="Node2D"]
diff --git a/scripts/Main.cs b/scripts/Main.cs
deleted file mode 100644
index 52278fa9..00000000
--- a/scripts/Main.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using System;
-using Godot;
-using static InputHandler;
-
-public partial class Main : Node2D { }