diff --git a/data/dfndata/npc/birds.dfn b/data/dfndata/npc/birds.dfn
index 4fadade4c..493428ea8 100644
--- a/data/dfndata/npc/birds.dfn
+++ b/data/dfndata/npc/birds.dfn
@@ -1,26 +1,19 @@
-[bird]
+[base_birds]
+{
+DIRECTION=RND
+BACKPACK
+NPCWANDER=4
+FX2=20
+FLAG=NEUTRAL
+}
+
+[base_bird]
 {
+GET=base_birds
 NAME=#//a bird
 NAMELIST=8
 ID=0x0006
 SKINLIST=11
-DIRECTION=RND
-BACKPACK
-STR=1 4
-DEX=25
-INT=1 4
-MANAMAX=0
-FAME=150
-HIDING=50
-PARRYING=50
-TACTICS=50
-WRESTLING=50
-DAMAGE=2
-NPCWANDER=4
-FX2=30
-TOPROV=46
-TOPEACE=46 5
-TOTAME=69
 TAMEDHUNGER=600 30
 FOOD=bird
 CARVE=2
@@ -30,19 +23,19 @@ NPCAI=12
 CONTROLSLOTS=1
 }
 
-[canary]
+[bird]
 {
-GET=bird
-NAME=5001//a canary
-SKIN=0x00fd
-STR=1 3
-DEX=10
-INT=5 10
-TACTICS=10
-WRESTLING=10
-DAMAGE=1
-DEF=1
-RACE=4
+GETUO=bird_lbr
+GETT2A=bird_lbr
+GETUOR=bird_lbr
+GETTD=bird_lbr
+GETLBR=bird_lbr
+GETAOS=bird_lbr
+GETSE=bird_aos
+GETML=bird_aos
+GETSA=bird_aos
+GETHS=bird_aos
+GETTOL=bird_aos
 }
 
 [tropicalbird]
@@ -51,31 +44,41 @@ GET=bird
 NAME=5159//a tropical bird
 }
 
-[crow]
+[base_canary]
 {
-GET=raven
-NAME=3283//a crow
+GET=base_birds
+NAME=5001//a canary
+ID=0x0006
+SKIN=0x00fd
+TAMEDHUNGER=600 30
+FOOD=bird
+CARVE=2
+RUNS
+RACE=4
+NPCAI=12
+CONTROLSLOTS=1
 }
 
-[chicken]
+[canary]
+{
+GETUO=canary_lbr
+GETT2A=canary_lbr
+GETUOR=canary_lbr
+GETTD=canary_lbr
+GETLBR=canary_lbr
+GETAOS=canary_aos
+GETSE=canary_aos
+GETML=canary_aos
+GETSA=canary_aos
+GETHS=canary_aos
+GETTOL=canary_aos
+}
+
+[base_chicken]
 {
+GET=base_birds
 NAME=#//a chicken
 ID=0x00d0
-DIRECTION=RND
-BACKPACK
-STR=5
-DEX=15
-INT=5
-FAME=150
-TACTICS=50
-WRESTLING=50
-DAMAGE=2
-DEF=1
-NPCWANDER=4
-FX2=30
-TOPROV=34
-TOPEACE=34 5
-TOTAME=0
 TAMEDHUNGER=600 30
 FOOD=hay
 CARVE=8
@@ -84,55 +87,55 @@ NPCAI=12
 CONTROLSLOTS=1
 }
 
