diff --git a/TSE_Core/src/interfaces/ICursorHandler.cpp b/TSE_Core/src/interfaces/ICursorHandler.cpp
index 272d384..4a7c7b9 100644
--- a/TSE_Core/src/interfaces/ICursorHandler.cpp
+++ b/TSE_Core/src/interfaces/ICursorHandler.cpp
@@ -17,6 +17,7 @@ void TSE::ICursorHandler::Enable()
     if(!enabled())
     {
         IInputManager::instance()->RegisterCursorHandler(this);
+        Enabled = true;
     }
 }
 
@@ -25,6 +26,7 @@ void TSE::ICursorHandler::Disable()
     if(enabled())
     {
         IInputManager::instance()->UnregisterCursorHandler(this);
+        Enabled = false;
     }
 }
 
diff --git a/TSE_Core/src/interfaces/IKeyInputHandler.cpp b/TSE_Core/src/interfaces/IKeyInputHandler.cpp
index 74f1011..2f685a5 100644
--- a/TSE_Core/src/interfaces/IKeyInputHandler.cpp
+++ b/TSE_Core/src/interfaces/IKeyInputHandler.cpp
@@ -17,6 +17,7 @@ void TSE::IKeyInputHandler::Enable()
     if(!enabled())
     {
         IInputManager::instance()->RegisterKeyHandler(this);
+        Enabled = true;
     }
 }
 
@@ -25,6 +26,7 @@ void TSE::IKeyInputHandler::Disable()
     if(enabled())
     {
         IInputManager::instance()->UnregisterKeyHandler(this);
+        Enabled = false;
     }
 }
 
