diff --git a/model/src/main/kotlin/tdt4240/netrunner/model/game/components/dynamic/GravityComponent.kt b/model/src/main/kotlin/tdt4240/netrunner/model/game/components/dynamic/GravityComponent.kt
index 20c834b1adf67b27f10de335e85baefc79921e91..cbdc942895be4de8bc19aeb5ff1f0c9d8dd432e7 100644
--- a/model/src/main/kotlin/tdt4240/netrunner/model/game/components/dynamic/GravityComponent.kt
+++ b/model/src/main/kotlin/tdt4240/netrunner/model/game/components/dynamic/GravityComponent.kt
@@ -7,7 +7,10 @@ import tdt4240.netrunner.model.util.Vec2f
 class GravityComponent(val gravSpeed: Vec2f = Vec2f(0f, GRAVITY)) : Component {
     override val componentName: String = this::class.java.name
 
+
+
     companion object {
-        const val GRAVITY = 9.81f
+        const val GRAVITY = -700.0f
+        //TODO:
     }
 }
\ No newline at end of file
diff --git a/model/src/main/kotlin/tdt4240/netrunner/model/game/factories/PlayerFactory.kt b/model/src/main/kotlin/tdt4240/netrunner/model/game/factories/PlayerFactory.kt
index 5d255ba9cf827889bbe7a7a6a9dc00fd86ffa804..0fd0178d91e6e1b61fd71b6fde5b77df5efe3252 100644
--- a/model/src/main/kotlin/tdt4240/netrunner/model/game/factories/PlayerFactory.kt
+++ b/model/src/main/kotlin/tdt4240/netrunner/model/game/factories/PlayerFactory.kt
@@ -1,6 +1,7 @@
 package tdt4240.netrunner.model.game.factories
 
 import tdt4240.netrunner.model.game.Entity
+import tdt4240.netrunner.model.game.components.dynamic.GravityComponent
 import tdt4240.netrunner.model.game.components.dynamic.PositionComponent
 import tdt4240.netrunner.model.game.components.dynamic.VelocityComponent
 import tdt4240.netrunner.model.game.components.living.LivingComponent
@@ -37,7 +38,8 @@ class PlayerFactory {
                 PositionComponent(initPosition),
                 VelocityComponent(Vec2f()),
                 PlayerComponent(username, color, uid),
-                LivingComponent(100, DEFAULT_MAX_PLAYER_SPEED)
+                LivingComponent(100, DEFAULT_MAX_PLAYER_SPEED),
+                GravityComponent()
         ))
     }
 
diff --git a/server/src/main/java/tdt4240/netrunner/server/game/GameRoom.kt b/server/src/main/java/tdt4240/netrunner/server/game/GameRoom.kt
index b2e2fbfaff64f1d4c7ceba2de28154c2045d52fb..c7fa791b799ed535ced74bc269a382e42a154e9a 100644
--- a/server/src/main/java/tdt4240/netrunner/server/game/GameRoom.kt
+++ b/server/src/main/java/tdt4240/netrunner/server/game/GameRoom.kt
@@ -6,6 +6,7 @@ import tdt4240.netrunner.game.WorldGen
 import tdt4240.netrunner.game.controllers.MovementController
 import tdt4240.netrunner.model.game.EcsEngine
 import tdt4240.netrunner.model.game.Entity
+import tdt4240.netrunner.model.game.components.dynamic.GravityComponent
 import tdt4240.netrunner.model.game.components.dynamic.VelocityComponent
 import tdt4240.netrunner.model.game.factories.PlayerFactory
 import tdt4240.netrunner.model.requests.JoinGameRequest
@@ -80,7 +81,7 @@ class GameRoom(val socketRoomID: String, val server: SocketIoServer, val control
                 }
             }
 
-            val delta = (System.currentTimeMillis() - prevTime).toDouble()
+            val delta = ((System.currentTimeMillis() - prevTime).toDouble())/1000.0
 
             ecs.tick(delta)
 
@@ -201,6 +202,8 @@ class GameRoom(val socketRoomID: String, val server: SocketIoServer, val control
             }
         }
     }
+
+
     // }}}
 
     override fun toString(): String {
@@ -221,7 +224,7 @@ class GameRoom(val socketRoomID: String, val server: SocketIoServer, val control
 
         const val STANDARD_FIELD_LENGTH = 40_000
 
-        const val PLAYER_JUMP_VELOCITY = 10f
+        const val PLAYER_JUMP_VELOCITY = 600f
 
     }
 }