-[crane]
+[chicken]
 {
+GETUO=chicken_lbr
+GETT2A=chicken_lbr
+GETUOR=chicken_lbr
+GETTD=chicken_lbr
+GETLBR=chicken_lbr
+GETAOS=chicken_aos
+GETSE=chicken_aos
+GETML=chicken_aos
+GETSA=chicken_aos
+GETHS=chicken_aos
+GETTOL=chicken_aos
+}
+
+[base_crane]
+{
+GET=base_birds
 NAME=#//a crane
 ID=0x00fe
-DIRECTION=RND
-BACKPACK
-STR=25 35
-INT=10 15
-DEX=15 25
-HPMAX=25 35
-DEF=5
-DAMAGE=2
-MAGICRESISTANCE=40 50
-WRESTLING=100 110
-TACTICS=100 110
-NPCWANDER=4
-FX2=30
-TOPROV=92
-TOPEACE=92 5
 CARVE=2
 RUNS
 RACE=4
+NPCAI=12
+CONTROLSLOTS=1
 ORIGIN=se
 }
 
+[crane]
+{
+GETUO=crane_lbr
+GETT2A=crane_lbr
+GETUOR=crane_lbr
+GETTD=crane_lbr
+GETLBR=crane_lbr
+GETAOS=crane_se
+GETSE=crane_se
+GETML=crane_se
+GETSA=crane_se
+GETHS=crane_se
+GETTOL=crane_se
+}
+
 [eagle]
 {
+GET=base_birds
 NAME=#//an eagle
 ID=0x0005
 SKIN=0000
-DIRECTION=RND
-BACKPACK
-STR=31 47
-DEX=36 60
-INT=8 20
-MANAMAX=0
-FAME=300
-KARMA=0
-MAGICRESISTANCE=150 300
-PARRYING=250 400
-TACTICS=180 370
-WRESTLING=200 300
-DAMAGE=4 10
-DEF=11
-NPCWANDER=4
-FX2=30
-TOPROV=220
-TOPEACE=220 5
-TOTAME=171
 TAMEDHUNGER=600 30
 FOOD=carnivore
 CARVE=15
@@ -141,76 +144,111 @@ RACE=4
 CONTROLSLOTS=1
 }
 
-[falcon]
+[eagle]
 {
-GET=bird
+GETUO=eagle_lbr
+GETT2A=eagle_lbr
+GETUOR=eagle_lbr
+GETTD=eagle_lbr
+GETLBR=eagle_lbr
+GETAOS=eagle_aos
+GETSE=eagle_aos
+GETML=eagle_aos
+GETSA=eagle_aos
+GETHS=eagle_aos
+GETTOL=eagle_aos
+}
+
+[base_falcon]
+{
+GET=base_birds
 NAME=5002//a falcon
 ID=0x0006
 SKIN=0x0224
-STR=18 28
-DEX=42 68
-INT=6 15
-HPMAX=13 18
-FAME=190
-MAGICRESISTANCE=200 350
-PARRYING=200 300
-TACTICS=200 370
-WRESTLING=200 300
-DAMAGE=3 9
-DEF=9
-TOPROV=100
-TOPEACE=100 5
-TOTAME=100
 TAMEDHUNGER=600 30
+FOOD=bird
 CARVE=2
 RUNS
 RACE=4
+NPCAI=12
 CONTROLSLOTS=1
 }
 
+[falcon]
+{
+GETUO=falcon_lbr
+GETT2A=falcon_lbr
+GETUOR=falcon_lbr
+GETTD=falcon_lbr
+GETLBR=falcon_lbr
+GETAOS=falcon_aos
+GETSE=falcon_aos
+GETML=falcon_aos
+GETSA=falcon_aos
+GETHS=falcon_aos
+GETTOL=falcon_aos
+}
+
 [hawk]
 {
-GET=bird
+GET=base_birds
 NAME=5003//a hawk
 SKIN=0x0224
-STR=20 30
-DEX=40 66
-INT=8 20
-HPMAX=12 20
-FAME=200
-MAGICRESISTANCE=150 300
-PARRYING=200 300
-TACTICS=140 370
-WRESTLING=200 300
-DAMAGE=3 9
-DEF=9
-TOPROV=100
-TOPEACE=100 5
-TOTAME=100
 TAMEDHUNGER=600 30
 FOOD=carnivore
 CARVE=2
 RUNS
 RACE=4
+NPCAI=12
+CONTROLSLOTS=1
 }
 
