Added some more templating to locations and buildings.