diff --git a/editor/map.cpp b/editor/map.cpp
new file mode 100644
index 0000000..1854a28
--- /dev/null
+++ b/editor/map.cpp
@@ -0,0 +1,27 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "map.hpp"
+
+#include "utility.hpp"
+
+#include <stdexcept>
+
diff --git a/editor/map.hpp b/editor/map.hpp
new file mode 100644
index 0000000..8d39db5
--- /dev/null
+++ b/editor/map.hpp
@@ -0,0 +1,88 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef MAP_HPP_
+#define MAP_HPP_
+
+#include "tile.hpp"
+#include "region.hpp"
+#include "tile_sheet.hpp"
+
+#include <list>
+#include <map>
+#include <string>
+
+class Map {
+public:
+	Map() = default;
+	~Map() = default;
+
+	//simple call
+	void DrawTo(SDL_Surface* const, int camX, int camY);
+
+	//TODO: baking goes here...
+
+	//TODO: prune the map's data
+
+	//manage the whole map
+	void NewMap(std::string fname, int regionWidth, int regionHeight);
+	void LoadMap(std::string fname);
+	void UnloadMap();
+	void DeleteMap();
+
+	//for editing
+	bool NewTile(Tile const&);
+	Tile GetTile(int x, int y, int minDepth);
+	void DeleteTile(Tile const&);
+
+	//for pagination, etc.
+	Region* NewRegion(int x, int y);
+	Region* GetRegion(int x, int y);
+	void DeleteRegion(int x, int y);
+	void FreeRegion(int x, int y);
+
+	//all tile sheets are loaded into memory during operation
+	TileSheet* NewTileSheet(std::string name, Uint16 w, Uint16 h);
+	TileSheet* NewTileSheet(SDL_Surface* const, Uint16 w, Uint16 h);
+	TileSheet* GetTileSheet(std::string name);
+	TileSheet* GetTileSheetByRange(int tileIndex);
+	void DeleteTileSheet(std::string name);
+
+	//raw accessors and mutators
+	std::string GetName() const { return name; }
+
+	int GetRegionWidth() const { return regionWidth; }
+	int GetRegionHeight() const { return regionHeight; }
+	int GetTileRangeEnd() const { return tileRangeEnd; }
+
+	std::list<Region>* GetRegions() { return &regions; }
+	std::map<int, TileSheet>* GetTileSheets() { return &tileSheets; }
+
+private:
+	std::string name; //the name of the map
+	int regionWidth = 0, regionHeight = 0; //for pagination
+	int tileRangeEnd = 0; //for managing the tile sheet ranges
+
+	std::list<Region> regions;
+	std::map<int, TileSheet> tileSheets;
+};
+
+#endif
diff --git a/editor/tile_sheet.hpp b/editor/tile_sheet.hpp
index 3eb0723..47d777c 100644
--- a/editor/tile_sheet.hpp
+++ b/editor/tile_sheet.hpp
@@ -27,9 +27,7 @@
 #include <string>
 
 /* The TileSheet class is used for drawing tiles of the map to the screen.
- * This class also has some code to allow the management of several TileSheets,
- * namely the index, begin & end members, tracking of the tile indexes, and
- * custom wrapper functions.
+ * This class also tracks the range of the tile images.
 */
 class TileSheet {
 public:
@@ -57,11 +55,9 @@ public:
 	int GetXCount() const { return xCount; }
 	int GetYCount() const { return yCount; }
 
-	int SetIndex(int i) { return index = i; }
 	int SetBegin(int i) { return begin = i; }
 	int SetEnd(int i) { return end = i; }
 
-	int GetIndex() const { return index; }
 	int GetBegin() const { return begin; }
 	int GetEnd() const { return end; }
 private:
@@ -70,7 +66,7 @@ private:
 
 	//these are generated and used by internal processes
 	int totalCount = 0, xCount = 0, yCount = 0;
-	int index = -1, begin = -1, end = -1;
+	int begin = -1, end = -1;
 };
 
 #endif