diff --git a/examples/buildingsdump.cpp b/examples/buildingsdump.cpp
index c20f4f6ba..8e1add8d9 100644
--- a/examples/buildingsdump.cpp
+++ b/examples/buildingsdump.cpp
@@ -16,12 +16,16 @@ using namespace std;
 #include <DFTypes.h>
 #include <modules/Buildings.h>
 #include <modules/Materials.h>
+#include <modules/Position.h>
 #include "miscutils.h"
 
 int main (int argc,const char* argv[])
 {
+    int lines = 16;
+    int mode = 0;
     if (argc < 2 || argc > 3)
     {
+        /*
         cout << "usage:" << endl;
         cout << argv[0] << " object_name [number of lines]" << endl;
         #ifndef LINUX_BUILD
@@ -29,14 +33,15 @@ int main (int argc,const char* argv[])
             cin.ignore();
         #endif
         return 0;
+        */
     }
-    int lines = 16;
-    if(argc == 3)
+    else if(argc == 3)
     {
         string s = argv[2]; //blah. I don't care
         istringstream ins; // Declare an input string stream.
         ins.str(s);        // Specify string to read.
         ins >> lines;     // Reads the integers from the string.
+        mode = 1;
     }
     
     vector<DFHack::t_matgloss> creaturestypes;
@@ -56,35 +61,71 @@ int main (int argc,const char* argv[])
     }
     DFHack::memory_info * mem = DF.getMemoryInfo();
     DFHack::Buildings * Bld = DF.getBuildings();
+    DFHack::Position * Pos = DF.getPosition();
     
     uint32_t numBuildings;
     if(Bld->Start(numBuildings))
     {
-        cout << numBuildings << endl;
-        vector < uint32_t > addresses;
-        for(uint32_t i = 0; i < numBuildings; i++)
+        if(mode)
+        {
+            cout << numBuildings << endl;
+            vector < uint32_t > addresses;
+            for(uint32_t i = 0; i < numBuildings; i++)
+            {
+                DFHack::t_building temp;
+                Bld->Read(i, temp);
+                if(temp.type != 0xFFFFFFFF) // check if type isn't invalid
+                {
+                    string typestr;
+                    mem->resolveClassIDToClassname(temp.type, typestr);
+                    cout << typestr << endl;
+                    if(typestr == argv[1])
+                    {
+                        //cout << buildingtypes[temp.type] << " 0x" << hex << temp.origin << endl;
+                        //hexdump(DF, temp.origin, 16);
+                        addresses.push_back(temp.origin);
+                    }
+                }
+                else
+                {
+                    // couldn't translate type, print out the vtable
+                    cout << "unknown vtable: " << temp.vtable << endl;
+                }
+            }
+            interleave_hex(DF,addresses,lines / 4);
+        }
+        else // mode
         {
-            DFHack::t_building temp;
-            Bld->Read(i, temp);
-            if(temp.type != 0xFFFFFFFF) // check if type isn't invalid
+            int32_t x,y,z;
+            Pos->getCursorCoords(x,y,z);
+            if(x != -30000)
             {
-                string typestr;
-                mem->resolveClassIDToClassname(temp.type, typestr);
-                cout << typestr << endl;
-                if(typestr == argv[1])
+                for(uint32_t i = 0; i < numBuildings; i++)
                 {
-                    //cout << buildingtypes[temp.type] << " 0x" << hex << temp.origin << endl;
-                    //hexdump(DF, temp.origin, 16);
-                    addresses.push_back(temp.origin);
+                    DFHack::t_building temp;
+                    Bld->Read(i, temp);
+                    if(x >= temp.x1 && x <= temp.x2 && y >= temp.y1 && y <= temp.y2 && z == temp.z)
+                    {
+                        string typestr;
+                        mem->resolveClassIDToClassname(temp.type, typestr);
+                        printf("Address 0x%x, type %d (%s), %d/%d/%d\n",temp.origin, temp.type, typestr.c_str(), temp.x1,temp.y1,temp.z);
+                        hexdump(DF,temp.origin,120);
+                    }
                 }
             }
             else
             {
-                // couldn't translate type, print out the vtable
-                cout << "unknown vtable: " << temp.vtable << endl;
+                cout << numBuildings << endl;
+                for(uint32_t i = 0; i < numBuildings; i++)
+                {
+                    DFHack::t_building temp;
+                    Bld->Read(i, temp);
+                    string typestr;
+                    mem->resolveClassIDToClassname(temp.type, typestr);
+                    printf("Address 0x%x, type %d (%s), %d/%d/%d\n",temp.origin, temp.type, typestr.c_str(), temp.x1,temp.y1,temp.z);
+                }
             }
         }
-        interleave_hex(DF,addresses,lines / 4);
         Bld->Finish();
     }
     else