-[raven]
+[hawk]
 {
-GET=bird
+GETUO=hawk_lbr
+GETT2A=hawk_lbr
+GETUOR=hawk_lbr
+GETTD=hawk_lbr
+GETLBR=hawk_lbr
+GETAOS=hawk_aos
+GETSE=hawk_aos
+GETML=hawk_aos
+GETSA=hawk_aos
+GETHS=hawk_aos
+GETTOL=hawk_aos
+}
+
+[base_raven]
+{
+GET=base_birds
 NAME=5006//a raven
 SKIN=0x1
-STR=9
-DEX=25
-INT=5
-MANAMAX=0
-FAME=300
-HIDING=50 150
-MAGICRESISTANCE=50
-PARRYING=51
-TACTICS=100
-WRESTLING=100
-DAMAGE=1
-DEF=3
+TAMEDHUNGER=600 30
+FOOD=bird
+CARVE=2
+RUNS
 RACE=4
 NPCAI=12
+CONTROLSLOTS=1
+}
+
+[raven]
+{
+GETUO=raven_lbr
+GETT2A=raven_lbr
+GETUOR=raven_lbr
+GETTD=raven_lbr
+GETLBR=raven_lbr
+GETAOS=raven_aos
+GETSE=raven_aos
+GETML=raven_aos
+GETSA=raven_aos
+GETHS=raven_aos
+GETTOL=raven_aos
+}
+
+[crow]
+{
+GET=raven
+NAME=3283//a crow
 }
diff --git a/data/dfndata/npc/clockwork.dfn b/data/dfndata/npc/clockwork.dfn
index fbaa98230..7b35cc168 100644
--- a/data/dfndata/npc/clockwork.dfn
+++ b/data/dfndata/npc/clockwork.dfn
@@ -1,134 +1,142 @@
-[craftedgolem]
+[base_clockwork]
+{
+DIRECTION=RND
+BACKPACK
+NPCWANDER=4
+FX2=20
+}
+
+[base_craftedgolem]
 {
+GET=base_clockwork
 Name=golem
 ID=0x02f0
-COLOUR=0x835
-DIRECTION=RND
-STR=251 350
-DEX=76 100
-INT=101 150
-FAME=10
-KARMA=10
-DAMAGE=8 29
-DEF=12 30
-MAGICRESISTANCE=1500 1900
-PARRYING=600 1000
-TACTICS=600 1000
-WRESTLING=600 1000
 NPCWANDER=2
 WALKINGSPEED=0.8
-TOPROV=2000
-TOPEACE=784 5
-TOTAME=2000
+COLOUR=0x835
 CONTROLSLOTS=4
-FLAG=NEUTRAL
 CUSTOMINTTAG=repairResource 0x1f1c
 ORIGIN=td
 SCRIPT=3511// Colossal Blow
 }
 
-[golem]
+[craftedgolem]
 {
-get=craftedgolem
-BACKPACK
-PACKITEM=0x1bf2,11 25
-LOOT=arcane_gems
-LOOT=randomgems,2
-LOOT=golemLoot
-NPCWANDER=4
-FX2=30
+GETUO=craftedgolem_lbr
+GETT2A=craftedgolem_lbr
+GETUOR=craftedgolem_lbr
+GETTD=craftedgolem_lbr
+GETLBR=craftedgolem_lbr
+GETAOS=craftedgolem_lbr
+GETSE=craftedgolem_aos
+GETML=craftedgolem_aos
+GETSA=craftedgolem_aos
+GETHS=craftedgolem_aos
+GETTOL=craftedgolem_aos
+}
+
+[base_golem]
+{
+GET=base_clockwork
+Name=golem
+ID=0x02f0
+COLOUR=0x835
+NPCWANDER=2
+WALKINGSPEED=0.8
 NPCAI=2
+ORIGIN=td
+SCRIPT=3511// Colossal Blow
 }
 