diff --git a/TSE_Editor/src/BehaviourScripts/basicEditorCamera.cpp b/TSE_Editor/src/BehaviourScripts/basicEditorCamera.cpp
new file mode 100644
index 0000000..a563a2c
--- /dev/null
+++ b/TSE_Editor/src/BehaviourScripts/basicEditorCamera.cpp
@@ -0,0 +1,172 @@
+#include "basicEditorCamera.hpp"
+#include "elements/Transformable.hpp"
+#include "utils/Time.hpp"
+#include "BehaviourScripts/Camera.hpp"
+#include <cmath>
+
+void TSE::EDITOR::basicEditorCamera::OnUpdate()
+{
+    auto euler = baseObject->GetEuler();
+    auto finalrot = rotDelta * rotationMultiplier * Time::deltaTime();
+    rotDelta = Vector2::zero;
+    if(mouseInputEnabled)
+    {
+        euler.y += finalrot.x;  
+        euler.x += finalrot.y;
+    }
+    baseObject->SetEuler(euler);
+
+    Vector3 move;
+
+    if(keyInputEnabled && SceneView::IsHovered)
+        delta = delta + keydelta * keyMultiplier;
+
+    move = baseObject->right() * delta.x;
+    move = move + baseObject->up() * delta.y;
+    move = move + baseObject->forward() * delta.z;
+
+    delta = Vector3::zero;
+
+    
+    move = move * movementMultiplier * Time::deltaTime();
+
+    baseObject->position = baseObject->position + move;
+}
+
+void TSE::EDITOR::basicEditorCamera::Start()
+{
+    ICursorHandler::Enable();
+    IKeyInputHandler::Enable();
+}
+
+void TSE::EDITOR::basicEditorCamera::OnKeyDown(const Key &key, const Modifier &mods)
+{
+    switch (key)
+    {
+    case Key::LeftShift:
+        isShiftPressed = true;
+        break;
+    case Key::W:
+        keydelta = keydelta + Vector3::forward * keyMultiplier;
+        break;
+    case Key::A:
+        keydelta = keydelta + Vector3::left * keyMultiplier;
+        break;
+    case Key::S:
+        keydelta = keydelta + Vector3::back * keyMultiplier;
+        break;
+    case Key::D:
+        keydelta = keydelta + Vector3::right * keyMultiplier;
+        break;
+    case Key::E:
+        keydelta = keydelta + Vector3::up * keyMultiplier;
+        break;
+    case Key::Q:
+        keydelta = keydelta + Vector3::down * keyMultiplier;
+        break;
+    
+    default:
+        return;
+    }
+}
+
+void TSE::EDITOR::basicEditorCamera::OnKeyUp(const Key &key, const Modifier &mods)
+{
+    switch (key)
+    {
+    case Key::LeftShift:
+        isShiftPressed = false;
+        break;
+    case Key::W:
+        keydelta = keydelta - Vector3::forward * keyMultiplier;
+        break;
+    case Key::A:
+        keydelta = keydelta - Vector3::left * keyMultiplier;
+        break;
+    case Key::S:
+        keydelta = keydelta - Vector3::back * keyMultiplier;
+        break;
+    case Key::D:
+        keydelta = keydelta - Vector3::right * keyMultiplier;
+        break;
+    case Key::E:
+        keydelta = keydelta - Vector3::up * keyMultiplier;
+        break;
+    case Key::Q:
+        keydelta = keydelta - Vector3::down * keyMultiplier;
+        break;
+    
+    default:
+        return;
+    }
+}
+
+void TSE::EDITOR::basicEditorCamera::OnMouseButtonDown(const MouseBtn &btn, const Modifier &mods)
+{
+    if(!mouseInputEnabled) return;
+    switch (btn)
+    {
+    case MouseBtn::RightMouse:
+        holdingRightClick = true;
+        break;
+    case MouseBtn::LeftMouse:
+        holdingLeftClick = true;
+        break;
+    }
+}
+
+void TSE::EDITOR::basicEditorCamera::OnMouseButtonUp(const MouseBtn &btn, const Modifier &mods)
+{
+    if(!mouseInputEnabled) return;
+    switch (btn)
+    {
+    case MouseBtn::RightMouse:
+        holdingRightClick = false;
+        break;
+    case MouseBtn::LeftMouse:
+        holdingLeftClick = false;
+        break;
+    
+    default:
+        return;
+    }
+}
+
+void TSE::EDITOR::basicEditorCamera::OnMousePosition(const Vector2 &pos)
+{
+    if(!mouseInputEnabled || !SceneView::IsHovered) return;
+    if(isShiftPressed && holdingLeftClick)
+    {
+        auto tmp = pos - lastMousepos;
+        tmp.x *= -1;
+        delta = delta + tmp;
+    }
+    else if(holdingRightClick)
+    {
+        rotDelta = rotDelta + (pos - lastMousepos);
+    }
+    lastMousepos = pos;
+}
+
+void TSE::EDITOR::basicEditorCamera::OnMouseScroll(const Vector2 &mdelta)
+{
+    if(!mouseInputEnabled || !SceneView::IsHovered) return;
+    Camera* editorCam = (Camera*)Transformable::Find(".EditorCamera")->GetBehaviourScript(CAMERA);
+    float scale = editorCam->GetRenderScale();
+
+    scale += mdelta.y * zoomMultiplier;
+    scale = std::clamp(scale, zoomMin, zoomMax);
+
+    editorCam->SetRenderScale(scale);
+}
+
+void TSE::EDITOR::basicEditorCamera::CustomDraw(const bool &debug)
+{
+    ImGui::DragFloat("Rotation Speed", &rotationMultiplier, 0.1f);
+    ImGui::DragFloat("Movement Speed", &movementMultiplier, 0.1f);
+    ImGui::DragFloat("Zoom Speed", &zoomMultiplier, 0.1f);
+    ImGui::DragFloat("key Speed", &keyMultiplier, 0.1f);
+
+    ImGui::Checkbox("Keybord Input", &keyInputEnabled);
+    ImGui::Checkbox("Mouse Input", &mouseInputEnabled);
+}
diff --git a/TSE_Editor/src/BehaviourScripts/basicEditorCamera.hpp b/TSE_Editor/src/BehaviourScripts/basicEditorCamera.hpp
new file mode 100644
index 0000000..a3945ee
--- /dev/null
+++ b/TSE_Editor/src/BehaviourScripts/basicEditorCamera.hpp
@@ -0,0 +1,60 @@
+#pragma once
+
+#define BASIC_EDITOR_CAMERA typeid(basicEditorCamera).name()
+
+#include "elements/BehaviourScript.hpp"
+#include "interfaces/ICursorHandler.hpp"
+#include "interfaces/IKeyInputHandler.hpp"
+#include "Vector2.hpp"
+#include "Vector3.hpp"
+#include "imgui/imgui.h"
+#include "UI/windows/SceneView.hpp"
+
+namespace TSE::EDITOR
+{
+    class basicEditorCamera : public BehaviourScript, public ICursorHandler, public IKeyInputHandler
+    {
+    private:
+        bool keyInputEnabled = true;
+        bool mouseInputEnabled = true;
+
+        bool isShiftPressed = false;
+        bool holdingRightClick = false;
+        bool holdingLeftClick = false;
+        Vector3 delta = Vector3::zero;
+        Vector3 keydelta = Vector3::zero;
+        Vector2 rotDelta = Vector2::zero;
+        Vector2 lastMousepos;
+        float keyMultiplier = 0.5f;
+
+        float rotationMultiplier = 150;
+        float movementMultiplier = 64;
+        float zoomMultiplier = 2;
+
+        const float zoomMin = 6;
+        const float zoomMax = 500;
+
+        public:
+        void OnUpdate() override;
+        void Start() override;
+        inline const char* GetName() override
+        {
+            return "basicEditorCamera";
+        }
+
+        void OnKeyDown(const Key& key, const Modifier& mods) override;
+        
+        void OnKeyUp(const Key& key, const Modifier& mods) override;
+        
+        void OnMouseButtonDown(const MouseBtn& btn, const Modifier& mods) override;
+        
+        void OnMouseButtonUp(const MouseBtn& btn, const Modifier& mods) override;
+        
+        void OnMousePosition(const Vector2& pos) override;
+        
+        void OnMouseScroll(const Vector2& delta) override;
+
+        void CustomDraw(const bool& debug) override;
+
+    };
+} // namespace TSE::EDITOR
diff --git a/TSE_Editor/src/EditorSubsystem.cpp b/TSE_Editor/src/EditorSubsystem.cpp
index 6cd96aa..5f3bcb4 100644
--- a/TSE_Editor/src/EditorSubsystem.cpp
+++ b/TSE_Editor/src/EditorSubsystem.cpp
@@ -3,6 +3,7 @@
 #include "BehaviourScriptRegistry.hpp"
 #include "BehaviourScripts/AudioListener.hpp"
 #include "BehaviourScripts/AudioSource.hpp"
