diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp
index e05554f50..b5c2e8455 100644
--- a/zone/lua_general.cpp
+++ b/zone/lua_general.cpp
@@ -7233,6 +7233,530 @@ luabind::scope lua_register_message_types() {
 	)];
 }
 
+luabind::scope lua_register_zone_types() {
+	return luabind::class_<MessageTypes>("Zone")
+		.enum_("constants")
+		[(
+			luabind::value("qeynos", Zones::QEYNOS),
+			luabind::value("qeynos2", Zones::QEYNOS2),
+			luabind::value("qrg", Zones::QRG),
+			luabind::value("qeytoqrg", Zones::QEYTOQRG),
+			luabind::value("highpass", Zones::HIGHPASS),
+			luabind::value("highkeep", Zones::HIGHKEEP),
+			luabind::value("freportn", Zones::FREPORTN),
+			luabind::value("freportw", Zones::FREPORTW),
+			luabind::value("freporte", Zones::FREPORTE),
+			luabind::value("runnyeye", Zones::RUNNYEYE),
+			luabind::value("qey2hh1", Zones::QEY2HH1),
+			luabind::value("northkarana", Zones::NORTHKARANA),
+			luabind::value("southkarana", Zones::SOUTHKARANA),
+			luabind::value("eastkarana", Zones::EASTKARANA),
+			luabind::value("beholder", Zones::BEHOLDER),
+			luabind::value("blackburrow", Zones::BLACKBURROW),
+			luabind::value("paw", Zones::PAW),
+			luabind::value("rivervale", Zones::RIVERVALE),
+			luabind::value("kithicor", Zones::KITHICOR),
+			luabind::value("commons", Zones::COMMONS),
+			luabind::value("ecommons", Zones::ECOMMONS),
+			luabind::value("erudnint", Zones::ERUDNINT),
+			luabind::value("erudnext", Zones::ERUDNEXT),
+			luabind::value("nektulos", Zones::NEKTULOS),
+			luabind::value("cshome", Zones::CSHOME),
+			luabind::value("lavastorm", Zones::LAVASTORM),
+			luabind::value("nektropos", Zones::NEKTROPOS),
+			luabind::value("halas", Zones::HALAS),
+			luabind::value("everfrost", Zones::EVERFROST),
+			luabind::value("soldunga", Zones::SOLDUNGA),
+			luabind::value("soldungb", Zones::SOLDUNGB),
+			luabind::value("misty", Zones::MISTY),
+			luabind::value("nro", Zones::NRO),
+			luabind::value("sro", Zones::SRO),
+			luabind::value("befallen", Zones::BEFALLEN),
+			luabind::value("oasis", Zones::OASIS),
+			luabind::value("tox", Zones::TOX),
+			luabind::value("hole", Zones::HOLE),
+			luabind::value("neriaka", Zones::NERIAKA),
+			luabind::value("neriakb", Zones::NERIAKB),
+			luabind::value("neriakc", Zones::NERIAKC),
+			luabind::value("neriakd", Zones::NERIAKD),
+			luabind::value("najena", Zones::NAJENA),
+			luabind::value("qcat", Zones::QCAT),
+			luabind::value("innothule", Zones::INNOTHULE),
+			luabind::value("feerrott", Zones::FEERROTT),
+			luabind::value("cazicthule", Zones::CAZICTHULE),
+			luabind::value("oggok", Zones::OGGOK),
+			luabind::value("rathemtn", Zones::RATHEMTN),
+			luabind::value("lakerathe", Zones::LAKERATHE),
+			luabind::value("grobb", Zones::GROBB),
+			luabind::value("aviak", Zones::AVIAK),
+			luabind::value("gfaydark", Zones::GFAYDARK),
+			luabind::value("akanon", Zones::AKANON),
+			luabind::value("steamfont", Zones::STEAMFONT),
+			luabind::value("lfaydark", Zones::LFAYDARK),
+			luabind::value("crushbone", Zones::CRUSHBONE),
+			luabind::value("mistmoore", Zones::MISTMOORE),
+			luabind::value("kaladima", Zones::KALADIMA),
+			luabind::value("felwithea", Zones::FELWITHEA),
+			luabind::value("felwitheb", Zones::FELWITHEB),
+			luabind::value("unrest", Zones::UNREST),
+			luabind::value("kedge", Zones::KEDGE),
+			luabind::value("guktop", Zones::GUKTOP),
+			luabind::value("gukbottom", Zones::GUKBOTTOM),
+			luabind::value("kaladimb", Zones::KALADIMB),
+			luabind::value("butcher", Zones::BUTCHER),
+			luabind::value("oot", Zones::OOT),
+			luabind::value("cauldron", Zones::CAULDRON),
+			luabind::value("airplane", Zones::AIRPLANE),
+			luabind::value("fearplane", Zones::FEARPLANE),
+			luabind::value("permafrost", Zones::PERMAFROST),
+			luabind::value("kerraridge", Zones::KERRARIDGE),
+			luabind::value("paineel", Zones::PAINEEL),
+			luabind::value("hateplane", Zones::HATEPLANE),
+			luabind::value("arena", Zones::ARENA),
+			luabind::value("fieldofbone", Zones::FIELDOFBONE),
+			luabind::value("warslikswood", Zones::WARSLIKSWOOD),
+			luabind::value("soltemple", Zones::SOLTEMPLE),
+			luabind::value("droga", Zones::DROGA),
+			luabind::value("cabwest", Zones::CABWEST),
+			luabind::value("swampofnohope", Zones::SWAMPOFNOHOPE),
+			luabind::value("firiona", Zones::FIRIONA),
+			luabind::value("lakeofillomen", Zones::LAKEOFILLOMEN),
+			luabind::value("dreadlands", Zones::DREADLANDS),
+			luabind::value("burningwood", Zones::BURNINGWOOD),
+			luabind::value("kaesora", Zones::KAESORA),
+			luabind::value("sebilis", Zones::SEBILIS),
+			luabind::value("citymist", Zones::CITYMIST),
+			luabind::value("skyfire", Zones::SKYFIRE),
+			luabind::value("frontiermtns", Zones::FRONTIERMTNS),
+			luabind::value("overthere", Zones::OVERTHERE),
+			luabind::value("emeraldjungle", Zones::EMERALDJUNGLE),
+			luabind::value("trakanon", Zones::TRAKANON),
+			luabind::value("timorous", Zones::TIMOROUS),
+			luabind::value("kurn", Zones::KURN),
+			luabind::value("erudsxing", Zones::ERUDSXING),
+			luabind::value("stonebrunt", Zones::STONEBRUNT),
+			luabind::value("warrens", Zones::WARRENS),
+			luabind::value("karnor", Zones::KARNOR),
+			luabind::value("chardok", Zones::CHARDOK),
+			luabind::value("dalnir", Zones::DALNIR),
+			luabind::value("charasis", Zones::CHARASIS),
+			luabind::value("cabeast", Zones::CABEAST),
+			luabind::value("nurga", Zones::NURGA),
+			luabind::value("veeshan", Zones::VEESHAN),
+			luabind::value("veksar", Zones::VEKSAR),
+			luabind::value("iceclad", Zones::ICECLAD),
+			luabind::value("frozenshadow", Zones::FROZENSHADOW),
+			luabind::value("velketor", Zones::VELKETOR),
+			luabind::value("kael", Zones::KAEL),
+			luabind::value("skyshrine", Zones::SKYSHRINE),
+			luabind::value("thurgadina", Zones::THURGADINA),
+			luabind::value("eastwastes", Zones::EASTWASTES),
+			luabind::value("cobaltscar", Zones::COBALTSCAR),
+			luabind::value("greatdivide", Zones::GREATDIVIDE),
+			luabind::value("wakening", Zones::WAKENING),
+			luabind::value("westwastes", Zones::WESTWASTES),
+			luabind::value("crystal", Zones::CRYSTAL),
+			luabind::value("necropolis", Zones::NECROPOLIS),
+			luabind::value("templeveeshan", Zones::TEMPLEVEESHAN),
+			luabind::value("sirens", Zones::SIRENS),
+			luabind::value("mischiefplane", Zones::MISCHIEFPLANE),
+			luabind::value("growthplane", Zones::GROWTHPLANE),
+			luabind::value("sleeper", Zones::SLEEPER),
+			luabind::value("thurgadinb", Zones::THURGADINB),
+			luabind::value("erudsxing2", Zones::ERUDSXING2),
+			luabind::value("shadowhaven", Zones::SHADOWHAVEN),
+			luabind::value("bazaar", Zones::BAZAAR),
+			luabind::value("nexus", Zones::NEXUS),
+			luabind::value("echo_", Zones::ECHO_),
+			luabind::value("acrylia", Zones::ACRYLIA),
+			luabind::value("sharvahl", Zones::SHARVAHL),
+			luabind::value("paludal", Zones::PALUDAL),
+			luabind::value("fungusgrove", Zones::FUNGUSGROVE),
+			luabind::value("vexthal", Zones::VEXTHAL),
+			luabind::value("sseru", Zones::SSERU),
+			luabind::value("katta", Zones::KATTA),
+			luabind::value("netherbian", Zones::NETHERBIAN),
+			luabind::value("ssratemple", Zones::SSRATEMPLE),
+			luabind::value("griegsend", Zones::GRIEGSEND),
+			luabind::value("thedeep", Zones::THEDEEP),
+			luabind::value("shadeweaver", Zones::SHADEWEAVER),
+			luabind::value("hollowshade", Zones::HOLLOWSHADE),
+			luabind::value("grimling", Zones::GRIMLING),
+			luabind::value("mseru", Zones::MSERU),
+			luabind::value("letalis", Zones::LETALIS),
+			luabind::value("twilight", Zones::TWILIGHT),
+			luabind::value("thegrey", Zones::THEGREY),
+			luabind::value("tenebrous", Zones::TENEBROUS),
+			luabind::value("maiden", Zones::MAIDEN),
+			luabind::value("dawnshroud", Zones::DAWNSHROUD),
+			luabind::value("scarlet", Zones::SCARLET),
+			luabind::value("umbral", Zones::UMBRAL),
+			luabind::value("akheva", Zones::AKHEVA),
+			luabind::value("arena2", Zones::ARENA2),
+			luabind::value("jaggedpine", Zones::JAGGEDPINE),
+			luabind::value("nedaria", Zones::NEDARIA),
+			luabind::value("tutorial", Zones::TUTORIAL),
+			luabind::value("load", Zones::LOAD),
+			luabind::value("load2", Zones::LOAD2),
+			luabind::value("hateplaneb", Zones::HATEPLANEB),
+			luabind::value("shadowrest", Zones::SHADOWREST),
+			luabind::value("tutoriala", Zones::TUTORIALA),
+			luabind::value("tutorialb", Zones::TUTORIALB),
+			luabind::value("clz", Zones::CLZ),
+			luabind::value("codecay", Zones::CODECAY),
+			luabind::value("pojustice", Zones::POJUSTICE),
+			luabind::value("poknowledge", Zones::POKNOWLEDGE),
+			luabind::value("potranquility", Zones::POTRANQUILITY),
+			luabind::value("ponightmare", Zones::PONIGHTMARE),
+			luabind::value("podisease", Zones::PODISEASE),
+			luabind::value("poinnovation", Zones::POINNOVATION),
+			luabind::value("potorment", Zones::POTORMENT),
+			luabind::value("povalor", Zones::POVALOR),
+			luabind::value("bothunder", Zones::BOTHUNDER),
+			luabind::value("postorms", Zones::POSTORMS),
+			luabind::value("hohonora", Zones::HOHONORA),
+			luabind::value("solrotower", Zones::SOLROTOWER),
+			luabind::value("powar", Zones::POWAR),
+			luabind::value("potactics", Zones::POTACTICS),
+			luabind::value("poair", Zones::POAIR),
+			luabind::value("powater", Zones::POWATER),
+			luabind::value("pofire", Zones::POFIRE),
+			luabind::value("poeartha", Zones::POEARTHA),
+			luabind::value("potimea", Zones::POTIMEA),
+			luabind::value("hohonorb", Zones::HOHONORB),
+			luabind::value("nightmareb", Zones::NIGHTMAREB),
+			luabind::value("poearthb", Zones::POEARTHB),
+			luabind::value("potimeb", Zones::POTIMEB),
+			luabind::value("gunthak", Zones::GUNTHAK),
+			luabind::value("dulak", Zones::DULAK),
+			luabind::value("torgiran", Zones::TORGIRAN),
+			luabind::value("nadox", Zones::NADOX),
+			luabind::value("hatesfury", Zones::HATESFURY),
+			luabind::value("guka", Zones::GUKA),
+			luabind::value("ruja", Zones::RUJA),
+			luabind::value("taka", Zones::TAKA),
+			luabind::value("mira", Zones::MIRA),
+			luabind::value("mmca", Zones::MMCA),
+			luabind::value("gukb", Zones::GUKB),
+			luabind::value("rujb", Zones::RUJB),
+			luabind::value("takb", Zones::TAKB),
+			luabind::value("mirb", Zones::MIRB),
+			luabind::value("mmcb", Zones::MMCB),
+			luabind::value("gukc", Zones::GUKC),
+			luabind::value("rujc", Zones::RUJC),
+			luabind::value("takc", Zones::TAKC),
+			luabind::value("mirc", Zones::MIRC),
+			luabind::value("mmcc", Zones::MMCC),
+			luabind::value("gukd", Zones::GUKD),
+			luabind::value("rujd", Zones::RUJD),
+			luabind::value("takd", Zones::TAKD),
+			luabind::value("mird", Zones::MIRD),
+			luabind::value("mmcd", Zones::MMCD),
+			luabind::value("guke", Zones::GUKE),
+			luabind::value("ruje", Zones::RUJE),
+			luabind::value("take", Zones::TAKE),
+			luabind::value("mire", Zones::MIRE),
+			luabind::value("mmce", Zones::MMCE),
+			luabind::value("gukf", Zones::GUKF),
+			luabind::value("rujf", Zones::RUJF),
+			luabind::value("takf", Zones::TAKF),
+			luabind::value("mirf", Zones::MIRF),
+			luabind::value("mmcf", Zones::MMCF),
+			luabind::value("gukg", Zones::GUKG),
+			luabind::value("rujg", Zones::RUJG),
+			luabind::value("takg", Zones::TAKG),
+			luabind::value("mirg", Zones::MIRG),
+			luabind::value("mmcg", Zones::MMCG),
+			luabind::value("gukh", Zones::GUKH),
+			luabind::value("rujh", Zones::RUJH),
+			luabind::value("takh", Zones::TAKH),
+			luabind::value("mirh", Zones::MIRH),
+			luabind::value("mmch", Zones::MMCH),
+			luabind::value("ruji", Zones::RUJI),
+			luabind::value("taki", Zones::TAKI),
+			luabind::value("miri", Zones::MIRI),
+			luabind::value("mmci", Zones::MMCI),
+			luabind::value("rujj", Zones::RUJJ),
+			luabind::value("takj", Zones::TAKJ),
+			luabind::value("mirj", Zones::MIRJ),
+			luabind::value("mmcj", Zones::MMCJ),
+			luabind::value("chardokb", Zones::CHARDOKB),
+			luabind::value("soldungc", Zones::SOLDUNGC),
+			luabind::value("abysmal", Zones::ABYSMAL),
+			luabind::value("natimbi", Zones::NATIMBI),
+			luabind::value("qinimi", Zones::QINIMI),
+			luabind::value("riwwi", Zones::RIWWI),
+			luabind::value("barindu", Zones::BARINDU),
+			luabind::value("ferubi", Zones::FERUBI),
+			luabind::value("snpool", Zones::SNPOOL),
+			luabind::value("snlair", Zones::SNLAIR),
+			luabind::value("snplant", Zones::SNPLANT),
+			luabind::value("sncrematory", Zones::SNCREMATORY),
+			luabind::value("tipt", Zones::TIPT),
+			luabind::value("vxed", Zones::VXED),
+			luabind::value("yxtta", Zones::YXTTA),
+			luabind::value("uqua", Zones::UQUA),
+			luabind::value("kodtaz", Zones::KODTAZ),
+			luabind::value("ikkinz", Zones::IKKINZ),
+			luabind::value("qvic", Zones::QVIC),
+			luabind::value("inktuta", Zones::INKTUTA),
+			luabind::value("txevu", Zones::TXEVU),
+			luabind::value("tacvi", Zones::TACVI),
+			luabind::value("qvicb", Zones::QVICB),
+			luabind::value("wallofslaughter", Zones::WALLOFSLAUGHTER),
+			luabind::value("bloodfields", Zones::BLOODFIELDS),
+			luabind::value("draniksscar", Zones::DRANIKSSCAR),
+			luabind::value("causeway", Zones::CAUSEWAY),
+			luabind::value("chambersa", Zones::CHAMBERSA),
+			luabind::value("chambersb", Zones::CHAMBERSB),
+			luabind::value("chambersc", Zones::CHAMBERSC),
+			luabind::value("chambersd", Zones::CHAMBERSD),
+			luabind::value("chamberse", Zones::CHAMBERSE),
+			luabind::value("chambersf", Zones::CHAMBERSF),
+			luabind::value("provinggrounds", Zones::PROVINGGROUNDS),
+			luabind::value("anguish", Zones::ANGUISH),
+			luabind::value("dranikhollowsa", Zones::DRANIKHOLLOWSA),
+			luabind::value("dranikhollowsb", Zones::DRANIKHOLLOWSB),
+			luabind::value("dranikhollowsc", Zones::DRANIKHOLLOWSC),
+			luabind::value("dranikcatacombsa", Zones::DRANIKCATACOMBSA),
+			luabind::value("dranikcatacombsb", Zones::DRANIKCATACOMBSB),
+			luabind::value("dranikcatacombsc", Zones::DRANIKCATACOMBSC),
+			luabind::value("draniksewersa", Zones::DRANIKSEWERSA),
+			luabind::value("draniksewersb", Zones::DRANIKSEWERSB),
+			luabind::value("draniksewersc", Zones::DRANIKSEWERSC),
+			luabind::value("riftseekers", Zones::RIFTSEEKERS),
+			luabind::value("harbingers", Zones::HARBINGERS),
+			luabind::value("dranik", Zones::DRANIK),
+			luabind::value("broodlands", Zones::BROODLANDS),
+			luabind::value("stillmoona", Zones::STILLMOONA),
+			luabind::value("stillmoonb", Zones::STILLMOONB),
+			luabind::value("thundercrest", Zones::THUNDERCREST),
+			luabind::value("delvea", Zones::DELVEA),
+			luabind::value("delveb", Zones::DELVEB),
+			luabind::value("thenest", Zones::THENEST),
+			luabind::value("guildlobby", Zones::GUILDLOBBY),
+			luabind::value("guildhall", Zones::GUILDHALL),
+			luabind::value("barter", Zones::BARTER),
+			luabind::value("illsalin", Zones::ILLSALIN),
+			luabind::value("illsalina", Zones::ILLSALINA),
+			luabind::value("illsalinb", Zones::ILLSALINB),
+			luabind::value("illsalinc", Zones::ILLSALINC),
+			luabind::value("dreadspire", Zones::DREADSPIRE),
+			luabind::value("drachnidhive", Zones::DRACHNIDHIVE),
+			luabind::value("drachnidhivea", Zones::DRACHNIDHIVEA),
+			luabind::value("drachnidhiveb", Zones::DRACHNIDHIVEB),
+			luabind::value("drachnidhivec", Zones::DRACHNIDHIVEC),
+			luabind::value("westkorlach", Zones::WESTKORLACH),
+			luabind::value("westkorlacha", Zones::WESTKORLACHA),
+			luabind::value("westkorlachb", Zones::WESTKORLACHB),
+			luabind::value("westkorlachc", Zones::WESTKORLACHC),
+			luabind::value("eastkorlach", Zones::EASTKORLACH),
+			luabind::value("eastkorlacha", Zones::EASTKORLACHA),
+			luabind::value("shadowspine", Zones::SHADOWSPINE),
+			luabind::value("corathus", Zones::CORATHUS),
+			luabind::value("corathusa", Zones::CORATHUSA),
+			luabind::value("corathusb", Zones::CORATHUSB),
+			luabind::value("nektulosa", Zones::NEKTULOSA),
+			luabind::value("arcstone", Zones::ARCSTONE),
+			luabind::value("relic", Zones::RELIC),
+			luabind::value("skylance", Zones::SKYLANCE),
+			luabind::value("devastation", Zones::DEVASTATION),
+			luabind::value("devastationa", Zones::DEVASTATIONA),
+			luabind::value("rage", Zones::RAGE),
+			luabind::value("ragea", Zones::RAGEA),
+			luabind::value("takishruins", Zones::TAKISHRUINS),
+			luabind::value("takishruinsa", Zones::TAKISHRUINSA),
+			luabind::value("elddar", Zones::ELDDAR),
+			luabind::value("elddara", Zones::ELDDARA),
+			luabind::value("theater", Zones::THEATER),
+			luabind::value("theatera", Zones::THEATERA),
+			luabind::value("freeporteast", Zones::FREEPORTEAST),
+			luabind::value("freeportwest", Zones::FREEPORTWEST),
+			luabind::value("freeportsewers", Zones::FREEPORTSEWERS),
+			luabind::value("freeportacademy", Zones::FREEPORTACADEMY),
+			luabind::value("freeporttemple", Zones::FREEPORTTEMPLE),
+			luabind::value("freeportmilitia", Zones::FREEPORTMILITIA),
+			luabind::value("freeportarena", Zones::FREEPORTARENA),
+			luabind::value("freeportcityhall", Zones::FREEPORTCITYHALL),
+			luabind::value("freeporttheater", Zones::FREEPORTTHEATER),
+			luabind::value("freeporthall", Zones::FREEPORTHALL),
+			luabind::value("northro", Zones::NORTHRO),
+			luabind::value("southro", Zones::SOUTHRO),
+			luabind::value("crescent", Zones::CRESCENT),
+			luabind::value("moors", Zones::MOORS),
+			luabind::value("stonehive", Zones::STONEHIVE),
+			luabind::value("mesa", Zones::MESA),
+			luabind::value("roost", Zones::ROOST),
+			luabind::value("steppes", Zones::STEPPES),
+			luabind::value("icefall", Zones::ICEFALL),
+			luabind::value("valdeholm", Zones::VALDEHOLM),
+			luabind::value("frostcrypt", Zones::FROSTCRYPT),
+			luabind::value("sunderock", Zones::SUNDEROCK),
+			luabind::value("vergalid", Zones::VERGALID),
+			luabind::value("direwind", Zones::DIREWIND),
+			luabind::value("ashengate", Zones::ASHENGATE),
+			luabind::value("highpasshold", Zones::HIGHPASSHOLD),
+			luabind::value("commonlands", Zones::COMMONLANDS),
+			luabind::value("oceanoftears", Zones::OCEANOFTEARS),
+			luabind::value("kithforest", Zones::KITHFOREST),
+			luabind::value("befallenb", Zones::BEFALLENB),
+			luabind::value("highpasskeep", Zones::HIGHPASSKEEP),
+			luabind::value("innothuleb", Zones::INNOTHULEB),
+			luabind::value("toxxulia", Zones::TOXXULIA),
+			luabind::value("mistythicket", Zones::MISTYTHICKET),
+			luabind::value("kattacastrum", Zones::KATTACASTRUM),
+			luabind::value("thalassius", Zones::THALASSIUS),
+			luabind::value("atiiki", Zones::ATIIKI),
+			luabind::value("zhisza", Zones::ZHISZA),
+			luabind::value("silyssar", Zones::SILYSSAR),
+			luabind::value("solteris", Zones::SOLTERIS),
+			luabind::value("barren", Zones::BARREN),
+			luabind::value("buriedsea", Zones::BURIEDSEA),
+			luabind::value("jardelshook", Zones::JARDELSHOOK),
+			luabind::value("monkeyrock", Zones::MONKEYROCK),
+			luabind::value("suncrest", Zones::SUNCREST),
+			luabind::value("deadbone", Zones::DEADBONE),
+			luabind::value("blacksail", Zones::BLACKSAIL),
+			luabind::value("maidensgrave", Zones::MAIDENSGRAVE),
+			luabind::value("redfeather", Zones::REDFEATHER),
+			luabind::value("shipmvp", Zones::SHIPMVP),
+			luabind::value("shipmvu", Zones::SHIPMVU),
+			luabind::value("shippvu", Zones::SHIPPVU),
+			luabind::value("shipuvu", Zones::SHIPUVU),
+			luabind::value("shipmvm", Zones::SHIPMVM),
+			luabind::value("mechanotus", Zones::MECHANOTUS),
+			luabind::value("mansion", Zones::MANSION),
+			luabind::value("steamfactory", Zones::STEAMFACTORY),
+			luabind::value("shipworkshop", Zones::SHIPWORKSHOP),
+			luabind::value("gyrospireb", Zones::GYROSPIREB),
+			luabind::value("gyrospirez", Zones::GYROSPIREZ),
+			luabind::value("dragonscale", Zones::DRAGONSCALE),
+			luabind::value("lopingplains", Zones::LOPINGPLAINS),
+			luabind::value("hillsofshade", Zones::HILLSOFSHADE),
+			luabind::value("bloodmoon", Zones::BLOODMOON),
+			luabind::value("crystallos", Zones::CRYSTALLOS),
+			luabind::value("guardian", Zones::GUARDIAN),
+			luabind::value("steamfontmts", Zones::STEAMFONTMTS),
+			luabind::value("cryptofshade", Zones::CRYPTOFSHADE),
+			luabind::value("dragonscaleb", Zones::DRAGONSCALEB),
+			luabind::value("oldfieldofbone", Zones::OLDFIELDOFBONE),
+			luabind::value("oldkaesoraa", Zones::OLDKAESORAA),
+			luabind::value("oldkaesorab", Zones::OLDKAESORAB),
+			luabind::value("oldkurn", Zones::OLDKURN),
+			luabind::value("oldkithicor", Zones::OLDKITHICOR),
+			luabind::value("oldcommons", Zones::OLDCOMMONS),
+			luabind::value("oldhighpass", Zones::OLDHIGHPASS),
+			luabind::value("thevoida", Zones::THEVOIDA),
+			luabind::value("thevoidb", Zones::THEVOIDB),
+			luabind::value("thevoidc", Zones::THEVOIDC),
+			luabind::value("thevoidd", Zones::THEVOIDD),
+			luabind::value("thevoide", Zones::THEVOIDE),
+			luabind::value("thevoidf", Zones::THEVOIDF),
+			luabind::value("thevoidg", Zones::THEVOIDG),
+			luabind::value("oceangreenhills", Zones::OCEANGREENHILLS),
+			luabind::value("oceangreenvillage", Zones::OCEANGREENVILLAGE),
+			luabind::value("oldblackburrow", Zones::OLDBLACKBURROW),
+			luabind::value("bertoxtemple", Zones::BERTOXTEMPLE),
+			luabind::value("discord", Zones::DISCORD),
+			luabind::value("discordtower", Zones::DISCORDTOWER),
+			luabind::value("oldbloodfield", Zones::OLDBLOODFIELD),
+			luabind::value("precipiceofwar", Zones::PRECIPICEOFWAR),
+			luabind::value("olddranik", Zones::OLDDRANIK),
+			luabind::value("toskirakk", Zones::TOSKIRAKK),
+			luabind::value("korascian", Zones::KORASCIAN),
+			luabind::value("rathechamber", Zones::RATHECHAMBER),
+			luabind::value("brellsrest", Zones::BRELLSREST),
+			luabind::value("fungalforest", Zones::FUNGALFOREST),
+			luabind::value("underquarry", Zones::UNDERQUARRY),
+			luabind::value("coolingchamber", Zones::COOLINGCHAMBER),
+			luabind::value("shiningcity", Zones::SHININGCITY),
+			luabind::value("arthicrex", Zones::ARTHICREX),
+			luabind::value("foundation", Zones::FOUNDATION),
+			luabind::value("lichencreep", Zones::LICHENCREEP),
+			luabind::value("pellucid", Zones::PELLUCID),
+			luabind::value("stonesnake", Zones::STONESNAKE),
+			luabind::value("brellstemple", Zones::BRELLSTEMPLE),
+			luabind::value("convorteum", Zones::CONVORTEUM),
+			luabind::value("brellsarena", Zones::BRELLSARENA),
+			luabind::value("weddingchapel", Zones::WEDDINGCHAPEL),
+			luabind::value("weddingchapeldark", Zones::WEDDINGCHAPELDARK),
+			luabind::value("dragoncrypt", Zones::DRAGONCRYPT),
+			luabind::value("feerrott2", Zones::FEERROTT2),
+			luabind::value("thulehouse1", Zones::THULEHOUSE1),
+			luabind::value("thulehouse2", Zones::THULEHOUSE2),
+			luabind::value("housegarden", Zones::HOUSEGARDEN),
+			luabind::value("thulelibrary", Zones::THULELIBRARY),
+			luabind::value("well", Zones::WELL),
+			luabind::value("fallen", Zones::FALLEN),
+			luabind::value("morellcastle", Zones::MORELLCASTLE),
+			luabind::value("somnium", Zones::SOMNIUM),
+			luabind::value("alkabormare", Zones::ALKABORMARE),
+			luabind::value("miragulmare", Zones::MIRAGULMARE),
+			luabind::value("thuledream", Zones::THULEDREAM),
+			luabind::value("neighborhood", Zones::NEIGHBORHOOD),
+			luabind::value("argath", Zones::ARGATH),
+			luabind::value("arelis", Zones::ARELIS),
+			luabind::value("sarithcity", Zones::SARITHCITY),
+			luabind::value("rubak", Zones::RUBAK),
+			luabind::value("beastdomain", Zones::BEASTDOMAIN),
+			luabind::value("resplendent", Zones::RESPLENDENT),
+			luabind::value("pillarsalra", Zones::PILLARSALRA),
+			luabind::value("windsong", Zones::WINDSONG),
+			luabind::value("cityofbronze", Zones::CITYOFBRONZE),
+			luabind::value("sepulcher", Zones::SEPULCHER),
+			luabind::value("eastsepulcher", Zones::EASTSEPULCHER),
+			luabind::value("westsepulcher", Zones::WESTSEPULCHER),
+			luabind::value("shardslanding", Zones::SHARDSLANDING),
+			luabind::value("xorbb", Zones::XORBB),
+			luabind::value("kaelshard", Zones::KAELSHARD),
+			luabind::value("eastwastesshard", Zones::EASTWASTESSHARD),
+			luabind::value("crystalshard", Zones::CRYSTALSHARD),
+			luabind::value("breedinggrounds", Zones::BREEDINGGROUNDS),
+			luabind::value("eviltree", Zones::EVILTREE),
+			luabind::value("grelleth", Zones::GRELLETH),
+			luabind::value("chapterhouse", Zones::CHAPTERHOUSE),
+			luabind::value("arttest", Zones::ARTTEST),
+			luabind::value("fhalls", Zones::FHALLS),
+			luabind::value("apprentice", Zones::APPRENTICE)
+	)];
+}
+
+luabind::scope lua_register_languages() {
+	return luabind::class_<MessageTypes>("Language")
+		.enum_("constants")
+		[(
+			luabind::value("CommonTongue", Language::CommonTongue),
+			luabind::value("Barbarian", Language::Barbarian),
+			luabind::value("Erudian", Language::Erudian),
+			luabind::value("Elvish", Language::Elvish),
+			luabind::value("DarkElvish", Language::DarkElvish),
+			luabind::value("Dwarvish", Language::Dwarvish),
+			luabind::value("Troll", Language::Troll),
+			luabind::value("Ogre", Language::Ogre),
+			luabind::value("Gnomish", Language::Gnomish),
+			luabind::value("Halfling", Language::Halfling),
+			luabind::value("ThievesCant", Language::ThievesCant),
+			luabind::value("OldErudian", Language::OldErudian),
+			luabind::value("ElderElvish", Language::ElderElvish),
+			luabind::value("Froglok", Language::Froglok),
+			luabind::value("Goblin", Language::Goblin),
+			luabind::value("Gnoll", Language::Gnoll),
+			luabind::value("CombineTongue", Language::CombineTongue),
+			luabind::value("ElderTeirDal", Language::ElderTeirDal),
+			luabind::value("Lizardman", Language::Lizardman),
+			luabind::value("Orcish", Language::Orcish),
+			luabind::value("Faerie", Language::Faerie),
+			luabind::value("Dragon", Language::Dragon),
+			luabind::value("ElderDragon", Language::ElderDragon),
+			luabind::value("DarkSpeech", Language::DarkSpeech),
+			luabind::value("VahShir", Language::VahShir),
+			luabind::value("Alaran", Language::Alaran),
+			luabind::value("Hadal", Language::Hadal),
+			luabind::value("Unknown27", Language::Unknown27),
+			luabind::value("MaxValue", Language::MaxValue)
+	)];
+}
+
 luabind::scope lua_register_rules_const() {
 	return luabind::class_<Rule>("Rule")
 		.enum_("constants")
diff --git a/zone/lua_general.h b/zone/lua_general.h
index d5b741a76..802e8a055 100644
--- a/zone/lua_general.h
+++ b/zone/lua_general.h
@@ -15,6 +15,8 @@ luabind::scope lua_register_skills();
 luabind::scope lua_register_bodytypes();
 luabind::scope lua_register_filters();
 luabind::scope lua_register_message_types();
+luabind::scope lua_register_zone_types();
+luabind::scope lua_register_languages();
 luabind::scope lua_register_rules_const();
 luabind::scope lua_register_rulei();
 luabind::scope lua_register_ruler();
diff --git a/zone/lua_parser.cpp b/zone/lua_parser.cpp
index 0076ff14d..275be87ac 100644
--- a/zone/lua_parser.cpp
+++ b/zone/lua_parser.cpp
@@ -1264,6 +1264,8 @@ void LuaParser::MapFunctions(lua_State *L) {
 			lua_register_bodytypes(),
 			lua_register_filters(),
 			lua_register_message_types(),
+			lua_register_zone_types(),
+			lua_register_languages(),
 			lua_register_entity(),
 			lua_register_encounter(),
 			lua_register_mob(),