diff --git a/engine/dlib/src/dlib/configfile.cpp b/engine/dlib/src/dlib/configfile.cpp
index 2843c603db3..b06d50742ed 100644
--- a/engine/dlib/src/dlib/configfile.cpp
+++ b/engine/dlib/src/dlib/configfile.cpp
@@ -399,7 +399,7 @@ namespace dmConfigFile
         (void) value;
     }
 
-    void HttpContent(dmHttpClient::HResponse response , void* user_data, int status_code, const void* content_data, uint32_t content_data_size)
+    void HttpContent(dmHttpClient::HResponse response , void* user_data, int status_code, const void* content_data, uint32_t content_data_size, int32_t content_length)
     {
         HttpContext* context = (HttpContext*) user_data;
         if (status_code != 200)
diff --git a/engine/dlib/src/dlib/http_cache.cpp b/engine/dlib/src/dlib/http_cache.cpp
index 981e1dec28a..eba95a7a429 100644
--- a/engine/dlib/src/dlib/http_cache.cpp
+++ b/engine/dlib/src/dlib/http_cache.cpp
@@ -666,7 +666,7 @@ namespace dmHttpCache
         }
     }
 
-    Result Get(HCache cache, const char* uri, const char* etag, FILE** file, uint64_t* checksum)
+    Result Get(HCache cache, const char* uri, const char* etag, FILE** file, uint32_t* file_size, uint64_t* checksum)
     {
         dmMutex::ScopedLock lock(cache->m_Mutex);
 
@@ -693,6 +693,13 @@ namespace dmHttpCache
             FILE* f = fopen(path, "rb");
             if (f)
             {
+                if (file_size)
+                {
+                    fseek(f, 0L, SEEK_END);
+                    *file_size = ftell(f);
+                    fseek(f, 0L, SEEK_SET);
+                }
+
                 *file = f;
                 entry->m_ReadLockCount++;
                 *checksum = entry->m_Info.m_Checksum;
diff --git a/engine/dlib/src/dlib/http_cache.h b/engine/dlib/src/dlib/http_cache.h
index 72f0705c966..4c86170626f 100644
--- a/engine/dlib/src/dlib/http_cache.h
+++ b/engine/dlib/src/dlib/http_cache.h
@@ -181,7 +181,7 @@ namespace dmHttpCache
      * @param checksum content checksum (dmHashString64)
      * @return RESULT_OK on success.
      */
-    Result Get(HCache cache, const char* uri, const char* etag, FILE** file, uint64_t* checksum);
+    Result Get(HCache cache, const char* uri, const char* etag, FILE** file, uint32_t* file_size, uint64_t* checksum);
 
     /**
      * Set cache entry to verifed
diff --git a/engine/dlib/src/dlib/http_cache_verify.cpp b/engine/dlib/src/dlib/http_cache_verify.cpp
index 5542d81c7d3..245bafcb296 100644
--- a/engine/dlib/src/dlib/http_cache_verify.cpp
+++ b/engine/dlib/src/dlib/http_cache_verify.cpp
@@ -119,7 +119,7 @@ namespace dmHttpCacheVerify
         return verify_context->m_Result;
     }
 
-    static void HttpContent(dmHttpClient::HResponse, void* user_data, int status_code, const void* content_data, uint32_t content_data_size)
+    static void HttpContent(dmHttpClient::HResponse, void* user_data, int status_code, const void* content_data, uint32_t content_data_size, int32_t content_length)
     {
         VerifyContext* verify_context = (VerifyContext*) user_data;
 
diff --git a/engine/dlib/src/dlib/http_client.cpp b/engine/dlib/src/dlib/http_client.cpp
index f095309638f..1b860749152 100644
--- a/engine/dlib/src/dlib/http_client.cpp
+++ b/engine/dlib/src/dlib/http_client.cpp
@@ -220,13 +220,14 @@ namespace dmHttpClient
         }
     }
 
-    static void DefaultHttpContentData(HResponse response, void* user_data, int status_code, const void* content_data, uint32_t content_data_size)
+    static void DefaultHttpContentData(HResponse response, void* user_data, int status_code, const void* content_data, uint32_t content_data_size, int32_t content_length)
     {
         (void) response;
         (void) user_data;
         (void) status_code;
         (void) content_data;
         (void) content_data_size;
+        (void) content_length;
     }
 
     void SetDefaultParams(NewParams* params)
@@ -653,7 +654,7 @@ if (sock_res != dmSocket::RESULT_OK)\
             } else {
                 n = dmMath::Min(to_transfer - total_transferred, response->m_TotalReceived - response->m_ContentOffset);
             }
-            http_content(response, client->m_Userdata, response->m_Status, client->m_Buffer + response->m_ContentOffset, n);
+            http_content(response, client->m_Userdata, response->m_Status, client->m_Buffer + response->m_ContentOffset, n, response->m_ContentLength);
 
             if (response->m_CacheCreator && add_to_cache)
             {
@@ -726,13 +727,14 @@ if (sock_res != dmSocket::RESULT_OK)\
         }
     }
 
-    static void HttpContentConsume(HResponse response, void* user_data, int status_code, const void* content_data, uint32_t content_data_size)
+    static void HttpContentConsume(HResponse response, void* user_data, int status_code, const void* content_data, uint32_t content_data_size, int32_t content_length)
     {
         (void) response;
         (void) user_data;
         (void) status_code;
         (void) content_data;
         (void) content_data_size;
+        (void) content_length;
     }
 
     static Result HandleCached(HClient client, const char* path, Response* response)
@@ -777,8 +779,9 @@ if (sock_res != dmSocket::RESULT_OK)\
         }
 
         FILE* file = 0;
+        uint32_t file_size = 0;
         uint64_t checksum;
-        cache_result = dmHttpCache::Get(client->m_HttpCache, client->m_URI, cache_etag, &file, &checksum);
+        cache_result = dmHttpCache::Get(client->m_HttpCache, client->m_URI, cache_etag, &file, &file_size, &checksum);
         if (cache_result == dmHttpCache::RESULT_OK)
         {
             // NOTE: We have an extra byte for null-termination so no buffer overrun here.
@@ -787,7 +790,7 @@ if (sock_res != dmSocket::RESULT_OK)\
             {
                 nread = fread(client->m_Buffer, 1, BUFFER_SIZE, file);
                 client->m_Buffer[nread] = '\0';
-                client->m_HttpContent(response, client->m_Userdata, response->m_Status, client->m_Buffer, nread);
+                client->m_HttpContent(response, client->m_Userdata, response->m_Status, client->m_Buffer, nread, file_size);
             }
             while (nread > 0);
             dmHttpCache::Release(client->m_HttpCache, client->m_URI, cache_etag, file);
@@ -806,7 +809,7 @@ if (sock_res != dmSocket::RESULT_OK)\
     {
         Result r = RESULT_OK;
 
-        client->m_HttpContent(response, client->m_Userdata, response->m_Status, 0, 0);
+        client->m_HttpContent(response, client->m_Userdata, response->m_Status, 0, 0, 0);
 
         if (strcmp(method, "HEAD") == 0) {
             // A response from a HEAD request should not attempt to read any body despite
@@ -824,7 +827,6 @@ if (sock_res != dmSocket::RESULT_OK)\
             response->m_ContentOffset = 0;
 
             int chunk_size;
-            int chunk_number = 0;
             while(true)
             {
                 chunk_size = 0;
@@ -855,8 +857,6 @@ if (sock_res != dmSocket::RESULT_OK)\
                         r = RESULT_OK;
                         break;
                     }
-
-                    ++chunk_number;
                 }
                 else
                 {
@@ -1057,9 +1057,10 @@ if (sock_res != dmSocket::RESULT_OK)\
         client->m_Statistics.m_DirectFromCache++;
 
         FILE* file = 0;
+        uint32_t file_size = 0;
         uint64_t checksum;
 
-        dmHttpCache::Result cache_result = dmHttpCache::Get(client->m_HttpCache, client->m_URI, info->m_ETag, &file, &checksum);
+        dmHttpCache::Result cache_result = dmHttpCache::Get(client->m_HttpCache, client->m_URI, info->m_ETag, &file, &file_size, &checksum);
         if (cache_result == dmHttpCache::RESULT_OK)
         {
             // NOTE: We have an extra byte for null-termination so no buffer overrun here.
@@ -1068,7 +1069,7 @@ if (sock_res != dmSocket::RESULT_OK)\
             {
                 nread = fread(client->m_Buffer, 1, BUFFER_SIZE, file);
                 client->m_Buffer[nread] = '\0';
-                client->m_HttpContent(&response, client->m_Userdata, 304, client->m_Buffer, nread);
+                client->m_HttpContent(&response, client->m_Userdata, 304, client->m_Buffer, nread, file_size);
             }
             while (nread > 0);
             dmHttpCache::Release(client->m_HttpCache, client->m_URI, info->m_ETag, file);
diff --git a/engine/dlib/src/dlib/http_client.h b/engine/dlib/src/dlib/http_client.h
index b463832cd2b..33b04ee9cd2 100644
--- a/engine/dlib/src/dlib/http_client.h
+++ b/engine/dlib/src/dlib/http_client.h
@@ -68,7 +68,7 @@ namespace dmHttpClient
      * @param content_data Content data
      * @param content_data_size Content data size
      */
-    typedef void (*HttpContent)(HResponse response, void* user_data, int status_code, const void* content_data, uint32_t content_data_size);
+    typedef void (*HttpContent)(HResponse response, void* user_data, int status_code, const void* content_data, uint32_t content_data_size, int32_t content_size);
 
     /**
      * HTTP content-length callback. Invoked for POST-request prior to HttpWrite-callback to determine content-length
diff --git a/engine/dlib/src/test/test_httpcache.cpp b/engine/dlib/src/test/test_httpcache.cpp
index 2a65b8be00c..9474be293c9 100644
--- a/engine/dlib/src/test/test_httpcache.cpp
+++ b/engine/dlib/src/test/test_httpcache.cpp
@@ -73,7 +73,7 @@ class dmHttpCacheTest : public jc_test_base_class
     {
         FILE* f = 0;
         dmHttpCache::Result r;
-        r = dmHttpCache::Get(cache, uri, etag, &f, checksum);
+        r = dmHttpCache::Get(cache, uri, etag, &f, 0, checksum);
         if (r != dmHttpCache::RESULT_OK)
             return r;
 
@@ -387,7 +387,7 @@ TEST_F(dmHttpCacheTest, UpdateReadlocked)
 
     FILE* file;
     uint64_t checksum;
-    r = dmHttpCache::Get(cache, "uri", "etag", &file, &checksum);
+    r = dmHttpCache::Get(cache, "uri", "etag", &file, 0, &checksum);
     ASSERT_EQ(dmHashString64("data"), checksum);
     ASSERT_EQ(dmHttpCache::RESULT_OK, r);
 
@@ -417,7 +417,7 @@ TEST_F(dmHttpCacheTest, GetWriteLocked)
 
     FILE* file;
     uint64_t checksum;
-    r = dmHttpCache::Get(cache, "uri", "etag", &file, &checksum);
+    r = dmHttpCache::Get(cache, "uri", "etag", &file, 0, &checksum);
     ASSERT_EQ(dmHttpCache::RESULT_LOCKED, r);
 
     dmHttpCache::Add(cache, cache_creator, "data", 4);
@@ -481,7 +481,7 @@ TEST_F(dmHttpCacheTest, PartialUpdate)
 
     FILE* file;
     uint64_t checksum;
-    r = dmHttpCache::Get(cache, "uri", "etag", &file, &checksum);
+    r = dmHttpCache::Get(cache, "uri", "etag", &file, 0, &checksum);
     ASSERT_EQ(dmHttpCache::RESULT_LOCKED, r);
 
     dmHttpCache::Add(cache, cache_creator, "data", 4);
diff --git a/engine/dlib/src/test/test_httpclient.cpp b/engine/dlib/src/test/test_httpclient.cpp
index fab45488e86..81f50efe759 100644
--- a/engine/dlib/src/test/test_httpclient.cpp
+++ b/engine/dlib/src/test/test_httpclient.cpp
@@ -85,7 +85,7 @@ class dmHttpClientTest: public jc_test_params_class<const char*>
         self->m_Headers[key] = value;
     }
 
-    static void HttpContent(dmHttpClient::HResponse response, void* user_data, int status_code, const void* content_data, uint32_t content_data_size)
+    static void HttpContent(dmHttpClient::HResponse response, void* user_data, int status_code, const void* content_data, uint32_t content_data_size, int32_t content_length)
     {
         dmHttpClientTest* self = (dmHttpClientTest*) user_data;
         self->m_StatusCode = status_code;
@@ -473,7 +473,7 @@ struct HttpStressHelper
         dmHttpClient::Delete(m_Client);
     }
 
-    static void HttpContent(dmHttpClient::HResponse response, void* user_data, int status_code, const void* content_data, uint32_t content_data_size)
+    static void HttpContent(dmHttpClient::HResponse response, void* user_data, int status_code, const void* content_data, uint32_t content_data_size, int32_t content_length)
     {
         HttpStressHelper* self = (HttpStressHelper*) user_data;
         self->m_StatusCode = status_code;
diff --git a/engine/dlib/src/test/test_httpserver.cpp b/engine/dlib/src/test/test_httpserver.cpp
index 77e5c7b01f5..01760eddce3 100644
--- a/engine/dlib/src/test/test_httpserver.cpp
+++ b/engine/dlib/src/test/test_httpserver.cpp
@@ -131,7 +131,7 @@ class dmHttpServerTest: public jc_test_base_class
         }
     }
 
-    static void ClientHttpContent(dmHttpClient::HResponse response, void* user_data, int status_code, const void* content_data, uint32_t content_data_size)
+    static void ClientHttpContent(dmHttpClient::HResponse response, void* user_data, int status_code, const void* content_data, uint32_t content_data_size, int32_t content_length)
     {
         dmHttpServerTest* self = (dmHttpServerTest*) user_data;
         self->m_ClientData.append((const char*) content_data, content_data_size);
diff --git a/engine/engine/src/engine.cpp b/engine/engine/src/engine.cpp
index 3ccaa89ae89..ba1b1a78eee 100644
--- a/engine/engine/src/engine.cpp
+++ b/engine/engine/src/engine.cpp
@@ -1307,13 +1307,16 @@ namespace dmEngine
         script_lib_context.m_JobThread       = engine->m_JobThreadContext;
 
         if (engine->m_SharedScriptContext) {
+            script_lib_context.m_ScriptContext = engine->m_SharedScriptContext;
             script_lib_context.m_LuaState = dmScript::GetLuaState(engine->m_SharedScriptContext);
             if (!dmGameSystem::InitializeScriptLibs(script_lib_context))
                 goto bail;
         } else {
+            script_lib_context.m_ScriptContext = engine->m_GOScriptContext;
             script_lib_context.m_LuaState = dmScript::GetLuaState(engine->m_GOScriptContext);
             if (!dmGameSystem::InitializeScriptLibs(script_lib_context))
                 goto bail;
+            script_lib_context.m_ScriptContext = engine->m_GuiScriptContext;
             script_lib_context.m_LuaState = dmScript::GetLuaState(engine->m_GuiScriptContext);
             if (!dmGameSystem::InitializeScriptLibs(script_lib_context))
                 goto bail;
diff --git a/engine/gamesys/src/gamesys/gamesys.h b/engine/gamesys/src/gamesys/gamesys.h
index e63233627e6..e30d1ddad8c 100644
--- a/engine/gamesys/src/gamesys/gamesys.h
+++ b/engine/gamesys/src/gamesys/gamesys.h
@@ -155,6 +155,7 @@ namespace dmGameSystem
         dmHID::HContext         m_HidContext;
         dmGraphics::HContext    m_GraphicsContext;
         dmJobThread::HContext   m_JobThread;
+        dmScript::HContext      m_ScriptContext;
     };
 
 
diff --git a/engine/gamesys/src/gamesys/gamesys_script.cpp b/engine/gamesys/src/gamesys/gamesys_script.cpp
index 403fd8af08c..3e75d961217 100644
--- a/engine/gamesys/src/gamesys/gamesys_script.cpp
+++ b/engine/gamesys/src/gamesys/gamesys_script.cpp
@@ -37,6 +37,8 @@
 #include "scripts/script_image.h"
 #include "scripts/script_sys_gamesys.h"
 #include "scripts/script_camera.h"
+#include "scripts/script_http.h"
+
 #include "components/comp_gui.h"
 
 #include <dmsdk/gamesys/script.h>
@@ -146,6 +148,7 @@ namespace dmGameSystem
         ScriptCollectionProxyRegister(context);
         ScriptImageRegister(context);
         ScriptSysGameSysRegister(context);
+        ScriptHttpRegister(context);
 
         assert(top == lua_gettop(L));
         return result;
@@ -159,6 +162,7 @@ namespace dmGameSystem
         ScriptResourceFinalize(context);
         ScriptWindowFinalize(context);
         ScriptSysGameSysFinalize(context);
+        ScriptHttpFinalize(context);
     }
 
     void UpdateScriptLibs(const ScriptLibContext& context)
diff --git a/engine/script/src/script_http.cpp b/engine/gamesys/src/gamesys/scripts/script_http.cpp
similarity index 89%
rename from engine/script/src/script_http.cpp
rename to engine/gamesys/src/gamesys/scripts/script_http.cpp
index 7f13cc02a0d..a5e9b1540c0 100644
--- a/engine/script/src/script_http.cpp
+++ b/engine/gamesys/src/gamesys/scripts/script_http.cpp
@@ -18,6 +18,8 @@
 #include <ctype.h>
 #include <string.h>
 
+#include <dmsdk/gameobject/script.h>
+
 #include <ddf/ddf.h>
 #include <dlib/dstrings.h>
 #include <dlib/hash.h>
@@ -25,11 +27,11 @@
 #include <dlib/math.h>
 #include <dlib/uri.h>
 
-#include "script.h"
-#include "http_ddf.h"
+#include <script/script.h>
+#include <script/http_ddf.h>
+#include <script/http_service.h>
 
 #include "script_http.h"
-#include "http_service.h"
 
 extern "C"
 {
@@ -39,7 +41,7 @@ extern "C"
 
 #include "script_http_util.h"
 
-namespace dmScript
+namespace dmGameSystem
 {
     /*# HTTP API documentation
      *
@@ -50,9 +52,16 @@ namespace dmScript
      * @namespace http
      */
 
-    dmHttpService::HHttpService g_Service = 0;
-    int g_ServiceRefCount = 0;
-    uint64_t g_Timeout = 0;
+    static dmHttpService::HHttpService g_Service = 0;
+    static uint64_t g_Timeout                    = 0;
+
+    static void ReportProgressCallback(dmHttpDDF::HttpRequestProgress* msg, dmMessage::URL* url, uintptr_t user_data)
+    {
+        if (dmGameObject::RESULT_OK != dmGameObject::PostDDF(msg, 0, url, user_data, false))
+        {
+            dmLogWarning("Failed to return http-progress. Requester deleted?");
+        }
+    }
 
     /*# perform a HTTP/HTTPS request
      * Perform a HTTP/HTTPS request.
@@ -186,6 +195,7 @@ namespace dmScript
             const char* path = 0;
             bool ignore_cache = false;
             bool chunked_transfer = true;
+            bool report_progress = false;
             if (top > 5 && !lua_isnil(L, 6)) {
                 luaL_checktype(L, 6, LUA_TTABLE);
                 lua_pushvalue(L, 6);
@@ -208,6 +218,10 @@ namespace dmScript
                     {
                         chunked_transfer = lua_toboolean(L, -1);
                     }
+                    else if (strcmp(attr, "report_progress") == 0)
+                    {
+                        report_progress = lua_toboolean(L, -1);
+                    }
 
                     lua_pop(L, 1);
                 }
@@ -231,6 +245,7 @@ namespace dmScript
             request->m_Path = path;
             request->m_IgnoreCache = ignore_cache;
             request->m_ChunkedTransfer = chunked_transfer;
+            request->m_ReportProgress = report_progress;
 
             uint32_t post_len = sizeof(dmHttpDDF::HttpRequest) + method_len + 1 + url_len + 1;
             dmMessage::URL receiver;
@@ -262,29 +277,35 @@ namespace dmScript
         g_Timeout = timeout;
     }
 
-    static void HttpInitialize(HContext context)
+    void ScriptHttpRegister(const ScriptLibContext& context)
     {
-        lua_State* L = GetLuaState(context);
-        dmConfigFile::HConfig config_file = GetConfigFile(context);
+        lua_State* L = dmScript::GetLuaState(context.m_ScriptContext);
+        dmConfigFile::HConfig config_file = dmScript::GetConfigFile(context.m_ScriptContext);
 
         int top = lua_gettop(L);
 
-        if (g_Service == 0) {
+        if (g_Service == 0)
+        {
 
             dmHttpService::Params params;
-            if (config_file) {
+            params.m_ReportProgressCallback = ReportProgressCallback;
+
+            if (config_file)
+            {
                 params.m_ThreadCount = dmConfigFile::GetInt(config_file, "network.http_thread_count", params.m_ThreadCount);
                 params.m_UseHttpCache = dmConfigFile::GetInt(config_file, "network.http_cache_enabled", params.m_UseHttpCache);
             }
-#if defined(DM_NO_HTTP_CACHE)
+
+        #if defined(DM_NO_HTTP_CACHE)
             params.m_UseHttpCache = 0;
-#endif
+        #endif
 
             g_Service = dmHttpService::New(&params);
             dmScript::RegisterDDFDecoder(dmHttpDDF::HttpResponse::m_DDFDescriptor, &HttpResponseDecoder);
         }
-        g_ServiceRefCount++;
-        if (config_file) {
+
+        if (config_file)
+        {
             float timeout = dmConfigFile::GetFloat(config_file, "network.http_timeout", 0.0f);
             g_Timeout = (uint64_t) (timeout * 1000000.0f);
         }
@@ -295,29 +316,12 @@ namespace dmScript
         assert(top == lua_gettop(L));
     }
 
-    static void HttpFinalize(HContext context)
+    void ScriptHttpFinalize(const ScriptLibContext& context)
     {
-        assert(g_ServiceRefCount > 0);
-        g_ServiceRefCount--;
-        if (g_ServiceRefCount == 0) {
+        if (g_Service != 0)
+        {
             dmHttpService::Delete(g_Service);
             g_Service = 0;
         }
     }
-
-    void InitializeHttp(HContext context)
-    {
-        static ScriptExtension sl;
-        sl.Initialize = HttpInitialize;
-        sl.Update = 0x0;
-        sl.Finalize = HttpFinalize;
-        sl.NewScriptWorld = 0x0;
-        sl.DeleteScriptWorld = 0x0;
-        sl.UpdateScriptWorld = 0x0;
-        sl.FixedUpdateScriptWorld = 0x0;
-        sl.InitializeScriptInstance = 0x0;
-        sl.FinalizeScriptInstance = 0x0;
-        RegisterScriptExtension(context, &sl);
-    }
-
 }
diff --git a/engine/script/src/script_http.h b/engine/gamesys/src/gamesys/scripts/script_http.h
similarity index 73%
rename from engine/script/src/script_http.h
rename to engine/gamesys/src/gamesys/scripts/script_http.h
index d08e1b8a96b..11e6f64c996 100644
--- a/engine/script/src/script_http.h
+++ b/engine/gamesys/src/gamesys/scripts/script_http.h
@@ -12,16 +12,16 @@
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
 
-#ifndef DM_SCRIPT_HTTP_H
-#define DM_SCRIPT_HTTP_H
+#ifndef DM_GAMESYS_SCRIPT_HTTP_H
+#define DM_GAMESYS_SCRIPT_HTTP_H
 
-namespace dmScript
-{
-    typedef struct Context* HContext;
-
-    void InitializeHttp(HContext context);
+#include "../gamesys.h"
 
+namespace dmGameSystem
+{
+    void ScriptHttpRegister(const ScriptLibContext& context);
+    void ScriptHttpFinalize(const ScriptLibContext& context);
     void SetHttpRequestTimeout(uint64_t timeout);
 }
 
-#endif // DM_SCRIPT_HTTP_H
+#endif // DM_GAMESYS_SCRIPT_HTTP_H
diff --git a/engine/script/src/script_http_js.cpp b/engine/gamesys/src/gamesys/scripts/script_http_js.cpp
similarity index 99%
rename from engine/script/src/script_http_js.cpp
rename to engine/gamesys/src/gamesys/scripts/script_http_js.cpp
index 2babe9b51ca..9568ed0e6d9 100644
--- a/engine/script/src/script_http_js.cpp
+++ b/engine/gamesys/src/gamesys/scripts/script_http_js.cpp
@@ -40,7 +40,7 @@ extern "C"
 
 #include "script_http_util.h"
 
-namespace dmScript
+namespace dmGameSystem
 {
     uint64_t g_Timeout = 0;
 
diff --git a/engine/script/src/script_http_util.h b/engine/gamesys/src/gamesys/scripts/script_http_util.h
similarity index 92%
rename from engine/script/src/script_http_util.h
rename to engine/gamesys/src/gamesys/scripts/script_http_util.h
index bb0e4f20728..b17c4598dc5 100644
--- a/engine/script/src/script_http_util.h
+++ b/engine/gamesys/src/gamesys/scripts/script_http_util.h
@@ -12,12 +12,15 @@
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
 
+#ifndef DM_GAMESYS_SCRIPT_HTTP_UTIL_H
+#define DM_GAMESYS_SCRIPT_HTTP_UTIL_H
+
 #include <dlib/dstrings.h>
 #include <dlib/log.h>
 #include <dlib/path.h>
 #include <dlib/sys.h>
 
-namespace dmScript
+namespace dmGameSystem
 {
     static bool WriteResponseToFile(const char* path, const void* data, uint32_t data_len)
     {
@@ -46,7 +49,7 @@ namespace dmScript
         return true;
     }
 
-    Result HttpResponseDecoder(lua_State* L, const dmDDF::Descriptor* desc, const char* data)
+    dmScript::Result HttpResponseDecoder(lua_State* L, const dmDDF::Descriptor* desc, const char* data)
     {
         assert(desc == dmHttpDDF::HttpResponse::m_DDFDescriptor);
         dmHttpDDF::HttpResponse* resp = (dmHttpDDF::HttpResponse*) data;
@@ -109,6 +112,8 @@ namespace dmScript
         }
         lua_rawset(L, -3);
 
-        return RESULT_OK;
+        return dmScript::RESULT_OK;
     }
 }
+
+#endif // DM_GAMESYS_SCRIPT_HTTP_UTIL_H
diff --git a/engine/gamesys/src/gamesys/scripts/script_image.h b/engine/gamesys/src/gamesys/scripts/script_image.h
index 64413846407..d95b41d29af 100644
--- a/engine/gamesys/src/gamesys/scripts/script_image.h
+++ b/engine/gamesys/src/gamesys/scripts/script_image.h
@@ -12,8 +12,8 @@
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
 
-#ifndef DM_SCRIPT_IMAGE_H
-#define DM_SCRIPT_IMAGE_H
+#ifndef DM_GAMESYS_SCRIPT_IMAGE_H
+#define DM_GAMESYS_SCRIPT_IMAGE_H
 
 #include <dmsdk/gamesys/script.h>
 
@@ -22,4 +22,4 @@ namespace dmGameSystem
     void ScriptImageRegister(const ScriptLibContext& context);
 }
 
-#endif // DM_SCRIPT_IMAGE_H
+#endif // DM_GAMESYS_SCRIPT_IMAGE_H
diff --git a/engine/gamesys/src/gamesys/test/http/http_request.go b/engine/gamesys/src/gamesys/test/http/http_request.go
new file mode 100644
index 00000000000..75cba4dd94d
--- /dev/null
+++ b/engine/gamesys/src/gamesys/test/http/http_request.go
@@ -0,0 +1,4 @@
+components {
+  id: "script"
+  component: "/http/http_request.script"
+}
diff --git a/engine/gamesys/src/gamesys/test/http/http_request.script b/engine/gamesys/src/gamesys/test/http/http_request.script
new file mode 100644
index 00000000000..14b56bda9dc
--- /dev/null
+++ b/engine/gamesys/src/gamesys/test/http/http_request.script
@@ -0,0 +1,123 @@
+-- Copyright 2020-2024 The Defold Foundation
+-- Copyright 2014-2020 King
+-- Copyright 2009-2014 Ragnar Svensson, Christian Murray
+-- Licensed under the Defold License version 1.0 (the "License"); you may not use
+-- this file except in compliance with the License.
+--
+-- You may obtain a copy of the License, together with FAQs at
+-- https://www.defold.com/license
+--
+-- Unless required by applicable law or agreed to in writing, software distributed
+-- under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+-- CONDITIONS OF ANY KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations under the License.
+
+local tests_left = 6
+tests_done = false
+
+local function test_done(response, data_str)
+    assert(response.status         == 200)
+    assert(response.headers.server == "Dynamo 1.0")
+    assert(response.response       == data_str)
+    tests_left = tests_left - 1
+    if tests_left <= 0 then
+        tests_done = true
+    end
+end
+
+
+function test_get(self)
+    local chunked_data   = ""
+    local chunk_size_tot = 64 * 1024 * 2
+
+    for i=1,chunk_size_tot do
+        chunked_data = chunked_data .. "A"
+    end
+
+    -- 1
+    http.request(ADDRESS, "GET",
+        function(self, id, response)
+            test_done(response, "Hello")
+        end)
+
+    -- 2
+    http.request(ADDRESS .. "/test_progress", "GET",
+        function(self, id, response)
+            local data_str = "test_progress_complete"
+            if not self.test_1_progress then
+                assert(response.bytes_received == #data_str)
+                -- no content-length headers
+                assert(response.bytes_total == -1)
+                self.test_1_progress = true
+            else
+                test_done(response, data_str)
+            end
+        end,
+        nil, nil, { report_progress = true })
+
+    -- 3
+    http.request(ADDRESS .. "/test_progress_content_length", "GET",
+        function(self, id, response)
+            local data_str = "test_progress_complete"
+            if not self.test_2_progress then
+                assert(response.bytes_received == #data_str)
+                -- no content-length headers
+                assert(response.bytes_total == #data_str)
+                self.test_2_progress = true
+            else
+                test_done(response, data_str)
+            end
+        end,
+        nil, nil, { report_progress = true })
+
+
+    -- 4
+    http.request(ADDRESS .. "/test_progress_chunked", "GET",
+        function(self, id, response)
+            if not self.test_3_progress then
+                if response.bytes_received == chunk_size_tot then
+                    self.test_3_progress = true
+                end
+            else
+                test_done(response, chunked_data)
+            end
+        end,
+        nil, nil, { report_progress = true })
+end
+
+function test_post(self)
+    -- 5
+    http.request(ADDRESS, "POST",
+        function(self, id, response)
+            test_done(response, "PONG")
+        end)
+
+    -- 6
+    local test_post_1_data_str = "test_post_progress"
+    self.test_post_1_received = 0
+    self.test_post_1_sent = 0
+    http.request(ADDRESS .. "/test_post_progress", "POST",
+        function(self, id, response)
+
+            -- The server prepends "PONG" to whatever we send
+            local data_str = "PONG" .. test_post_1_data_str
+
+            if response.status ~= nil then
+                test_done(response, data_str)
+            elseif response.bytes_sent > 0 then
+                assert(response.bytes_sent == #test_post_1_data_str)
+                assert(response.bytes_total == #test_post_1_data_str)
+            elseif response.bytes_received > 0 then
+                -- ignore
+            else
+                assert(false)
+            end
+        end,
+        nil, test_post_1_data_str, { report_progress = true })
+end
+
+function init(self)
+    test_get(self)
+    test_post(self)
+end
+
diff --git a/engine/gamesys/src/gamesys/test/http/test_http.config.raw b/engine/gamesys/src/gamesys/test/http/test_http.config.raw
new file mode 100644
index 00000000000..e670534b59e
--- /dev/null
+++ b/engine/gamesys/src/gamesys/test/http/test_http.config.raw
@@ -0,0 +1,4 @@
+[foo]
+value=123
+[network]
+http_timeout = 0
diff --git a/engine/script/src/test/test_http.lua b/engine/gamesys/src/gamesys/test/http/test_http.lua.raw
similarity index 100%
rename from engine/script/src/test/test_http.lua
rename to engine/gamesys/src/gamesys/test/http/test_http.lua.raw
diff --git a/engine/script/src/test/test_http_timeout.lua b/engine/gamesys/src/gamesys/test/http/test_http_timeout.lua.raw
similarity index 100%
rename from engine/script/src/test/test_http_timeout.lua
rename to engine/gamesys/src/gamesys/test/http/test_http_timeout.lua.raw
diff --git a/engine/gamesys/src/gamesys/test/test_gamesys.cpp b/engine/gamesys/src/gamesys/test/test_gamesys.cpp
index ea7edc7bc4a..c8e2f006d13 100644
--- a/engine/gamesys/src/gamesys/test/test_gamesys.cpp
+++ b/engine/gamesys/src/gamesys/test/test_gamesys.cpp
@@ -44,6 +44,9 @@
 
 #include <dmsdk/gamesys/render_constants.h>
 
+#define JC_TEST_IMPLEMENTATION
+#include <jc_test/jc_test.h>
+
 using namespace dmVMath;
 
 #if !defined(DM_TEST_EXTERN_INIT_FUNCTIONS)
@@ -110,22 +113,6 @@ bool UnlinkResource(const char* name)
     return dmSys::Unlink(path) == 0;
 }
 
-static dmGameObject::HInstance Spawn(dmResource::HFactory factory, dmGameObject::HCollection collection, const char* prototype_name, dmhash_t id, uint8_t* property_buffer, uint32_t property_buffer_size, const Point3& position, const Quat& rotation, const Vector3& scale)
-{
-    dmGameObject::HPrototype prototype = 0x0;
-    if (dmResource::Get(factory, prototype_name, (void**)&prototype) == dmResource::RESULT_OK) {
-        dmGameObject::HInstance result = dmGameObject::Spawn(collection, prototype, prototype_name, id, property_buffer, property_buffer_size, position, rotation, scale);
-        dmResource::Release(factory, prototype);
-        return result;
-    }
-    return 0x0;
-}
-
-static dmGameObject::HInstance Spawn(dmResource::HFactory factory, dmGameObject::HCollection collection, const char* prototype_name, dmhash_t id)
-{
-    return Spawn(factory, collection, prototype_name, id, 0, 0, Point3(0, 0, 0), Quat(0, 0, 0, 1), Vector3(1, 1, 1));
-}
-
 static void DeleteInstance(dmGameObject::HCollection collection, dmGameObject::HInstance instance) {
     dmGameObject::UpdateContext ctx;
     dmGameObject::Update(collection, &ctx);
@@ -252,6 +239,7 @@ TEST_F(ResourceTest, TestCreateTextureFromScript)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -360,6 +348,7 @@ TEST_F(ResourceTest, TestResourceScriptBuffer)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -379,6 +368,7 @@ TEST_F(ResourceTest, TestResourceScriptRenderTarget)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -398,6 +388,7 @@ TEST_F(ResourceTest, TestResourceScriptAtlas)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -417,6 +408,7 @@ TEST_F(ResourceTest, TestSetTextureFromScript)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -751,6 +743,7 @@ TEST_F(BufferMetadataTest, MetadataLuaApi)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -773,6 +766,7 @@ TEST_F(SoundTest, UpdateSoundResource)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -819,6 +813,7 @@ TEST_F(SoundTest, LuaCallback)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -853,6 +848,7 @@ TEST_F(SoundTest, DelayedSoundStoppedBeforePlay)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -1024,6 +1020,7 @@ TEST_F(SpriteTest, FlipbookAnim)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -1056,6 +1053,7 @@ TEST_F(SpriteTest, FrameCount)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -1075,6 +1073,7 @@ TEST_F(ParticleFxTest, PlayAnim)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -1265,6 +1264,7 @@ TEST_F(WindowTest, MouseLock)
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_HidContext      = hid_context;
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -1296,6 +1296,7 @@ TEST_F(WindowTest, Events)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -1382,6 +1383,7 @@ TEST_P(FactoryTest, Test)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
     const FactoryTestParams& param = GetParam();
@@ -1569,6 +1571,7 @@ TEST_P(CollectionFactoryTest, Test)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
     const CollectionFactoryTestParams& param = GetParam();
@@ -1913,6 +1916,7 @@ TEST_P(BoxRenderTest, BoxRender)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -1964,6 +1968,7 @@ TEST_F(GamepadConnectedTest, TestGamepadConnectedInputEvent)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -2030,6 +2035,7 @@ TEST_F(CollisionObject2DTest, WakingCollisionObjectTest)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = L;
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
     // a 'base' gameobject works as the base for other dynamic objects to stand on
@@ -2080,6 +2086,7 @@ TEST_F(CollisionObject2DTest, PropertiesTest)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = L;
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
     // a 'base' gameobject works as the base for other dynamic objects to stand on
@@ -2117,6 +2124,7 @@ TEST_P(GroupAndMask2DTest, GroupAndMaskTest )
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = L;
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
 /*
@@ -2177,6 +2185,7 @@ TEST_P(GroupAndMask3DTest, GroupAndMaskTest )
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = L;
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
 /*
@@ -2248,6 +2257,7 @@ TEST_F(VelocityThreshold2DTest, VelocityThresholdTest)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = L;
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
     // two dynamic 'body' objects will get spawned and placed apart
@@ -2304,6 +2314,7 @@ TEST_F(ComponentTest, JointTest)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = L;
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
     const char* path_joint_test_a = "/collision_object/joint_test_a.goc";
@@ -2359,6 +2370,7 @@ TEST_F(ComponentTest, PhysicsListenerTest)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = L;
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
     const char* path_test_object = "/collision_object/callback_object.goc";
@@ -2406,6 +2418,7 @@ TEST_F(ComponentTest, PhysicsUpdateMassTest)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = L;
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
     const char* path_test_object = "/collision_object/mass_object.goc";
@@ -2448,6 +2461,7 @@ TEST_F(ComponentTest, DispatchBuffersTest)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = L;
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
     dmRender::RenderContext* render_context_ptr  = (dmRender::RenderContext*) m_RenderContext;
@@ -4626,7 +4640,7 @@ TEST_F(MaterialTest, DynamicVertexAttributes)
 
         for (int i = 0; i < tmp_pool.Capacity(); ++i)
         {
-            uint32_t dummy_index = tmp_pool.Alloc();
+            tmp_pool.Alloc();
         }
 
         dmhash_t attr_name_hash = dmHashString64("position");
@@ -4796,6 +4810,7 @@ TEST_F(MaterialTest, GoGetSetConstants)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -4818,6 +4833,7 @@ TEST_F(ComponentTest, GetSetCollisionShape)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = L;
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
     dmGameObject::HInstance go_base = Spawn(m_Factory, m_Collection, "/collision_object/get_set_shape.goc", dmHashString64("/get_set_shape_go"), 0, 0, Point3(0, 0, 0), Quat(0, 0, 0, 1), Vector3(1, 1, 1));
@@ -4836,6 +4852,7 @@ TEST_F(ComponentTest, GetSetErrorCollisionShape)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = L;
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
     dmGameObject::HInstance go_base = Spawn(m_Factory, m_Collection, "/collision_object/get_set_error_shape.goc", dmHashString64("/get_set_error_shape_go"), 0, 0, Point3(0, 0, 0), Quat(0, 0, 0, 1), Vector3(1, 1, 1));
@@ -4851,6 +4868,7 @@ TEST_F(SysTest, LoadBufferSync)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
 
@@ -4909,6 +4927,7 @@ TEST_F(SysTest, LoadBufferASync)
     scriptlibcontext.m_Register        = m_Register;
     scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
     scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
     scriptlibcontext.m_JobThread       = dmJobThread::Create(job_thread_create_param);
 
     dmGameSystem::InitializeScriptLibs(scriptlibcontext);
diff --git a/engine/gamesys/src/gamesys/test/test_gamesys.h b/engine/gamesys/src/gamesys/test/test_gamesys.h
index 9638b1d0da1..1e3159e35ea 100644
--- a/engine/gamesys/src/gamesys/test/test_gamesys.h
+++ b/engine/gamesys/src/gamesys/test/test_gamesys.h
@@ -12,6 +12,9 @@
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
 
+#ifndef DM_TEST_GAMESYS_H
+#define DM_TEST_GAMESYS_H
+
 #include <resource/resource.h>
 
 #include <dlib/buffer.h>
@@ -34,9 +37,25 @@
 
 #include <testmain/testmain.h>
 
-#define JC_TEST_IMPLEMENTATION
 #include <jc_test/jc_test.h>
 
+static inline dmGameObject::HInstance Spawn(dmResource::HFactory factory, dmGameObject::HCollection collection, const char* prototype_name, dmhash_t id, uint8_t* property_buffer, uint32_t property_buffer_size, const dmVMath::Point3& position, const dmVMath::Quat& rotation, const dmVMath::Vector3& scale)
+{
+    dmGameObject::HPrototype prototype = 0x0;
+    if (dmResource::Get(factory, prototype_name, (void**)&prototype) == dmResource::RESULT_OK)
+    {
+        dmGameObject::HInstance result = dmGameObject::Spawn(collection, prototype, prototype_name, id, property_buffer, property_buffer_size, position, rotation, scale);
+        dmResource::Release(factory, prototype);
+        return result;
+    }
+    return 0x0;
+}
+
+static inline dmGameObject::HInstance Spawn(dmResource::HFactory factory, dmGameObject::HCollection collection, const char* prototype_name, dmhash_t id)
+{
+    return Spawn(factory, collection, prototype_name, id, 0, 0, dmVMath::Point3(0, 0, 0), dmVMath::Quat(0, 0, 0, 1), dmVMath::Vector3(1, 1, 1));
+}
+
 struct Params
 {
     const char* m_ValidResource;
@@ -642,6 +661,7 @@ class ScriptImageTest : public GamesysTest<const char*>
         m_ScriptLibContext.m_Register        = m_Register;
         m_ScriptLibContext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
         m_ScriptLibContext.m_GraphicsContext = m_GraphicsContext;
+        m_ScriptLibContext.m_ScriptContext   = m_ScriptContext;
         dmGameSystem::InitializeScriptLibs(m_ScriptLibContext);
 
         L = dmScript::GetLuaState(m_ScriptContext);
@@ -669,6 +689,7 @@ class ScriptBufferTest : public jc_test_base_class
         m_ScriptLibContext.m_Factory = 0x0;
         m_ScriptLibContext.m_Register = 0x0;
         m_ScriptLibContext.m_LuaState = dmScript::GetLuaState(m_Context);
+        m_ScriptLibContext.m_ScriptContext = m_Context;
         dmGameSystem::InitializeScriptLibs(m_ScriptLibContext);
 
         L = dmScript::GetLuaState(m_Context);
@@ -721,6 +742,7 @@ class ScriptBufferCopyTest : public jc_test_params_class<CopyBufferTestParams>
         m_ScriptLibContext.m_Factory = 0x0;
         m_ScriptLibContext.m_Register = 0x0;
         m_ScriptLibContext.m_LuaState = dmScript::GetLuaState(m_Context);
+        m_ScriptLibContext.m_ScriptContext = m_Context;
         dmGameSystem::InitializeScriptLibs(m_ScriptLibContext);
 
         dmScript::Initialize(m_Context);
@@ -781,3 +803,6 @@ class LabelTest : public jc_test_base_class
     dmVMath::Vector3 m_Size;
     dmVMath::Vector3 m_Scale;
 };
+
+#endif // DM_TEST_GAMESYS_H
+
diff --git a/engine/gamesys/src/gamesys/test/test_gamesys_http.cpp b/engine/gamesys/src/gamesys/test/test_gamesys_http.cpp
new file mode 100644
index 00000000000..36580361930
--- /dev/null
+++ b/engine/gamesys/src/gamesys/test/test_gamesys_http.cpp
@@ -0,0 +1,124 @@
+// Copyright 2020-2024 The Defold Foundation
+// Copyright 2014-2020 King
+// Copyright 2009-2014 Ragnar Svensson, Christian Murray
+// Licensed under the Defold License version 1.0 (the "License"); you may not use
+// this file except in compliance with the License.
+//
+// You may obtain a copy of the License, together with FAQs at
+// https://www.defold.com/license
+//
+// Unless required by applicable law or agreed to in writing, software distributed
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+
+#include <script/test_script.h>
+#include <dlib/dstrings.h>
+#include <dlib/time.h>
+
+#include "test_gamesys.h"
+
+using namespace dmVMath;
+
+static int g_HttpPort = 9001;
+static char g_HttpAddress[128] = "localhost";
+
+#define DEFAULT_URL "__default_url"
+
+static void SetHttpAddress(lua_State* L)
+{
+    char buf[128];
+    dmSnPrintf(buf, sizeof(buf), "IP='%s'\n", g_HttpAddress);
+    dmScriptTest::RunString(L, buf);
+    dmSnPrintf(buf, sizeof(buf), "PORT=%d\n", g_HttpPort);
+    dmScriptTest::RunString(L, buf);
+    dmSnPrintf(buf, sizeof(buf), "ADDRESS='http://%s:%d'\n", g_HttpAddress, g_HttpPort);
+    dmScriptTest::RunString(L, buf);
+}
+
+TEST_F(ComponentTest, HTTPRequest)
+{
+    dmGameSystem::ScriptLibContext scriptlibcontext;
+    scriptlibcontext.m_Factory         = m_Factory;
+    scriptlibcontext.m_Register        = m_Register;
+    scriptlibcontext.m_LuaState        = dmScript::GetLuaState(m_ScriptContext);
+    scriptlibcontext.m_GraphicsContext = m_GraphicsContext;
+    scriptlibcontext.m_ScriptContext   = m_ScriptContext;
+
+    dmGameSystem::InitializeScriptLibs(scriptlibcontext);
+
+    lua_State* L = scriptlibcontext.m_LuaState;
+
+    dmMessage::URL m_DefaultURL;
+    ASSERT_EQ(dmMessage::RESULT_OK, dmMessage::NewSocket("default_socket", &m_DefaultURL.m_Socket));
+    m_DefaultURL.m_Path = dmHashString64("default_path");
+    m_DefaultURL.m_Fragment = dmHashString64("default_fragment");
+    dmScript::PushURL(scriptlibcontext.m_LuaState, m_DefaultURL);
+    lua_setglobal(L, DEFAULT_URL);
+
+    SetHttpAddress(L);
+
+    ASSERT_TRUE(dmGameObject::Init(m_Collection));
+
+    dmGameObject::HInstance go = Spawn(m_Factory, m_Collection, "/http/http_request.goc", dmHashString64("/http_request"), 0, 0, Point3(0, 0, 0), Quat(0, 0, 0, 1), Vector3(1, 1, 1));
+    ASSERT_NE((void*)0, go);
+
+    uint64_t stop_time = dmTime::GetTime() + 1*1e6; // 1 second
+    bool tests_done = false;
+    while (dmTime::GetTime() < stop_time && !tests_done)
+    {
+    	ASSERT_TRUE(dmGameObject::Update(m_Collection, &m_UpdateContext));
+
+        // check if tests are done
+        lua_getglobal(L, "tests_done");
+        tests_done = lua_toboolean(L, -1);
+        lua_pop(L, 1);
+
+        dmTime::Sleep(30*1000);
+    }
+
+    ASSERT_TRUE(tests_done);
+    ASSERT_TRUE(dmGameObject::Final(m_Collection));
+
+    dmGameSystem::FinalizeScriptLibs(scriptlibcontext);
+}
+
+int main(int argc, char **argv)
+{
+    TestMainPlatformInit();
+
+    dmLog::LogParams params;
+    dmLog::LogInitialize(&params);
+    dmHashEnableReverseHash(true);
+    // // Enable message descriptor translation when sending messages
+    dmDDF::RegisterAllTypes();
+
+    if(argc > 1)
+    {
+        char path[512];
+        dmTestUtil::MakeHostPath(path, sizeof(path), argv[1]);
+
+        dmConfigFile::HConfig config;
+        if( dmConfigFile::Load(path, argc, (const char**)argv, &config) != dmConfigFile::RESULT_OK )
+        {
+            dmLogError("Could not read config file '%s'", argv[1]);
+            return 1;
+        }
+        dmTestUtil::GetSocketsFromConfig(config, &g_HttpPort, 0, 0);
+        if (!dmTestUtil::GetIpFromConfig(config, g_HttpAddress, sizeof(g_HttpAddress))) {
+            dmLogError("Failed to get server ip!");
+        } else {
+            dmLogInfo("Server ip: %s:%d", g_HttpAddress, g_HttpPort);
+        }
+
+        dmConfigFile::Delete(config);
+    }
+    else
+    {
+        dmLogError("No config file specified!");
+        return 1;
+    }
+
+    jc_test_init(&argc, argv);
+    return jc_test_run_all();
+}
diff --git a/engine/script/src/test/test_script_http.cpp b/engine/gamesys/src/gamesys/test/test_script_http.cpp
similarity index 92%
rename from engine/script/src/test/test_script_http.cpp
rename to engine/gamesys/src/gamesys/test/test_script_http.cpp
index 3b1be60add6..15c3bbb29f4 100644
--- a/engine/script/src/test/test_script_http.cpp
+++ b/engine/gamesys/src/gamesys/test/test_script_http.cpp
@@ -12,10 +12,10 @@
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
 
-#include "script.h"
-#include "script_http.h" // to set the timeout
-#include "test_script.h"
+#include "../scripts/script_http.h" // to set the timeout
 
+#include <script/test_script.h>
+#include <script/script.h>
 #include <testmain/testmain.h>
 #include <dlib/configfile.h>
 #include <dlib/dstrings.h>
@@ -101,7 +101,7 @@ class ScriptHttpTest : public jc_test_base_class
     virtual void SetUp()
     {
         char path[1024];
-        dmTestUtil::MakeHostPath(path, sizeof(path), "src/test/test.config");
+        dmTestUtil::MakeHostPath(path, sizeof(path), "src/gamesys/test/http/test_http.config.raw");
 
         dmConfigFile::Result r = dmConfigFile::Load(path, 0, 0, &m_ConfigFile);
         ASSERT_EQ(dmConfigFile::RESULT_OK, r);
@@ -112,6 +112,12 @@ class ScriptHttpTest : public jc_test_base_class
         dmScript::Initialize(m_ScriptContext);
         L = dmScript::GetLuaState(m_ScriptContext);
 
+        dmGameSystem::ScriptLibContext scriptlibcontext;
+        scriptlibcontext.m_LuaState        = L;
+        scriptlibcontext.m_ScriptContext   = m_ScriptContext;
+
+        dmGameSystem::InitializeScriptLibs(scriptlibcontext);
+
         ASSERT_EQ(dmMessage::RESULT_OK, dmMessage::NewSocket("default_socket", &m_DefaultURL.m_Socket));
         m_DefaultURL.m_Path = dmHashString64("default_path");
         m_DefaultURL.m_Fragment = dmHashString64("default_fragment");
@@ -185,11 +191,11 @@ static void DispatchCallbackDDF(dmMessage::Message *message, void* user_ptr)
     ASSERT_EQ(0, ret);
 }
 
-TEST_F(ScriptHttpTest, TestPost)
+TEST_F(ScriptHttpTest, TestGetPost)
 {
     int top = lua_gettop(L);
 
-    ASSERT_TRUE(dmScriptTest::RunFile(L, "test_http.luac"));
+    ASSERT_TRUE(dmScriptTest::RunFile(L, "test_http.lua.rawc", "build/src/gamesys/test/http"));
     SetHttpAddress(L);
 
     lua_getglobal(L, "functions");
@@ -247,11 +253,11 @@ struct SHttpRequestTimeoutGuard // Makes sure it gets reset after gtest returns
 {
     SHttpRequestTimeoutGuard(uint64_t timeout)
     {
-        dmScript::SetHttpRequestTimeout(timeout);
+        dmGameSystem::SetHttpRequestTimeout(timeout);
     }
     ~SHttpRequestTimeoutGuard()
     {
-        dmScript::SetHttpRequestTimeout(0);
+        dmGameSystem::SetHttpRequestTimeout(0);
     }
 };
 
@@ -261,7 +267,7 @@ TEST_F(ScriptHttpTest, TestTimeout)
 
     int top = lua_gettop(L);
 
-    ASSERT_TRUE(dmScriptTest::RunFile(L, "test_http_timeout.luac"));
+    ASSERT_TRUE(dmScriptTest::RunFile(L, "test_http_timeout.lua.rawc", "build/src/gamesys/test/http"));
     SetHttpAddress(L);
 
     lua_getglobal(L, "functions");
@@ -316,7 +322,7 @@ TEST_F(ScriptHttpTest, TestDeletedSocket)
 
     int top = lua_gettop(L);
 
-    ASSERT_TRUE(dmScriptTest::RunFile(L, "test_http.luac"));
+    ASSERT_TRUE(dmScriptTest::RunFile(L, "test_http.lua.rawc", "build/src/gamesys/test/http"));
     SetHttpAddress(L);
 
     lua_getglobal(L, "functions");
diff --git a/engine/gamesys/src/gamesys/test/test_script_server_plugin.py b/engine/gamesys/src/gamesys/test/test_script_server_plugin.py
new file mode 100644
index 00000000000..c330d514530
--- /dev/null
+++ b/engine/gamesys/src/gamesys/test/test_script_server_plugin.py
@@ -0,0 +1,18 @@
+
+def do_GET(req):
+
+    result = {}
+    result['to_send'] = ""
+    result['headers'] = {}
+
+    if req.startswith('/test_progress'):
+        result['to_send'] = "test_progress_complete"
+        if req == '/test_progress_content_length':
+            result['headers']['Content-Length'] = len(result['to_send'])
+        elif req == '/test_progress_chunked':
+            chunk_size = 64 * 1024
+            chunk_count = 2
+            result['to_send'] = 'A' * chunk_count * chunk_size
+            result['headers']['Content-Length'] = chunk_count * chunk_size
+
+    return result
diff --git a/engine/gamesys/src/gamesys/test/wscript b/engine/gamesys/src/gamesys/test/wscript
index 85753b1796f..e3b56b9710f 100644
--- a/engine/gamesys/src/gamesys/test/wscript
+++ b/engine/gamesys/src/gamesys/test/wscript
@@ -71,15 +71,34 @@ def build(bld):
                         'ResourceTypeGui','ResourceTypeGuiScript',
                         'GraphicsAdapterNull']
 
-    test_task_gen = bld.program(features = 'cxx cprogram test',
-                                includes = '../../../src ../../../proto',
-                                use = 'TESTMAIN DMGLFW GAMEOBJECT DDF RESOURCE PHYSICS RENDER GRAPHICS_GAMESYS_TEST SOCKET APP PROFILE_NULL SCRIPT LUA EXTENSION INPUT PLATFORM_NULL HID_NULL PARTICLE RIG GUI SOUND_NULL LIVEUPDATE DLIB gamesys',
-                                exported_symbols = exported_symbols,
-                                web_libs = ['library_sys.js', 'library_script.js'],
-                                proto_gen_py = True,
-                                content_root='../test',
-                                source = bld.path.ant_glob('test_gamesys.cpp') + bld.path.ant_glob(dirs, excl=excl_pattern),
-                                target = 'test_gamesys')
+    test_gamesys = bld.program(features = 'cxx cprogram test',
+                               includes = '../../../src ../../../proto',
+                               use = 'TESTMAIN DMGLFW GAMEOBJECT DDF RESOURCE PHYSICS RENDER GRAPHICS_GAMESYS_TEST SOCKET APP PROFILE_NULL SCRIPT LUA EXTENSION INPUT PLATFORM_NULL HID_NULL PARTICLE RIG GUI SOUND_NULL LIVEUPDATE DLIB gamesys',
+                               exported_symbols = exported_symbols,
+                               web_libs = ['library_sys.js', 'library_script.js'],
+                               proto_gen_py = True,
+                               content_root='../test',
+                               source = bld.path.ant_glob('test_gamesys.cpp') + bld.path.ant_glob(dirs, excl=excl_pattern),
+                               target = 'test_gamesys')
+
+    if not 'web' in bld.env['PLATFORM']:
+        test_gamesys_http = bld.program(features = 'cxx cprogram test',
+                                        includes = '../../../src ../../../proto',
+                                        use = 'TESTMAIN DMGLFW GAMEOBJECT DDF RESOURCE PHYSICS RENDER GRAPHICS_GAMESYS_TEST SOCKET APP PROFILE_NULL SCRIPT TEST_SCRIPT LUA EXTENSION INPUT PLATFORM_NULL HID_NULL PARTICLE RIG GUI SOUND_NULL LIVEUPDATE DLIB gamesys',
+                                        exported_symbols = exported_symbols,
+                                        proto_gen_py = True,
+                                        content_root='../test',
+                                        source = bld.path.ant_glob('test_gamesys_http.cpp') + bld.path.ant_glob('http/*'),
+                                        target = 'test_gamesys_http')
+
+    if not 'web' in bld.env['PLATFORM']:
+        if platform_supports_feature(bld.env.PLATFORM, 'test_script_http', {}):
+            bld.program(features = 'cxx test',
+                        includes = '..',
+                        use = 'TESTMAIN DMGLFW GAMEOBJECT DDF RESOURCE PHYSICS RENDER GRAPHICS_GAMESYS_TEST SOCKET APP PROFILE_NULL SCRIPT LUA EXTENSION INPUT PLATFORM_NULL HID_NULL PARTICLE RIG GUI SOUND_NULL LIVEUPDATE DLIB TEST_SCRIPT gamesys',
+                        proto_gen_py = True,
+                        source = 'test_script_http.cpp http/test_http.lua.raw http/test_http_timeout.lua.raw'.split(),
+                        target = 'test_script_http')
 
     if bld.env.PLATFORM in ('x86_64-win32', 'x86_64-macos', 'arm64-macos', 'x86_64-linux')  and not waflib.Options.options.with_vulkan:
         bld.recurse('fontview')
diff --git a/engine/gamesys/src/gamesys/wscript b/engine/gamesys/src/gamesys/wscript
index eea0af57eb6..7237dc4c86d 100644
--- a/engine/gamesys/src/gamesys/wscript
+++ b/engine/gamesys/src/gamesys/wscript
@@ -6,6 +6,15 @@ from waf_dynamo import apidoc_extract_task
 def configure(conf):
     conf.recurse('test')
 
+def has_ext(itm, ext):
+    if type("") == type(itm):
+        return itm.endswith(ext)
+    else:
+        return itm.abspath().endswith(ext)
+
+def remove_from_node_list(lst, name):
+    return [x for x in lst if not has_ext(x, name)]
+
 def build(bld):
     resource = bld.stlib(features = 'cxx ddf embed',
         includes = '. .. ../../src ../../proto',
@@ -21,6 +30,11 @@ def build(bld):
     else:
         resource.source += ['scripts/window/script_window_null.cpp']
 
+    if bld.env.PLATFORM in ('web'):
+        resource.source = remove_from_node_list(resource.source, 'script_http.cpp')
+    else:
+        resource.source = remove_from_node_list(resource.source, 'script_http_js.cpp')
+
     bld.add_group()
 
     proto_files = os.listdir('./proto/gamesys')
@@ -43,6 +57,7 @@ def build(bld):
         'scripts/script_window.cpp',
         'scripts/script_image.cpp',
         'scripts/script_sys_gamesys.cpp',
+        'scripts/script_http.cpp',
         'components/comp_sound.cpp',
         'components/comp_collection_proxy.cpp'] + proto_files)
 
diff --git a/engine/gamesys/wscript b/engine/gamesys/wscript
index 0f79a992a38..1b00fcdd2dd 100644
--- a/engine/gamesys/wscript
+++ b/engine/gamesys/wscript
@@ -6,7 +6,7 @@ APPNAME='gamesys'
 srcdir = '.'
 blddir = 'build'
 
-import sys, os, re
+import sys, os, re, socket
 import waf_ddf, waf_graphics, waf_dynamo, waf_physics, waf_render
 from waf_dynamo import platform_supports_feature
 import waflib.Options
@@ -62,6 +62,8 @@ def configure(conf):
     conf.env['STLIB_HID_NULL'] = 'hid_null'
     conf.env['STLIB_PLATFORM_NULL'] = 'platform_null'
     conf.env['STLIB_GRAPHICS_GAMESYS_TEST'] = ['graphics_null', 'graphics_transcoder_basisu', 'basis_transcoder']
+    conf.env['STLIB_SCRIPT'] = 'script'
+    conf.env['STLIB_TEST_SCRIPT'] = 'test_script'
 
     conf.env.append_unique('DEFINES', 'DLIB_LOG_DOMAIN="GAMESYS"')
     conf.recurse('src')
@@ -72,6 +74,7 @@ def build(bld):
     sys.path.insert(0, os.path.abspath('build/proto/gamesys'))
     sys.path.insert(0, os.path.join(bld.env.PREFIX, 'lib/python/gameobject'))
     sys.path.insert(0, os.path.join(bld.env.PREFIX, 'lib/python/input'))
+    sys.path.insert(0, os.path.abspath('src/gamesys/test'))
 
     bld.recurse('content')
     bld.add_group()
@@ -79,5 +82,39 @@ def build(bld):
 
     TestContext.initialize_test_context(test_context, bld)
 
+def _get_local_ip(self):
+    hostname = socket.gethostname()
+    try:
+        local_ip = socket.gethostbyname(hostname)
+    except socket.gaierror as e:
+        print(e)
+        print(f"Hostname was '{hostname}', now trying empty ('') string now")
+        local_ip = socket.gethostbyname("")
+    return local_ip
+
 def shutdown(self):
-    waf_dynamo.run_tests(test_context, valgrind = True)
+
+    if not TestContext.is_valid(test_context):
+        return
+
+    if getattr(waflib.Options.options, 'skip_tests', False):
+        return
+
+    import test_script_server
+
+    local_ip = _get_local_ip(self)
+
+    if test_context.env.PLATFORM in ('win32', 'x86_64-win32', 'x86_64-linux', 'x86_64-macos', 'arm64-macos'):
+        local_ip = "localhost"
+
+    PORT=9001
+    configfile = waf_dynamo.create_test_server_config(self, port=PORT, ip=local_ip)
+
+    serv = test_script_server.Server(port=PORT, ip=local_ip)
+    serv.start()
+    try:
+        waf_dynamo.run_tests(test_context, valgrind = True, configfile = configfile)
+    finally:
+        if serv:
+            serv.stop()
+        os.remove(configfile)
diff --git a/engine/resource/src/providers/provider_http.cpp b/engine/resource/src/providers/provider_http.cpp
index 969531591f7..74f03848c6a 100644
--- a/engine/resource/src/providers/provider_http.cpp
+++ b/engine/resource/src/providers/provider_http.cpp
@@ -62,7 +62,7 @@ static void HttpHeader(dmHttpClient::HResponse response, void* user_data, int st
     }
 }
 
-static void HttpContent(dmHttpClient::HResponse, void* user_data, int status_code, const void* content_data, uint32_t content_data_size)
+static void HttpContent(dmHttpClient::HResponse, void* user_data, int status_code, const void* content_data, uint32_t content_data_size, int32_t content_length)
 {
     HttpProviderContext* archive = (HttpProviderContext*)user_data;
     (void) status_code;
diff --git a/engine/script/src/http_service.cpp b/engine/script/src/http_service.cpp
index 58f7f0e3cfc..be733b9c86f 100644
--- a/engine/script/src/http_service.cpp
+++ b/engine/script/src/http_service.cpp
@@ -51,15 +51,19 @@ namespace dmHttpService
         dmMessage::HSocket    m_Socket;
         dmHttpClient::HClient m_Client;
         dmURI::Parts          m_CurrentURL;
+        dmMessage::URL        m_CurrentRequesterURL;
         dmHttpDDF::HttpRequest*   m_Request;
         const char*           m_Filepath;
         int                   m_Status;
+        uintptr_t             m_ResponseUserData1;
+        uintptr_t             m_ResponseUserData2;
         dmArray<char>         m_Response;
         dmArray<char>         m_Headers;
         const HttpService*    m_Service;
         bool                  m_CacheFlusher;
         volatile bool         m_Run;
         int                   m_Canceled;
+        bool                  m_ReportProgress;
     };
 
     struct HttpService
@@ -76,6 +80,7 @@ namespace dmHttpService
         dmThread::Thread          m_Balancer;
         dmMessage::HSocket        m_Socket;
         dmHttpCache::HCache       m_HttpCache;
+        ReportProgressCallback    m_ReportProgressCallback;
         int                       m_LoadBalanceCount;
         volatile bool             m_Run;
     };
@@ -96,7 +101,7 @@ namespace dmHttpService
         h.Push('\n');
     }
 
-    void HttpContent(dmHttpClient::HResponse response, void* user_data, int status_code, const void* content_data, uint32_t content_data_size)
+    void HttpContent(dmHttpClient::HResponse response, void* user_data, int status_code, const void* content_data, uint32_t content_data_size, int32_t content_length)
     {
         Worker* worker = (Worker*) user_data;
         worker->m_Status = status_code;
@@ -113,6 +118,16 @@ namespace dmHttpService
             r.OffsetCapacity((int32_t) dmMath::Max(content_data_size - left, 128U * 1024U));
         }
         r.PushArray((char*) content_data, content_data_size);
+
+        if (worker->m_ReportProgress && content_data_size > 0)
+        {
+            assert(worker->m_Service->m_ReportProgressCallback);
+
+            dmHttpDDF::HttpRequestProgress progress = {};
+            progress.m_BytesReceived                = r.Size();
+            progress.m_BytesTotal                   = content_length;
+            worker->m_Service->m_ReportProgressCallback(&progress, &worker->m_CurrentRequesterURL, worker->m_ResponseUserData2);
+        }
     }
 
     uint32_t HttpSendContentLength(dmHttpClient::HResponse response, void* user_data)
@@ -126,7 +141,19 @@ namespace dmHttpService
         Worker* worker = (Worker*) user_data;
         uint8_t* request = (uint8_t*)worker->m_Request->m_Request;
         uint32_t request_len = dmMath::Min(worker->m_Request->m_RequestLength - offset, size);
-        return dmHttpClient::Write(response, (const void*) &request[offset], request_len);
+
+        dmHttpClient::Result res_write = dmHttpClient::Write(response, (const void*) &request[offset], request_len);
+
+        if (res_write == dmHttpClient::RESULT_OK && worker->m_ReportProgress && size > 0)
+        {
+            assert(worker->m_Service->m_ReportProgressCallback);
+            dmHttpDDF::HttpRequestProgress progress = {};
+            progress.m_BytesSent                    = offset + size;
+            progress.m_BytesTotal                   = worker->m_Request->m_RequestLength;
+            worker->m_Service->m_ReportProgressCallback(&progress, &worker->m_CurrentRequesterURL, worker->m_ResponseUserData2);
+        }
+
+        return res_write;
     }
 
     dmHttpClient::Result HttpWriteHeaders(dmHttpClient::HResponse response, void* user_data)
@@ -237,6 +264,14 @@ namespace dmHttpService
         worker->m_Headers.SetCapacity(DEFAULT_HEADER_BUFFER_SIZE);
         worker->m_Filepath = request->m_Path;
 
+        if (request->m_ReportProgress)
+        {
+            worker->m_ReportProgress    = request->m_ReportProgress;
+            worker->m_ResponseUserData1 = userdata1;
+            worker->m_ResponseUserData2 = userdata2;
+            memcpy(&worker->m_CurrentRequesterURL, requester, sizeof(dmMessage::URL));
+        }
+
         if (worker->m_Client) {
             worker->m_Request = request;
             dmHttpClient::SetOptionInt(worker->m_Client, dmHttpClient::OPTION_REQUEST_TIMEOUT, request->m_Timeout);
@@ -244,6 +279,7 @@ namespace dmHttpService
             dmHttpClient::SetOptionInt(worker->m_Client, dmHttpClient::OPTION_REQUEST_CHUNKED_TRANSFER, request->m_ChunkedTransfer);
 
             dmHttpClient::Result r = dmHttpClient::Request(worker->m_Client, request->m_Method, url.m_Path);
+
             if (r == dmHttpClient::RESULT_OK || r == dmHttpClient::RESULT_NOT_200_OK) {
                 SendResponse(requester, userdata1, userdata2, worker->m_Status, worker->m_Headers.Begin(), worker->m_Headers.Size(), worker->m_Response.Begin(), worker->m_Response.Size(), worker->m_Filepath);
             } else {
@@ -411,6 +447,8 @@ namespace dmHttpService
         dmThread::Thread t = dmThread::New(&LoadBalancer, THREAD_STACK_SIZE, service, "http_balance");
         service->m_Balancer = t;
 
+        service->m_ReportProgressCallback = params->m_ReportProgressCallback;
+
         return service;
     }
 
diff --git a/engine/script/src/http_service.h b/engine/script/src/http_service.h
index 230b918d71b..94594fec84f 100644
--- a/engine/script/src/http_service.h
+++ b/engine/script/src/http_service.h
@@ -21,15 +21,21 @@ namespace dmHttpService
 {
     typedef struct HttpService* HHttpService;
 
+    typedef void (*ReportProgressCallback)(dmHttpDDF::HttpRequestProgress* msg, dmMessage::URL* url, uintptr_t user_data);
+
     struct Params
     {
-    	Params() :
-    		m_ThreadCount(4),
-            m_UseHttpCache(1)
+    	Params()
+        : m_ReportProgressCallback(0)
+        , m_ThreadCount(4)
+        , m_UseHttpCache(1)
     	{}
-    	uint32_t m_ThreadCount:4;
-        uint32_t m_UseHttpCache:1;
+
+        ReportProgressCallback m_ReportProgressCallback;
+    	uint32_t               m_ThreadCount  : 4;
+        uint32_t               m_UseHttpCache : 1;
     };
+
     HHttpService New(const Params* params);
     dmMessage::HSocket GetSocket(HHttpService http_service);
     void Delete(HHttpService http_service);
diff --git a/engine/script/src/script.cpp b/engine/script/src/script.cpp
index 3b798e8f73a..2d8057df006 100644
--- a/engine/script/src/script.cpp
+++ b/engine/script/src/script.cpp
@@ -27,7 +27,6 @@
 #include "script_sys.h"
 #include "script_module.h"
 #include "script_json.h"
-#include "script_http.h"
 #include "script_zlib.h"
 #include "script_html5.h"
 #include "script_luasocket.h"
@@ -205,7 +204,6 @@ namespace dmScript
         lua_newtable(L);
         context->m_ContextTableRef = Ref(L, LUA_REGISTRYINDEX);
 
-        InitializeHttp(context);
         InitializeTimer(context);
         if (context->m_EnableExtensions)
         {
diff --git a/engine/script/src/script/http_ddf.proto b/engine/script/src/script/http_ddf.proto
index 038683db95f..4da698067ae 100644
--- a/engine/script/src/script/http_ddf.proto
+++ b/engine/script/src/script/http_ddf.proto
@@ -35,6 +35,15 @@ message HttpRequest
 
     // Use chunked transfer encoding
     optional bool   chunked_transfer   = 10 [default=true];
+
+    optional bool report_progress = 11;
+}
+
+message HttpRequestProgress
+{
+    required uint32 bytes_sent     = 1;
+    required uint32 bytes_received = 2;
+    required uint32 bytes_total    = 3;
 }
 
 message HttpResponse
diff --git a/engine/script/src/test/test_script.cpp b/engine/script/src/test/test_script.cpp
index 7b9a8c76e3c..7251f1caf8a 100644
--- a/engine/script/src/test/test_script.cpp
+++ b/engine/script/src/test/test_script.cpp
@@ -21,10 +21,10 @@
 namespace dmScriptTest
 {
 
-bool RunFile(lua_State* L, const char* filename)
+bool RunFile(lua_State* L, const char* filename, const char* base_dir)
 {
     char path[1024];
-    dmTestUtil::MakeHostPathf(path, sizeof(path), "build/src/test/%s", filename);
+    dmTestUtil::MakeHostPathf(path, sizeof(path), "%s/%s", base_dir, filename);
 
     if (luaL_dofile(L, path) != 0)
     {
@@ -121,7 +121,11 @@ void ScriptTest::AppendToLog(const char* log)
 
 bool ScriptTest::RunFile(lua_State* L, const char* filename)
 {
-    return dmScriptTest::RunFile(L, filename);
+    return dmScriptTest::RunFile(L, filename, "build/src/test/");
+}
+bool ScriptTest::RunFile(lua_State* L, const char* filename, const char* base_dir)
+{
+    return dmScriptTest::RunFile(L, filename, base_dir);
 }
 bool ScriptTest::RunString(lua_State* L, const char* script)
 {
diff --git a/engine/script/src/test/test_script.h b/engine/script/src/test/test_script.h
index 8fe08527f58..42fb7f1db0e 100644
--- a/engine/script/src/test/test_script.h
+++ b/engine/script/src/test/test_script.h
@@ -32,7 +32,7 @@ extern "C"
 
 namespace dmScriptTest
 {
-    bool RunFile(lua_State* L, const char* filename);
+    bool RunFile(lua_State* L, const char* filename, const char* base_dir);
     bool RunString(lua_State* L, const char* script);
 
     class ScriptTest : public jc_test_base_class
@@ -47,6 +47,7 @@ namespace dmScriptTest
         void AppendToLog(const char* log);
 
         bool RunFile(lua_State* L, const char* filename);
+        bool RunFile(lua_State* L, const char* filename, const char* base_dir);
         bool RunString(lua_State* L, const char* script);
 
         dmScript::HContext m_Context;
diff --git a/engine/script/src/test/wscript b/engine/script/src/test/wscript
index c6980fa3c14..72362e4939e 100644
--- a/engine/script/src/test/wscript
+++ b/engine/script/src/test/wscript
@@ -18,25 +18,13 @@ def build(bld):
     bld.stlib(features = 'c cxx',
               includes = '..',
               use = 'DLIB LUA script',
-              target = 'test_script_private',
-              source = 'test_script_private.cpp')
+              target = 'test_script',
+              source = 'test_script.cpp test_script_private.cpp')
 
     web_libs = ['library_sys.js', 'library_script.js']
-    libs = 'TESTMAIN SOCKET APP THREAD EXTENSION RESOURCE DDF DLIB PROFILE_NULL LUA script test_script_private'
+    libs = 'TESTMAIN SOCKET APP THREAD EXTENSION RESOURCE DDF DLIB PROFILE_NULL LUA script test_script'
     exported_symbols = ['ResourceProviderFile']
 
-    common_src = ["test_script.cpp"]
-
-    if not 'web' in bld.env['PLATFORM']:
-        if platform_supports_feature(bld.env.PLATFORM, 'test_script_http', {}):
-            bld.program(features = flist,
-                                       includes = '..',
-                                       use = libs,
-                                       web_libs = web_libs,
-                                       proto_gen_py = True,
-                                       target = 'test_script_http',
-                                       source = common_src + 'test_script_http.cpp test_http.lua test_http_timeout.lua'.split())
-
     test_script_ddf = bld.program(features = flist,
                                   includes = '..',
                                   use = libs,
@@ -44,7 +32,7 @@ def build(bld):
                                   exported_symbols = exported_symbols,
                                   proto_gen_py = True,
                                   target = 'test_script_ddf',
-                                  source = common_src + 'test_script_ddf.cpp test_ddf.proto'.split())
+                                  source = 'test_script_ddf.cpp test_ddf.proto'.split())
 
     test_script_msg = bld.program(features = flist,
                                         includes = '..',
@@ -52,7 +40,7 @@ def build(bld):
                                         web_libs = web_libs,
                                         proto_gen_py = True,
                                         target = 'test_script_msg',
-                                        source = common_src + 'test_script_msg.cpp test_ddf.proto'.split())
+                                        source = 'test_script_msg.cpp test_ddf.proto'.split())
 
     test_script_hash = bld.program(features = flist,
                                         includes = '..',
@@ -61,7 +49,7 @@ def build(bld):
                                         exported_symbols = exported_symbols,
                                         proto_gen_py = True,
                                         target = 'test_script_hash',
-                                        source = common_src + 'test_script_hash.cpp test_hash.lua'.split())
+                                        source = 'test_script_hash.cpp test_hash.lua'.split())
 
     test_script_vmath = bld.program(features = flist,
                                      includes = '.. .',
@@ -70,7 +58,7 @@ def build(bld):
                                      exported_symbols = exported_symbols,
                                      proto_gen_py = True,
                                      target = 'test_script_vmath',
-                                     source = common_src + 'test_script_vmath.cpp test_number.lua test_vector.lua test_vector3.lua test_vector4.lua test_quat.lua test_matrix4.lua'.split())
+                                     source = 'test_script_vmath.cpp test_number.lua test_vector.lua test_vector3.lua test_vector4.lua test_quat.lua test_matrix4.lua'.split())
 
     script_table_features = flist + ' embed';
     test_script_table = bld.program(features = script_table_features,
@@ -81,7 +69,7 @@ def build(bld):
                                      proto_gen_py = True,
                                      embed_source = 'data/table_cos_v0.dat data/table_sin_v0.dat data/table_cos_v1.dat data/table_sin_v1.dat data/table_v818192.dat data/table_tstring_v1.dat data/table_tstring_v2.dat data/table_tstring_v3.dat',
                                      target = 'test_script_table',
-                                     source = common_src + 'test_script_table.cpp test_script_table.lua'.split())
+                                     source = 'test_script_table.cpp test_script_table.lua'.split())
 
     test_script_table_log = bld.program(features = flist,
                                      includes = '.. .',
@@ -89,7 +77,7 @@ def build(bld):
                                      web_libs = web_libs,
                                      proto_gen_py = True,
                                      target = 'test_script_table_log',
-                                     source = common_src + 'test_script_table_log.cpp'.split())
+                                     source = 'test_script_table_log.cpp'.split())
 
     test_script_timer = bld.program(features = flist,
                                      includes = '.. .',
@@ -98,7 +86,7 @@ def build(bld):
                                      exported_symbols = exported_symbols,
                                      proto_gen_py = True,
                                      target = 'test_script_timer',
-                                     source = common_src + 'test_script_timer.cpp'.split())
+                                     source = 'test_script_timer.cpp'.split())
 
     test_script_sys = bld.program(features = flist,
                                        includes = '..',
@@ -107,7 +95,7 @@ def build(bld):
                                        exported_symbols = exported_symbols,
                                        proto_gen_py = True,
                                        target = 'test_script_sys',
-                                       source = common_src + 'test_script_sys.cpp test_sys.lua'.split())
+                                       source = 'test_script_sys.cpp test_sys.lua'.split())
 
     test_script = bld.program(features = flist,
                                         includes = '..',
@@ -116,7 +104,7 @@ def build(bld):
                                         exported_symbols = exported_symbols,
                                         proto_gen_py = True,
                                         target = 'test_script_lua',
-                                        source = common_src + 'test_script_lua.cpp test_script_lua.lua test_script_coroutine.lua test_circular_ref_pprint.lua test_pprint_truncate.lua test_lua_callstack.lua'.split())
+                                        source = 'test_script_lua.cpp test_script_lua.lua test_script_coroutine.lua test_circular_ref_pprint.lua test_pprint_truncate.lua test_lua_callstack.lua'.split())
 
     test_script_module = bld.program(features = flist,
                                           includes = '..',
@@ -125,7 +113,7 @@ def build(bld):
                                           exported_symbols = exported_symbols,
                                           proto_gen_py = True,
                                           target = 'test_script_module',
-                                          source = common_src + 'test_script_module.cpp test_module.lua test_module_missing.lua'.split())
+                                          source = 'test_script_module.cpp test_module.lua test_module_missing.lua'.split())
 
     test_script_json = bld.program(features = flist,
                                        includes = '..',
@@ -134,7 +122,7 @@ def build(bld):
                                        exported_symbols = exported_symbols,
                                        proto_gen_py = True,
                                        target = 'test_script_json',
-                                       source = common_src + 'test_script_json.cpp test_json.lua'.split())
+                                       source = 'test_script_json.cpp test_json.lua'.split())
 
     test_script_zlib = bld.program(features = flist,
                                        includes = '..',
@@ -143,7 +131,7 @@ def build(bld):
                                        exported_symbols = exported_symbols,
                                        proto_gen_py = True,
                                        target = 'test_script_zlib',
-                                       source = common_src + 'test_script_zlib.cpp test_zlib.lua'.split())
+                                       source = 'test_script_zlib.cpp test_zlib.lua'.split())
 
     test_script_user_type = bld.program(features = flist,
                                        includes = '..',
@@ -152,7 +140,7 @@ def build(bld):
                                        exported_symbols = exported_symbols,
                                        proto_gen_py = True,
                                        target = 'test_script_user_type',
-                                       source = common_src + 'test_script_user_type.cpp'.split())
+                                       source = 'test_script_user_type.cpp'.split())
 
     if platform_supports_feature(bld.env.PLATFORM, 'luasocket', {}):
         bld.program(features = flist,
@@ -162,7 +150,7 @@ def build(bld):
                         exported_symbols = exported_symbols,
                         proto_gen_py = True,
                         target = 'test_script_luasocket',
-                        source = common_src + 'test_script_luasocket.cpp test_luasocket.lua'.split())
+                        source = 'test_script_luasocket.cpp test_luasocket.lua'.split())
 
     test_script_bitop = bld.program(features = flist,
                                        includes = '..',
@@ -171,6 +159,7 @@ def build(bld):
                                        exported_symbols = exported_symbols,
                                        proto_gen_py = True,
                                        target = 'test_script_bitop',
-                                       source = common_src + 'test_script_bitop.cpp test_bitop.lua'.split())
+                                       source = 'test_script_bitop.cpp test_bitop.lua'.split())
 
+    bld.install_files('${PREFIX}/include/script', 'test_script.h')
 
diff --git a/engine/script/src/wscript b/engine/script/src/wscript
index 6ce0dd91b99..a0bbc31b20f 100644
--- a/engine/script/src/wscript
+++ b/engine/script/src/wscript
@@ -20,10 +20,8 @@ def build(bld):
                        target = 'script')
 
     if 'web' in bld.env.PLATFORM:
-        script.source = remove_from_node_list(script.source, 'script_http.cpp')
         script.source = remove_from_node_list(script.source, 'script_html5.cpp')
     else:
-        script.source = remove_from_node_list(script.source, 'script_http_js.cpp')
         script.source = remove_from_node_list(script.source, 'script_html5_js.cpp')
 
     # luabitop
@@ -55,9 +53,22 @@ def build(bld):
 
     bld.add_group()
 
-    apidoc_extract_task(bld, ['script.cpp','script_bitop.cpp','script_hash.cpp','script_html5_js.cpp','script_http.cpp','script_json.cpp','script_msg.cpp','script_sys.cpp','script_timer.cpp','script_vmath.cpp','script_zlib.cpp','luasocket/luasocket.doc_h','script/sys_ddf.proto'])
+    apidoc_extract_task(bld,[
+        'script.cpp',
+        'script_bitop.cpp',
+        'script_hash.cpp',
+        'script_html5_js.cpp',
+        'script_json.cpp',
+        'script_msg.cpp',
+        'script_sys.cpp',
+        'script_timer.cpp',
+        'script_vmath.cpp',
+        'script_zlib.cpp',
+        'luasocket/luasocket.doc_h',
+        'script/sys_ddf.proto'])
 
     bld.install_files('${PREFIX}/include/script', 'script.h')
+    bld.install_files('${PREFIX}/include/script', 'http_service.h')
 
     # for #imports to work for other projects
     # ..first for python
diff --git a/engine/script/server.py b/engine/script/test_script_server.py
similarity index 89%
rename from engine/script/server.py
rename to engine/script/test_script_server.py
index 5e96f42b73f..5a775196e38 100644
--- a/engine/script/server.py
+++ b/engine/script/test_script_server.py
@@ -27,6 +27,8 @@ def version_string(self):
 
     def do_GET(self):
         to_send = ""
+        extra_headers = None
+
         if self.path == "/":
             a,b = self.headers.get('X-A', None), self.headers.get('X-B', None)
             if a and b:
@@ -51,6 +53,16 @@ def do_GET(self):
             sys.stdout.flush()
             time.sleep( sleeptime )
             to_send = "slept for %f" % sleeptime
+        else:
+            try:
+                import test_script_server_plugin
+                result = test_script_server_plugin.do_GET(self.path)
+
+                to_send = result['to_send']
+                extra_headers = result['headers']
+
+            except Exception as e:
+                pass
 
         if to_send:
             self.send_response(200)
@@ -58,6 +70,11 @@ def do_GET(self):
             self.send_response(404)
 
         self.send_header("Content-type", "text/plain")
+
+        if extra_headers:
+            for k,v in extra_headers.items():
+                self.send_header(k, v)
+
         self.end_headers()
         self.wfile.write(to_send.encode('ascii'))
 
diff --git a/engine/script/wscript b/engine/script/wscript
index 6a4585027a4..217b48105f7 100644
--- a/engine/script/wscript
+++ b/engine/script/wscript
@@ -42,6 +42,9 @@ def build(bld):
     python_path = os.environ.get('PYTHONPATH', '')
     os.environ['PYTHONPATH'] = os.path.abspath('build/src/script') + os.pathsep + python_path
     bld.recurse('src')
+
+    bld.install_files('${PREFIX}/lib/python', 'test_script_server.py')
+
     TestContext.initialize_test_context(test_context, bld)
 
 def _get_local_ip(self):
@@ -67,7 +70,7 @@ def shutdown(self):
     os.environ['DM_SAVEGAME_HOME'] = 'build'
     sys.path.append('.')
 
-    import server
+    import test_script_server
 
     local_ip = _get_local_ip(self)
 
@@ -77,7 +80,7 @@ def shutdown(self):
     PORT=9001
     configfile = waf_dynamo.create_test_server_config(self, port=PORT, ip=local_ip)
 
-    serv = server.Server(port=PORT, ip=local_ip)
+    serv = test_script_server.Server(port=PORT, ip=local_ip)
     serv.start()
     try:
         waf_dynamo.run_tests(test_context, valgrind = True, configfile = configfile)