+#include "BehaviourScripts/basicEditorCamera.hpp"
 
 TSE::EDITOR::EditorSubsystem::EditorSubsystem() : sv(nullptr), editorLayer("")
 {
@@ -34,8 +35,8 @@ TSE::EDITOR::EditorSubsystem::EditorSubsystem() : sv(nullptr), editorLayer("")
     editorCam->SetRenderTarget(rt);
     editorCamera->AddBehaviourScript(editorCam);
 
-    // basicCameraControls controls = basicCameraControls();
-    // editorCamera->AddBehaviourScript(&controls);
+    basicEditorCamera* controls = new basicEditorCamera();
+    editorCamera->AddBehaviourScript(controls);
 
     editorLayer = Layer(".editor");
     editorLayer.AddTransformable(editorCamera);
diff --git a/TSE_Editor/src/UI/windows/HirearchieView.cpp b/TSE_Editor/src/UI/windows/HirearchieView.cpp
index 88ab9bd..4d993bb 100644
--- a/TSE_Editor/src/UI/windows/HirearchieView.cpp
+++ b/TSE_Editor/src/UI/windows/HirearchieView.cpp
@@ -41,6 +41,11 @@ void TSE::EDITOR::HirearchieView::Define()
             //if(layer->GetName() != ".editor")
             DisplayLayer(layer);
         }
+
+        if(!selectedFound && PropertiesView::GetCurrentInspectableType() == InspectableType::Transformable)
+        {
+            PropertiesView::ForceClearInspectorElement();
+        }
         
     }
 
@@ -188,10 +193,6 @@ void TSE::EDITOR::HirearchieView::DisplayLayer(Layer *l)
         {
             DisplayObj(l->GetAllObjects()[i], l);
         }
-        if(!selectedFound && PropertiesView::GetCurrentInspectableType() == InspectableType::Transformable)
-        {
-            PropertiesView::ForceClearInspectorElement();
-        }
     }
     ImGui::Unindent(20.0f);
 }
diff --git a/TSE_Editor/src/UI/windows/SceneView.cpp b/TSE_Editor/src/UI/windows/SceneView.cpp
index 93cb4a4..3b7ce3a 100644
--- a/TSE_Editor/src/UI/windows/SceneView.cpp
+++ b/TSE_Editor/src/UI/windows/SceneView.cpp
@@ -16,6 +16,14 @@ void TSE::EDITOR::SceneView::Define()
         {
             fb->SetSize({vec2.x, vec2.y});
         }
