diff --git a/FinalProject/camera.cpp b/FinalProject/camera.cpp
index 6f70f09..7aa211d 100644
--- a/FinalProject/camera.cpp
+++ b/FinalProject/camera.cpp
@@ -1 +1,5 @@
 #pragma once
+
+#include <GLM/ext/matrix_transform.hpp>
+
+#include "camera.h"
diff --git a/FinalProject/camera.h b/FinalProject/camera.h
index b8ebd48..aef1ef3 100644
--- a/FinalProject/camera.h
+++ b/FinalProject/camera.h
@@ -4,17 +4,26 @@
 
 class Camera {
 private:
+    // Camera state
     glm::vec3 _position;
-    glm::vec3 _direction;
     glm::vec3 _right;
+    glm::vec3 _front;
     glm::vec3 _up;
-    float _zoom;
     float _yawRad;
     float _pitchRad;
     float _rollRad;
+    float _zoom;
 
+//private:
+//    // Camera settings
+//    float _moveStep;
+//    float _yawStep;
+//    float _pitchStep;
+//    float _rollStep;
+    
 private:
-    glm::vec3 frontVec();
+    // World settings
+    glm::vec3 _worldUp;
     
 public:
     Camera();
@@ -23,7 +32,7 @@ public:
     ~Camera();
 
 public:
-    glm::mat4 viewMatrix();
+    inline glm::mat4 viewMatrix();
     
 public:
     void move(glm::vec3 deltaVec);