-[exodusoverseer]
+[golem]
+{
+GETUO=golem_lbr
+GETT2A=golem_lbr
+GETUOR=golem_lbr
+GETTD=golem_lbr
+GETLBR=golem_lbr
+GETAOS=golem_aos
+GETSE=golem_aos
+GETML=golem_aos
+GETSA=golem_aos
+GETHS=golem_aos
+GETTOL=golem_aos
+}
+
+[base_exodusoverseer]
 {
+GET=base_clockwork
 NAME=#//exodus overseer
 ID=0x02f4
-DIRECTION=RND
-BACKPACK
-GOLD=30 250
-LOOT=exodusOverseerLoot
-LOOT=arcane_gems
-STR=551 650
-DEX=76 95
-INT=61 90
-KARMA=-10000
-FAME=10000
-MAGICRESISTANCE=800 980
-PARRYING=800 980
-TACTICS=800 980
-WRESTLING=800 980
-DAMAGE=12 20
-DEF=25
-NPCWANDER=4
-FX2=20
 NPCAI=2
-TOPROV=821
-TOPEACE=821 5
 RACE=27
-FLAG=NEUTRAL
 ORIGIN=td
 SCRIPT=3211//exodus clockwork AI
 }
 
-[exodusminionlord]
+[exodusoverseer]
+{
+GETUO=exodusoverseer_lbr
+GETT2A=exodusoverseer_lbr
+GETUOR=exodusoverseer_lbr
+GETTD=exodusoverseer_lbr
+GETLBR=exodusoverseer_lbr
+GETAOS=exodusoverseer_aos
+GETSE=exodusoverseer_aos
+GETML=exodusoverseer_aos
+GETSA=exodusoverseer_aos
+GETHS=exodusoverseer_aos
+GETTOL=exodusoverseer_aos
+}
+
+[base_exodusminionlord]
 {
+GET=base_clockwork
 NAME=#//exodus minion lord
 ID=0x02fb
-DIRECTION=RND
-BACKPACK
-GOLD=80 700
-LOOT=exodusMinionLordLoot,2
-LOOT=arcane_gems
-STR=1500 1600
-DEX=71 80
-INT=61 90
-KARMA=-15000
-FAME=15000
-MAGICRESISTANCE=990 1000
-PARRYING=990 1000
-TACTICS=990 1000
-WRESTLING=990 1000
-DAMAGE=14 30
-DEF=35
-NPCWANDER=4
-FX2=20
 NPCAI=2
-TOPROV=2000
-TOPEACE=2000 5
 RACE=27
-FLAG=NEUTRAL
 ORIGIN=td
 SCRIPT=3211//exodus clockwork AI
 }
 
-[exodusminion]
+[exodusminionlord]
 {
+GETUO=exodusminionlord_lbr
+GETT2A=exodusminionlord_lbr
+GETUOR=exodusminionlord_lbr
+GETTD=exodusminionlord_lbr
+GETLBR=exodusminionlord_lbr
+GETAOS=exodusminionlord_aos
+GETSE=exodusminionlord_aos
+GETML=exodusminionlord_aos
+GETSA=exodusminionlord_aos
+GETHS=exodusminionlord_aos
+GETTOL=exodusminionlord_aos
+}
+
+[base_exodusminion]
+{
+GET=base_clockwork
 NAME=#//exodus minion
 ID=0x02f5
-DIRECTION=RND
-BACKPACK
-GOLD=25 220
-LOOT=exodusMinionLoot
-LOOT=arcane_gems
-STR=851 950
-DEX=71 80
-INT=61 90
-KARMA=-18000
-FAME=18000
-MAGICRESISTANCE=990 1000
-PARRYING=990 1000
-TACTICS=990 1000
-WRESTLING=990 1000
-DAMAGE=13 25
-DEF=30
-NPCWANDER=4
-FX2=20
 NPCAI=2
-TOPROV=920
-TOPEACE=920 5
 RACE=27
-FLAG=NEUTRAL
 ORIGIN=td
 SCRIPT=3211//exodus clockwork AI
+}
+
+[exodusminion]
+{
+GETUO=exodusminion_lbr
+GETT2A=exodusminion_lbr
+GETUOR=exodusminion_lbr
+GETTD=exodusminion_lbr
+GETLBR=exodusminion_lbr
+GETAOS=exodusminion_aos
+GETSE=exodusminion_aos
+GETML=exodusminion_aos
+GETSA=exodusminion_aos
+GETHS=exodusminion_aos
+GETTOL=exodusminion_aos
 }
