3 files changed, 16 insertions, 3 deletions
diff --git a/builtin/client/init.lua b/builtin/client/init.lua
index 4797ac4b6..dd218aab6 100644
--- a/builtin/client/init.lua
+++ b/builtin/client/init.lua
@@ -4,9 +4,10 @@ local clientpath = scriptpath.."client"..DIR_DELIM
 local commonpath = scriptpath.."common"..DIR_DELIM
 
 dofile(clientpath .. "register.lua")
+dofile(commonpath .. "after.lua")
+dofile(commonpath .. "chatcommands.lua")
 dofile(clientpath .. "preview.lua")
 
 core.register_on_death(function()
 	core.display_chat_message("You died.")
 end)
-
diff --git a/builtin/client/preview.lua b/builtin/client/preview.lua
index c421791f5..22e8bb97f 100644
--- a/builtin/client/preview.lua
+++ b/builtin/client/preview.lua
@@ -1,6 +1,6 @@
 -- This is an example function to ensure it's working properly, should be removed before merge
 core.register_on_shutdown(function()
-	print("shutdown client")
+	print("[PREVIEW] shutdown client")
 end)
 
 -- This is an example function to ensure it's working properly, should be removed before merge
@@ -15,17 +15,28 @@ core.register_on_sending_chat_messages(function(message)
 	return false
 end)
 
+-- This is an example function to ensure it's working properly, should be removed before merge
 core.register_on_hp_modification(function(hp)
 	print("[PREVIEW] HP modified " .. hp)
 end)
 
+-- This is an example function to ensure it's working properly, should be removed before merge
 core.register_on_damage_taken(function(hp)
 	print("[PREVIEW] Damage taken " .. hp)
 end)
 
 -- This is an example function to ensure it's working properly, should be removed before merge
+core.register_globalstep(function(dtime)
+	-- print("[PREVIEW] globalstep " .. dtime)
+end)
+
+-- This is an example function to ensure it's working properly, should be removed before merge
 core.register_chatcommand("dump", {
 	func = function(name, param)
 		return true, dump(_G)
 	end,
-})
-\ No newline at end of file
+})
+
+core.after(2, function()
+	print("After 2")
+end)
diff --git a/builtin/client/register.lua b/builtin/client/register.lua
index ddaf4f424..8b60c1222 100644
--- a/builtin/client/register.lua
+++ b/builtin/client/register.lua
@@ -55,6 +55,7 @@ local function make_registration()
 	return t, registerfunc
 end
 
+core.registered_globalsteps, core.register_globalstep = make_registration()
 core.registered_on_shutdown, core.register_on_shutdown = make_registration()
 core.registered_on_receiving_chat_messages, core.register_on_receiving_chat_messages = make_registration()
 core.registered_on_sending_chat_messages, core.register_on_sending_chat_messages = make_registration()