+        if(ImGui::IsWindowFocused())
+        {
+            IsHovered = true;
+        }
+        else
+        {
+            IsHovered = false;
+        }
     }
     ImGui::EndChild();
 }
diff --git a/TSE_Editor/src/UI/windows/SceneView.hpp b/TSE_Editor/src/UI/windows/SceneView.hpp
index 40c2886..2a9b619 100644
--- a/TSE_Editor/src/UI/windows/SceneView.hpp
+++ b/TSE_Editor/src/UI/windows/SceneView.hpp
@@ -10,6 +10,7 @@ namespace TSE::EDITOR
         private:
             TSE::IRenderTexture* fb;
         public:
+            inline static bool IsHovered = false;
             SceneView(TSE::IRenderTexture* frameBuffer);
             void Define() override;
     };
diff --git a/TSE_GlfwImpl/src/InputGlfw.cpp b/TSE_GlfwImpl/src/InputGlfw.cpp
index 06a7f62..fcf9dfd 100644
--- a/TSE_GlfwImpl/src/InputGlfw.cpp
+++ b/TSE_GlfwImpl/src/InputGlfw.cpp
@@ -17,19 +17,22 @@ void TSE::GLFW::InputGlfw::KeyCallback(GLFWwindow *window, int key, int scancode
     case 1: //down
         for(auto handler : ((InputGlfw*)instance())->keyHandler)
         {
-            handler->OnKeyDown((Key)key, (Modifier)mods);
+            if(handler->enabled())
+                handler->OnKeyDown((Key)key, (Modifier)mods);
         }
         break;
     case 0: //up
         for(auto handler : ((InputGlfw*)instance())->keyHandler)
         {
-            handler->OnKeyUp((Key)key, (Modifier)mods);
+            if(handler->enabled())
+                handler->OnKeyUp((Key)key, (Modifier)mods);
         }
         break;
     case 2: //hold
         for(auto handler : ((InputGlfw*)instance())->keyHandler)
         {
-            handler->OnKeyHold((Key)key, (Modifier)mods);
+            if(handler->enabled())
+                handler->OnKeyHold((Key)key, (Modifier)mods);
         }
         break;
     }
@@ -42,19 +45,22 @@ void TSE::GLFW::InputGlfw::MouseButtonCallback(GLFWwindow *window, int button, i
     case 1: //down
         for(auto handler : ((InputGlfw*)instance())->cursorHandler)
         {
-            handler->OnMouseButtonDown((MouseBtn)button, (Modifier)mods);
+            if(handler->enabled())
+                handler->OnMouseButtonDown((MouseBtn)button, (Modifier)mods);
         }
         break;
     case 0: //up
         for(auto handler : ((InputGlfw*)instance())->cursorHandler)
         {
-            handler->OnMouseButtonUp((MouseBtn)button, (Modifier)mods);
+            if(handler->enabled())
+                handler->OnMouseButtonUp((MouseBtn)button, (Modifier)mods);
         }
         break;
     case 2: //hold
         for(auto handler : ((InputGlfw*)instance())->cursorHandler)
         {
-            handler->OnMouseButtonHold((MouseBtn)button, (Modifier)mods);
+            if(handler->enabled())
+                handler->OnMouseButtonHold((MouseBtn)button, (Modifier)mods);
         }
         break;
     }
@@ -64,7 +70,8 @@ void TSE::GLFW::InputGlfw::CursorPosCallback(GLFWwindow *window, double xpos, do
 {
     for(auto handler : ((InputGlfw*)instance())->cursorHandler)
     {
-        handler->OnMousePosition(Vector2(xpos, ypos));
+        if(handler->enabled())
+            handler->OnMousePosition(Vector2(xpos, ypos));
     }
 }
 
@@ -72,7 +79,8 @@ void TSE::GLFW::InputGlfw::ScrollCallback(GLFWwindow *window, double xoffset, do
 {
     for(auto handler : ((InputGlfw*)instance())->cursorHandler)
     {
-        handler->OnMouseScroll(Vector2(xoffset, yoffset));
+        if(handler->enabled())
+            handler->OnMouseScroll(Vector2(xoffset, yoffset));
     }
 }
 
@@ -106,6 +114,7 @@ void TSE::GLFW::InputGlfw::CharCallback(GLFWwindow *window, unsigned int codepoi
 
         for(auto handler : ((InputGlfw*)instance())->keyHandler)
         {
-            handler->OnChar(msg);
+            if(handler->enabled())
+                handler->OnChar(msg);
         }
 }