\ No newline at end of file
diff --git a/data/dfndata/npc/npc_aos/birds_aos.dfn b/data/dfndata/npc/npc_aos/birds_aos.dfn
new file mode 100644
index 000000000..b01672b6d
--- /dev/null
+++ b/data/dfndata/npc/npc_aos/birds_aos.dfn
@@ -0,0 +1,161 @@
+[bird_aos]
+{
+GET=base_bird
+STR=1 4
+DEX=25
+INT=1 4
+HPMAX=1 3
+MANAMAX=0
+FAME=150
+HIDING=50
+PARRYING=50
+TACTICS=50
+WRESTLING=50
+DAMAGE=1 1
+DEF=0 0
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=46
+TOPEACE=46 5
+TOTAME=69
+}
+
+[canary_aos]
+{
+GET=base_canary
+STR=1 3
+DEX=10
+INT=5 10
+HPMAX=3 3
+MANAMAX=0
+FAME=150
+HIDING=50
+PARRYING=50
+TACTICS=10
+WRESTLING=10
+DAMAGE=1
+DEF=1 5
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=46
+TOPEACE=46 5
+TOTAME=69
+}
+
+[chicken_aos]
+{
+GET=base_chicken
+STR=5
+DEX=15
+INT=5
+HPMAX=4 5
+FAME=150
+TACTICS=50
+WRESTLING=50
+DAMAGE=2
+DEF=1 1
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=34
+TOPEACE=34 5
+TOTAME=0
+}
+
+[eagle_aos]
+{
+GET=base_eagle
+STR=31 47
+DEX=36 60
+INT=8 20
+HPMAX=20 27
+MANAMAX=0
+FAME=300
+KARMA=0
+MAGICRESISTANCE=150 300
+PARRYING=250 400
+TACTICS=180 370
+WRESTLING=200 300
+ANATOMY=0 1
+DAMAGE=6 13
+DEF=20 25
+RESISTFIRE=10 15
+RESISTCOLD=20 25
+RESISTPOISON=5 10
+RESISTLIGHTNING=5 10
+TOPROV=220
+TOPEACE=220 5
+TOTAME=171
+}
+
+[falcon_aos]
+{
+GET=base_falcon
+STR=18 28
+DEX=42 68
+INT=6 15
+HPMAX=13 18
+FAME=190
+MAGICRESISTANCE=200 350
+PARRYING=200 300
+TACTICS=200 370
+WRESTLING=200 300
+DAMAGE=3 9
+DEF=9 10
+RESISTFIRE=10 15
+RESISTCOLD=20 25
+RESISTPOISON=5 10
+RESISTLIGHTNING=5 10
+TOPROV=100
+TOPEACE=100 5
+TOTAME=100
+}
+
+[hawk_aos]
+{
+GET=base_hawk
+STR=20 30
+DEX=40 66
+INT=8 20
+HPMAX=12 20
+FAME=200
+MAGICRESISTANCE=150 300
+PARRYING=200 300
+TACTICS=140 370
+WRESTLING=200 300
+DAMAGE=3 9
+DEF=9 10
+RESISTFIRE=10 15
+RESISTCOLD=20 25
+RESISTPOISON=5 10
+RESISTLIGHTNING=5 10
+TOPROV=100
+TOPEACE=100 5
+TOTAME=100
+}
+
+[raven_aos]
+{
+GET=base_raven
+STR=9
+DEX=25
+INT=5
+MANAMAX=0
+FAME=300
+HIDING=50 150
+MAGICRESISTANCE=50
+PARRYING=51
+TACTICS=100
+WRESTLING=100
+DAMAGE=1
+DEF=3
+RESISTFIRE=10 15
+RESISTCOLD=20 25
+RESISTPOISON=5 10
+RESISTLIGHTNING=5 10
+}
\ No newline at end of file
diff --git a/data/dfndata/npc/npc_aos/clockwork_aos.dfn b/data/dfndata/npc/npc_aos/clockwork_aos.dfn
new file mode 100644
index 000000000..2754eb0a1
--- /dev/null
+++ b/data/dfndata/npc/npc_aos/clockwork_aos.dfn
@@ -0,0 +1,129 @@
+[craftedgolem_aos]
+{
+GET=base_craftedgolem
+STR=251 350
+DEX=76 100
+INT=101 150
+HPMAX=151 210
+FAME=10
+KARMA=10
+MAGICRESISTANCE=1500 1900
+PARRYING=600 1000
+TACTICS=600 1000
+WRESTLING=600 1000
+DAMAGE=31 64
+DEF=35 45
+RESISTFIRE=100 100
+RESISTCOLD=10 30
+RESISTPOISON=10 25
+RESISTLIGHTNING=30 40
+TOPROV=2000
+TOPEACE=784 5
+TOTAME=2000
+}
+
+[golem_aos]
+{
+GET=base_golem
+PACKITEM=0x1bf2,11 25
+LOOT=arcane_gems
+LOOT=randomgems,2
+LOOT=golemLoot
+STR=251 350
+DEX=76 100
+INT=101 150
+HPMAX=151 210
+FAME=3500
+KARMA=-3500
+MAGICRESISTANCE=1500 1900
+PARRYING=600 1000
+TACTICS=600 1000
+WRESTLING=600 1000
+DAMAGE=31 64
+DEF=35 45
+RESISTFIRE=100 100
+RESISTCOLD=10 30
+RESISTPOISON=10 25
+RESISTLIGHTNING=30 40
+TOPROV=2000
+TOPEACE=784 5
+TOTAME=2000
+}
+
+[exodusoverseer_aos]
+{
+GET=base_exodusoverseer
+GOLD=30 250
+LOOT=exodusOverseerLoot
+LOOT=arcane_gems
+STR=551 650
+DEX=76 95
+INT=61 90
+HPMAX=331 390
+KARMA=-10000
+FAME=10000
+MAGICRESISTANCE=800 980
+PARRYING=800 980
+TACTICS=800 980
+WRESTLING=800 980
+DAMAGE=43 67
+DEF=45 55
+RESISTFIRE=40 60
+RESISTCOLD=25 35
+RESISTPOISON=25 35
+RESISTLIGHTNING=25 35
+TOPROV=821
+TOPEACE=821 5
+}
+
+[exodusminionlord_aos]
+{
+GET=base_exodusminionlord
+GOLD=80 700
+LOOT=exodusMinionLordLoot,2
+LOOT=arcane_gems
+STR=1500 1600
+DEX=71 80
+INT=61 90
+HPMAX=511 570
+KARMA=-15000
+FAME=15000
+MAGICRESISTANCE=990 1000
+PARRYING=990 1000
+TACTICS=990 1000
+WRESTLING=990 1000
+DAMAGE=14 30
+DEF=20 25
+RESISTFIRE=10 20
+RESISTCOLD=10 15
+RESISTPOISON=5 10
+RESISTLIGHTNING=5 10
+TOPROV=2000
+TOPEACE=2000 5
+}
+
+[exodusminion_aos]
+{
+GET=base_exodusminion
+GOLD=25 220
+LOOT=exodusMinionLoot
+LOOT=arcane_gems
+STR=851 950
+DEX=71 80
+INT=61 90
+HPMAX=511 570
+KARMA=-18000
+FAME=18000
+MAGICRESISTANCE=990 1000
+PARRYING=990 1000
+TACTICS=990 1000
+WRESTLING=990 1000
+DAMAGE=69 98
+DEF=60 70
+RESISTFIRE=40 50
+RESISTCOLD=15 25
+RESISTPOISON=15 25
+RESISTLIGHTNING=15 25
+TOPROV=920
+TOPEACE=920 5
+}
\ No newline at end of file
diff --git a/data/dfndata/npc/npc_lbr/birds_lbr.dfn b/data/dfndata/npc/npc_lbr/birds_lbr.dfn
new file mode 100644
index 000000000..908a518fc
--- /dev/null
+++ b/data/dfndata/npc/npc_lbr/birds_lbr.dfn
@@ -0,0 +1,131 @@
+[bird_lbr]
+{
+GET=base_bird
+STR=1 4
+DEX=25
+INT=1 4
+MANAMAX=0
+FAME=150
+HIDING=50
+PARRYING=50
+TACTICS=50
+WRESTLING=50
+DAMAGE=2
+DEF=1
+TOPROV=46
+TOPEACE=46 5
+TOTAME=69
+}
+
+[canary_lbr]
+{
+GET=base_canary
+STR=1 3
+DEX=10
+INT=5 10
+MANAMAX=0
+FAME=150
+HIDING=50
+PARRYING=50
+TACTICS=10
+WRESTLING=10
+DAMAGE=2
+DAMAGE=1
+DEF=1
+TOPROV=46
+TOPEACE=46 5
+TOTAME=69
+}
+
+[chicken_lbr]
+{
+GET=base_chicken
+STR=5
+DEX=15
+INT=5
+FAME=150
+TACTICS=50
+WRESTLING=50
+DAMAGE=2
+DEF=1
+TOPROV=34
+TOPEACE=34 5
+TOTAME=0
+}
+
+[eagle_lbr]
+{
+GET=base_eagle
+STR=31 47
+DEX=36 60
+INT=8 20
+MANAMAX=0
+FAME=300
+KARMA=0
+MAGICRESISTANCE=150 300
+PARRYING=250 400
+TACTICS=180 370
+WRESTLING=200 300
+DAMAGE=4 10
+DEF=11
+TOPROV=220
+TOPEACE=220 5
+TOTAME=171
+}
+
+[falcon_lbr]
+{
+GET=base_falcon
+STR=18 28
+DEX=42 68
+INT=6 15
+HPMAX=13 18
+FAME=190
+MAGICRESISTANCE=200 350
+PARRYING=200 300
+TACTICS=200 370
+WRESTLING=200 300
+DAMAGE=3 9
+DEF=9
+TOPROV=100
+TOPEACE=100 5
+TOTAME=100
+}
+
+[hawk_lbr]
+{
+GET=base_hawk
+NAME=5003//a hawk
+SKIN=0x0224
+STR=20 30
+DEX=40 66
+INT=8 20
+HPMAX=12 20
+FAME=200
+MAGICRESISTANCE=150 300
+PARRYING=200 300
+TACTICS=140 370
+WRESTLING=200 300
+DAMAGE=3 9
+DEF=9
+TOPROV=100
+TOPEACE=100 5
+TOTAME=100
+}
+
+[raven_lbr]
+{
+GET=base_raven
+STR=9
+DEX=25
+INT=5
+MANAMAX=0
+FAME=300
+HIDING=50 150
+MAGICRESISTANCE=50
+PARRYING=51
+TACTICS=100
+WRESTLING=100
+DAMAGE=1
+DEF=3
+}
\ No newline at end of file
diff --git a/data/dfndata/npc/npc_lbr/clockwork_lbr.dfn b/data/dfndata/npc/npc_lbr/clockwork_lbr.dfn
new file mode 100644
index 000000000..dc38a91e8
--- /dev/null
+++ b/data/dfndata/npc/npc_lbr/clockwork_lbr.dfn
@@ -0,0 +1,108 @@
+[craftedgolem]
+{
+GET=base_craftedgolem
+STR=251 350
+DEX=76 100
+INT=101 150
+FAME=10
+KARMA=10
+DAMAGE=8 29
+DEF=12 30
+MAGICRESISTANCE=1500 1900
+PARRYING=600 1000
+TACTICS=600 1000
+WRESTLING=600 1000
+NPCWANDER=2
+WALKINGSPEED=0.8
+TOPROV=2000
+TOPEACE=784 5
+TOTAME=2000
+}
+
+[golem]
+{
+GET=base_golem
+PACKITEM=0x1bf2,11 25
+LOOT=arcane_gems
+LOOT=randomgems,2
+LOOT=golemLoot
+STR=251 350
+DEX=76 100
+INT=101 150
+FAME=10
+KARMA=10
+DAMAGE=8 29
+DEF=12 30
+MAGICRESISTANCE=1500 1900
+PARRYING=600 1000
+TACTICS=600 1000
+WRESTLING=600 1000
+NPCWANDER=2
+WALKINGSPEED=0.8
+TOPROV=2000
+TOPEACE=784 5
+TOTAME=2000
+}
+
+[exodusoverseer]
+{
+GET=base_exodusoverseer
+GOLD=30 250
+LOOT=exodusOverseerLoot
+LOOT=arcane_gems
+STR=551 650
+DEX=76 95
+INT=61 90
+KARMA=-10000
+FAME=10000
+MAGICRESISTANCE=800 980
+PARRYING=800 980
+TACTICS=800 980
+WRESTLING=800 980
+DAMAGE=12 20
+DEF=25
+TOPROV=821
+TOPEACE=821 5
+}
+
+[exodusminionlord]
+{
+GET=base_exodusminionlord
+GOLD=80 700
+LOOT=exodusMinionLordLoot,2
+LOOT=arcane_gems
+STR=1500 1600
+DEX=71 80
+INT=61 90
+KARMA=-15000
+FAME=15000
+MAGICRESISTANCE=990 1000
+PARRYING=990 1000
+TACTICS=990 1000
+WRESTLING=990 1000
+DAMAGE=14 30
+DEF=35
+TOPROV=2000
+TOPEACE=2000 5
+}
+
+[exodusminion]
+{
+GET=base_exodusminion
+GOLD=25 220
+LOOT=exodusMinionLoot
+LOOT=arcane_gems
+STR=851 950
+DEX=71 80
+INT=61 90
+KARMA=-18000
+FAME=18000
+MAGICRESISTANCE=990 1000
+PARRYING=990 1000
+TACTICS=990 1000
+WRESTLING=990 1000
+DAMAGE=13 25
+DEF=30
+TOPROV=920
+TOPEACE=920 5
+}
\ No newline at end of file
diff --git a/data/dfndata/npc/npc_se/birds_se.dfn b/data/dfndata/npc/npc_se/birds_se.dfn
new file mode 100644
index 000000000..be1e8acc4
--- /dev/null
+++ b/data/dfndata/npc/npc_se/birds_se.dfn
@@ -0,0 +1,19 @@
+[crane_se]
+{
+GET=base_crane
+STR=25 35
+INT=10 15
+DEX=15 25
+HPMAX=25 35
+WRESTLING=100 110
+TACTICS=100 110
+MAGICRESISTANCE=40 50
+DAMAGE=1 1
+DEF=5 5
+RESISTFIRE=0 0
+RESISTCOLD=0 0
+RESISTPOISON=0 0
+RESISTLIGHTNING=0 0
+TOPROV=92
+TOPEACE=92 5
+}
\ No newline at end of file