diff --git a/CMakeLists.txt b/CMakeLists.txt
index a24c2c2..743620e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
 
 CPMAddPackage(
         NAME ReWindow
-        URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-2.zip
+        URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-3.zip
 )
 
 CPMAddPackage(
@@ -38,25 +38,24 @@ CPMAddPackage(
         URL https://git.redacted.cc/josh/Event/archive/Release-6.zip
 )
 
-#Temporarily removed due to SystemD requirement.
-#CPMAddPackage(
-#        NAME ReHardwareID
-#        URL https://git.redacted.cc/Redacted/ReHardwareID/archive/v1.1.zip
-#)
+CPMAddPackage(
+        NAME ReHardwareID
+        URL https://git.redacted.cc/Redacted/ReHardwareID/archive/Prerelease-1.zip
+)
 
 CPMAddPackage(
         NAME J3ML
-        URL https://git.redacted.cc/josh/j3ml/archive/Release-2.1.zip
+        URL https://git.redacted.cc/josh/j3ml/archive/Release-2.2.zip
 )
 
 CPMAddPackage(
         NAME JGL
-        URL https://git.redacted.cc/josh/JGL/archive/Prerelease-14.zip
+        URL https://git.redacted.cc/josh/JGL/archive/Prerelease-15.zip
 )
 
 CPMAddPackage(
         NAME ReTexture
-        URL https://git.redacted.cc/Redacted/ReTexture/archive/Prerelease-1.zip
+        URL https://git.redacted.cc/Redacted/ReTexture/archive/Prerelease-2.zip
 )
 
 CPMAddPackage(
diff --git a/src/demo/RuntimeTest/main.cpp b/src/demo/RuntimeTest/main.cpp
index a57b099..432c273 100644
--- a/src/demo/RuntimeTest/main.cpp
+++ b/src/demo/RuntimeTest/main.cpp
@@ -4,8 +4,6 @@
 #include <ball.h>
 #include <freeCam.h>
 #include <demoSky.h>
-//#include <JGL/JGL.h>
-//#include <JGL/Colors.h>
 
 int main()
 {
diff --git a/src/types/entity/moby.cpp b/src/types/entity/moby.cpp
index 07f43bf..7fc03ae 100644
--- a/src/types/entity/moby.cpp
+++ b/src/types/entity/moby.cpp
@@ -48,13 +48,8 @@ Position Moby::projectedVerticalMove(float speed) {
     return {position.x, position.y += (speed*engine->frameDelta), position.z};
 }
 
-Direction Moby::fAngle()
-{
-    Direction a;
-    a.x = -(cos(Math::Radians(getAngle().y)) * cos(Math::Radians(getAngle().x)));
-    a.y = -sin(Math::Radians(getAngle().x));
-    a.z = -(sin(Math::Radians(getAngle().y)) * cos(Math::Radians(getAngle().x)));
-    return a;
+Direction Moby::fAngle() {
+    return getAngleDirection();
 }
 
 Direction Moby::bAngle() {
@@ -62,21 +57,11 @@ Direction Moby::bAngle() {
 }
 
 Direction Moby::rAngle() {
-    Direction f = fAngle();
-    Direction a;
-    a.x = f.x * engine->world->upVector.z - f.z * engine->world->upVector.y;
-    a.y = f.z * engine->world->upVector.x - f.x * engine->world->upVector.z;
-    a.z = f.x * engine->world->upVector.y - f.y * engine->world->upVector.x;
-    return a;
+    return Vector3::Cross(fAngle(), engine->world->upVector);
 }
 
 Direction Moby::lAngle() {
-    Direction f = fAngle();
-    Direction a;
-    a.x = -(f.y * engine->world->upVector.z - f.z * engine->world->upVector.y);
-    a.y = (f.z * engine->world->upVector.x - f.x * engine->world->upVector.z);
-    a.z = -(f.x * engine->world->upVector.y - f.y * engine->world->upVector.x);
-    return a;
+    return -rAngle();
 }
 
 float Moby::getVelocity() {