diff --git a/src/services/galaxy/EnvironmentService.java b/src/services/galaxy/EnvironmentService.java
index cc5b1af66..a53c771c9 100644
--- a/src/services/galaxy/EnvironmentService.java
+++ b/src/services/galaxy/EnvironmentService.java
@@ -35,6 +35,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 import network.packets.swg.SWGPacket;
+import network.packets.swg.zone.ServerTimeMessage;
 import network.packets.swg.zone.ServerWeatherMessage;
 import intents.NotifyPlayersPacketIntent;
 import intents.PlayerEventIntent;
@@ -46,19 +47,19 @@ import resources.player.Player;
 import resources.player.PlayerEvent;
 import utilities.ThreadUtilities;
 
-public final class WeatherService extends Service {
+public final class EnvironmentService extends Service {
 	
 	private final long cycleDuration;
 	private final Terrain[] terrains;
-	private final ScheduledExecutorService executor;
 	private final WeatherType[] weatherTypes;
 	private final Map<Terrain, WeatherType> weatherForTerrain;
 	private final Random random;
+
+	private ScheduledExecutorService executor;
 	
-	public WeatherService() {
+	public EnvironmentService() {
 		cycleDuration = 600;	// Ziggy: 10 minutes, 600 seconds
 		terrains = Terrain.values();
-		executor = Executors.newSingleThreadScheduledExecutor(ThreadUtilities.newThreadFactory("weather-service"));
 		weatherForTerrain = new HashMap<>();
 		weatherTypes = WeatherType.values();
 		random = new Random();
@@ -66,20 +67,23 @@ public final class WeatherService extends Service {
 	
 	@Override
 	public boolean initialize() {
-		for(Terrain t : terrains) {
+		executor = Executors.newScheduledThreadPool(2, ThreadUtilities.newThreadFactory("environment-service"));
+		for (Terrain t : terrains) {
 			weatherForTerrain.put(t, randomWeather());
-			
-			executor.scheduleAtFixedRate(
-					new WeatherChanger(t), 0, 
-					cycleDuration, TimeUnit.SECONDS);
-			
+			executor.scheduleAtFixedRate(new WeatherChanger(t), 0, cycleDuration, TimeUnit.SECONDS);
 		}
+		executor.scheduleAtFixedRate(() -> { updateTime(); }, 0, 5, TimeUnit.SECONDS);
 		
 		registerForIntent(PlayerEventIntent.TYPE);
 		
 		return super.initialize();
 	}
 	
+	@Override
+	public boolean start() {
+		return super.start();
+	}
+	
 	@Override
 	public void onIntentReceived(Intent i) {
 		if(i.getType().equals(PlayerEventIntent.TYPE))
@@ -91,14 +95,19 @@ public final class WeatherService extends Service {
 				}
 	}
 	
-	private final void handleZoneIn(PlayerEventIntent pei) {
+	private void handleZoneIn(PlayerEventIntent pei) {
 		Player p = pei.getPlayer();
 		Terrain t = p.getCreatureObject().getTerrain();
 		
 		p.sendPacket(constructWeatherPacket(t));
 	}
 	
-	private final void setWeather(Terrain terrain, WeatherType type) {
+	private void updateTime() {
+		ServerTimeMessage stm = new ServerTimeMessage((long) (System.currentTimeMillis() / 1E3));
+		new NotifyPlayersPacketIntent(stm, null, (player) -> { return true; /* ALL THE ABOVE! */}, null).broadcast();
+	}
+	
+	private void setWeather(Terrain terrain, WeatherType type) {
 		SWGPacket swm;
 		
 		// Ziggy: Prevent packets containing the same weather from being sent
diff --git a/src/services/galaxy/GameManager.java b/src/services/galaxy/GameManager.java
index a0b7747da..fdd322c79 100644
--- a/src/services/galaxy/GameManager.java
+++ b/src/services/galaxy/GameManager.java
@@ -38,7 +38,7 @@ public class GameManager extends Manager {
 	private final CommandService commandService;
 	private final ConnectionService connectionService;
 	private final SuiService suiService;
-	private final WeatherService weatherService;
+	private final EnvironmentService weatherService;
 	private final TerminalService terminalManager;
 	private final FactionService factionService;
 	
@@ -46,7 +46,7 @@ public class GameManager extends Manager {
 		commandService = new CommandService();
 		connectionService = new ConnectionService();
 		suiService = new SuiService();
-		weatherService = new WeatherService();
+		weatherService = new EnvironmentService();
 		terminalManager = new TerminalService();
 		factionService = new FactionService();