diff --git a/output/Memory.xml b/output/Memory.xml
index 3f0727157..2535a8e59 100644
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -2821,32 +2821,32 @@
             ====================================================================
         <VTable name="building_vtable">
             <multiclass name="building_workshopst" typeoffset="0x138">
-                <class name="building_alchemists_laboratoryst" type="0x0"/>
-                <class name="building_carpenters_workshopst" type="0x1"/>
-                <class name="building_farmers_workshopst" type="0x2"/>
-                <class name="building_masons_workshopst" type="0x3"/>
-                <class name="building_craftdwarfs_workshopst" type="0x4"/>
-                <class name="building_jewelers_workshopst" type="0x5"/>
-                <class name="building_metalsmiths_workshopst" type="0x6"/>
-                <class name="building_magma_forgest" type="0x7"/>
-                <class name="building_bowyers_workshopst" type="0x8"/>
-                <class name="building_mechanics_workshopst" type="0x9"/>
-                <class name="building_siege_workshopst" type="0xA"/>
-                <class name="building_butchers_shopst" type="0xB"/>
-                <class name="building_leather_worksst" type="0xC"/>
-                <class name="building_tanners_shopst" type="0xD"/>
-                <class name="building_clothiers_shopst" type="0xE"/>
-                <class name="building_fisheryst" type="0xF"/>
-                <class name="building_stillst" type="0x10"/>
-                <class name="building_loomst" type="0x11"/>
-                <class name="building_quernst" type="0x12"/>
-                <class name="building_kennelsst" type="0x13"/>
-                <class name="building_kitchenst" type="0x14"/>
-                <class name="building_asheryst" type="0x15"/>
-                <class name="building_dyers_shopst" type="0x16"/>
-                <class name="building_millstonest" type="0x17"/>
+                <!--<class name="building_alchemists_laboratoryst" type="0x0"/>-->
+                <class name="building_carpenters_workshopst" type="0x0"/>
+                <class name="building_farmers_workshopst" type="0x1"/>
+                <class name="building_masons_workshopst" type="0x2"/>
+                <class name="building_craftdwarfs_workshopst" type="0x3"/>
+                <class name="building_jewelers_workshopst" type="0x4"/>
+                <class name="building_metalsmiths_workshopst" type="0x5"/>
+                <class name="building_magma_forgest" type="0x6"/>
+                <class name="building_bowyers_workshopst" type="0x7"/>
+                <class name="building_mechanics_workshopst" type="0x8"/>
+                <class name="building_siege_workshopst" type="0x9"/>
+                <class name="building_butchers_shopst" type="0xA"/>
+                <class name="building_leather_worksst" type="0xB"/>
+                <class name="building_tanners_shopst" type="0xC"/>
+                <class name="building_clothiers_shopst" type="0xD"/>
+                <class name="building_fisheryst" type="0xE"/>
+                <class name="building_stillst" type="0xF"/>
+                <class name="building_loomst" type="0x10"/>
+                <class name="building_quernst" type="0x11"/>
+                <class name="building_kennelsst" type="0x12"/>
+                <class name="building_kitchenst" type="0x13"/>
+                <class name="building_asheryst" type="0x14"/>
+                <class name="building_dyers_shopst" type="0x15"/>
+                <class name="building_millstonest" type="0x16"/>
             </multiclass>
-            <multiclass name="building_furnacest" typeoffset="0xDA">
+            <multiclass name="building_furnacest" typeoffset="0x152">
                 <class name="building_wood_furnacest" type="0x0"/>
                 <class name="building_smelterst" type="0x1"/>
                 <class name="building_glass_furnacest" type="0x2"/>
@@ -2855,11 +2855,11 @@
                 <class name="building_magma_glass_furnacest" type="0x5"/>
                 <class name="building_magma_kilnst" type="0x6"/>
             </multiclass>
-            <multiclass name="building_siegeenginest" typeoffset="0xC8">
+            <multiclass name="building_siegeenginest" typeoffset="0x138">
                 <class name="building_catapultst" type="0x0"/>
                 <class name="building_ballistast" type="0x1"/>
             </multiclass>
-            <multiclass name="building_trapst" typeoffset="0xC8">
+            <multiclass name="building_trapst" typeoffset="0x138">
                 <class name="building_leverst" type="0x0"/>
                 <class name="building_pressure_platest" type="0x1"/>
                 <class name="building_cage_trapst" type="0x2"/>