diff --git a/Utils/MapEdit/LayerFX.cpp b/Utils/MapEdit/LayerFX.cpp
new file mode 100644
index 000000000..dc392a416
--- /dev/null
+++ b/Utils/MapEdit/LayerFX.cpp
@@ -0,0 +1,165 @@
+/**********************/
+/*** Layer Platform ***/
+/**********************/
+
+#include	"stdafx.h"
+#include	<Vector3.h>
+#include	<gl\gl.h>
+#include	<gl\glu.h>
+#include	"GLEnabledView.h"
+
+#include	"MapEdit.h"
+#include	"MapEditDoc.h"
+#include	"MapEditView.h"
+#include	"MainFrm.h"
+
+#include	"Core.h"
+#include	"LayerThing.h"
+#include	"LayerPlatform.h"
+#include	"Utils.h"
+#include	"Export.h"
+
+/*****************************************************************************/
+/*****************************************************************************/
+/*****************************************************************************/
+CLayerPlatform::CLayerPlatform(sLayerDef &Def)
+{
+		InitLayer(Def);
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::InitLayer(sLayerDef &Def)
+{
+		ThingBank=new CElemBank(-1,-1,false,CElem::CentreModeLR | CElem::CentreModeB);
+		CLayerThing::InitLayer(Def);
+		LoadThingScript(theApp.GetConfigStr("LayerScript","PlatformScript"));
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::InitSubView(CCore *Core)
+{
+}
+
+/*****************************************************************************/
+/*** Gui *********************************************************************/
+/*****************************************************************************/
+void	CLayerPlatform::GUIInit(CCore *Core)
+{
+		GUIPlatform.DisableCallback(true);
+		Core->GUIAdd(GUIThing,IDD_LAYER_THING);
+		Core->GUIAdd(GUIThingPos,IDD_LAYER_THING_POS);
+		Core->GUIAdd(GUIPlatform,IDD_LAYER_PLATFORM);
+		GUIPlatform.DisableCallback(false);
+
+// Init type lists
+		{
+CComboBox	&List=GUIPlatform.m_MoveList;
+			List.AddString("Linear");
+			List.AddString("Circular");
+		}
+
+		{
+CComboBox	&List=GUIPlatform.m_Type;
+			List.AddString("Normal");
+			List.AddString("Weighted");
+			List.AddString("Rotating");
+		}
+
+
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::GUIKill(CCore *Core)
+{
+		Core->GUIRemove(GUIThing,IDD_LAYER_THING);
+		Core->GUIRemove(GUIThingPos,IDD_LAYER_THING_POS);
+		Core->GUIRemove(GUIPlatform,IDD_LAYER_PLATFORM);
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::GUIUpdate(CCore *Core)
+{
+int			i,ListSize;
+CComboBox	&List=GUIThing.m_DefList;
+
+// Setup Def Platform List
+		ListSize=DefList.size();
+		List.ResetContent();
+		for (i=0; i<ListSize; i++)
+		{
+			List.AddString(DefList[i].Name);
+		}
+		List.SetCurSel(CurrentDefThing);
+
+		GUIThingUpdate();
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::GUIThingDefClear()
+{
+CComboBox	&List=GUIThing.m_DefList;
+		CurrentDefThing=-1;
+		List.SetCurSel(CurrentDefThing);
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::GUIThingUpdate(bool OnlySel)
+{
+		GUIThingUpdateList(GUIThing.m_List,false);
+// Params
+		GUIPlatform.DisableCallback(true);
+		if (CurrentThing!=-1)
+		{
+			sLayerThing	&ThisThing=ThingList[CurrentThing];
+			GUIPlatform.SetVal(GUIPlatform.m_Speed,ThisThing.Data.Speed);
+			GUIPlatform.SetVal(GUIPlatform.m_TurnRate,ThisThing.Data.TurnRate);
+			GUIPlatform.m_Collision.SetCheck(ThisThing.Data.CollisionFlag);
+			GUIPlatform.m_MoveList.SetCurSel(ThisThing.Data.MoveType);
+			GUIPlatform.m_Type.SetCurSel(ThisThing.Data.PlatformType);
+		}
+		else
+		{
+			GUIPlatform.m_Speed.SetWindowText("");
+			GUIPlatform.m_TurnRate.SetWindowText("");
+			GUIPlatform.m_Collision.SetCheck(false);
+			GUIPlatform.m_MoveList.SetCurSel(-1);
+			GUIPlatform.m_Type.SetCurSel(-1);
+		}
+		GUIPlatform.DisableCallback(false);
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::GUIThingPointUpdate(bool OnlySel)
+{
+		GUIThingPointUpdateList(GUIThingPos.m_List,OnlySel);
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::GUIChanged(CCore *Core)
+{
+		if (CurrentThing!=-1)
+		{
+			sLayerThing	&ThisThing=ThingList[CurrentThing];
+			ThisThing.Data.Speed=GUIPlatform.GetVal(GUIPlatform.m_Speed);
+			ThisThing.Data.TurnRate=GUIPlatform.GetVal(GUIPlatform.m_TurnRate);
+			ThisThing.Data.CollisionFlag=GUIPlatform.m_Collision.GetCheck()!=0;
+			ThisThing.Data.MoveType=GUIPlatform.m_MoveList.GetCurSel();
+			ThisThing.Data.PlatformType=GUIPlatform.m_Type.GetCurSel();
+			SetThingParams(ThisThing);
+		}
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::SetThingParams(sLayerThing &Thing)
+{
+		switch(Thing.Data.MoveType)
+		{
+			case MoveTypeLinear:
+				Thing.Data.WaypointCount=16;
+				break;
+			case MoveTypeCirular:
+				Thing.Data.WaypointCount=1;
+				Thing.XY.resize(1);
+				break;
+		}
+}
diff --git a/Utils/MapEdit/LayerFX.h b/Utils/MapEdit/LayerFX.h
new file mode 100644
index 000000000..e40248f04
--- /dev/null
+++ b/Utils/MapEdit/LayerFX.h
@@ -0,0 +1,50 @@
+/*******************/
+/*** Layer Platform ***/
+/*******************/
+
+#ifndef	__LAYER_PLATFORM_HEADER__
+#define	__LAYER_PLATFORM_HEADER__
+
+#include	"LayerThing.h"
+#include	"Layer.h"
+#include	"MapEdit.h"
+#include	"GUILayerPlatform.h"
+#include	"Elem.h"
+
+/*****************************************************************************/
+class	CLayerPlatform : public CLayerThing
+{
+public:
+		enum
+		{
+				MoveTypeLinear=0,
+				MoveTypeCirular
+
+		};
+
+		CLayerPlatform(sLayerDef &Def);
+		CLayerPlatform(CFile *File,int Version)	{Load(File,Version);}
+
+		void			InitLayer(sLayerDef &Def);
+		void			InitSubView(CCore *Core);
+
+		void			GUIInit(CCore *Core);
+		void			GUIKill(CCore *Core);
+		void			GUIUpdate(CCore *Core);
+		void			GUIChanged(CCore *Core);
+		bool			GUIReady();
+
+		void			GUIThingDefClear();
+		void			GUIThingUpdate(bool OnlySel=false);
+		void			GUIThingPointUpdate(bool OnlySel=false);
+
+
+protected:
+		void			SetThingParams(sLayerThing &Thing);
+
+		CGUILayerPlatform		GUIPlatform;
+
+};
+
+/*****************************************************************************/
+#endif
diff --git a/Utils/MapEdit/LayerTrigger.cpp b/Utils/MapEdit/LayerTrigger.cpp
new file mode 100644
index 000000000..dc392a416
--- /dev/null
+++ b/Utils/MapEdit/LayerTrigger.cpp
@@ -0,0 +1,165 @@
+/**********************/
+/*** Layer Platform ***/
+/**********************/
+
+#include	"stdafx.h"
+#include	<Vector3.h>
+#include	<gl\gl.h>
+#include	<gl\glu.h>
+#include	"GLEnabledView.h"
+
+#include	"MapEdit.h"
+#include	"MapEditDoc.h"
+#include	"MapEditView.h"
+#include	"MainFrm.h"
+
+#include	"Core.h"
+#include	"LayerThing.h"
+#include	"LayerPlatform.h"
+#include	"Utils.h"
+#include	"Export.h"
+
+/*****************************************************************************/
+/*****************************************************************************/
+/*****************************************************************************/
+CLayerPlatform::CLayerPlatform(sLayerDef &Def)
+{
+		InitLayer(Def);
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::InitLayer(sLayerDef &Def)
+{
+		ThingBank=new CElemBank(-1,-1,false,CElem::CentreModeLR | CElem::CentreModeB);
+		CLayerThing::InitLayer(Def);
+		LoadThingScript(theApp.GetConfigStr("LayerScript","PlatformScript"));
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::InitSubView(CCore *Core)
+{
+}
+
+/*****************************************************************************/
+/*** Gui *********************************************************************/
+/*****************************************************************************/
+void	CLayerPlatform::GUIInit(CCore *Core)
+{
+		GUIPlatform.DisableCallback(true);
+		Core->GUIAdd(GUIThing,IDD_LAYER_THING);
+		Core->GUIAdd(GUIThingPos,IDD_LAYER_THING_POS);
+		Core->GUIAdd(GUIPlatform,IDD_LAYER_PLATFORM);
+		GUIPlatform.DisableCallback(false);
+
+// Init type lists
+		{
+CComboBox	&List=GUIPlatform.m_MoveList;
+			List.AddString("Linear");
+			List.AddString("Circular");
+		}
+
+		{
+CComboBox	&List=GUIPlatform.m_Type;
+			List.AddString("Normal");
+			List.AddString("Weighted");
+			List.AddString("Rotating");
+		}
+
+
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::GUIKill(CCore *Core)
+{
+		Core->GUIRemove(GUIThing,IDD_LAYER_THING);
+		Core->GUIRemove(GUIThingPos,IDD_LAYER_THING_POS);
+		Core->GUIRemove(GUIPlatform,IDD_LAYER_PLATFORM);
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::GUIUpdate(CCore *Core)
+{
+int			i,ListSize;
+CComboBox	&List=GUIThing.m_DefList;
+
+// Setup Def Platform List
+		ListSize=DefList.size();
+		List.ResetContent();
+		for (i=0; i<ListSize; i++)
+		{
+			List.AddString(DefList[i].Name);
+		}
+		List.SetCurSel(CurrentDefThing);
+
+		GUIThingUpdate();
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::GUIThingDefClear()
+{
+CComboBox	&List=GUIThing.m_DefList;
+		CurrentDefThing=-1;
+		List.SetCurSel(CurrentDefThing);
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::GUIThingUpdate(bool OnlySel)
+{
+		GUIThingUpdateList(GUIThing.m_List,false);
+// Params
+		GUIPlatform.DisableCallback(true);
+		if (CurrentThing!=-1)
+		{
+			sLayerThing	&ThisThing=ThingList[CurrentThing];
+			GUIPlatform.SetVal(GUIPlatform.m_Speed,ThisThing.Data.Speed);
+			GUIPlatform.SetVal(GUIPlatform.m_TurnRate,ThisThing.Data.TurnRate);
+			GUIPlatform.m_Collision.SetCheck(ThisThing.Data.CollisionFlag);
+			GUIPlatform.m_MoveList.SetCurSel(ThisThing.Data.MoveType);
+			GUIPlatform.m_Type.SetCurSel(ThisThing.Data.PlatformType);
+		}
+		else
+		{
+			GUIPlatform.m_Speed.SetWindowText("");
+			GUIPlatform.m_TurnRate.SetWindowText("");
+			GUIPlatform.m_Collision.SetCheck(false);
+			GUIPlatform.m_MoveList.SetCurSel(-1);
+			GUIPlatform.m_Type.SetCurSel(-1);
+		}
+		GUIPlatform.DisableCallback(false);
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::GUIThingPointUpdate(bool OnlySel)
+{
+		GUIThingPointUpdateList(GUIThingPos.m_List,OnlySel);
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::GUIChanged(CCore *Core)
+{
+		if (CurrentThing!=-1)
+		{
+			sLayerThing	&ThisThing=ThingList[CurrentThing];
+			ThisThing.Data.Speed=GUIPlatform.GetVal(GUIPlatform.m_Speed);
+			ThisThing.Data.TurnRate=GUIPlatform.GetVal(GUIPlatform.m_TurnRate);
+			ThisThing.Data.CollisionFlag=GUIPlatform.m_Collision.GetCheck()!=0;
+			ThisThing.Data.MoveType=GUIPlatform.m_MoveList.GetCurSel();
+			ThisThing.Data.PlatformType=GUIPlatform.m_Type.GetCurSel();
+			SetThingParams(ThisThing);
+		}
+}
+
+/*****************************************************************************/
+void	CLayerPlatform::SetThingParams(sLayerThing &Thing)
+{
+		switch(Thing.Data.MoveType)
+		{
+			case MoveTypeLinear:
+				Thing.Data.WaypointCount=16;
+				break;
+			case MoveTypeCirular:
+				Thing.Data.WaypointCount=1;
+				Thing.XY.resize(1);
+				break;
+		}
+}
diff --git a/Utils/MapEdit/LayerTrigger.h b/Utils/MapEdit/LayerTrigger.h
new file mode 100644
index 000000000..e40248f04
--- /dev/null
+++ b/Utils/MapEdit/LayerTrigger.h
@@ -0,0 +1,50 @@
+/*******************/
+/*** Layer Platform ***/
+/*******************/
+
+#ifndef	__LAYER_PLATFORM_HEADER__
+#define	__LAYER_PLATFORM_HEADER__
+
+#include	"LayerThing.h"
+#include	"Layer.h"
+#include	"MapEdit.h"
+#include	"GUILayerPlatform.h"
+#include	"Elem.h"
+
+/*****************************************************************************/
+class	CLayerPlatform : public CLayerThing
+{
+public:
+		enum
+		{
+				MoveTypeLinear=0,
+				MoveTypeCirular
+
+		};
+
+		CLayerPlatform(sLayerDef &Def);
+		CLayerPlatform(CFile *File,int Version)	{Load(File,Version);}
+
+		void			InitLayer(sLayerDef &Def);
+		void			InitSubView(CCore *Core);
+
+		void			GUIInit(CCore *Core);
+		void			GUIKill(CCore *Core);
+		void			GUIUpdate(CCore *Core);
+		void			GUIChanged(CCore *Core);
+		bool			GUIReady();
+
+		void			GUIThingDefClear();
+		void			GUIThingUpdate(bool OnlySel=false);
+		void			GUIThingPointUpdate(bool OnlySel=false);
+
+
+protected:
+		void			SetThingParams(sLayerThing &Thing);
+
+		CGUILayerPlatform		GUIPlatform;
+
+};
+
+/*****************************************************************************/
+#endif