diff --git a/Makefile b/Makefile
index 3ec2f7e2..cb4b16d9 100644
--- a/Makefile
+++ b/Makefile
@@ -67,9 +67,7 @@ clean:
 
 .PHONY: run 
 run: generate  ### Build and run server.
-	go build -o tmp-gomud.exe
-	make ungenerate
-	./tmp-gomud.exe
+	@go run .
 
 .PHONY: run-docker
 run-docker: ### Build and run server in docker.
diff --git a/main.go b/main.go
index 0b6fdd3f..d08d7083 100644
--- a/main.go
+++ b/main.go
@@ -75,6 +75,8 @@ var (
 
 func main() {
 
+	serverStartTime := time.Now()
+
 	// Capture panic and write msg/stack to logs
 	defer func() {
 		if r := recover(); r != nil {
@@ -243,8 +245,8 @@ func main() {
 
 	go worldManager.InputWorker(workerShutdownChan, &wg)
 	go worldManager.MainWorker(workerShutdownChan, &wg)
-	//go worldManager.MaintenanceWorker(workerShutdownChan, &wg)
-	//go worldManager.GameTickWorker(workerShutdownChan, &wg)
+
+	mudlog.Info("Server Ready", "Time Taken", time.Since(serverStartTime))
 
 	// block until a signal comes in
 	<-sigChan