diff --git a/.gitignore b/.gitignore
index 51b8c1f0f..52078bbf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ prebuilt
 
 ## doxygen
 Doxygen
-!docs/cs-manual/Makefile
 
 ## ides/editors
 *~
@@ -22,6 +21,8 @@ Doxygen
 .project
 .settings
 .directory
+.idea
+cmake-build-*
 ## qt-creator
 CMakeLists.txt.user*
 
@@ -34,15 +35,36 @@ resources
 
 ## binaries
 /esmtool
-/mwiniimport
-/omwlauncher
 /openmw
 /opencs
 /niftest
+/bsatool
+/openmw-cs
+/openmw-essimporter
+/openmw-iniimporter
+/openmw-launcher
+/openmw-wizard
 
 ## generated objects
 apps/openmw/config.hpp
+apps/launcher/ui_contentselector.h
+apps/launcher/ui_settingspage.h
+apps/opencs/ui_contentselector.h
+apps/opencs/ui_filedialog.h
+apps/wizard/qrc_wizard.cxx
+apps/wizard/ui_componentselectionpage.h
+apps/wizard/ui_conclusionpage.h
+apps/wizard/ui_existinginstallationpage.h
+apps/wizard/ui_importpage.h
+apps/wizard/ui_installationpage.h
+apps/wizard/ui_installationtargetpage.h
+apps/wizard/ui_intropage.h
+apps/wizard/ui_languageselectionpage.h
+apps/wizard/ui_methodselectionpage.h
+components/ui_contentselector.h
 docs/mainpage.hpp
+docs/Doxyfile
+docs/DoxyfilePages
 moc_*.cxx
 *.cxx_parameters
 *qrc_launcher.cxx
@@ -54,3 +76,6 @@ moc_*.cxx
 *ui_playpage.h
 *.[ao]
 *.so
+gamecontrollerdb.txt
+openmw.appdata.xml
+venv/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..9ad6c4012
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "extern/breakpad"]
+	path = extern/breakpad
+	url = https://chromium.googlesource.com/breakpad/breakpad
diff --git a/.travis.yml b/.travis.yml
index e314d8e7b..dbcb00ff8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 os:
  - linux
 # - osx
+osx_image: xcode8.2
 language: cpp
 sudo: required
 dist: trusty
@@ -11,17 +12,37 @@ branches:
     - /openmw-.*$/
 env:
   global:
-   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-   #   via the "travis encrypt" command using the project repo's public key
-   - secure: "jybGzAdUbqt9vWR/GEnRd96BgAi/7Zd1+2HK68j/i/8+/1YH2XxLOy4Jv/DUBhBlJIkxs/Xv8dRcUlFOclZDHX1d/9Qnsqd3oUVkD7k1y7cTOWy9TBQaE/v/kZo3LpzA3xPwwthrb0BvqIbOfIELi5fS5s8ba85WFRg3AX70wWE="
+  - macos_qt_formula=qt@5.5
+  - secure: NZmvVuA0O9NJXVQ12tXQZHDJC2mbFgYNFcsicw0DgW1It2Nk5hxIkF0pfu4/Z59mhQuOPgRVjl5b0FKy2Axh0gkWc1DJEXGwNaiW5lpTMNWR1LJG5rxa8LrDUpFkycpbzfAFuTUZu5z3iYVv64XzELvBuqNGhPMu1LeBnrlech0jFNjkR9p5qtJGWb8zYcPMCC57rig8a9g1ABoVYS6UXjrKpx0946ZLRsE5ukc9pXsypGwPmOMyfzZkxxzIqFaxoE5JIEdaJTWba/6Za315ozYYIi/N35ROI1YAv5GHRe/Iw9XAa4vQpbDzjM7ZSsZdTvvQsSU598gD2xC6jFUKSrpW6GZKwM2x236fZLGnOk5Uw7DUbG+AwpcEmxBwoy9PjBl9ZF3tJykI0gROewCy8MODhdsVMKr1HGIMVBIJySm/RnNqtoDbYV8mYnSl5b8rwJiCajoiR8Zuv4CIfGneeH1a3DOQDPH/qkDsU6ilzF4ANsBlMUUpgY653KBMBmTlNuVZSH527tnD7Fg6JgHVuSQkTbRa1vSkR7Zcre604RZcAoaEdbX3bhVDasPPghU/I742L0RH3oQNlR09pPBDZ8kG7ydl4aPHwpCWnvXNM1vgxtGvnYLztwrse7IoaRXRYiMFmrso78WhMWUDKgvY4wV9aeUu0DtnMezZVIQwCKg=
 addons:
+  apt:
+    sources:
+      - sourceline: 'ppa:openmw/openmw'
+      - ubuntu-toolchain-r-test
+      - llvm-toolchain-precise-3.6
+    packages: [
+      # Dev
+      clang-3.6, libunshield-dev, libtinyxml-dev,
+      g++-6,
+      # Tests
+      libgtest-dev, google-mock,
+      # Boost
+      libboost-filesystem-dev, libboost-program-options-dev, libboost-system-dev, libboost-thread-dev,
+      # FFmpeg
+      libavcodec-dev, libavformat-dev, libavutil-dev, libswscale-dev,
+      # Audio & Video
+      libsdl2-dev, qtbase5-dev, libopenal-dev,
+      # The other ones from OpenMW ppa
+      libbullet-dev, libswresample-dev, libopenscenegraph-3.4-dev, libmygui-dev
+    ]
+
   coverity_scan:
     project:
-      name: "OpenMW/openmw"
+      name: "TES3MP/openmw-tes3mp"
       description: "<Your project description here>"
-    notification_email: scrawl@baseoftrash.de
+    notification_email: stas5978@gmail.com
     build_command_prepend: "cmake . -DBUILD_UNITTESTS=FALSE"
-    build_command:   "make -j2"
+    build_command:   "make -j3"
     branch_pattern: coverity_scan
 matrix:
   include:
@@ -32,27 +53,24 @@ matrix:
   allow_failures:
     - env: ANALYZE="scan-build-3.6 --use-cc clang-3.6 --use-c++ clang++-3.6 "
 
-before_install:
- - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./CI/before_install.linux.sh; fi
- - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./CI/before_install.osx.sh; fi
-before_script:
- - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./CI/before_script.linux.sh; fi
- - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./CI/before_script.osx.sh; fi
+before_install: 
+      - ./CI/before_install.${TRAVIS_OS_NAME}.sh
+before_script: ./CI/before_script.${TRAVIS_OS_NAME}.sh
 script:
  - cd ./build
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then ${ANALYZE}make -j3; fi
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi
-notifications:
-  recipients:
-    - corrmage+travis-ci@gmail.com
-  email:
-    on_success: change
-    on_failure: always
-  irc:
-    channels:
-      - "chat.freenode.net#openmw"
-    on_success: change
-    on_failure: always
-    use_notice: true
+#notifications:
+#  email:
+#    recipients:
+#      - corrmage+travis-ci@gmail.com
+#    on_success: change
+#    on_failure: always
+#  irc:
+#    channels:
+#      - "chat.freenode.net#openmw"
+#    on_success: change
+#    on_failure: always
+#    use_notice: true
diff --git a/AUTHORS.md b/AUTHORS.md
index 79cb87e64..d7e011cd8 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -14,15 +14,23 @@ Programmers
 
     Adam Hogan (aurix)
     Aesylwinn
+    aegis
     Aleksandar Jovanov
     Alex Haddad (rainChu)
-    Alex McKibben (WeirdSexy)
+    Alex McKibben
+    alexanderkjall
     Alexander Nadeau (wareya)
     Alexander Olofsson (Ace)
+    Allofich
+    AnyOldName3
+    Aussiemon
+    Austin Salgat (Salgat)
     Artem Kotsynyak (greye)
     artemutin
     Arthur Moore (EmperorArthur)
+    Assumeru
     athile
+    Ben Shealy (bentsherman)
     Bret Curtis (psi29a)
     Britt Mathis (galdor557)
     cc9cii
@@ -31,6 +39,7 @@ Programmers
     Cory F. Cohen (cfcohen)
     Cris Mihalache (Mirceam)
     darkf
+    devnexen
     Dieho
     Dmitry Shkurskiy (endorph)
     Douglas Diniz (Dgdiniz)
@@ -44,6 +53,7 @@ Programmers
     eroen
     escondida
     Evgeniy Mineev (sandstranger)
+    Federico Guerra (FedeWar)
     Fil Krynicki (filkry)
     Gašper Sedej
     gugus/gus
@@ -62,13 +72,18 @@ Programmers
     John Blomberg (fstp)
     Jordan Ayers
     Jordan Milne
+    Jules Blok (Armada651)
     Julien Voisin (jvoisin/ap0)
     Karl-Felix Glatzer (k1ll)
     Kevin Poitra (PuppyKevin)
     Koncord
+    Kurnevsky Evgeny (kurnevsky)
     Lars Söderberg (Lazaroth)
     lazydev
+    Leon Krieg (lkrieg)
     Leon Saunders (emoose)
+    logzero
+    lohikaarme
     Lukasz Gromanowski (lgro)
     Manuel Edelmann (vorenon)
     Marc Bouvier (CramitDeFrog)
@@ -76,6 +91,7 @@ Programmers
     Mark Siewert (mark76)
     Marco Melletti (mellotanica)
     Marco Schulze
+    Martin Otto (MAtahualpa)
     Mateusz Kołaczek (PL_kolek)
     Mateusz Malisz (malice)
     megaton
@@ -83,6 +99,7 @@ Programmers
     Michael Mc Donnell
     Michael Papageorgiou (werdanith)
     Michał Bień (Glorf)
+    Michał Moroz (dragonee)
     Miroslav Puda (pakanek)
     MiroslavR
     naclander
@@ -92,26 +109,31 @@ Programmers
     Nikolay Kasyanov (corristo)
     nobrakal
     Nolan Poe (nopoe)
+    Oleg Chkan (mrcheko)
     Paul Cercueil (pcercuei)
     Paul McElroy (Greendogo)
+    Pi03k
     Pieter van der Kloet (pvdk)
     pkubik
     Radu-Marius Popovici (rpopovici)
-    rcutmore
     rdimesio
     riothamus
+    Rob Cutmore (rcutmore)
     Robert MacGregor (Ragora)
     Rohit Nirmal
     Roman Melnik (Kromgart)
-    Roman Proskuryakov (humbug)
+    Roman Proskuryakov (kpp)
     Sandy Carter (bwrsandman)
     Scott Howard
     Sebastian Wick (swick)
     Sergey Shambir
+    ShadowRadiance
     sir_herrbatka
     smbas
     Stefan Galowicz (bogglez)
     Stanislav Bobrov (Jiub)
+    stil-t
+    svaante
     Sylvain Thesnieres (Garvek)
     t6
     terrorfisch
@@ -123,19 +145,21 @@ Programmers
     vocollapse
     zelurker
 
-Manual
-------
+Documentation
+-------------
 
+    Alejandro Sanchez (HiPhish)
     Bodillium
+    Bret Curtis (psi29a)
     Cramal
-    Alejandro Sanchez (HiPhish)
+    Ryan Tucker (Ravenwing)
     sir_herrbatka
 
 Packagers
 ---------
 
     Alexander Olofsson (Ace) - Windows
-    Bret Curtis (psi29a) - Ubuntu Linux
+    Bret Curtis (psi29a) - Debian and Ubuntu Linux
     Edmondo Tommasina (edmondo) - Gentoo Linux
     Julian Ospald (hasufell) - Gentoo Linux
     Karl-Felix Glatzer (k1ll) - Linux Binaries
@@ -146,16 +170,16 @@ Packagers
 Public Relations and Translations
 ---------------------------------
 
-    Alex McKibben (WeirdSexy) - Podcaster
     Artem Kotsynyak (greye) - Russian News Writer
+    Dawid Lakomy (Vedyimyn) - Polish News Writer
     Jim Clauwaert (Zedd) - Public Outreach
     Julien Voisin (jvoisin/ap0) - French News Writer
-    Tom Koenderink (Okulo) - English News Writer
     Lukasz Gromanowski (lgro) - English News Writer
+    Martin Otto (Atahualpa) - Podcaster, Public Outreach, German Translator
     Mickey Lyle (raevol) - Release Manager
     Pithorn - Chinese News Writer
     sir_herrbatka - Polish News Writer
-    Dawid Lakomy (Vedyimyn) - Polish News Writer
+    Tom Koenderink (Okulo) - English News Writer
 
 Website
 -------
@@ -206,7 +230,6 @@ Inactive Contributors
     Nekochan
     pchan3
     penguinroad
-    psi29a
     sergoz
     spyboot
     Star-Demon
diff --git a/CHANGELOG.md b/CHANGELOG.md
index de4a6fc24..87d826753 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,228 @@
+0.41.0
+------
+
+    Bug #1138: Casting water walking doesn't move the player out of the water
+    Bug #1931: Rocks from blocked passage in Bamz-Amschend, Radacs Forge can reset and cant be removed again.
+    Bug #2048: Almvisi and Divine Intervention display wrong spell effect
+    Bug #2054: Show effect-indicator for "instant effect" spells and potions
+    Bug #2150: Clockwork City door animation problem
+    Bug #2288: Playback of weapon idle animation not correct
+    Bug #2410: Stat-review window doesn't display starting spells, powers, or abilities
+    Bug #2493: Repairing occasionally very slow
+    Bug #2716: [OSG] Water surface is too transparent from some angles
+    Bug #2859: [MAC OS X] Cannot exit fullscreen once enabled
+    Bug #3091: Editor: will not save addon if global variable value type is null
+    Bug #3277: Editor: Non-functional nested tables in subviews need to be hidden instead of being disabled
+    Bug #3348: Disabled map markers show on minimap
+    Bug #3350: Extending selection to instances with same object results in duplicates.
+    Bug #3353: [Mod] Romance version 3.7 script failed
+    Bug #3376: [Mod] Vampire Embrace script fails to execute
+    Bug #3385: Banners don't animate in stormy weather as they do in the original game
+    Bug #3393: Akulakhan re-enabled after main quest
+    Bug #3427: Editor: OpenMW-CS instances won´t get deleted
+    Bug #3451: Feril Salmyn corpse isn't where it is supposed to be
+    Bug #3497: Zero-weight armor is displayed as "heavy" in inventory tooltip
+    Bug #3499: Idle animations don't always loop
+    Bug #3500: Spark showers at Sotha Sil do not appear until you look at the ceiling
+    Bug #3515: Editor: Moved objects in interior cells are teleported to exterior cells.
+    Bug #3520: Editor: OpenMW-CS cannot find project file when launching the game
+    Bug #3521: Armed NPCs don't use correct melee attacks
+    Bug #3535: Changing cell immediately after dying causes character to freeze.
+    Bug #3542: Unable to rest if unalerted slaughterfish are in the cell with you
+    Bug #3549: Blood effects occur even when a hit is resisted
+    Bug #3551: NPC Todwendy in german version can't interact
+    Bug #3552: Opening the journal when fonts are missing results in a crash
+    Bug #3555: SetInvisible command should not apply graphic effect
+    Bug #3561: Editor: changes from omwaddon are not loaded in [New Addon] mode
+    Bug #3562: Non-hostile NPCs can be disarmed by stealing their weapons via sneaking
+    Bug #3564: Editor: openmw-cs verification results
+    Bug #3568: Items that should be invisible are shown in the inventory
+    Bug #3574: Alchemy: Alembics and retorts are used in reverse
+    Bug #3575: Diaglog choices don't work in mw 0.40
+    Bug #3576: Minor differences in AI reaction to hostile spell effects
+    Bug #3577: not local nolore dialog test
+    Bug #3578: Animation Replacer hangs after one cicle/step
+    Bug #3579: Bound Armor skillups and sounds
+    Bug #3583: Targetted GetCurrentAiPackage returns 0
+    Bug #3584: Persuasion bug
+    Bug #3590: Vendor, Ilen Faveran, auto equips items from stock
+    Bug #3594: Weather doesn't seem to update correctly in Mournhold
+    Bug #3598: Saving doesn't save status of objects
+    Bug #3600: Screen goes black when trying to travel to Sadrith Mora
+    Bug #3608: Water ripples aren't created when walking on water
+    Bug #3626: Argonian NPCs swim like khajiits
+    Bug #3627: Cannot delete "Blessed touch" spell from spellbook
+    Bug #3634: An enchanted throwing weapon consumes charges from the stack in your inventory. (0.40.0)
+    Bug #3635: Levelled items in merchants are "re-rolled" (not bug 2952, see inside)
+    Feature #1118: AI combat: flee
+    Feature #1596: Editor: Render water
+    Feature #2042: Adding a non-portable Light to the inventory should cause the player to glow
+    Feature #3166: Editor: Instance editing mode - rotate sub mode
+    Feature #3167: Editor: Instance editing mode - scale sub mode
+    Feature #3420: ess-Importer: player control flags
+    Feature #3489: You shouldn't be be able to re-cast a bound equipment spell
+    Feature #3496: Zero-weight boots should play light boot footsteps
+    Feature #3516: Water Walking should give a "can't cast" message and fail when you are too deep
+    Feature #3519: Play audio and visual effects for all effects in a spell
+    Feature #3527: Double spell explosion scaling
+    Feature #3534: Play particle textures for spell effects
+    Feature #3539: Make NPCs use opponent's weapon range to decide whether to dodge
+    Feature #3540: Allow dodging for creatures with "biped" flag
+    Feature #3545: Drop shadow for items in menu
+    Feature #3558: Implement same spell range for "on touch" spells as original engine
+    Feature #3560: Allow using telekinesis with touch spells on objects
+    Task #3585: Some objects added by Morrowind Rebirth do not display properly their texture
+
+0.40.0
+------
+
+    Bug #1320: AiWander - Creatures in cells without pathgrids do not wander
+    Bug #1873: Death events are triggered at the beginning of the death animation
+    Bug #1996: Resting interrupts magic effects
+    Bug #2399: Vampires can rest in broad daylight and survive the experience
+    Bug #2604: Incorrect magicka recalculation
+    Bug #2721: Telekinesis extends interaction range where it shouldn't
+    Bug #2981: When waiting, NPCs can go where they wouldn't go normally.
+    Bug #3045: Esp files containing the letter '#' in the file name cannot be loaded on startup
+    Bug #3071: Slowfall does not stop momentum when jumping
+    Bug #3085: Plugins can not replace parent cell references with a cell reference of different type
+    Bug #3145: Bug with AI Cliff Racer. He will not attack you, unless you put in front of him.
+    Bug #3149: Editor: Weather tables were missing from regions
+    Bug #3201: Netch shoots over your head
+    Bug #3269: If you deselect a mod and try to load a save made inside a cell added by it, you end bellow the terrain in the grid 0/0
+    Bug #3286: Editor: Script editor tab width
+    Bug #3329: Teleportation spells cause crash to desktop after build update from 0.37 to 0.38.0
+    Bug #3331: Editor: Start Scripts table: Adding a script doesn't refresh the list of Start Scripts and allows to add a single script multiple times
+    Bug #3332: Editor: Scene view: Tool tips only occur when holding the left mouse button
+    Bug #3340: ESS-Importer does not separate item stacks
+    Bug #3342: Editor: Creation of pathgrids did not check if the pathgrid already existed
+    Bug #3346: "Talked to PC" is always 0 for "Hello" dialogue
+    Bug #3349: AITravel doesn't repeat
+    Bug #3370: NPCs wandering to invalid locations after training
+    Bug #3378: "StopCombat" command does not function in vanilla quest
+    Bug #3384: Battle at Nchurdamz - Larienna Macrina does not stop combat after killing Hrelvesuu
+    Bug #3388: Monster Respawn tied to Quicksave
+    Bug #3390: Strange visual effect in Dagoth Ur's chamber
+    Bug #3391: Inappropriate Blight weather behavior at end of main quest
+    Bug #3394: Replaced dialogue inherits some of its old data
+    Bug #3397: Actors that start the game dead always have the same death pose
+    Bug #3401: Sirollus Saccus sells not glass arrows
+    Bug #3402: Editor: Weapon data not being properly set
+    Bug #3405: Mulvisic Othril will not use her chitin throwing stars
+    Bug #3407: Tanisie Verethi will immediately detect the player
+    Bug #3408: Improper behavior of ashmire particles
+    Bug #3412: Ai Wander start time resets when saving/loading the game
+    Bug #3416: 1st person and 3rd person camera isn't converted from .ess correctly
+    Bug #3421: Idling long enough while paralyzed sometimes causes character to get stuck
+    Bug #3423: Sleep interruption inside dungeons too agressive
+    Bug #3424: Pickpocketing sometimes won't work
+    Bug #3432: AiFollow / AiEscort durations handled incorrectly
+    Bug #3434: Dead NPC's and Creatures still contribute to sneak skill increases
+    Bug #3437: Weather-conditioned dialogue should not play in interiors
+    Bug #3439: Effects cast by summon stick around after their death
+    Bug #3440: Parallax maps looks weird
+    Bug #3443: Class graphic for custom class should be Acrobat
+    Bug #3446: OpenMW segfaults when using Atrayonis's "Anthology Solstheim: Tomb of the Snow Prince" mod
+    Bug #3448: After dispelled, invisibility icon is still displayed
+    Bug #3453: First couple of seconds of NPC speech is muted
+    Bug #3455: Portable house mods lock player and npc movement up exiting house.
+    Bug #3456: Equipping an item will undo dispel of constant effect invisibility
+    Bug #3458: Constant effect restore health doesn't work during Wait
+    Bug #3466: It is possible to stack multiple scroll effects of the same type
+    Bug #3471: When two mods delete the same references, many references are not disabled by the engine.
+    Bug #3473: 3rd person camera can be glitched
+    Feature #1424: NPC "Face" function
+    Feature #2974: Editor: Multiple Deletion of Subrecords
+    Feature #3044: Editor: Render path grid v2
+    Feature #3362: Editor: Configurable key bindings
+    Feature #3375: Make sun / moon reflections weather dependent
+    Feature #3386: Editor: Edit pathgrid
+
+0.39.0
+------
+
+    Bug #1384: Dark Brotherhood Assassin (and other scripted NPCs?) spawns beneath/inside solid objects
+    Bug #1544: "Drop" drops equipped item in a separate stack
+    Bug #1587: Collision detection glitches
+    Bug #1629: Container UI locks up in Vivec at Jeanne's
+    Bug #1771: Dark Brotherhood Assassin oddity in Eight Plates
+    Bug #1827: Unhandled NiTextureEffect in ex_dwrv_ruin30.nif
+    Bug #2089: When saving while swimming in water in an interior cell, you will be spawned under water on loading
+    Bug #2295: Internal texture not showing, nipixeldata
+    Bug #2363: Corpses don't disappear
+    Bug #2369: Respawns should be timed individually
+    Bug #2393: Сharacter is stuck in the tree
+    Bug #2444: [Mod] NPCs from Animated Morrowind appears not using proper animations
+    Bug #2467: Creatures do not respawn
+    Bug #2515: Ghosts in Ibar-Dad spawn stuck in walls
+    Bug #2610: FixMe script still needs to be implemented
+    Bug #2689: Riekling raider pig constantly screams while running
+    Bug #2719: Vivec don't put their hands on the knees with this replacer (Psymoniser Vivec God Replacement NPC Edition v1.0
+    Bug #2737: Camera shaking when side stepping around object
+    Bug #2760: AI Combat Priority Problem - Use of restoration spell instead of attacking
+    Bug #2806: Stack overflow in LocalScripts::getNext
+    Bug #2807: Collision detection allows player to become stuck inside objects
+    Bug #2814: Stairs to Marandus have improper collision
+    Bug #2925: Ranes Ienith will not appear, breaking the Morag Tong and Thieves Guid questlines
+    Bug #3024: Editor: Creator bar in startscript subview does not accept script ID drops
+    Bug #3046: Sleep creature: Velk is spawned half-underground in the Thirr River Valley
+    Bug #3080: Calling aifollow without operant in local script every frame causes mechanics to overheat + log
+    Bug #3101: Regression: White guar does not move
+    Bug #3108: Game Freeze after Killing Diseased Rat in Foreign Quarter Tomb
+    Bug #3124: Bloodmoon Quest - Rite of the Wolf Giver (BM_WolfGiver) – Innocent victim won't turn werewolf
+    Bug #3125: Improper dialogue window behavior when talking to creatures
+    Bug #3130: Some wandering NPCs disappearing, cannot finish quests
+    Bug #3132: Editor: GMST ID named sMake Enchantment is instead named sMake when making new game from scratch
+    Bug #3133: OpenMW and the OpenCS are writting warnings about scripts that use the function GetDisabled.
+    Bug #3135: Journal entry for The Pigrim's Path missing name
+    Bug #3136: Dropped bow is displaced
+    Bug #3140: Editor: OpenMW-CS fails to open newly converted and saved omwaddon file.
+    Bug #3142: Duplicate Resist Magic message
+    Bug #3143: Azura missing her head
+    Bug #3146: Potion effect showing when ingredient effects are not known
+    Bug #3155: When executing chop attack with a spear, hands turn partly invisible
+    Bug #3161: Fast travel from Silt Strider or Boat Ride will break save files made afterwards
+    Bug #3163: Editor: Objects dropped to scene do not always save
+    Bug #3173: Game Crashes After Casting Recall Spell
+    Bug #3174: Constant effect enchantments play spell animation on dead bodies
+    Bug #3175: Spell effects do not wear down when caster dies
+    Bug #3176: NPCs appearing randomly far away from towns
+    Bug #3177: Submerged corpse floats ontop of water when it shouldn't (Widow Vabdas' Deed quest)
+    Bug #3184: Bacola Closcius in Balmora, South Wall Cornerclub spams magic effects if attacked
+    Bug #3207: Editor: New objects do not render
+    Bug #3212: Arrow of Ranged Silence
+    Bug #3213: Looking at Floor After Magical Transport
+    Bug #3220: The number of remaining ingredients in the alchemy window doesn't go down when failing to brew a potion
+    Bug #3222: Falling through the water in Vivec
+    Bug #3223: Crash at the beginning with MOD (The Symphony)
+    Bug #3228: Purple screen when leveling up.
+    Bug #3233: Infinite disposition via MWDialogue::Filter::testDisposition() glitch
+    Bug #3234: Armor mesh stuck on body in inventory menu
+    Bug #3235: Unlike vanilla, OpenMW don't allow statics and activators cast effects on the player.
+    Bug #3238: Not loading cells when using Poorly Placed Object Fix.esm
+    Bug #3248: Editor: Using the "Next Script" and "Previous Script" buttons changes the record status to "Modified"
+    Bug #3258: Woman biped skeleton
+    Bug #3259: No alternating punches
+    Bug #3262: Crash in class selection menu
+    Bug #3279: Load menu: Deleting a savegame makes scroll bar jump to the top
+    Bug #3326: Starting a new game, getting to class selection, then starting another new game temporarily assigns Acrobat class
+    Bug #3327: Stuck in table after loading when character was sneaking when quicksave
+    Feature #652: Editor: GMST verifier
+    Feature #929: Editor: Info record verifier
+    Feature #1279: Editor: Render cell border markers
+    Feature #2482: Background cell loading and caching of loaded cells
+    Feature #2484: Editor: point lighting
+    Feature #2801: Support NIF bump map textures in osg
+    Feature #2926: Editor: Optional line wrap in script editor wrap lines
+    Feature #3000: Editor: Reimplement 3D scene camera system
+    Feature #3035: Editor: Make scenes a drop target for referenceables
+    Feature #3043: Editor: Render cell markers v2
+    Feature #3164: Editor: Instance Selection Menu
+    Feature #3165: Editor: Instance editing mode - move sub mode
+    Feature #3244: Allow changing water Level of Interiors behaving like exteriors
+    Feature #3250: Editor: Use "Enter" key instead of clicking "Create" button to confirm ID input in Creator Bar
+    Support #3179: Fatal error on startup
+
 0.38.0
 ------
 
diff --git a/CI/before_install.linux.sh b/CI/before_install.linux.sh
index 1c02bc8d9..f4b448900 100755
--- a/CI/before_install.linux.sh
+++ b/CI/before_install.linux.sh
@@ -1,21 +1,24 @@
 #!/bin/sh
+echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
+sudo ln -s /usr/bin/clang-3.6 /usr/local/bin/clang
+sudo ln -s /usr/bin/clang++-3.6 /usr/local/bin/clang++
 
-if [ "${ANALYZE}" ]; then
-  echo "yes" | sudo add-apt-repository "deb http://llvm.org/apt/`lsb_release -sc`/ llvm-toolchain-`lsb_release -sc`-3.6 main"
-  wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add -
-fi
-
-echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
-echo "yes" | sudo apt-add-repository ppa:openmw/openmw
-sudo apt-get update -qq
-sudo apt-get install -qq libgtest-dev google-mock
-sudo apt-get install -qq libboost-filesystem-dev libboost-program-options-dev libboost-system-dev libboost-thread-dev
-sudo apt-get install -qq libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev
-sudo apt-get install -qq libbullet-dev libopenscenegraph-dev libmygui-dev libsdl2-dev libunshield-dev libtinyxml-dev libopenal-dev libqt4-dev
-if [ "${ANALYZE}" ]; then sudo apt-get install -qq clang-3.6; fi
+# build libgtest & libgtest_main
 sudo mkdir /usr/src/gtest/build
 cd /usr/src/gtest/build
 sudo cmake .. -DBUILD_SHARED_LIBS=1
 sudo make -j4
 sudo ln -s /usr/src/gtest/build/libgtest.so /usr/lib/libgtest.so
 sudo ln -s /usr/src/gtest/build/libgtest_main.so /usr/lib/libgtest_main.so
+
+cd ~/
+git clone https://github.com/TES3MP/RakNet
+cd RakNet
+cmake . -DRAKNET_ENABLE_DLL=OFF -DRAKNET_ENABLE_SAMPLES=OFF -DCMAKE_BUILD_TYPE=Release
+mkdir ./lib
+make -j3 install
+cp ./Lib/RakNetLibStatic/libRakNetLibStatic.a ./lib
+cd ..
+
+wget https://github.com/zdevito/terra/releases/download/release-2016-03-25/terra-Linux-x86_64-332a506.zip
+unzip terra-Linux-x86_64-332a506.zip
diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 8bfe2b70f..49af86a3e 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
-export CXX=clang++
-export CC=clang
-
-brew tap openmw/openmw
 brew update
-brew unlink boost
-brew install openmw-mygui openmw-bullet openmw-sdl2 openmw-ffmpeg openmw/openmw/qt unshield
+
+brew rm cmake || true
+brew rm pkgconfig || true
+brew rm qt5 || true
+brew install cmake pkgconfig $macos_qt_formula
+
+curl https://downloads.openmw.org/osx/dependencies/openmw-deps-0ecece4.zip -o ~/openmw-deps.zip
+unzip ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 17667ad28..efdf28c6c 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -4,5 +4,14 @@ free -m
 mkdir build
 cd build
 export CODE_COVERAGE=1
-if [ "${CC}" = "clang" ]; then export CODE_COVERAGE=0; fi
-${ANALYZE}cmake .. -DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} -DBUILD_UNITTESTS=1 -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=/usr/games  -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DUSE_SYSTEM_TINYXML=TRUE
+export RAKNET_ROOT=~/RakNet
+export Terra_ROOT=~/terra-Linux-x86_64-332a506
+export BUILD_SERVER=OFF
+if [ "${CC}" = "clang" ]; then export CODE_COVERAGE=0; 
+else 
+    export COMPILER_NAME=gcc
+    export CXX=g++-6
+    export CC=gcc-6
+    export BUILD_SERVER=ON
+fi
+${ANALYZE}cmake .. -DBUILD_OPENMW_MP=${BUILD_SERVER} -DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} -DBUILD_BSATOOL=OFF -DBUILD_ESMTOOL=OFF -DBUILD_ESSIMPORTER=OFF -DBUILD_LAUNCHER=OFF -DBUILD_MWINIIMPORTER=OFF -DBUILD_MYGUI_PLUGIN=OFF -DBUILD_OPENCS=OFF -DBUILD_WIZARD=OFF -DBUILD_BROWSER=OFF -DBUILD_UNITTESTS=1 -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=/usr/games  -DCMAKE_BUILD_TYPE="None" -DUSE_SYSTEM_TINYXML=TRUE -DRakNet_LIBRARY_RELEASE=~/RakNet/lib/libRakNetLibStatic.a -DRakNet_LIBRARY_DEBUG=~/RakNet/lib/libRakNetLibStatic.a
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
old mode 100755
new mode 100644
index 5aa8d3e9d..aa8c565ba
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
 
+set -euo pipefail
+
+APPVEYOR=${APPVEYOR:-}
+CI=${CI:-}
+STEP=${STEP:-}
+
+VERBOSE=""
+STRIP=""
+SKIP_DOWNLOAD=""
+SKIP_EXTRACT=""
+KEEP=""
+UNITY_BUILD=""
+VS_VERSION=""
+PLATFORM=""
+CONFIGURATION=""
+
 while [ $# -gt 0 ]; do
 	ARGSTR=$1
 	shift
@@ -16,10 +32,6 @@ while [ $# -gt 0 ]; do
 			V )
 				VERBOSE=true ;;
 
-			v )
-				VS_VERSION=$1
-				shift ;;
-
 			d )
 				SKIP_DOWNLOAD=true ;;
 
@@ -32,6 +44,10 @@ while [ $# -gt 0 ]; do
 			u )
 				UNITY_BUILD=true ;;
 
+			v )
+				VS_VERSION=$1
+				shift ;;
+
 			p )
 				PLATFORM=$1
 				shift ;;
@@ -78,9 +94,6 @@ done
 if [ -z $VERBOSE ]; then
 	STRIP="> /dev/null 2>&1"
 fi
-if [ -z $VS_VERSION ]; then
-	VS_VERSION="2013"
-fi
 
 if [ -z $APPVEYOR ]; then
 	echo "Running prebuild outside of Appveyor."
@@ -90,9 +103,7 @@ if [ -z $APPVEYOR ]; then
 else
 	echo "Running prebuild in Appveyor."
 
-	cd $APPVEYOR_BUILD_FOLDER
-	VERSION="$(cat README.md | grep Version: | awk '{ print $3; }')-$(git rev-parse --short HEAD)"
-	appveyor UpdateBuild -Version "$VERSION" > /dev/null &
+	cd "$APPVEYOR_BUILD_FOLDER"
 fi
 
 run_cmd() {
@@ -105,7 +116,7 @@ run_cmd() {
 
 		if [ $RET -ne 0 ]; then
 			if [ -z $APPVEYOR ]; then
-				echo "Command $CMD failed, output can be found in `real_pwd`/output.log"
+				echo "Command $CMD failed, output can be found in $(real_pwd)/output.log"
 			else
 				echo
 				echo "Command $CMD failed;"
@@ -184,44 +195,58 @@ add_osg_dlls() {
 	OSG_PLUGINS="$OSG_PLUGINS $@"
 }
 
+QT_PLATFORMS=""
+add_qt_platform_dlls() {
+	QT_PLATFORMS="$QT_PLATFORMS $@"
+}
+
 if [ -z $PLATFORM ]; then
-	PLATFORM=`uname -m`
+	PLATFORM="$(uname -m)"
 fi
 
 if [ -z $CONFIGURATION ]; then
 	CONFIGURATION="Debug"
 fi
 
+if [ -z $VS_VERSION ]; then
+	VS_VERSION="2013"
+fi
+
 case $VS_VERSION in
-	14|2015 )
+	14|14.0|2015 )
 		GENERATOR="Visual Studio 14 2015"
 		XP_TOOLSET="v140_xp"
+		TOOLSET="v140"
+		MSVC_VER="14"
+		MSVC_YEAR="2015"
 		;;
 
-#	12|2013|
-	* )
+	12|12.0|2013 )
 		GENERATOR="Visual Studio 12 2013"
 		XP_TOOLSET="v120_xp"
+		TOOLSET="v120"
+		MSVC_VER="12"
+		MSVC_YEAR="2013"
 		;;
 esac
 
 case $PLATFORM in
 	x64|x86_64|x86-64|win64|Win64 )
-		ARCHNAME=x86-64
-		ARCHSUFFIX=64
-		BITS=64
+		ARCHNAME="x86-64"
+		ARCHSUFFIX="64"
+		BITS="64"
 
 		BASE_OPTS="-G\"$GENERATOR Win64\""
 		add_cmake_opts "-G\"$GENERATOR Win64\""
 		;;
 
 	x32|x86|i686|i386|win32|Win32 )
-		ARCHNAME=x86
-		ARCHSUFFIX=86
-		BITS=32
+		ARCHNAME="x86"
+		ARCHSUFFIX="86"
+		BITS="32"
 
-		BASE_OPTS="-G\"$GENERATOR\" -T$XP_TOOLSET"
-		add_cmake_opts "-G\"$GENERATOR\"" -T$XP_TOOLSET
+		BASE_OPTS="-G\"$GENERATOR\""
+		add_cmake_opts "-G\"$GENERATOR\""
 		;;
 
 	* )
@@ -230,35 +255,38 @@ case $PLATFORM in
 		;;
 esac
 
-if ! [ -z $UNITY_BUILD ]; then
-	add_cmake_opts "-DOPENMW_UNITY_BUILD=True"
-fi
-
 case $CONFIGURATION in
 	debug|Debug|DEBUG )
 		CONFIGURATION=Debug
+		BUILD_CONFIG=Debug
 		;;
 
 	release|Release|RELEASE )
 		CONFIGURATION=Release
+		BUILD_CONFIG=Release
 		;;
 
 	relwithdebinfo|RelWithDebInfo|RELWITHDEBINFO )
-		CONFIGURATION=RelWithDebInfo
+		CONFIGURATION=Release
+		BUILD_CONFIG=RelWithDebInfo
 		;;
 esac
 
+if ! [ -z $UNITY_BUILD ]; then
+	add_cmake_opts "-DOPENMW_UNITY_BUILD=True"
+fi
+
 echo
-echo "=========================="
-echo "Starting prebuild on win$BITS"
-echo "=========================="
+echo "==================================="
+echo "Starting prebuild on MSVC${MSVC_YEAR} WIN${BITS}"
+echo "==================================="
 echo
 
 # cd OpenMW/AppVeyor-test
 mkdir -p deps
 cd deps
 
-DEPS="`pwd`"
+DEPS="$(pwd)"
 
 if [ -z $SKIP_DOWNLOAD ]; then
 	echo "Downloading dependency packages."
@@ -266,162 +294,165 @@ if [ -z $SKIP_DOWNLOAD ]; then
 
 	# Boost
 	if [ -z $APPVEYOR ]; then
-		download "Boost 1.58.0" \
-			http://sourceforge.net/projects/boost/files/boost-binaries/1.58.0/boost_1_58_0-msvc-12.0-$BITS.exe \
-			boost-1.58.0-win$BITS.exe
+		download "Boost 1.61.0" \
+			"http://sourceforge.net/projects/boost/files/boost-binaries/1.61.0/boost_1_61_0-msvc-${MSVC_VER}.0-${BITS}.exe" \
+			"boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe"
 	fi
 
 	# Bullet
-	download "Bullet 2.83.5" \
-		http://www.lysator.liu.se/~ace/OpenMW/deps/Bullet-2.83.5-win$BITS.7z \
-		Bullet-2.83.5-win$BITS.7z
+	download "Bullet 2.86" \
+		"http://www.lysator.liu.se/~ace/OpenMW/deps/Bullet-2.86-msvc${MSVC_YEAR}-win${BITS}.7z" \
+		"Bullet-2.86-msvc${MSVC_YEAR}-win${BITS}.7z"
 
 	# FFmpeg
-	download "FFmpeg 2.5.2" \
-		http://ffmpeg.zeranoe.com/builds/win$BITS/shared/ffmpeg-2.5.2-win$BITS-shared.7z \
-		ffmpeg$BITS-2.5.2.7z \
-		http://ffmpeg.zeranoe.com/builds/win$BITS/dev/ffmpeg-2.5.2-win$BITS-dev.7z \
-		ffmpeg$BITS-2.5.2-dev.7z
+	download "FFmpeg 3.0.1" \
+		"http://ffmpeg.zeranoe.com/builds/win${BITS}/shared/ffmpeg-3.0.1-win${BITS}-shared.7z" \
+		"ffmpeg-3.0.1-win${BITS}.7z" \
+		"http://ffmpeg.zeranoe.com/builds/win${BITS}/dev/ffmpeg-3.0.1-win${BITS}-dev.7z" \
+		"ffmpeg-3.0.1-dev-win${BITS}.7z"
 
 	# MyGUI
-	download "MyGUI 3.2.2" \
-		http://www.lysator.liu.se/~ace/OpenMW/deps/MyGUI-3.2.2-win$BITS.7z \
-		MyGUI-3.2.2-win$BITS.7z
+	download "MyGUI 3.2.3-git" \
+		"http://www.lysator.liu.se/~ace/OpenMW/deps/MyGUI-3.2.3-git-msvc${MSVC_YEAR}-win${BITS}.7z" \
+		"MyGUI-3.2.3-git-msvc${MSVC_YEAR}-win${BITS}.7z"
 
 	# OpenAL
-	download "OpenAL-Soft 1.16.0" \
-		http://kcat.strangesoft.net/openal-binaries/openal-soft-1.16.0-bin.zip \
-		OpenAL-Soft-1.16.0.zip
+	download "OpenAL-Soft 1.17.2" \
+		"http://kcat.strangesoft.net/openal-binaries/openal-soft-1.17.2-bin.zip" \
+		"OpenAL-Soft-1.17.2.zip"
 
 	# OSG
-	download "OpenSceneGraph 3.3.8" \
-		http://www.lysator.liu.se/~ace/OpenMW/deps/OSG-3.3.8-win$BITS.7z \
-		OSG-3.3.8-win$BITS.7z
+	download "OpenSceneGraph 3.4.0-scrawl" \
+		"http://www.lysator.liu.se/~ace/OpenMW/deps/OSG-3.4.0-scrawl-msvc${MSVC_YEAR}-win${BITS}.7z" \
+		"OSG-3.4.0-scrawl-msvc${MSVC_YEAR}-win${BITS}.7z"
 
 	# Qt
 	if [ -z $APPVEYOR ]; then
-		download "Qt 4.8.6" \
-			http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z \
-			qt$BITS-4.8.6.7z
+		if [ $BITS == "64" ]; then
+			QT_SUFFIX="_64"
+		else
+			QT_SUFFIX=""
+		fi
+
+		download "Qt 5.7.2" \
+			"http://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-windows-x86-msvc${MSVC_YEAR}${QT_SUFFIX}-5.7.0.exe" \
+			"qt-5.7.0-msvc${MSVC_YEAR}-win${BITS}.exe" \
+			"http://www.lysator.liu.se/~ace/OpenMW/deps/qt-5-install.qs" \
+			"qt-5-install.qs"
 	fi
 
 	# SDL2
-	download "SDL 2.0.3" \
-		https://www.libsdl.org/release/SDL2-devel-2.0.3-VC.zip \
-		SDL2-2.0.3.zip
+	download "SDL 2.0.4" \
+		"https://www.libsdl.org/release/SDL2-devel-2.0.4-VC.zip" \
+		"SDL2-2.0.4.zip"
 fi
 
 cd .. #/..
 
 # Set up dependencies
+BUILD_DIR="MSVC${MSVC_YEAR}_${BITS}"
 if [ -z $KEEP ]; then
 	echo
-	printf "Preparing build directory... "
-
-	rm -rf Build_$BITS
-	mkdir -p Build_$BITS/deps
+	echo "(Re)Creating build directory."
 
-	echo Done.
+	rm -rf "$BUILD_DIR"
 fi
-mkdir -p Build_$BITS/deps
-cd Build_$BITS/deps
 
-DEPS_INSTALL=`pwd`
+mkdir -p "${BUILD_DIR}/deps"
+cd "${BUILD_DIR}/deps"
+
+DEPS_INSTALL="$(pwd)"
 cd $DEPS
 
 echo
-echo "Extracting dependencies..."
+echo "Extracting dependencies, this might take a while..."
+echo "---------------------------------------------------"
+echo
 
 
 # Boost
-printf "Boost 1.58.0... "
+if [ -z $APPVEYOR ]; then
+	printf "Boost 1.61.0... "
+else
+	if [ $MSVC_VER -eq 12 ]; then
+		printf "Boost 1.58.0 AppVeyor... "
+	else
+		printf "Boost 1.60.0 AppVeyor... "
+	fi
+fi
 {
 	if [ -z $APPVEYOR ]; then
 		cd $DEPS_INSTALL
 
-		BOOST_SDK="`real_pwd`/Boost"
+		BOOST_SDK="$(real_pwd)/Boost"
 
-		if [ -d Boost ] && grep "BOOST_VERSION 105800" Boost/boost/version.hpp > /dev/null; then
+		if [ -d Boost ] && grep "BOOST_VERSION 106100" Boost/boost/version.hpp > /dev/null; then
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			$DEPS/boost-1.58.0-win$BITS.exe //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //verysilent
+			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //verysilent
 		fi
 
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
-			-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
+			-DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}.0"
 
 		echo Done.
 	else
 		# Appveyor unstable has all the boost we need already
-		BOOST_SDK="c:/Libraries/boost"
+		if [ $MSVC_VER -eq 12 ]; then
+			BOOST_SDK="c:/Libraries/boost_1_58_0"
+		else
+			BOOST_SDK="c:/Libraries/boost_1_60_0"
+		fi
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
-			-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
+			-DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}.0"
 
-		echo AppVeyor.
+		echo Done.
 	fi
 }
 cd $DEPS
+echo
 
 # Bullet
-printf "Bullet 2.83.5... "
+printf "Bullet 2.86... "
 {
 	cd $DEPS_INSTALL
 
 	if [ -d Bullet ]; then
-		printf "Exists. (No version checking) "
+		printf -- "Exists. (No version checking) "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf Bullet
-		eval 7z x -y $DEPS/Bullet-2.83.5-win$BITS.7z $STRIP
-		mv Bullet-2.83.5-win$BITS Bullet
+		eval 7z x -y "${DEPS}/Bullet-2.86-msvc${MSVC_YEAR}-win${BITS}.7z" $STRIP
+		mv "Bullet-2.86-msvc${MSVC_YEAR}-win${BITS}" Bullet
 	fi
 
-	BULLET_SDK="`real_pwd`/Bullet"
-	add_cmake_opts -DBULLET_INCLUDE_DIR="$BULLET_SDK/include/bullet" \
-		-DBULLET_COLLISION_LIBRARY="$BULLET_SDK/lib/BulletCollision.lib" \
-		-DBULLET_COLLISION_LIBRARY_DEBUG="$BULLET_SDK/lib/BulletCollision_Debug.lib" \
-		-DBULLET_MATH_LIBRARY="$BULLET_SDK/lib/LinearMath.lib" \
-		-DBULLET_MATH_LIBRARY_DEBUG="$BULLET_SDK/lib/LinearMath_Debug.lib"
+	export BULLET_ROOT="$(real_pwd)/Bullet"
 
 	echo Done.
 }
 cd $DEPS
+echo
 
 # FFmpeg
-printf "FFmpeg 2.5.2... "
+printf "FFmpeg 3.0.1... "
 {
 	cd $DEPS_INSTALL
 
-	if [ -d FFmpeg ] && grep "FFmpeg version: 2.5.2" FFmpeg/README.txt > /dev/null; then
+	if [ -d FFmpeg ] && grep "FFmpeg version: 3.0.1" FFmpeg/README.txt > /dev/null; then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf FFmpeg
 
-		eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2.7z $STRIP
-		eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2-dev.7z $STRIP
+		eval 7z x -y "${DEPS}/ffmpeg-3.0.1-win${BITS}.7z" $STRIP
+		eval 7z x -y "${DEPS}/ffmpeg-3.0.1-dev-win${BITS}.7z" $STRIP
 
-		mv ffmpeg-2.5.2-win$BITS-shared FFmpeg
-		cp -r ffmpeg-2.5.2-win$BITS-dev/* FFmpeg/
-		rm -rf ffmpeg-2.5.2-win$BITS-dev
+		mv "ffmpeg-3.0.1-win${BITS}-shared" FFmpeg
+		cp -r "ffmpeg-3.0.1-win${BITS}-dev/"* FFmpeg/
+		rm -rf "ffmpeg-3.0.1-win${BITS}-dev"
 	fi
 
-	FFMPEG_SDK="`real_pwd`/FFmpeg"
-	add_cmake_opts -DAVCODEC_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-		-DAVCODEC_LIBRARIES="$FFMPEG_SDK/lib/avcodec.lib" \
-		-DAVDEVICE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-		-DAVDEVICE_LIBRARIES="$FFMPEG_SDK/lib/avdevice.lib" \
-		-DAVFORMAT_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-		-DAVFORMAT_LIBRARIES="$FFMPEG_SDK/lib/avformat.lib" \
-		-DAVUTIL_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-		-DAVUTIL_LIBRARIES="$FFMPEG_SDK/lib/avutil.lib" \
-		-DPOSTPROC_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-		-DPOSTPROC_LIBRARIES="$FFMPEG_SDK/lib/postproc.lib" \
-		-DSWRESAMPLE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-		-DSWRESAMPLE_LIBRARIES="$FFMPEG_SDK/lib/swresample.lib" \
-		-DSWSCALE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-		-DSWSCALE_LIBRARIES="$FFMPEG_SDK/lib/swscale.lib"
-
-	add_runtime_dlls `pwd`/FFmpeg/bin/{avcodec-56,avformat-56,avutil-54,swresample-1,swscale-3}.dll
+	export FFMPEG_HOME="$(real_pwd)/FFmpeg"
+	add_runtime_dlls "$(pwd)/FFmpeg/bin/"{avcodec-57,avformat-57,avutil-55,swresample-2,swscale-4}.dll
 
 	if [ $BITS -eq 32 ]; then
 		add_cmake_opts "-DCMAKE_EXE_LINKER_FLAGS=\"/machine:X86 /safeseh:no\""
@@ -430,78 +461,79 @@ printf "FFmpeg 2.5.2... "
 	echo Done.
 }
 cd $DEPS
+echo
 
 # MyGUI
-printf "MyGUI 3.2.2... "
+printf "MyGUI 3.2.3-git... "
 {
 	cd $DEPS_INSTALL
 
 	if [ -d MyGUI ] && \
 		grep "MYGUI_VERSION_MAJOR 3" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
 		grep "MYGUI_VERSION_MINOR 2" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
-		grep "MYGUI_VERSION_PATCH 2" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null
+		grep "MYGUI_VERSION_PATCH 3" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null
 	then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf MyGUI
-		eval 7z x -y $DEPS/MyGUI-3.2.2-win$BITS.7z $STRIP
-		mv MyGUI-3.2.2-win$BITS MyGUI
+		eval 7z x -y "${DEPS}/MyGUI-3.2.3-git-msvc${MSVC_YEAR}-win${BITS}.7z" $STRIP
+		mv "MyGUI-3.2.3-git-msvc${MSVC_YEAR}-win${BITS}" MyGUI
 	fi
 
-	MYGUI_SDK="`real_pwd`/MyGUI"
-
-	add_cmake_opts -DMYGUISDK="$MYGUI_SDK" \
-		-DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \
-		-DMYGUI_PREQUEST_FILE="$MYGUI_SDK/include/MYGUI/MyGUI_Prerequest.h"
+	export MYGUI_HOME="$(real_pwd)/MyGUI"
 
 	if [ $CONFIGURATION == "Debug" ]; then
 		SUFFIX="_d"
 	else
 		SUFFIX=""
 	fi
-	add_runtime_dlls `pwd`/MyGUI/bin/$CONFIGURATION/MyGUIEngine$SUFFIX.dll
+	add_runtime_dlls "$(pwd)/MyGUI/bin/${CONFIGURATION}/MyGUIEngine${SUFFIX}.dll"
 
 	echo Done.
 }
 cd $DEPS
+echo
 
 # OpenAL
-printf "OpenAL-Soft 1.16.0... "
+printf "OpenAL-Soft 1.17.2... "
 {
-	if [ -d openal-soft-1.16.0-bin ]; then
+	if [ -d openal-soft-1.17.2-bin ]; then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf openal-soft-1.16.0-bin
-		eval 7z x -y OpenAL-Soft-1.16.0.zip $STRIP
+		rm -rf openal-soft-1.17.2-bin
+		eval 7z x -y OpenAL-Soft-1.17.2.zip $STRIP
 	fi
 
-	OPENAL_SDK="`real_pwd`/openal-soft-1.16.0-bin"
+	OPENAL_SDK="$(real_pwd)/openal-soft-1.17.2-bin"
+
+	add_cmake_opts -DOPENAL_INCLUDE_DIR="${OPENAL_SDK}/include/AL" \
+		-DOPENAL_LIBRARY="${OPENAL_SDK}/libs/Win${BITS}/OpenAL32.lib"
 
-	add_cmake_opts -DOPENAL_INCLUDE_DIR="$OPENAL_SDK/include/AL" \
-		-DOPENAL_LIBRARY="$OPENAL_SDK/libs/Win$BITS/OpenAL32.lib"
+	add_runtime_dlls "$(pwd)/openal-soft-1.17.2-bin/bin/WIN${BITS}/soft_oal.dll:OpenAL32.dll"
 
 	echo Done.
 }
 cd $DEPS
+echo
 
 # OSG
-printf "OSG 3.3.8... "
+printf "OSG 3.4.0-scrawl... "
 {
 	cd $DEPS_INSTALL
 
 	if [ -d OSG ] && \
 		grep "OPENSCENEGRAPH_MAJOR_VERSION    3" OSG/include/osg/Version > /dev/null && \
-		grep "OPENSCENEGRAPH_MINOR_VERSION    3" OSG/include/osg/Version > /dev/null && \
-		grep "OPENSCENEGRAPH_PATCH_VERSION    8" OSG/include/osg/Version > /dev/null
+		grep "OPENSCENEGRAPH_MINOR_VERSION    4" OSG/include/osg/Version > /dev/null && \
+		grep "OPENSCENEGRAPH_PATCH_VERSION    0" OSG/include/osg/Version > /dev/null
 	then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf OSG
-		eval 7z x -y $DEPS/OSG-3.3.8-win$BITS.7z $STRIP
-		mv OSG-3.3.8-win$BITS OSG
+		eval 7z x -y "${DEPS}/OSG-3.4.0-scrawl-msvc${MSVC_YEAR}-win${BITS}.7z" $STRIP
+		mv "OSG-3.4.0-scrawl-msvc${MSVC_YEAR}-win${BITS}" OSG
 	fi
 
-	OSG_SDK="`real_pwd`/OSG"
+	OSG_SDK="$(real_pwd)/OSG"
 
 	add_cmake_opts -DOSG_DIR="$OSG_SDK"
 
@@ -511,85 +543,101 @@ printf "OSG 3.3.8... "
 		SUFFIX=""
 	fi
 
-	add_runtime_dlls `pwd`/OSG/bin/{OpenThreads,zlib}$SUFFIX.dll \
-		`pwd`/OSG/bin/osg{,Animation,DB,FX,GA,Particle,Qt,Text,Util,Viewer}$SUFFIX.dll
+	add_runtime_dlls "$(pwd)/OSG/bin/"{OpenThreads,zlib,libpng*}${SUFFIX}.dll \
+		"$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer}${SUFFIX}.dll
 
-	add_osg_dlls `pwd`/OSG/bin/osgPlugins-3.3.8/osgdb_{bmp,dds,gif,jpeg,png,tga}$SUFFIX.dll
+	add_osg_dlls "$(pwd)/OSG/bin/osgPlugins-3.4.0/osgdb_"{bmp,dds,jpeg,osg,png,tga}${SUFFIX}.dll
+	add_osg_dlls "$(pwd)/OSG/bin/osgPlugins-3.4.0/osgdb_serializers_osg"{,animation,fx,ga,particle,text,util,viewer}${SUFFIX}.dll
 
 	echo Done.
 }
 cd $DEPS
+echo
 
 # Qt
 if [ -z $APPVEYOR ]; then
-	printf "Qt 4.8.6... "
+	printf "Qt 5.7.0... "
 else
-	printf "Qt 5.4... "
+	printf "Qt 5.7 AppVeyor... "
 fi
 {
+	if [ $BITS -eq 64 ]; then
+		SUFFIX="_64"
+	else
+		SUFFIX=""
+	fi
+
 	if [ -z $APPVEYOR ]; then
 		cd $DEPS_INSTALL
-		QT_SDK="`real_pwd`/Qt"
+		QT_SDK="$(real_pwd)/Qt/5.7/msvc${MSVC_YEAR}${SUFFIX}"
 
-		if [ -d Qt ] && head -n2 Qt/BUILDINFO.txt | grep "4.8.6" > /dev/null; then
+		if [ -d Qt ] && head -n2 Qt/InstallationLog.txt | grep "5.7.0" > /dev/null; then
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Qt
-			eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
-			mv qt-4.8.6-* Qt
-			cd Qt
-			eval ./qtbinpatcher.exe $STRIP
+			cp "${DEPS}/qt-5-install.qs" qt-install.qs
+
+
+			sed -i "s|INSTALL_DIR|$(real_pwd)/Qt|" qt-install.qs
+			sed -i "s/qt.VERSION.winBITS_msvcYEAR/qt.57.win${BITS}_msvc${MSVC_YEAR}${SUFFIX}/" qt-install.qs
+
+			printf -- "(Installation might take a while) "
+			"${DEPS}/qt-5.7.0-msvc${MSVC_YEAR}-win${BITS}.exe" --script qt-install.qs --silent
+
+			mv qt-install.qs Qt/
+
+			echo Done.
+			printf "  Cleaning up extraneous data... "
+			rm -r "$(real_pwd)/Qt/"{dist,Docs,Examples,Tools,vcredist,components.xml,MaintenanceTool.dat,MaintenanceTool.exe,MaintenanceTool.ini,network.xml,qt-install.qs}
 		fi
 
 		cd $QT_SDK
 
-		add_cmake_opts -DDESIRED_QT_VERSION=4 \
-			-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
+		add_cmake_opts -DDESIRED_QT_VERSION=5 \
+			-DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \
+			-DCMAKE_PREFIX_PATH="$QT_SDK"
 
 		if [ $CONFIGURATION == "Debug" ]; then
-			SUFFIX="d4"
+			SUFFIX="d"
 		else
-			SUFFIX="4"
+			SUFFIX=""
 		fi
 
-		add_runtime_dlls `pwd`/bin/Qt{Core,Gui,Network,OpenGL}$SUFFIX.dll
+		add_runtime_dlls "$(pwd)/bin/lib"{EGL,GLESv2}${SUFFIX}.dll \
+			"$(pwd)/bin/Qt5"{Core,Gui,Network,OpenGL,Widgets}${SUFFIX}.dll
+		add_qt_platform_dlls "$(pwd)/plugins/platforms/qwindows${SUFFIX}.dll"
 
 		echo Done.
 	else
-		if [ $BITS -eq 32 ]; then
-			QT_SDK="C:/Qt/5.4/msvc2013_opengl"
-		else
-			QT_SDK="C:/Qt/5.4/msvc2013_64_opengl"
-		fi
+		QT_SDK="C:/Qt/5.7/msvc${MSVC_YEAR}${SUFFIX}"
 
 		add_cmake_opts -DDESIRED_QT_VERSION=5 \
-			-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe" \
+			-DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \
 			-DCMAKE_PREFIX_PATH="$QT_SDK"
 
-		echo AppVeyor.
+		echo Done.
 	fi
 }
 cd $DEPS
+echo
 
 # SDL2
-printf "SDL 2.0.3... "
+printf "SDL 2.0.4... "
 {
-	if [ -d SDL2-2.0.3 ]; then
+	if [ -d SDL2-2.0.4 ]; then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf SDL2-2.0.3
-		eval 7z x -y SDL2-2.0.3.zip $STRIP
+		rm -rf SDL2-2.0.4
+		eval 7z x -y SDL2-2.0.4.zip $STRIP
 	fi
 
-	SDL_SDK="`real_pwd`/SDL2-2.0.3"
-	add_cmake_opts -DSDL2_INCLUDE_DIR="$SDL_SDK/include" \
-		-DSDL2MAIN_LIBRARY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2main.lib" \
-		-DSDL2_LIBRARY_PATH="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib"
+	export SDL2DIR="$(real_pwd)/SDL2-2.0.4"
 
-	add_runtime_dlls `pwd`/SDL2-2.0.3/lib/x$ARCHSUFFIX/SDL2.dll
+	add_runtime_dlls "$(pwd)/SDL2-2.0.4/lib/x${ARCHSUFFIX}/SDL2.dll"
 
 	echo Done.
 }
+echo
 
 
 cd $DEPS_INSTALL/..
@@ -602,12 +650,10 @@ add_cmake_opts -DBUILD_BSATOOL=no \
 	-DBUILD_MYGUI_PLUGIN=no \
 	-DOPENMW_MP_BUILD=on
 
-if [ -z $CI ]; then
-	echo "  (Outside of CI, doing full build.)"
-else
+if [ ! -z $CI ]; then
 	case $STEP in
 		components )
-			echo "  Subproject: Components."
+			echo "  Building subproject: Components."
 			add_cmake_opts -DBUILD_ESSIMPORTER=no \
 				-DBUILD_LAUNCHER=no \
 				-DBUILD_MWINIIMPORTER=no \
@@ -615,64 +661,98 @@ else
 				-DBUILD_OPENMW=no \
 				-DBUILD_WIZARD=no
 			;;
+
 		openmw )
-			echo "  Subproject: OpenMW."
+			echo "  Building subproject: OpenMW."
 			add_cmake_opts -DBUILD_ESSIMPORTER=no \
 				-DBUILD_LAUNCHER=no \
 				-DBUILD_MWINIIMPORTER=no \
 				-DBUILD_OPENCS=no \
 				-DBUILD_WIZARD=no
 			;;
+
 		opencs )
-			echo "  Subproject: OpenCS."
+			echo "  Building subproject: OpenCS."
 			add_cmake_opts -DBUILD_ESSIMPORTER=no \
 				-DBUILD_LAUNCHER=no \
 				-DBUILD_MWINIIMPORTER=no \
 				-DBUILD_OPENMW=no \
 				-DBUILD_WIZARD=no
 			;;
+
 		misc )
-			echo "  Subproject: Misc."
+			echo "  Building subprojects: Misc."
 			add_cmake_opts -DBUILD_OPENCS=no \
 				-DBUILD_OPENMW=no
 			;;
-		* )
-			echo "  Building everything."
-			;;
 	esac
 fi
 
+# NOTE: Disable this when/if we want to run test cases
+if [ -z $CI ]; then
+	echo "- Copying Runtime DLLs..."
+	mkdir -p $BUILD_CONFIG
+	for DLL in $RUNTIME_DLLS; do
+		TARGET="$(basename "$DLL")"
+		if [[ "$DLL" == *":"* ]]; then
+			IFS=':'; SPLIT=( ${DLL} ); unset IFS
+
+			DLL=${SPLIT[0]}
+			TARGET=${SPLIT[1]}
+		fi
+
+		echo "    ${TARGET}."
+		cp "$DLL" "$BUILD_CONFIG/$TARGET"
+	done
+	echo
+
+	echo "- OSG Plugin DLLs..."
+	mkdir -p $BUILD_CONFIG/osgPlugins-3.4.0
+	for DLL in $OSG_PLUGINS; do
+		echo "    $(basename $DLL)."
+		cp "$DLL" $BUILD_CONFIG/osgPlugins-3.4.0
+	done
+	echo
+
+	echo "- Qt Platform DLLs..."
+	mkdir -p ${BUILD_CONFIG}/platforms
+	for DLL in $QT_PLATFORMS; do
+		echo "    $(basename $DLL)"
+		cp "$DLL" "${BUILD_CONFIG}/platforms"
+	done
+	echo
+fi
+
 if [ -z $VERBOSE ]; then
-	printf "  Configuring... "
+	printf -- "- Configuring... "
 else
-	echo "  cmake .. $CMAKE_OPTS"
+	echo "- cmake .. $CMAKE_OPTS"
 fi
 
 run_cmd cmake .. $CMAKE_OPTS
 RET=$?
 
 if [ -z $VERBOSE ]; then
-	if [ $RET -eq 0 ]; then echo Done.
-	else echo Failed.; fi
+	if [ $RET -eq 0 ]; then
+		echo Done.
+	else
+		echo Failed.
+	fi
 fi
 
-echo
-
-# NOTE: Disable this when/if we want to run test cases
 if [ -z $CI ]; then
-	echo "Copying Runtime DLLs..."
-	mkdir -p $CONFIGURATION
-	for DLL in $RUNTIME_DLLS; do
-		echo "  `basename $DLL`."
-		cp "$DLL" $CONFIGURATION/
-	done
-	echo "OSG Plugin DLLs..."
-	mkdir -p $CONFIGURATION/osgPlugins-3.3.8
-	for DLL in $OSG_PLUGINS; do
-		echo "  `basename $DLL`."
-		cp "$DLL" $CONFIGURATION/osgPlugins-3.3.8
-	done
+	echo "- Copying Runtime Resources/Config Files"
+	echo "    gamecontrollerdb.txt"
+	cp gamecontrollerdb.txt $BUILD_CONFIG/gamecontrollerdb.txt
+	echo "    openmw.cfg"
+	cp openmw.cfg.install $BUILD_CONFIG/openmw.cfg
+	echo "    openmw-cs.cfg"
+	cp openmw-cs.cfg $BUILD_CONFIG/openmw-cs.cfg
+	echo "    settings-default.cfg"
+	cp settings-default.cfg $BUILD_CONFIG/settings-default.cfg
+	echo "    resources/"
+	cp -r resources $BUILD_CONFIG/resources
 	echo
 fi
 
-exit $RET
+exit $RET
\ No newline at end of file
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 772284f91..f3d0f716b 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -1,5 +1,22 @@
 #!/bin/sh
 
+export CXX=clang++
+export CC=clang
+
+DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps"
+QT_PATH=`brew --prefix $macos_qt_formula`
+
 mkdir build
 cd build
-cmake -DCMAKE_FRAMEWORK_PATH="/usr/local/lib/macosx/Release" -DCMAKE_EXE_LINKER_FLAGS="-F/usr/local/lib/macosx/Release" -DCMAKE_CXX_FLAGS="-stdlib=libstdc++" -DCMAKE_BUILD_TYPE=Debug -DBUILD_MYGUI_PLUGIN=OFF -G"Unix Makefiles" ..
+
+cmake \
+-D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH" \
+-D CMAKE_OSX_DEPLOYMENT_TARGET="10.8" \
+-D CMAKE_OSX_SYSROOT="macosx10.12" \
+-D CMAKE_BUILD_TYPE=Debug \
+-D OPENMW_OSX_DEPLOYMENT=TRUE \
+-D DESIRED_QT_VERSION=5 \
+-D BUILD_ESMTOOL=FALSE \
+-D BUILD_MYGUI_PLUGIN=FALSE \
+-G"Unix Makefiles" \
+..
diff --git a/CI/build.msvc.sh b/CI/build.msvc.sh
index 731c51eda..f8d5a2f24 100644
--- a/CI/build.msvc.sh
+++ b/CI/build.msvc.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+APPVEYOR=""
+CI=""
+
+PACKAGE=""
+PLATFORM=""
+CONFIGURATION=""
+VS_VERSION=""
+
 if [ -z $PLATFORM ]; then
 	PLATFORM=`uname -m`
 fi
@@ -8,39 +16,63 @@ if [ -z $CONFIGURATION ]; then
 	CONFIGURATION="Debug"
 fi
 
+case $VS_VERSION in
+	14|14.0|2015 )
+		GENERATOR="Visual Studio 14 2015"
+		MSVC_YEAR="2015"
+		MSVC_VER="14.0"
+		;;
+
+#	12|2013|
+	* )
+		GENERATOR="Visual Studio 12 2013"
+		MSVC_YEAR="2013"
+		MVSC_VER="12.0"
+		;;
+esac
+
 case $PLATFORM in
+	x64|x86_64|x86-64|win64|Win64 )
+		BITS=64
+		;;
+
 	x32|x86|i686|i386|win32|Win32 )
 		BITS=32
-		PLATFORM=Win32
 		;;
+esac
 
-	x64|x86_64|x86-64|win64|Win64 )
-		BITS=64
-		PLATFORM=x64
+case $CONFIGURATION in
+	debug|Debug|DEBUG )
+		CONFIGURATION=Debug
 		;;
 
-	* )
-		echo "Unknown platform $PLATFORM."
-		exit 1 ;;
+	release|Release|RELEASE )
+		CONFIGURATION=Release
+		;;
+
+	relwithdebinfo|RelWithDebInfo|RELWITHDEBINFO )
+		CONFIGURATION=RelWithDebInfo
+		;;
 esac
 
 if [ -z $APPVEYOR ]; then
-	echo "Running $BITS-bit $CONFIGURATION build outside of Appveyor."
+	echo "Running ${BITS}-bit MSVC${MSVC_YEAR} ${CONFIGURATION} build outside of Appveyor."
 
 	DIR=$(echo "$0" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,")
 	cd $(dirname "$DIR")/..
 else
-	echo "Running $BITS-bit $CONFIGURATION build in Appveyor."
+	echo "Running ${BITS}-bit MSVC${MSVC_YEAR} ${CONFIGURATION} build in Appveyor."
 
 	cd $APPVEYOR_BUILD_FOLDER
 fi
 
-cd build_$BITS
+BUILD_DIR="MSVC${MSVC_YEAR}_${BITS}"
+cd ${BUILD_DIR}
 
 which msbuild > /dev/null
 if [ $? -ne 0 ]; then
 	msbuild() {
-		/c/Program\ Files\ \(x86\)/MSBuild/12.0/Bin/MSBuild.exe "$@"
+		/c/Program\ Files\ \(x86\)/MSBuild/${MSVC_VER}/Bin/MSBuild.exe "$@"
 	}
 fi
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52970cfb5..cc85da9ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ endif()
 message(STATUS "Configuring OpenMW...")
 
 set(OPENMW_VERSION_MAJOR 0)
-set(OPENMW_VERSION_MINOR 38)
+set(OPENMW_VERSION_MINOR 41)
 set(OPENMW_VERSION_RELEASE 0)
 
 set(OPENMW_VERSION_COMMITHASH "")
@@ -46,7 +46,7 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
     else(NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/shallow)
         message(STATUS "Shallow Git clone detected, not attempting to retrieve version info")
     endif(NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/shallow)
-endif(EXISTS ${PROJECT_SOURCE_DIR}/.git)
+endif(EXISTS ${PROJECT_SOURCE_DIR}/.git)    
 
 # Macros
 include(OpenMWMacros)
@@ -65,9 +65,11 @@ option(OPENMW_UNITY_BUILD "Use fewer compilation units to speed up compile time"
 
 # Apps and tools
 option(BUILD_OPENMW "build OpenMW" ON)
+option(BUILD_OPENMW_MP "build OpenMW-MP" ON)
 option(BUILD_BSATOOL "build BSA extractor" ON)
 option(BUILD_ESMTOOL "build ESM inspector" ON)
 option(BUILD_LAUNCHER "build Launcher" ON)
+option(BUILD_BROWSER "build tes3mp Server Browser" ON)
 option(BUILD_MWINIIMPORTER "build MWiniImporter" ON)
 option(BUILD_ESSIMPORTER "build ESS (Morrowind save game) importer" ON)
 option(BUILD_OPENCS "build OpenMW Construction Set" ON)
@@ -76,6 +78,14 @@ option(BUILD_WITH_CODE_COVERAGE "Enable code coverage with gconv" OFF)
 option(BUILD_UNITTESTS "Enable Unittests with Google C++ Unittest" OFF)
 option(BUILD_NIFTEST "build nif file tester" OFF)
 option(BUILD_MYGUI_PLUGIN "build MyGUI plugin for OpenMW resources, to use with MyGUI tools" ON)
+option(BUILD_DOCS        "build documentation." OFF )
+
+# what is necessary to build documentation
+IF( BUILD_DOCS )
+    # Builds the documentation.
+    FIND_PACKAGE( Sphinx REQUIRED )
+    FIND_PACKAGE( Doxygen REQUIRED )
+ENDIF()
 
 # OS X deployment
 option(OPENMW_OSX_DEPLOYMENT OFF)
@@ -88,7 +98,7 @@ endif()
 # Set up common paths
 if (APPLE)
     set(MORROWIND_DATA_FILES "./data" CACHE PATH "location of Morrowind data files")
-    set(OPENMW_RESOURCE_FILES "./resources" CACHE PATH "location of OpenMW resources files")
+    set(OPENMW_RESOURCE_FILES "../Resources/resources" CACHE PATH "location of OpenMW resources files")
 elseif(UNIX)
     # Paths
     SET(BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Where to install binaries")
@@ -116,7 +126,10 @@ if (WIN32)
     option(USE_DEBUG_CONSOLE "whether a debug console should be enabled for debug builds, if false debug output is redirected to Visual Studio output" ON)
 endif()
 
-if (NOT BUILD_LAUNCHER AND NOT BUILD_OPENCS AND NOT BUILD_WIZARD)
+find_package(RakNet REQUIRED)
+include_directories(${RakNet_INCLUDES})
+
+if (NOT BUILD_LAUNCHER AND NOT BUILD_BROWSER AND NOT BUILD_OPENCS AND NOT BUILD_WIZARD)
    set(USE_QT FALSE)
 else()
    set(USE_QT TRUE)
@@ -124,7 +137,7 @@ endif()
 
 # Dependencies
 if (USE_QT)
-    set(DESIRED_QT_VERSION 4 CACHE STRING "The QT version OpenMW should use (4 or 5)")
+    set(DESIRED_QT_VERSION 5 CACHE STRING "The QT version OpenMW should use (4 or 5)")
     set_property(CACHE DESIRED_QT_VERSION PROPERTY STRINGS 4 5)
     message(STATUS "Using Qt${DESIRED_QT_VERSION}")
 
@@ -140,41 +153,31 @@ if (USE_QT)
     endif()
 endif()
 
-if (USE_QT AND DESIRED_QT_VERSION MATCHES 5)
-	# 2.8.11+ is required to make Qt5 happy and allow linking QtMain on Windows.
-	cmake_minimum_required(VERSION 2.8.11)
+if (APPLE)
+    # OS X build process relies on this fix: https://github.com/Kitware/CMake/commit/3df5147043d83aa09acd5c9ce31d5c602efb99db
+    cmake_minimum_required(VERSION 3.1.0)
+elseif (USE_QT AND DESIRED_QT_VERSION MATCHES 5)
+    # 2.8.11+ is required to make Qt5 happy and allow linking QtMain on Windows.
+    cmake_minimum_required(VERSION 2.8.11)
 else()
-	# We probably support older versions than this.
-	cmake_minimum_required(VERSION 2.6)
+    # We probably support older versions than this.
+    cmake_minimum_required(VERSION 2.6)
 endif()
 
-# Sound setup
-unset(FFMPEG_LIBRARIES CACHE)
-
-find_package(FFmpeg REQUIRED)
-
-set (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${SWSCALE_LIBRARY} ${SWRESAMPLE_LIBRARIES})
-
-if ( NOT AVCODEC_FOUND OR NOT AVFORMAT_FOUND OR NOT AVUTIL_FOUND OR NOT SWSCALE_FOUND OR NOT SWRESAMPLE_FOUND)
-    message(FATAL_ERROR "FFmpeg component required, but not found!")
-endif()
-# Required for building the FFmpeg headers
-add_definitions(-D__STDC_CONSTANT_MACROS)
+IF(BUILD_OPENMW OR BUILD_OPENCS)
+    # Sound setup
+    find_package(FFmpeg REQUIRED COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE SWRESAMPLE)
+    # Required for building the FFmpeg headers
+    add_definitions(-D__STDC_CONSTANT_MACROS)
 
 # TinyXML
 option(USE_SYSTEM_TINYXML "Use system TinyXML library instead of internal." OFF)
-if(USE_SYSTEM_TINYXML)
-    find_library(TINYXML_LIBRARIES tinyxml)
-    find_path(TINYXML_INCLUDE_DIR tinyxml.h)
-    message(STATUS "Found TinyXML: ${TINYXML_LIBRARIES} ${TINYXML_INCLUDE_DIR}")
+if (USE_SYSTEM_TINYXML)
+    find_package(TinyXML REQUIRED)
     add_definitions (-DTIXML_USE_STL)
-    if(TINYXML_LIBRARIES AND TINYXML_INCLUDE_DIR)
-        include_directories(${TINYXML_INCLUDE_DIR})
-        message(STATUS "Using system TinyXML library.")
-    else()
-        message(FATAL_ERROR "Detection of system TinyXML incomplete.")
-    endif()
+    include_directories(SYSTEM ${TinyXML_INCLUDE_DIRS})
 endif()
+ENDIF(BUILD_OPENMW OR BUILD_OPENCS)
 
 # Platform specific
 if (WIN32)
@@ -190,9 +193,10 @@ if (WIN32)
     add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
 endif()
 
-if (ANDROID)
-    set(OPENGL_ES TRUE CACHE BOOL "enable opengl es support for android" FORCE)
-endif (ANDROID)
+if (NOT WIN32 AND BUILD_WIZARD) # windows users can just run the morrowind installer
+    find_package(LIBUNSHIELD REQUIRED) # required only for non win32 when building openmw-wizard
+    set(OPENMW_USE_UNSHIELD TRUE)
+endif()
 
 option(OPENGL_ES "enable opengl es support" FALSE )
 
@@ -213,108 +217,77 @@ if(NOT HAVE_STDINT_H)
     message(FATAL_ERROR "stdint.h was not found" )
 endif()
 
-include (CheckIncludeFileCXX)
-check_include_file_cxx(unordered_map HAVE_UNORDERED_MAP)
-if (HAVE_UNORDERED_MAP)
-    add_definitions(-DHAVE_UNORDERED_MAP)
-endif ()
-
-
-set(BOOST_COMPONENTS system filesystem program_options thread)
-if(WIN32)
-    set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale)
-endif(WIN32)
-
-IF(BOOST_STATIC)
-    set(Boost_USE_STATIC_LIBS   ON)
-endif()
-
-if (USE_QT)
-    set (OSG_QT osgQt)
-endif()
-
-find_package(OpenSceneGraph 3.2.0 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle ${OSG_QT} osgUtil osgFX)
-
-include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS})
-
-if(OSG_STATIC)
-   macro(use_static_osg_plugin_library PLUGIN_NAME)
-      set(PLUGIN_NAME_DBG ${PLUGIN_NAME}d ${PLUGIN_NAME}D ${PLUGIN_NAME}_d ${PLUGIN_NAME}_D ${PLUGIN_NAME}_debug ${PLUGIN_NAME})
-
-      # For now, users wishing to do a static build will need to pass the path to where the plugins reside
-      # More clever logic would need to deduce the path, probably installed under <OpenSceneGraph>/lib/osgPlugins-<X.X.X>
-      find_library(${PLUGIN_NAME}_LIBRARY_REL NAMES ${PLUGIN_NAME} HINTS ${OSG_PLUGIN_LIB_SEARCH_PATH})
-      find_library(${PLUGIN_NAME}_LIBRARY_DBG NAMES ${PLUGIN_NAME_DBG} HINTS ${OSG_PLUGIN_LIB_SEARCH_PATH})
-      make_library_set(${PLUGIN_NAME}_LIBRARY)
 
-      if("${${PLUGIN_NAME}_LIBRARY}" STREQUAL "")
-         message(FATAL_ERROR "Unable to find static OpenSceneGraph plugin: ${PLUGIN_NAME}")
-      endif()
+IF(BUILD_OPENMW OR BUILD_OPENCS)
 
-      set(OPENSCENEGRAPH_LIBRARIES ${OPENSCENEGRAPH_LIBRARIES} ${${PLUGIN_NAME}_LIBRARY})
-   endmacro()
+    find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle osgUtil osgFX)
 
-   macro(use_static_osg_plugin_dep DEPENDENCY)
-      find_package(${DEPENDENCY} REQUIRED)
+    set(USED_OSG_PLUGINS
+                    osgdb_bmp
+                    osgdb_dds
+                    osgdb_jpeg
+                    osgdb_osg
+                    osgdb_png
+                    osgdb_serializers_osg
+                    osgdb_tga
+                  )
+
+    get_filename_component(OSG_LIB_DIR ${OSGDB_LIBRARY} DIRECTORY)
+    set(OSGPlugins_LIB_DIR "${OSG_LIB_DIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}")
+
+    if(OSG_STATIC)
+        add_definitions(-DOSG_LIBRARY_STATIC)
+
+        find_package(OSGPlugins REQUIRED COMPONENTS ${USED_OSG_PLUGINS})
+        list(APPEND OPENSCENEGRAPH_LIBRARIES ${OSGPlugins_LIBRARIES})
+    endif()
 
-      set(OPENSCENEGRAPH_LIBRARIES ${OPENSCENEGRAPH_LIBRARIES} ${${DEPENDENCY}_LIBRARIES})
-   endmacro()
+    if(QT_STATIC)
+       if(WIN32)
+          if(DESIRED_QT_VERSION MATCHES 4)
+             # QtCore needs WSAAsyncSelect from Ws2_32.lib
+             set(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} Ws2_32.lib)
+             message("QT_QTCORE_LIBRARY: ${QT_QTCORE_LIBRARY}")
+          endif()
+       endif()
+    endif()
 
-   add_definitions(-DOSG_LIBRARY_STATIC)
+    set(REQUIRED_BULLET_VERSION 286) # Bullet 286 required due to runtime bugfixes for btCapsuleShape
+    if (DEFINED ENV{TRAVIS_BRANCH} OR DEFINED ENV{APPVEYOR})
+        set(REQUIRED_BULLET_VERSION 283) # but for build testing, 283 is fine
+    endif()
 
-   set(PLUGIN_LIST
-       osgdb_png # depends on libpng, zlib
-       osgdb_tga
-       osgdb_dds
-       osgdb_jpeg # depends on libjpeg
-       )
+    find_package(MyGUI 3.2.1 REQUIRED)
+    find_package(SDL2 REQUIRED)
+    find_package(OpenAL REQUIRED)
+    find_package(Bullet ${REQUIRED_BULLET_VERSION} REQUIRED COMPONENTS BulletCollision LinearMath)
 
-   foreach(PLUGIN ${PLUGIN_LIST})
-      use_static_osg_plugin_library(${PLUGIN})
-   endforeach()
+ENDIF(BUILD_OPENMW OR BUILD_OPENCS)
 
-   # OSG static plugins need to linked against their respective dependencies
-   set(PLUGIN_DEPS_LIST
-       PNG # needed by osgdb_png
-       ZLIB # needed by osgdb_png
-       JPEG # needed by osgdb_jpeg
-       )
+include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS})
 
-   foreach(DEPENDENCY ${PLUGIN_DEPS_LIST})
-      use_static_osg_plugin_dep(${DEPENDENCY})
-   endforeach()
-endif()
 
-if(QT_STATIC)
-   if(WIN32)
-      if(DESIRED_QT_VERSION MATCHES 4)
-         # QtCore needs WSAAsyncSelect from Ws2_32.lib
-         set(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} Ws2_32.lib)
-         message("QT_QTCORE_LIBRARY: ${QT_QTCORE_LIBRARY}")
-      endif()
-   endif()
-endif()
+set(BOOST_COMPONENTS system filesystem program_options)
+if(WIN32)
+    set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale)
+endif(WIN32)
 
-find_package(MyGUI REQUIRED)
-if (${MYGUI_VERSION} VERSION_LESS "3.2.1")
-    message(FATAL_ERROR "OpenMW requires MyGUI 3.2.1 or later, please install the latest version from http://mygui.info")
+IF(BOOST_STATIC)
+    set(Boost_USE_STATIC_LIBS   ON)
 endif()
 
 find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
-find_package(SDL2 REQUIRED)
-find_package(OpenAL REQUIRED)
-find_package(Bullet REQUIRED)
 
 include_directories("."
     SYSTEM
     ${SDL2_INCLUDE_DIR}
     ${Boost_INCLUDE_DIR}
-    ${MYGUI_INCLUDE_DIRS}
+    ${MyGUI_INCLUDE_DIRS}
     ${OPENAL_INCLUDE_DIR}
-    ${BULLET_INCLUDE_DIRS}
+    ${Bullet_INCLUDE_DIRS}
 )
 
-link_directories(${SDL2_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS} ${MYGUI_LIB_DIR})
+link_directories(${SDL2_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
 
 if(MYGUI_STATIC)
    add_definitions(-DMYGUI_STATIC)
@@ -331,6 +304,11 @@ endif (APPLE)
 # Set up DEBUG define
 set_directory_properties(PROPERTIES COMPILE_DEFINITIONS_DEBUG DEBUG=1)
 
+if (NOT APPLE)
+    set(OPENMW_MYGUI_FILES_ROOT ${OpenMW_BINARY_DIR})
+    set(OPENMW_SHADERS_ROOT ${OpenMW_BINARY_DIR})
+endif ()
+
 add_subdirectory(files/)
 
 # Specify build paths
@@ -349,14 +327,24 @@ endif (APPLE)
 
 # Other files
 
+configure_file(${OpenMW_SOURCE_DIR}/files/tes3mp/tes3mp-client-default.cfg
+        "${OpenMW_BINARY_DIR}/tes3mp-client-default.cfg")
+
+configure_file(${OpenMW_SOURCE_DIR}/files/tes3mp/tes3mp-server-default.cfg
+        "${OpenMW_BINARY_DIR}/tes3mp-server-default.cfg")
+
 configure_file(${OpenMW_SOURCE_DIR}/files/settings-default.cfg
     "${OpenMW_BINARY_DIR}/settings-default.cfg")
 
-configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local
-    "${OpenMW_BINARY_DIR}/openmw.cfg")
-
-configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
-    "${OpenMW_BINARY_DIR}/openmw.cfg.install")
+if (NOT APPLE)
+    configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local
+        "${OpenMW_BINARY_DIR}/openmw.cfg")
+    configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
+        "${OpenMW_BINARY_DIR}/openmw.cfg.install")
+else ()
+    configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
+        "${OpenMW_BINARY_DIR}/openmw.cfg")
+endif ()
 
 configure_file(${OpenMW_SOURCE_DIR}/files/openmw-cs.cfg
     "${OpenMW_BINARY_DIR}/openmw-cs.cfg")
@@ -378,21 +366,17 @@ endif()
 
 # CXX Compiler settings
 if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -std=c++98 -pedantic -Wno-long-long")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wundef -Wno-unused-parameter -std=c++98 -pedantic -Wno-long-long -Wno-variadic-macros")
 
     if (CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT APPLE)
-        execute_process(COMMAND ${CMAKE_C_COMPILER} --version OUTPUT_VARIABLE CLANG_VERSION)
-        string(REGEX REPLACE ".*version ([0-9\\.]*).*" "\\1" CLANG_VERSION ${CLANG_VERSION})
-        if ("${CLANG_VERSION}" VERSION_GREATER 3.6 OR "${CLANG_VERSION}" VERSION_EQUAL 3.6)
+        if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 3.6)
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-potentially-evaluated-expression")
-        endif ("${CLANG_VERSION}" VERSION_GREATER 3.6 OR "${CLANG_VERSION}" VERSION_EQUAL 3.6)
-    endif(CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT APPLE)
+        endif ()
+    endif()
 
-    execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-                OUTPUT_VARIABLE GCC_VERSION)
-    if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND "${GCC_VERSION}" VERSION_GREATER 4.6 OR "${GCC_VERSION}" VERSION_EQUAL 4.6)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.6)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-parameter")
-    endif(CMAKE_CXX_COMPILER_ID STREQUAL GNU AND "${GCC_VERSION}" VERSION_GREATER 4.6 OR "${GCC_VERSION}" VERSION_EQUAL 4.6)
+    endif()
 elseif (MSVC)
     # Enable link-time code generation globally for all linking
     if (OPENMW_LTO_BUILD)
@@ -415,6 +399,9 @@ IF(NOT WIN32 AND NOT APPLE)
     IF(BUILD_LAUNCHER)
         INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/openmw-launcher" DESTINATION "${BINDIR}" )
     ENDIF(BUILD_LAUNCHER)
+    IF(BUILD_BROWSER)
+        INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/openmw-browser" DESTINATION "${BINDIR}" )
+    ENDIF(BUILD_BROWSER)
     IF(BUILD_BSATOOL)
         INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/bsatool" DESTINATION "${BINDIR}" )
     ENDIF(BUILD_BSATOOL)
@@ -458,6 +445,11 @@ IF(NOT WIN32 AND NOT APPLE)
     INSTALL(FILES "${OpenMW_BINARY_DIR}/resources/version" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
     INSTALL(FILES "${OpenMW_BINARY_DIR}/gamecontrollerdb.txt" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
 
+    INSTALL(FILES "${OpenMW_BINARY_DIR}/tes3mp-client-default" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
+    INSTALL(FILES "${OpenMW_BINARY_DIR}/tes3mp-client.install" DESTINATION "${SYSCONFDIR}" RENAME "tes3mp-client.cfg" COMPONENT "openmw")
+    INSTALL(FILES "${OpenMW_BINARY_DIR}/tes3mp-server-default" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw-mp")
+    INSTALL(FILES "${OpenMW_BINARY_DIR}/tes3mp-server.install" DESTINATION "${SYSCONFDIR}" RENAME "tes3mp-server.cfg" COMPONENT "openmw-mp")
+
     IF(BUILD_OPENCS)
         INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-cs.cfg" DESTINATION "${SYSCONFDIR}" COMPONENT "opencs")
     ENDIF(BUILD_OPENCS)
@@ -468,8 +460,10 @@ IF(NOT WIN32 AND NOT APPLE)
 ENDIF(NOT WIN32 AND NOT APPLE)
 
 if(WIN32)
-    FILE(GLOB dll_files "${OpenMW_BINARY_DIR}/Release/*.dll")
-    INSTALL(FILES ${dll_files} DESTINATION ".")
+    FILE(GLOB dll_files_debug "${OpenMW_BINARY_DIR}/Debug/*.dll")
+    FILE(GLOB dll_files_release "${OpenMW_BINARY_DIR}/Release/*.dll")
+    INSTALL(FILES ${dll_files_debug} DESTINATION "." CONFIGURATIONS Debug)
+    INSTALL(FILES ${dll_files_release} DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel)
     INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.cfg.install" DESTINATION "." RENAME "openmw.cfg")
     INSTALL(FILES "${OpenMW_SOURCE_DIR}/CHANGELOG.md" DESTINATION "." RENAME "CHANGELOG.txt")
     INSTALL(FILES "${OpenMW_SOURCE_DIR}/README.md" DESTINATION "." RENAME "README.txt")
@@ -477,33 +471,25 @@ if(WIN32)
         "${OpenMW_SOURCE_DIR}/Docs/license/GPL3.txt"
         "${OpenMW_SOURCE_DIR}/Docs/license/DejaVu Font License.txt"
         "${OpenMW_BINARY_DIR}/settings-default.cfg"
+        "${OpenMW_BINARY_DIR}/tes3mp-client-default.cfg"
         "${OpenMW_BINARY_DIR}/gamecontrollerdb.txt"
-        "${OpenMW_BINARY_DIR}/Release/openmw.exe"
         DESTINATION ".")
 
-    IF(BUILD_LAUNCHER)
-        INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Release/openmw-launcher.exe" DESTINATION ".")
-    ENDIF(BUILD_LAUNCHER)
-    IF(BUILD_MWINIIMPORTER)
-        INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Release/openmw-iniimporter.exe" DESTINATION ".")
-    ENDIF(BUILD_MWINIIMPORTER)
-    IF(BUILD_ESSIMPORTER)
-        INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Release/openmw-essimporter.exe" DESTINATION ".")
-    ENDIF(BUILD_ESSIMPORTER)
-    IF(BUILD_OPENCS)
-        INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Release/openmw-cs.exe" DESTINATION ".")
-        INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-cs.cfg" DESTINATION ".")
-    ENDIF(BUILD_OPENCS)
-    IF(BUILD_WIZARD)
-        INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Release/openmw-wizard.exe" DESTINATION ".")
-    ENDIF(BUILD_WIZARD)
     if(BUILD_MYGUI_PLUGIN)
-        INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Release/Plugin_MyGUI_OpenMW_Resources.dll" DESTINATION ".")
+        INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Debug/Plugin_MyGUI_OpenMW_Resources.dll" DESTINATION "." CONFIGURATIONS Debug)
+        INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Release/Plugin_MyGUI_OpenMW_Resources.dll" DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel)
     ENDIF(BUILD_MYGUI_PLUGIN)
 
+    IF(DESIRED_QT_VERSION MATCHES 5)
+        INSTALL(DIRECTORY "${OpenMW_BINARY_DIR}/Debug/platforms" DESTINATION "." CONFIGURATIONS Debug)
+        INSTALL(DIRECTORY "${OpenMW_BINARY_DIR}/Release/platforms" DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel)
+    ENDIF()
+
     INSTALL(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION ".")
-    FILE(GLOB plugin_dir "${OpenMW_BINARY_DIR}/Release/osgPlugins-*")
-    INSTALL(DIRECTORY ${plugin_dir} DESTINATION ".")
+    FILE(GLOB plugin_dir_debug "${OpenMW_BINARY_DIR}/Debug/osgPlugins-*")
+    FILE(GLOB plugin_dir_release "${OpenMW_BINARY_DIR}/Release/osgPlugins-*")
+    INSTALL(DIRECTORY ${plugin_dir_debug} DESTINATION "." CONFIGURATIONS Debug)
+    INSTALL(DIRECTORY ${plugin_dir_release} DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel)
 
     SET(CPACK_GENERATOR "NSIS")
     SET(CPACK_PACKAGE_NAME "OpenMW")
@@ -516,6 +502,9 @@ if(WIN32)
     IF(BUILD_LAUNCHER)
         SET(CPACK_PACKAGE_EXECUTABLES "${CPACK_PACKAGE_EXECUTABLES};openmw-launcher;OpenMW Launcher")
     ENDIF(BUILD_LAUNCHER)
+    IF(BUILD_BROWSER)
+        SET(CPACK_PACKAGE_EXECUTABLES "${CPACK_PACKAGE_EXECUTABLES};tes3mp-browser;tes3mp Launcher")
+    ENDIF(BUILD_BROWSER)
     IF(BUILD_OPENCS)
         SET(CPACK_PACKAGE_EXECUTABLES "${CPACK_PACKAGE_EXECUTABLES};openmw-cs;OpenMW Construction Set")
     ENDIF(BUILD_OPENCS)
@@ -534,8 +523,8 @@ if(WIN32)
     SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.openmw.org")
     SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.openmw.org")
     SET(CPACK_NSIS_INSTALLED_ICON_NAME "openmw-launcher.exe")
-    SET(CPACK_NSIS_MUI_ICON "${OpenMW_SOURCE_DIR}/files/windows/openmw.ico")
-    SET(CPACK_NSIS_MUI_UNIICON "${OpenMW_SOURCE_DIR}/files/windows/openmw.ico")
+    SET(CPACK_NSIS_MUI_ICON "${OpenMW_SOURCE_DIR}/files/tes3mp/tes3mp.ico")
+    SET(CPACK_NSIS_MUI_UNIICON "${OpenMW_SOURCE_DIR}/files/tes3mp/tes3mp.ico")
     SET(CPACK_PACKAGE_ICON "${OpenMW_SOURCE_DIR}\\\\files\\\\openmw.bmp")
 
     SET(VCREDIST32 "${OpenMW_BINARY_DIR}/vcredist_x86.exe")
@@ -565,8 +554,13 @@ if(WIN32)
 endif(WIN32)
 
 # Extern
+IF(BUILD_OPENMW OR BUILD_OPENCS)
 add_subdirectory (extern/osg-ffmpeg-videoplayer)
 add_subdirectory (extern/oics)
+if (BUILD_OPENCS)
+    add_subdirectory (extern/osgQt)
+endif()
+ENDIF(BUILD_OPENMW OR BUILD_OPENCS)
 
 # Components
 add_subdirectory (components)
@@ -577,6 +571,10 @@ add_subdirectory (components)
 #endif()
 
 # Apps and tools
+if (BUILD_OPENMW_MP)
+    add_subdirectory( apps/openmw-mp )
+endif()
+
 if (BUILD_OPENMW)
     add_subdirectory( apps/openmw )
 endif()
@@ -593,6 +591,10 @@ if (BUILD_LAUNCHER)
    add_subdirectory( apps/launcher )
 endif()
 
+if (BUILD_BROWSER)
+    add_subdirectory( apps/browser )
+endif()
+
 if (BUILD_MWINIIMPORTER)
    add_subdirectory( apps/mwiniimporter )
 endif()
@@ -631,20 +633,20 @@ if (WIN32)
     endforeach( OUTPUTCONFIG )
 
     if (USE_DEBUG_CONSOLE AND BUILD_OPENMW)
-      set_target_properties(openmw PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
-      set_target_properties(openmw PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE")
-      set_target_properties(openmw PROPERTIES COMPILE_DEFINITIONS_DEBUG "_CONSOLE")
+      set_target_properties(tes3mp PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
+      set_target_properties(tes3mp PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE")
+      set_target_properties(tes3mp PROPERTIES COMPILE_DEFINITIONS_DEBUG "_CONSOLE")
     elseif (BUILD_OPENMW)
       # Turn off debug console, debug output will be written to visual studio output instead
-      set_target_properties(openmw PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
-      set_target_properties(openmw PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:WINDOWS")
+      set_target_properties(tes3mp PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
+      set_target_properties(tes3mp PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:WINDOWS")
     endif()
 
     if (BUILD_OPENMW)
         # Release builds use the debug console
-        set_target_properties(openmw PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:CONSOLE")
-        set_target_properties(openmw PROPERTIES COMPILE_DEFINITIONS_RELEASE "_CONSOLE")
-        set_target_properties(openmw PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:CONSOLE")
+        set_target_properties(tes3mp PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:CONSOLE")
+        set_target_properties(tes3mp PROPERTIES COMPILE_DEFINITIONS_RELEASE "_CONSOLE")
+        set_target_properties(tes3mp PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:CONSOLE")
     endif()
 
     # Play a bit with the warning levels
@@ -667,9 +669,15 @@ if (WIN32)
         4987 # nonstandard extension used (triggered by setjmp.h)
         4996 # Function was declared deprecated
 
+        # caused by OSG
+        4589 # Constructor of abstract class 'osg::Operation' ignores initializer for virtual base class 'osg::Referenced' (False warning)
+
         # caused by boost
         4191 # 'type cast' : unsafe conversion (1.56, thread_primitives.hpp, normally off)
 
+        # caused by MyGUI
+        4275 # non dll-interface class 'std::exception' used as base for dll-interface class 'MyGUI::Exception'
+
         # OpenMW specific warnings
         4099 # Type mismatch, declared class or struct is defined with other type
         4100 # Unreferenced formal parameter (-Wunused-parameter)
@@ -683,19 +691,25 @@ if (WIN32)
         4309 # Variable overflow, trying to store 128 in a signed char for example
         4351 # New behavior: elements of array 'array' will be default initialized (desired behavior)
         4355 # Using 'this' in member initialization list
+        4464 # relative include path contains '..'
         4505 # Unreferenced local function has been removed
         4701 # Potentially uninitialized local variable used
         4702 # Unreachable code
+        4714 # function 'QString QString::trimmed(void) &&' marked as __forceinline not inlined
         4800 # Boolean optimization warning, e.g. myBool = (myInt != 0) instead of myBool = myInt
         )
 
+    if (MSVC_VERSION GREATER 1800)
+        set(WARNINGS_DISABLE ${WARNINGS_DISABLE} 5026 5027
+            5031 # #pragma warning(pop): likely mismatch, popping warning state pushed in different file (config_begin.hpp, config_end.hpp)
+        )
+    endif()
+
     foreach(d ${WARNINGS_DISABLE})
         set(WARNINGS "${WARNINGS} /wd${d}")
     endforeach(d)
 
     set_target_properties(components PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
-    # oics uses tinyxml, which has an initialized but unused variable
-    set_target_properties(oics PROPERTIES COMPILE_FLAGS "${WARNINGS} /wd4189 ${MT_BUILD}")
     set_target_properties(osg-ffmpeg-videoplayer PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
 
     if (BUILD_BSATOOL)
@@ -714,6 +728,10 @@ if (WIN32)
         set_target_properties(openmw-launcher PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
     endif()
 
+    if (BUILD_BROWSER)
+        set_target_properties(tes3mp-browser PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+    endif()
+
     if (BUILD_MWINIIMPORTER)
         set_target_properties(openmw-iniimporter PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
     endif()
@@ -723,7 +741,12 @@ if (WIN32)
     endif()
 
     if (BUILD_OPENMW)
-        set_target_properties(openmw PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+        # Very specific issue this, only needed on 32-bit VS2015 during unity builds.
+        if (MSVC_VERSION GREATER 1800 AND CMAKE_SIZEOF_VOID_P EQUAL 4 AND OPENMW_UNITY_BUILD)
+            set_target_properties(tes3mp PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD} /bigobj")
+        else()
+            set_target_properties(tes3mp PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+        endif()
     endif()
 
     if (BUILD_WIZARD)
@@ -732,8 +755,8 @@ if (WIN32)
   endif(MSVC)
 
   # TODO: At some point release builds should not use the console but rather write to a log file
-  #set_target_properties(openmw PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
-  #set_target_properties(openmw PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
+  #set_target_properties(tes3mp PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
+  #set_target_properties(tes3mp PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
 endif()
 
 # Apple bundling
@@ -750,14 +773,7 @@ if (APPLE)
       configure_file("${QT_COCOA_PLUGIN_PATH}" "${OPENCS_BUNDLE_NAME}/Contents/MacOS/${QT_COCOA_PLUGIN_GROUP}/${QT_COCOA_PLUGIN_NAME}" COPYONLY)
     endif ()
 
-    set(INSTALL_SUBDIR OpenMW)
-
-    install(DIRECTORY "${APP_BUNDLE_DIR}" USE_SOURCE_PERMISSIONS DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
-    install(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
-    install(FILES "${OpenMW_BINARY_DIR}/openmw.cfg.install" RENAME "openmw.cfg" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
-    install(FILES "${OpenMW_BINARY_DIR}/settings-default.cfg" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
-    install(FILES "${OpenMW_BINARY_DIR}/gamecontrollerdb.txt" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
-    install(FILES "${OpenMW_BINARY_DIR}/openmw-cs.cfg" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
+    install(DIRECTORY "${APP_BUNDLE_DIR}" USE_SOURCE_PERMISSIONS DESTINATION "." COMPONENT Runtime)
 
     set(CPACK_GENERATOR "DragNDrop")
     set(CPACK_PACKAGE_VERSION ${OPENMW_VERSION})
@@ -765,8 +781,8 @@ if (APPLE)
     set(CPACK_PACKAGE_VERSION_MINOR ${OPENMW_VERSION_MINOR})
     set(CPACK_PACKAGE_VERSION_PATCH ${OPENMW_VERSION_RELEASE})
 
-    set(INSTALLED_OPENMW_APP "\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR}/${APP_BUNDLE_NAME}")
-    set(INSTALLED_OPENCS_APP "\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR}/${OPENCS_BUNDLE_NAME}")
+    set(INSTALLED_OPENMW_APP "\${CMAKE_INSTALL_PREFIX}/${APP_BUNDLE_NAME}")
+    set(INSTALLED_OPENCS_APP "\${CMAKE_INSTALL_PREFIX}/${OPENCS_BUNDLE_NAME}")
 
     install(CODE "
         set(BU_CHMOD_BUNDLE_ITEMS ON)
@@ -776,19 +792,16 @@ if (APPLE)
     " COMPONENT Runtime)
 
     set(ABSOLUTE_PLUGINS "")
-    set(USED_OSG_PLUGINS
-                        osgdb_dds
-                        osgdb_jpeg
-                        osgdb_png
-                        osgdb_tga
-                      )
 
     foreach (PLUGIN_NAME ${USED_OSG_PLUGINS})
-      set(PLUGIN_ABS "${OSG_PLUGIN_LIB_SEARCH_PATH}/${PLUGIN_NAME}.so")
+      set(PLUGIN_ABS "${OSGPlugins_LIB_DIR}/${PLUGIN_NAME}.so")
       set(ABSOLUTE_PLUGINS ${PLUGIN_ABS} ${ABSOLUTE_PLUGINS})
     endforeach ()
 
-    get_filename_component(OSG_PLUGIN_PREFIX_DIR "${OSG_PLUGIN_LIB_SEARCH_PATH}" NAME)
+    get_filename_component(OSG_PLUGIN_PREFIX_DIR "${OSGPlugins_LIB_DIR}" NAME)
+    if (NOT OSG_PLUGIN_PREFIX_DIR)
+      message(FATAL_ERROR "Can't get directory name for OSG plugins from '${OSGPlugins_LIB_DIR}'")
+    endif()
 
     # installs used plugins in bundle at given path (bundle_path must be relative to ${CMAKE_INSTALL_PREFIX})
     # and returns list of install paths for all installed plugins
@@ -813,8 +826,8 @@ if (APPLE)
         set(${plugins_var} ${PLUGINS} PARENT_SCOPE)
     endfunction (install_plugins_for_bundle)
 
-    install_plugins_for_bundle("${INSTALL_SUBDIR}/${APP_BUNDLE_NAME}" PLUGINS)
-    install_plugins_for_bundle("${INSTALL_SUBDIR}/${OPENCS_BUNDLE_NAME}" OPENCS_PLUGINS)
+    install_plugins_for_bundle("${APP_BUNDLE_NAME}" PLUGINS)
+    install_plugins_for_bundle("${OPENCS_BUNDLE_NAME}" OPENCS_PLUGINS)
 
     set(PLUGINS ${PLUGINS} "${INSTALLED_OPENMW_APP}/Contents/MacOS/${QT_COCOA_PLUGIN_GROUP}/${QT_COCOA_PLUGIN_NAME}")
     set(OPENCS_PLUGINS ${OPENCS_PLUGINS} "${INSTALLED_OPENCS_APP}/Contents/MacOS/${QT_COCOA_PLUGIN_GROUP}/${QT_COCOA_PLUGIN_NAME}")
@@ -856,3 +869,4 @@ if (DOXYGEN_FOUND)
         WORKING_DIRECTORY ${OpenMW_BINARY_DIR}
         COMMENT "Generating documentation for the github-pages at ${DOXYGEN_PAGES_OUTPUT_DIR}" VERBATIM)
 endif ()
+
diff --git a/README.md b/README.md
index 9de814fd0..4def6168e 100644
--- a/README.md
+++ b/README.md
@@ -1,107 +1,41 @@
-OpenMW
+TES3MP
 ======
 
-[![Build Status](https://api.travis-ci.org/OpenMW/openmw.svg)](https://travis-ci.org/OpenMW/openmw) [![Build status](https://ci.appveyor.com/api/projects/status/e6bqw8oouy8ufd46?svg=true)](https://ci.appveyor.com/project/scrawl/openmw)  [![Coverity Scan Build Status](https://scan.coverity.com/projects/3740/badge.svg)](https://scan.coverity.com/projects/3740)
+[![Build Status](https://travis-ci.org/TES3MP/openmw-tes3mp.svg?branch=master)](https://travis-ci.org/TES3MP/openmw-tes3mp)
 
-OpenMW is a recreation of the engine for the popular role-playing game Morrowind by Bethesda Softworks. You need to own and install the original game for OpenMW to work.
+TES3MP is a project aiming to add multiplayer functionality to [OpenMW](https://github.com/OpenMW/openmw), a free and open source recreation of the popular Bethesda Softworks game "The Elder Scrolls III: Morrowind".
 
-OpenMW also comes with OpenMW-CS, a replacement for Morrowind's TES Construction Set.
-
-* Version: 0.38.0
-* License: GPL (see docs/license/GPL3.txt for more information)
-* Website: http://www.openmw.org
-* IRC: #openmw on irc.freenode.net
+* Version: 0.5.1
+* License: GPLv3 (see docs/license/GPL3.txt for more information)
+* Website: https://steamcommunity.com/groups/mwmulti
 
 Font Licenses:
 * DejaVuLGCSansMono.ttf: custom (see docs/license/DejaVu Font License.txt for more information)
 
-Current Status
+Project Status
 --------------
 
-The main quests in Morrowind, Tribunal and Bloodmoon are all completable. Some issues with side quests are to be expected (but rare). Check the [bug tracker](https://bugs.openmw.org/versions/21) for a list of issues we need to resolve before the "1.0" release. Even before the "1.0" release however, OpenMW boasts some new [features](https://wiki.openmw.org/index.php?title=Features), such as improved graphics and user interfaces. 
-
-Pre-existing modifications created for the original Morrowind engine can be hit-and-miss. The OpenMW script compiler performs more thorough error-checking than Morrowind does, meaning that a mod created for Morrowind may not necessarily run in OpenMW. Some mods also rely on quirky behaviour or engine bugs in order to work. We are considering such compatibility issues on a case-by-case basis - in some cases adding a workaround to OpenMW may be feasible, in other cases fixing the mod will be the only option. If you know of any mods that work or don't work, feel free to add them to the [Mod status](https://wiki.openmw.org/index.php?title=Mod_status) wiki page.
+[Version changelog](https://github.com/TES3MP/openmw-tes3mp/blob/master/tes3mp-changelog.md)
 
-Getting Started
----------------
+Our project is not yet in a playable state, though we are getting close. At the moment we have synchronization of character appearance, character skills, stats, attributes and death, movement in interiors and exteriors, melee and ranged combat, spell casting, picking up and dropping items in the world, using doors and levers, and adding and removing items from containers, as well as [serverside Lua scripts](https://github.com/TES3MP/PluginExamples) used to save and load the state of most of the aforementioned.
 
-* [Official forums](https://forum.openmw.org/)
-* [Installation instructions](https://wiki.openmw.org/index.php?title=Installation_Instructions)
-* [Build from source](https://wiki.openmw.org/index.php?title=Development_Environment_Setup)
-* [Testing the game](https://wiki.openmw.org/index.php?title=Testing)
-* [How to contribute](https://wiki.openmw.org/index.php?title=Contribution_Wanted)
-* [Report a bug](http://bugs.openmw.org/projects/openmw) - read the [guidelines](https://wiki.openmw.org/index.php?title=Bug_Reporting_Guidelines) before submitting your first bug!
-* [Known issues](http://bugs.openmw.org/projects/openmw/issues?utf8=%E2%9C%93&set_filter=1&f%5B%5D=status_id&op%5Bstatus_id%5D=%3D&v%5Bstatus_id%5D%5B%5D=7&f%5B%5D=tracker_id&op%5Btracker_id%5D=%3D&v%5Btracker_id%5D%5B%5D=1&f%5B%5D=&c%5B%5D=project&c%5B%5D=tracker&c%5B%5D=status&c%5B%5D=priority&c%5B%5D=subject&c%5B%5D=assigned_to&c%5B%5D=updated_on&group_by=tracker)
+Contributing
+--------------
 
-The data path
--------------
+Development has been relatively fast, but any contribution regarding [code](https://github.com/TES3MP/openmw-tes3mp/blob/master/CONTRIBUTING.md), documentation, bug hunting or video showcases is greatly appreciated.
 
-The data path tells OpenMW where to find your Morrowind files. If you run the launcher, OpenMW should be able to pick up the location of these files on its own, if both Morrowind and OpenMW are installed properly (installing Morrowind under WINE is considered a proper install).
+Test sessions are often advertised in [our Steam group](https://steamcommunity.com/groups/mwmulti) or [our Discord server](https://discord.gg/H8zhhuk).
 
-Command line options
---------------------
+Feel free to contact the [team members](https://github.com/TES3MP/openmw-tes3mp/blob/master/tes3mp-credits.md) for any questions you might have.
 
-    Syntax: openmw <options>
-    Allowed options:
-      --help                                print help message
-      --version                             print version information and quit
-      --data arg (=data)                    set data directories (later directories
-                                            have higher priority)
-      --data-local arg                      set local data directory (highest
-                                            priority)
-      --fallback-archive arg (=fallback-archive)
-                                            set fallback BSA archives (later
-                                            archives have higher priority)
-      --resources arg (=resources)          set resources directory
-      --start arg                           set initial cell
-      --content arg                         content file(s): esm/esp, or
-                                            omwgame/omwaddon
-      --no-sound [=arg(=1)] (=0)            disable all sounds
-      --script-verbose [=arg(=1)] (=0)      verbose script output
-      --script-all [=arg(=1)] (=0)          compile all scripts (excluding dialogue
-                                            scripts) at startup
-      --script-all-dialogue [=arg(=1)] (=0) compile all dialogue scripts at startup
-      --script-console [=arg(=1)] (=0)      enable console-only script
-                                            functionality
-      --script-run arg                      select a file containing a list of
-                                            console commands that is executed on
-                                            startup
-      --script-warn [=arg(=1)] (=1)         handling of warnings when compiling
-                                            scripts
-                                            0 - ignore warning
-                                            1 - show warning but consider script as
-                                            correctly compiled anyway
-                                            2 - treat warnings as errors
-      --script-blacklist arg                ignore the specified script (if the use
-                                            of the blacklist is enabled)
-      --script-blacklist-use [=arg(=1)] (=1)
-                                            enable script blacklisting
-      --load-savegame arg                   load a save game file on game startup
-                                            (specify an absolute filename or a
-                                            filename relative to the current
-                                            working directory)
-      --skip-menu [=arg(=1)] (=0)           skip main menu on game startup
-      --new-game [=arg(=1)] (=0)            run new game sequence (ignored if
-                                            skip-menu=0)
-      --fs-strict [=arg(=1)] (=0)           strict file system handling (no case
-                                            folding)
-      --encoding arg (=win1252)             Character encoding used in OpenMW game
-                                            messages:
+Getting Started
+---------------
 
-                                            win1250 - Central and Eastern European
-                                            such as Polish, Czech, Slovak,
-                                            Hungarian, Slovene, Bosnian, Croatian,
-                                            Serbian (Latin script), Romanian and
-                                            Albanian languages
+* [Community forums](https://steamcommunity.com/groups/mwmulti)
+* [Installation and build instructions](https://github.com/TES3MP/openmw-tes3mp/wiki/Installation-and-build-instructions)
+* [Known issues and bug reports](https://github.com/TES3MP/openmw-tes3mp/issues)
 
-                                            win1251 - Cyrillic alphabet such as
-                                            Russian, Bulgarian, Serbian Cyrillic
-                                            and other languages
+Donations
+---------------
 
-                                            win1252 - Western European (Latin)
-                                            alphabet, used by default
-      --fallback arg                        fallback values
-      --no-grab                             Don't grab mouse cursor
-      --export-fonts [=arg(=1)] (=0)        Export Morrowind .fnt fonts to PNG
-                                            image and XML file in current directory
-      --activate-dist arg (=-1)             activation distance override
+You can benefit the project by supporting OpenMW and/or by [becoming Koncord's patron](https://www.patreon.com/Koncord).
diff --git a/apps/browser/CMakeLists.txt b/apps/browser/CMakeLists.txt
new file mode 100644
index 000000000..95f09bfec
--- /dev/null
+++ b/apps/browser/CMakeLists.txt
@@ -0,0 +1,93 @@
+
+set (CMAKE_CXX_STANDARD 11)
+
+set(BROWSER_UI
+        ${CMAKE_SOURCE_DIR}/files/tes3mp/ui/Main.ui
+        ${CMAKE_SOURCE_DIR}/files/tes3mp/ui/ServerInfo.ui
+        )
+set(BROWSER
+        main.cpp
+        MainWindow.cpp
+        ServerModel.cpp
+        NetController.cpp
+        ServerInfoDialog.cpp
+        MySortFilterProxyModel.cpp
+        netutils/HTTPNetwork.cpp
+        netutils/Utils.cpp
+        ${CMAKE_SOURCE_DIR}/files/tes3mp/browser.rc
+        )
+
+set(BROWSER_HEADER_MOC
+        MainWindow.hpp
+        ServerModel.hpp
+        ServerInfoDialog.hpp
+        MySortFilterProxyModel.hpp
+        )
+
+set(BROWSER_HEADER
+        ${BROWSER_HEADER_MOC}
+        NetController.hpp
+        netutils/HTTPNetwork.hpp
+        netutils/Utils.hpp
+        )
+
+source_group(browser FILES ${BROWSER} ${BROWSER_HEADER})
+
+set(QT_USE_QTGUI 1)
+
+# Set some platform specific settings
+if(WIN32)
+    set(GUI_TYPE WIN32)
+    set(QT_USE_QTMAIN TRUE)
+endif(WIN32)
+
+if (DESIRED_QT_VERSION MATCHES 4)
+    message(SEND_ERROR "QT4 is not supported.")
+    #include(${QT_USE_FILE})
+    #QT4_ADD_RESOURCES(RCC_SRCS ${CMAKE_SOURCE_DIR}/files/launcher/launcher.qrc)
+    #QT4_WRAP_CPP(MOC_SRCS ${BROWSER_HEADER_MOC})
+    #QT4_WRAP_UI(UI_HDRS ${BROWSER_UI})
+else()
+    QT5_ADD_RESOURCES(RCC_SRCS ${CMAKE_SOURCE_DIR}/files/launcher/launcher.qrc)
+    QT5_WRAP_CPP(MOC_SRCS ${BROWSER_HEADER_MOC})
+    QT5_WRAP_UI(UI_HDRS ${BROWSER_UI})
+endif()
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+if(NOT WIN32)
+    include_directories(${LIBUNSHIELD_INCLUDE_DIR})
+endif(NOT WIN32)
+
+# Main executable
+add_executable(tes3mp-browser
+        ${GUI_TYPE}
+        ${BROWSER}
+        ${BROWSER_HEADER}
+        ${RCC_SRCS}
+        ${MOC_SRCS}
+        ${UI_HDRS}
+        )
+
+if (WIN32)
+    INSTALL(TARGETS tes3mp-browser RUNTIME DESTINATION ".")
+endif (WIN32)
+
+target_link_libraries(tes3mp-browser
+        ${SDL2_LIBRARY_ONLY}
+        ${RakNet_LIBRARY}
+        components
+        )
+
+if (DESIRED_QT_VERSION MATCHES 4)
+#    target_link_libraries(tes3mp-browser ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY})
+#    if(WIN32)
+#        target_link_libraries(tes3mp-browser ${QT_QTMAIN_LIBRARY})
+#    endif(WIN32)
+else()
+    qt5_use_modules(tes3mp-browser Widgets Core)
+endif()
+
+if (BUILD_WITH_CODE_COVERAGE)
+    add_definitions (--coverage)
+    target_link_libraries(tes3mp-browser gcov)
+endif()
\ No newline at end of file
diff --git a/apps/browser/MainWindow.cpp b/apps/browser/MainWindow.cpp
new file mode 100644
index 000000000..0d896986b
--- /dev/null
+++ b/apps/browser/MainWindow.cpp
@@ -0,0 +1,228 @@
+//
+// Created by koncord on 06.01.17.
+//
+
+#include "MainWindow.hpp"
+#include "NetController.hpp"
+#include "ServerInfoDialog.hpp"
+#include "components/files/configurationmanager.hpp"
+#include <qdebug.h>
+#include <QInputDialog>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QFile>
+#include <QJsonDocument>
+
+using namespace Process;
+
+MainWindow::MainWindow(QWidget *parent)
+{
+    setupUi(this);
+
+    mGameInvoker = new ProcessInvoker();
+
+    browser = new ServerModel;
+    favorites = new ServerModel;
+    proxyModel = new MySortFilterProxyModel(this);
+    proxyModel->setSourceModel(browser);
+    tblServerBrowser->setModel(proxyModel);
+    tblFavorites->setModel(proxyModel);
+
+    tblServerBrowser->hideColumn(ServerData::ADDR);
+    tblFavorites->hideColumn(ServerData::ADDR);
+
+    connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabSwitched(int)));
+    connect(actionAdd, SIGNAL(triggered(bool)), this, SLOT(addServer()));
+    connect(actionAdd_by_IP, SIGNAL(triggered(bool)), this, SLOT(addServerByIP()));
+    connect(actionDelete, SIGNAL(triggered(bool)), this, SLOT(deleteServer()));
+    connect(actionRefresh, SIGNAL(triggered(bool)), this, SLOT(refresh()));
+    connect(actionPlay, SIGNAL(triggered(bool)), this, SLOT(play()));
+    connect(tblServerBrowser, SIGNAL(clicked(QModelIndex)), this, SLOT(serverSelected()));
+    connect(tblFavorites, SIGNAL(clicked(QModelIndex)), this, SLOT(serverSelected()));
+    connect(tblFavorites, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(play()));
+    connect(tblServerBrowser, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(play()));
+    connect(cBoxNotFull, SIGNAL(toggled(bool)), this, SLOT(notFullSwitch(bool)));
+    connect(cBoxWithPlayers, SIGNAL(toggled(bool)), this, SLOT(havePlayersSwitch(bool)));
+    connect(comboLatency, SIGNAL(currentIndexChanged(int)), this, SLOT(maxLatencyChanged(int)));
+    connect(leGamemode, SIGNAL(textChanged(const QString &)), this, SLOT(gamemodeChanged(const QString &)));
+    loadFavorites();
+}
+
+MainWindow::~MainWindow()
+{
+    delete mGameInvoker;
+}
+
+void MainWindow::addServerAndUpdate(QString addr)
+{
+    favorites->insertRow(0);
+    QModelIndex mi = favorites->index(0, ServerData::ADDR);
+    favorites->setData(mi, addr, Qt::EditRole);
+    NetController::get()->updateInfo(favorites, mi);
+}
+
+void MainWindow::addServer()
+{
+    int id = tblServerBrowser->selectionModel()->currentIndex().row();
+
+    if(id >= 0)
+    {
+        int sourceId = proxyModel->mapToSource(proxyModel->index(id, ServerData::ADDR)).row();
+        favorites->myData.push_back(browser->myData[sourceId]);
+    }
+}
+
+void MainWindow::addServerByIP()
+{
+    bool ok;
+    QString text = QInputDialog::getText(this, tr("Add Server by address"), tr("Address:"), QLineEdit::Normal, "", &ok);
+    if(ok && !text.isEmpty())
+        addServerAndUpdate(text);
+}
+
+void MainWindow::deleteServer()
+{
+    if(tabWidget->currentIndex() != 1)
+        return;
+    int id = tblFavorites->selectionModel()->currentIndex().row();
+    if(id >= 0)
+    {
+        int sourceId = proxyModel->mapToSource(proxyModel->index(id, ServerData::ADDR)).row();
+        favorites->removeRow(sourceId);
+        if(favorites->myData.isEmpty())
+        {
+            actionPlay->setEnabled(false);
+            actionDelete->setEnabled(false);
+        }
+    }
+}
+
+bool MainWindow::refresh()
+{
+    return NetController::get()->updateInfo(proxyModel->sourceModel());
+    /*tblServerBrowser->resizeColumnToContents(ServerData::HOSTNAME);
+    tblServerBrowser->resizeColumnToContents(ServerData::MODNAME);
+    tblFavorites->resizeColumnToContents(ServerData::HOSTNAME);
+    tblFavorites->resizeColumnToContents(ServerData::MODNAME);*/
+}
+
+void MainWindow::play()
+{
+    QTableView *curTable = tabWidget->currentIndex() ? tblFavorites : tblServerBrowser;
+    int id = curTable->selectionModel()->currentIndex().row();
+    if(id < 0)
+        return;
+
+    ServerInfoDialog infoDialog(this);
+    ServerModel *sm = ((ServerModel*)proxyModel->sourceModel());
+
+    int sourceId = proxyModel->mapToSource(proxyModel->index(id, ServerData::ADDR)).row();
+    NetController::get()->selectServer(&sm->myData[sourceId]);
+    infoDialog.refresh();
+    if(!infoDialog.exec())
+        return;
+
+    QStringList arguments;
+    arguments.append(QLatin1String("--connect=") + sm->myData[sourceId].addr.toLatin1());
+
+    if(sm->myData[sourceId].needPassw)
+    {
+        bool ok;
+        QString passw = QInputDialog::getText(this, "Connecting to: " + sm->myData[sourceId].addr, "Password: ", QLineEdit::Password, "", &ok);
+        if(!ok)
+            return;
+        arguments.append(QLatin1String("--password=") + passw.toLatin1());
+    }
+
+    if (mGameInvoker->startProcess(QLatin1String("tes3mp"), arguments, true))
+        return qApp->quit();
+}
+
+void MainWindow::tabSwitched(int index)
+{
+    if(index == 0)
+    {
+        proxyModel->setSourceModel(browser);
+        actionDelete->setEnabled(false);
+    }
+    else
+    {
+        proxyModel->setSourceModel(favorites);
+    }
+    actionPlay->setEnabled(false);
+    actionAdd->setEnabled(false);
+}
+
+void MainWindow::serverSelected()
+{
+    actionPlay->setEnabled(true);
+    if(tabWidget->currentIndex() == 0)
+        actionAdd->setEnabled(true);
+    if(tabWidget->currentIndex() == 1)
+        actionDelete->setEnabled(true);
+}
+
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+    Files::ConfigurationManager cfgMgr;
+    QString cfgPath = QString::fromStdString((cfgMgr.getUserConfigPath() / "favorites.dat").string());
+
+    QJsonArray saveData;
+    for(auto server : favorites->myData)
+        saveData.push_back(server.addr);
+
+    QFile file(cfgPath);
+
+    if(!file.open(QIODevice::WriteOnly))
+    {
+        qDebug() << "Cannot save " << cfgPath;
+        return;
+    }
+
+    file.write(QJsonDocument(saveData).toJson());
+    file.close();
+}
+
+
+void MainWindow::loadFavorites()
+{
+    Files::ConfigurationManager cfgMgr;
+    QString cfgPath = QString::fromStdString((cfgMgr.getUserConfigPath() / "favorites.dat").string());
+
+    QFile file(cfgPath);
+    if(!file.open(QIODevice::ReadOnly))
+    {
+        qDebug() << "Cannot open " << cfgPath;
+        return;
+    }
+
+    QJsonDocument jsonDoc(QJsonDocument::fromJson(file.readAll()));
+
+    for(auto server : jsonDoc.array())
+        addServerAndUpdate(server.toString());
+
+    file.close();
+}
+
+void MainWindow::notFullSwitch(bool state)
+{
+    proxyModel->filterFullServer(state);
+}
+
+void MainWindow::havePlayersSwitch(bool state)
+{
+    proxyModel->filterEmptyServers(state);
+}
+
+void MainWindow::maxLatencyChanged(int index)
+{
+    int maxLatency = index * 50;
+    proxyModel->pingLessThan(maxLatency);
+
+}
+
+void MainWindow::gamemodeChanged(const QString &text)
+{
+    proxyModel->setFilterFixedString(text);
+    proxyModel->setFilterKeyColumn(ServerData::MODNAME);
+}
diff --git a/apps/browser/MainWindow.hpp b/apps/browser/MainWindow.hpp
new file mode 100644
index 000000000..d5d274cf9
--- /dev/null
+++ b/apps/browser/MainWindow.hpp
@@ -0,0 +1,44 @@
+//
+// Created by koncord on 06.01.17.
+//
+
+#ifndef NEWLAUNCHER_MAIN_HPP
+#define NEWLAUNCHER_MAIN_HPP
+
+
+#include "ui_Main.h"
+#include "ServerModel.hpp"
+#include "MySortFilterProxyModel.hpp"
+#include <components/process/processinvoker.hpp>
+
+class MainWindow : public QMainWindow,  private Ui::MainWindow
+{
+    Q_OBJECT
+public:
+    explicit MainWindow(QWidget *parent = 0);
+    virtual ~MainWindow();
+protected:
+    void closeEvent(QCloseEvent * event) Q_DECL_OVERRIDE;
+    void addServerAndUpdate(QString addr);
+public slots:
+    bool refresh();
+protected slots:
+    void tabSwitched(int index);
+    void addServer();
+    void addServerByIP();
+    void deleteServer();
+    void play();
+    void serverSelected();
+    void notFullSwitch(bool state);
+    void havePlayersSwitch(bool state);
+    void maxLatencyChanged(int index);
+    void gamemodeChanged(const QString &text);
+private:
+    Process::ProcessInvoker *mGameInvoker;
+    ServerModel *browser, *favorites;
+    MySortFilterProxyModel *proxyModel;
+    void loadFavorites();
+};
+
+
+#endif //NEWLAUNCHER_MAIN_HPP
diff --git a/apps/browser/MySortFilterProxyModel.cpp b/apps/browser/MySortFilterProxyModel.cpp
new file mode 100644
index 000000000..c5d43685e
--- /dev/null
+++ b/apps/browser/MySortFilterProxyModel.cpp
@@ -0,0 +1,54 @@
+//
+// Created by koncord on 30.01.17.
+//
+
+#include "MySortFilterProxyModel.hpp"
+#include "ServerModel.hpp"
+
+#include <qdebug.h>
+
+bool MySortFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+{
+
+    QModelIndex pingIndex = sourceModel()->index(sourceRow, ServerData::PING, sourceParent);
+    QModelIndex plIndex = sourceModel()->index(sourceRow, ServerData::PLAYERS, sourceParent);
+    QModelIndex maxPlIndex = sourceModel()->index(sourceRow, ServerData::MAX_PLAYERS, sourceParent);
+
+    int ping = sourceModel()->data(pingIndex).toInt();
+    int players =  sourceModel()->data(plIndex).toInt();
+    int maxPlayers =  sourceModel()->data(maxPlIndex).toInt();
+
+    if(maxPing > 0 && (ping == -1 || ping > maxPing))
+        return false;
+    if(filterEmpty && players == 0)
+        return false;
+    if(filterFull && players >= maxPlayers)
+        return false;
+
+    return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
+}
+
+MySortFilterProxyModel::MySortFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent)
+{
+    filterEmpty = false;
+    filterFull = false;
+    maxPing = 0;
+}
+
+void MySortFilterProxyModel::filterEmptyServers(bool state)
+{
+    filterEmpty = state;
+    invalidateFilter();
+}
+
+void MySortFilterProxyModel::filterFullServer(bool state)
+{
+    filterFull = state;
+    invalidateFilter();
+}
+
+void MySortFilterProxyModel::pingLessThan(int maxPing)
+{
+    this->maxPing = maxPing;
+    invalidateFilter();
+}
diff --git a/apps/browser/MySortFilterProxyModel.hpp b/apps/browser/MySortFilterProxyModel.hpp
new file mode 100644
index 000000000..c53de3a90
--- /dev/null
+++ b/apps/browser/MySortFilterProxyModel.hpp
@@ -0,0 +1,27 @@
+//
+// Created by koncord on 30.01.17.
+//
+
+#ifndef OPENMW_MYSORTFILTERPROXYMODEL_HPP
+#define OPENMW_MYSORTFILTERPROXYMODEL_HPP
+
+
+#include <QSortFilterProxyModel>
+
+class MySortFilterProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+protected:
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_FINAL;
+public:
+    MySortFilterProxyModel(QObject *parent);
+    void filterFullServer(bool state);
+    void filterEmptyServers(bool state);
+    void pingLessThan(int maxPing);
+private:
+    bool filterEmpty, filterFull;
+    int maxPing;
+};
+
+
+#endif //OPENMW_MYSORTFILTERPROXYMODEL_HPP
diff --git a/apps/browser/NetController.cpp b/apps/browser/NetController.cpp
new file mode 100644
index 000000000..e539f0983
--- /dev/null
+++ b/apps/browser/NetController.cpp
@@ -0,0 +1,266 @@
+//
+// Created by koncord on 07.01.17.
+//
+
+#include <cassert>
+#include <QtCore/QTime>
+#include "NetController.hpp"
+#include "qdebug.h"
+
+#include <RakPeer.h>
+#include <RakSleep.h>
+
+#include <sstream>
+
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <memory>
+#include <QtWidgets/QMessageBox>
+
+using namespace std;
+
+NetController *NetController::mThis = nullptr;
+
+NetController *NetController::get()
+{
+    assert(mThis);
+    return mThis;
+}
+
+void NetController::Create(std::string addr, unsigned short port)
+{
+    assert(!mThis);
+    mThis = new NetController(addr, port);
+}
+
+void NetController::Destroy()
+{
+    assert(mThis);
+    delete mThis;
+    mThis = nullptr;
+}
+
+NetController::NetController(std::string addr, unsigned short port) : httpNetwork(addr, port)
+{
+
+}
+
+NetController::~NetController()
+{
+
+}
+
+struct pattern
+{
+    pattern(QString value): value(value) {}
+    bool operator()(const ServerData &data)
+    {
+        return value == data.addr;
+    }
+    QString value;
+};
+
+void NetController::setData(QString address, QJsonObject server, ServerModel *model)
+{
+    QModelIndex mi = model->index(0, ServerData::ADDR);
+    model->setData(mi, address);
+
+    mi = model->index(0, ServerData::PLAYERS);
+    model->setData(mi, server["players"].toInt());
+
+    mi = model->index(0, ServerData::MAX_PLAYERS);
+    model->setData(mi, server["max_players"].toInt());
+
+    mi = model->index(0, ServerData::HOSTNAME);
+    model->setData(mi, server["hostname"].toString());
+
+    mi = model->index(0, ServerData::MODNAME);
+    model->setData(mi, server["modname"].toString());
+
+    mi = model->index(0, ServerData::VERSION);
+    model->setData(mi, server["version"].toString());
+
+    mi = model->index(0, ServerData::PASSW);
+    model->setData(mi, server["passw"].toBool());
+
+    mi = model->index(0, ServerData::PING);
+    
+    // This *should* fix a crash when a port isn't returned by data.
+    if(!address.contains(":"))
+        address.append(":25565");
+    QStringList addr = address.split(":");
+    model->setData(mi, PingRakNetServer(addr[0].toLatin1().data(), addr[1].toUShort())); 
+}
+
+bool NetController::downloadInfo(QAbstractItemModel *pModel, QModelIndex index)
+{
+    ServerModel *model = ((ServerModel *) pModel);
+
+    /*
+     * download stuff
+     */
+
+    QString data;
+    QJsonParseError err;
+
+    if(index.isValid() && index.row() >= 0)
+    {
+        const ServerData &sd = model->myData[index.row()];
+        while(true)
+        {
+            data = QString::fromStdString(httpNetwork.getData((QString("/api/servers/") + sd.addr).toLatin1()));
+            if (!data.isEmpty() && data != "NO_CONTENT" && data != "LOST_CONNECTION")
+                break;
+            RakSleep(30);
+        }
+        qDebug() << "Content for \"" <<  sd.addr << "\": " << data;
+
+        if(data == "bad request" || data == "not found") // TODO: if server is not registered we should download info directly from the server
+        {
+            qDebug() << "Server is not registered";
+            return false;
+        }
+
+        QJsonDocument jsonDocument = QJsonDocument::fromJson(data.toLatin1(), &err);
+        QJsonObject server = jsonDocument.object()["server"].toObject();
+
+        setData(sd.addr, server, model);
+
+        return true;
+    }
+
+    while (true)
+    {
+        data = QString::fromStdString(httpNetwork.getData("/api/servers"));
+        if (!data.isEmpty() && data != "NO_CONTENT" && data != "LOST_CONNECTION")
+            break;
+        RakSleep(30);
+    }
+
+    if(data == "UNKNOWN_ADDRESS")
+    {
+        QMessageBox::critical(0, "Error", "Cannot connect to the master server!");
+        return false;
+    }
+
+    qDebug() << "Content: " << data;
+
+    QJsonDocument jsonDocument = QJsonDocument::fromJson(data.toLatin1(), &err);
+
+    QJsonObject listServers = jsonDocument.object()["list servers"].toObject();
+
+    for(auto iter = listServers.begin(); iter != listServers.end(); iter++)
+    {
+        QJsonObject server = iter->toObject();
+        qDebug() << iter.key();
+        qDebug() << server["hostname"].toString();
+        qDebug() << server["modname"].toString();
+        qDebug() << server["players"].toInt();
+        qDebug() << server["max_players"].toInt();
+        qDebug() << server["version"].toString();
+        qDebug() << server["passw"].toBool();
+
+        QVector<ServerData>::Iterator value = std::find_if(model->myData.begin(), model->myData.end(), pattern(iter.key()));
+        if(value == model->myData.end())
+            model->insertRow(0);
+
+        setData(iter.key(), server, model);
+    }
+
+    return true;
+}
+
+bool NetController::updateInfo(QAbstractItemModel *pModel, QModelIndex index)
+{
+    ServerModel *model = ((ServerModel*)pModel);
+
+    bool result;
+    if (index.isValid() && index.row() >= 0)
+        result = downloadInfo(pModel, index);
+    else
+    {
+        for (auto iter = model->myData.begin(); iter != model->myData.end(); iter++)
+        {
+            qDebug() << iter->addr;
+        }
+        model->removeRows(0, model->rowCount(index));
+        result = downloadInfo(pModel, index);
+    }
+    return result;
+}
+
+void NetController::updateInfo()
+{
+    QString data;
+    QString uri = "/api/servers/" + sd->addr;
+    while (true)
+    {
+        data = QString::fromStdString(httpNetwork.getData(uri.toLatin1()));
+        if (!data.isEmpty() && data != "NO_CONTENT" && data != "LOST_CONNECTION")
+            break;
+        RakSleep(30);
+    }
+
+    if(data == "UNKNOWN_ADDRESS")
+    {
+        QMessageBox::critical(0, "Error", "Cannot connect to the master server!");
+        return;
+    }
+
+    qDebug() << "Content: " << data;
+
+    QJsonParseError err;
+    QJsonDocument jsonDocument = QJsonDocument::fromJson(data.toLatin1(), &err);
+
+    QMap<QString, QVariant> map = jsonDocument.toVariant().toMap()["server"].toMap();
+
+    qDebug() << sd->addr;
+    qDebug() << map["hostname"].toString();
+    qDebug() << map["modname"].toString();
+    qDebug() << map["players"].toInt();
+    qDebug() << map["max_players"].toInt();
+    qDebug() << map["version"].toString();
+    qDebug() << map["passw"].toBool();
+
+    sd->hostName = map["hostname"].toString();
+    sd->modName = map["modname"].toString();
+    sd->players = map["players"].toInt();
+    sd->maxPlayers = map["max_players"].toInt();
+
+    if(!sd->addr.contains(":")) 
+        sd->addr.append(":25565");
+    QStringList addr = sd->addr.split(":");
+    sd->ping = PingRakNetServer(addr[0].toLatin1(), addr[1].toUShort());
+    if(sd->ping != PING_UNREACHABLE)
+        sed = getExtendedData(addr[0].toLatin1(), addr[1].toUShort());
+    else
+        qDebug() << "Server is unreachable";
+}
+
+QStringList NetController::players()
+{
+    QStringList listPlayers;
+    for(auto player = sed.players.begin(); player != sed.players.end(); player++)
+        listPlayers.push_back(player->c_str());
+    return listPlayers;
+}
+
+QStringList NetController::plugins()
+{
+    QStringList listPlugins;
+    for(auto plugin = sed.plugins.begin(); plugin != sed.plugins.end(); plugin++)
+        listPlugins.push_back(plugin->c_str());
+    return listPlugins;
+}
+
+void NetController::selectServer(ServerData *pServerData)
+{
+    sd = pServerData;
+}
+
+ServerData *NetController::selectedServer()
+{
+    return sd;
+}
+
diff --git a/apps/browser/NetController.hpp b/apps/browser/NetController.hpp
new file mode 100644
index 000000000..2dd508068
--- /dev/null
+++ b/apps/browser/NetController.hpp
@@ -0,0 +1,42 @@
+//
+// Created by koncord on 07.01.17.
+//
+
+#ifndef NEWLAUNCHER_NETCONTROLLER_HPP
+#define NEWLAUNCHER_NETCONTROLLER_HPP
+
+
+#include "ServerModel.hpp"
+#include "netutils/HTTPNetwork.hpp"
+#include "netutils/Utils.hpp"
+
+struct ServerModel;
+
+class NetController
+{
+public:
+    static NetController *get();
+    static void Create(std::string addr, unsigned short port);
+    static void Destroy();
+    bool updateInfo(QAbstractItemModel *pModel, QModelIndex index= QModelIndex());
+    void updateInfo();
+    QStringList players();
+    QStringList plugins();
+    void selectServer(ServerData *pServerData);
+    ServerData *selectedServer();
+protected:
+    NetController(std::string addr, unsigned short port);
+    ~NetController();
+private:
+    NetController(const NetController &controller);
+    bool downloadInfo(QAbstractItemModel *pModel, QModelIndex index);
+    void setData(QString addr, QJsonObject server, ServerModel *model);
+
+    static NetController *mThis;
+    ServerData *sd;
+    HTTPNetwork httpNetwork;
+    ServerExtendedData sed;
+};
+
+
+#endif //NEWLAUNCHER_NETCONTROLLER_HPP
diff --git a/apps/browser/ServerInfoDialog.cpp b/apps/browser/ServerInfoDialog.cpp
new file mode 100644
index 000000000..5ed4b2a31
--- /dev/null
+++ b/apps/browser/ServerInfoDialog.cpp
@@ -0,0 +1,39 @@
+//
+// Created by koncord on 07.01.17.
+//
+
+#include "qdebug.h"
+#include "NetController.hpp"
+
+#include "ServerInfoDialog.hpp"
+
+ServerInfoDialog::ServerInfoDialog(QWidget *parent): QDialog(parent)
+{
+    setupUi(this);
+    connect(btnRefresh, SIGNAL(clicked()), this, SLOT(refresh()));
+}
+
+ServerInfoDialog::~ServerInfoDialog()
+{
+
+}
+
+void ServerInfoDialog::refresh()
+{
+    NetController::get()->updateInfo();
+    ServerData *sd = NetController::get()->selectedServer();
+    if (sd)
+    {
+        leAddr->setText(sd->addr);
+        lblName->setText(sd->hostName);
+        lblPing->setNum(sd->ping);
+
+        listPlayers->clear();
+        QStringList players = NetController::get()->players();
+        listPlayers->addItems(players);
+        listPlugins->clear();
+        listPlugins->addItems(NetController::get()->plugins());
+
+        lblPlayers->setText(QString::number(players.size()) + " / " + QString::number(sd->maxPlayers));
+    }
+}
diff --git a/apps/browser/ServerInfoDialog.hpp b/apps/browser/ServerInfoDialog.hpp
new file mode 100644
index 000000000..b26b34df5
--- /dev/null
+++ b/apps/browser/ServerInfoDialog.hpp
@@ -0,0 +1,21 @@
+//
+// Created by koncord on 07.01.17.
+//
+
+#ifndef NEWLAUNCHER_SERVERINFODIALOG_HPP
+#define NEWLAUNCHER_SERVERINFODIALOG_HPP
+
+#include "ui_ServerInfo.h"
+
+class ServerInfoDialog : public QDialog,  public Ui::Dialog
+{
+    Q_OBJECT
+public:
+    explicit ServerInfoDialog(QWidget *parent = 0);
+    virtual ~ServerInfoDialog();
+public slots:
+    void refresh();
+};
+
+
+#endif //NEWLAUNCHER_SERVERINFODIALOG_HPP
diff --git a/apps/browser/ServerModel.cpp b/apps/browser/ServerModel.cpp
new file mode 100644
index 000000000..1aaa9e88e
--- /dev/null
+++ b/apps/browser/ServerModel.cpp
@@ -0,0 +1,200 @@
+#include <qmessagebox.h>
+#include "ServerModel.hpp"
+#include <qdebug.h>
+
+ServerModel::ServerModel(QObject *parent) : QAbstractTableModel(parent)
+{
+}
+
+ServerModel::~ServerModel()
+{
+
+}
+
+/*QHash<int, QByteArray> ServerModel::roleNames() const
+{
+    return roles;
+}*/
+
+QVariant ServerModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+    if (index.row() < 0 || index.row() > myData.size())
+        return QVariant();
+
+    const ServerData &sd = myData.at(index.row());
+
+    if(role == Qt::DisplayRole)
+    {
+        QVariant var;
+        switch (index.column())
+        {
+            case ServerData::ADDR:
+                var = sd.addr;
+                break;
+            case ServerData::PASSW:
+                var = sd.needPassw ? "Yes" : "No";
+                break;
+            case ServerData::VERSION:
+                var = sd.version;
+                break;
+            case ServerData::PLAYERS:
+                var = sd.players;
+                break;
+            case ServerData::MAX_PLAYERS:
+                var = sd.maxPlayers;
+                break;
+            case ServerData::HOSTNAME:
+                var = sd.hostName;
+                break;
+            case ServerData::PING:
+                var = sd.ping;
+                break;
+            case ServerData::MODNAME:
+                if(sd.modName.isEmpty())
+                    var = "default";
+                else
+                    var = sd.modName;
+                break;
+        }
+        return var;
+    }
+    return QVariant();
+}
+
+QVariant ServerModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    QVariant var;
+    if (orientation == Qt::Horizontal)
+    {
+        if (role == Qt::SizeHintRole)
+        {
+            /*if(section == ServerData::HOSTNAME)
+                var = QSize(200, 25);*/
+        }
+        else if (role == Qt::DisplayRole)
+        {
+
+            switch (section)
+            {
+                case ServerData::ADDR:
+                    var = "Address";
+                    break;
+                case ServerData::PASSW:
+                    var = "Password";
+                    break;
+                case ServerData::VERSION:
+                    var = "Version";
+                    break;
+                case ServerData::HOSTNAME:
+                    var = "Host name";
+                    break;
+                case ServerData::PLAYERS:
+                    var = "Players";
+                    break;
+                case ServerData::MAX_PLAYERS:
+                    var = "Max players";
+                    break;
+                case ServerData::PING:
+                    var = "Ping";
+                    break;
+                case ServerData::MODNAME:
+                    var = "Game mode";
+            }
+        }
+    }
+    return var;
+}
+
+int ServerModel::rowCount(const QModelIndex &parent) const
+{
+    return myData.size();
+}
+
+int ServerModel::columnCount(const QModelIndex &parent) const
+{
+    return ServerData::LAST;
+}
+
+bool ServerModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (index.isValid() && role == Qt::EditRole)
+    {
+        int row = index.row();
+        int col = index.column();
+
+        ServerData &sd = myData[row];
+        bool ok = true;
+        switch(col)
+        {
+            case ServerData::ADDR:
+                sd.addr = value.toString();
+                ok = !sd.addr.isEmpty();
+                break;
+            case ServerData::PASSW:
+                sd.needPassw = value.toBool();
+                break;
+            case ServerData::VERSION:
+                sd.version = value.toString();
+                ok = !sd.addr.isEmpty();
+                break;
+            case ServerData::PLAYERS:
+                sd.players = value.toInt(&ok);
+                break;
+            case ServerData::MAX_PLAYERS:
+                sd.maxPlayers = value.toInt(&ok);
+                break;
+            case ServerData::HOSTNAME:
+                sd.hostName = value.toString();
+                ok = !sd.addr.isEmpty();
+                break;
+            case ServerData::PING:
+                sd.ping = value.toInt(&ok);
+                break;
+            case ServerData::MODNAME:
+                sd.modName = value.toString();
+                break;
+            default:
+                return false;
+        }
+        if(ok)
+            emit(dataChanged(index, index));
+        return true;
+    }
+    return false;
+}
+
+bool ServerModel::insertRows(int position, int count, const QModelIndex &index)
+{
+    Q_UNUSED(index);
+    beginInsertRows(QModelIndex(), position, position + count - 1);
+
+    for (int row = 0; row < count; ++row) {
+        ServerData sd {"", -1, -1, -1, "", "", false, 0};
+        myData.insert(position, sd);
+    }
+
+    endInsertRows();
+    return true;
+}
+
+bool ServerModel::removeRows(int position, int count, const QModelIndex &parent)
+{
+    if (count == 0)
+        return false;
+
+    beginRemoveRows(parent, position, position + count - 1);
+    myData.erase(myData.begin()+position, myData.begin() + position + count);
+    endRemoveRows();
+
+    return true;
+}
+
+QModelIndex ServerModel::index(int row, int column, const QModelIndex &parent) const
+{
+
+    QModelIndex index = QAbstractTableModel::index(row, column, parent);
+    //qDebug() << "Valid index? " << index.isValid() << "   " << row << "   " << column;
+    return index;
+}
diff --git a/apps/browser/ServerModel.hpp b/apps/browser/ServerModel.hpp
new file mode 100644
index 000000000..78f16501b
--- /dev/null
+++ b/apps/browser/ServerModel.hpp
@@ -0,0 +1,56 @@
+#ifndef SERVERMODEL_FONTMODEL_HPP
+#define SERVERMODEL_FONTMODEL_HPP
+
+#include <QObject>
+#include <vector>
+#include <QString>
+#include <QAbstractTableModel>
+
+struct ServerData
+{
+    QString addr;
+    int players, maxPlayers;
+    int ping;
+    QString hostName;
+    QString modName;
+    bool needPassw;
+    QString version;
+    enum IDS
+    {
+        ADDR,
+        HOSTNAME,
+        PLAYERS,
+        MAX_PLAYERS,
+        PASSW,
+        MODNAME,
+        PING,
+        VERSION,
+        LAST
+    };
+};
+
+class ServerModel: public QAbstractTableModel
+{
+    Q_OBJECT
+public:
+    explicit ServerModel(QObject *parent = 0);
+    ~ServerModel();
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_FINAL;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_FINAL;
+    int columnCount(const QModelIndex &parent) const Q_DECL_FINAL;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_FINAL;
+
+    bool insertRows(int row, int count, const QModelIndex &index = QModelIndex()) Q_DECL_FINAL;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_FINAL;
+
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_FINAL;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_FINAL;
+
+
+public:
+    //QHash<int, QByteArray> roles;
+    QVector<ServerData> myData;
+};
+
+
+#endif //SERVERMODEL_FONTMODEL_HPP
diff --git a/apps/browser/main.cpp b/apps/browser/main.cpp
new file mode 100644
index 000000000..ad54962c1
--- /dev/null
+++ b/apps/browser/main.cpp
@@ -0,0 +1,57 @@
+#include <QApplication>
+#include <components/settings/settings.hpp>
+#include <components/files/configurationmanager.hpp>
+#include "MainWindow.hpp"
+#include "NetController.hpp"
+
+std::string loadSettings (Settings::Manager & settings)
+{
+    Files::ConfigurationManager mCfgMgr;
+    // Create the settings manager and load default settings file
+    const std::string localdefault = (mCfgMgr.getLocalPath() / "tes3mp-client-default.cfg").string();
+    const std::string globaldefault = (mCfgMgr.getGlobalPath() / "tes3mp-client-default.cfg").string();
+
+    // prefer local
+    if (boost::filesystem::exists(localdefault))
+        settings.loadDefault(localdefault);
+    else if (boost::filesystem::exists(globaldefault))
+        settings.loadDefault(globaldefault);
+    else
+        throw std::runtime_error ("No default settings file found! Make sure the file \"tes3mp-client-default.cfg\" was properly installed.");
+
+    // load user settings if they exist
+    const std::string settingspath = (mCfgMgr.getUserConfigPath() / "tes3mp-client.cfg").string();
+    if (boost::filesystem::exists(settingspath))
+        settings.loadUser(settingspath);
+
+    return settingspath;
+}
+
+int main(int argc, char *argv[])
+{
+    Settings::Manager mgr;
+
+    loadSettings(mgr);
+
+    std::string addr = mgr.getString("address", "Master");
+    int port = mgr.getInt("port", "Master");
+
+    // initialize resources, if needed
+    // Q_INIT_RESOURCE(resfile);
+
+    NetController::Create(addr, port);
+    atexit(NetController::Destroy);
+    QApplication app(argc, argv);
+    MainWindow d;
+
+    if (d.refresh())
+    {
+        d.show();
+        return app.exec();
+    }
+    else
+    {
+        app.exit();
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/apps/browser/netutils/HTTPNetwork.cpp b/apps/browser/netutils/HTTPNetwork.cpp
new file mode 100644
index 000000000..b266e6acb
--- /dev/null
+++ b/apps/browser/netutils/HTTPNetwork.cpp
@@ -0,0 +1,99 @@
+//
+// Created by koncord on 07.01.17.
+//
+
+#include <RakPeer.h>
+#include <HTTPConnection2.h>
+#include <TCPInterface.h>
+#include <RakSleep.h>
+
+#include <sstream>
+
+#include "HTTPNetwork.hpp"
+
+using namespace RakNet;
+
+HTTPNetwork::HTTPNetwork(std::string addr, unsigned short port) : address(addr), port(port)
+{
+    httpConnection = HTTPConnection2::GetInstance();
+    tcpInterface = new TCPInterface;
+    tcpInterface->Start(0, 64);
+    tcpInterface->AttachPlugin(httpConnection);
+}
+
+HTTPNetwork::~HTTPNetwork()
+{
+    delete tcpInterface;
+}
+
+std::string HTTPNetwork::answer()
+{
+    RakNet::SystemAddress sa;
+    RakNet::Packet *packet;
+    RakNet::SystemAddress hostReceived;
+    RakNet::RakString response;
+    RakNet::RakString transmitted, hostTransmitted;
+    int contentOffset = 0;
+
+    while (true)
+    {
+        // This is kind of crappy, but for TCP plugins, always do HasCompletedConnectionAttempt,
+        // then Receive(), then HasFailedConnectionAttempt(),HasLostConnection()
+        sa = tcpInterface->HasCompletedConnectionAttempt();
+        if (sa != RakNet::UNASSIGNED_SYSTEM_ADDRESS)
+            printf("Connected to master server: %s\n", sa.ToString());
+
+        sa = tcpInterface->HasFailedConnectionAttempt();
+        if (sa != RakNet::UNASSIGNED_SYSTEM_ADDRESS)
+        {
+            printf("Failed to connect to master server: %s\n", sa.ToString());
+            return "FAIL_CONNECT";
+        }
+        sa = tcpInterface->HasLostConnection();
+        if (sa != RakNet::UNASSIGNED_SYSTEM_ADDRESS)
+        {
+            printf("Lost connection to master server: %s\n", sa.ToString());
+            return "LOST_CONNECTION";
+        }
+
+        for (packet = tcpInterface->Receive(); packet; tcpInterface->DeallocatePacket(
+                packet), packet = tcpInterface->Receive());
+
+        if (httpConnection->GetResponse(transmitted, hostTransmitted, response, hostReceived, contentOffset))
+        {
+            if (contentOffset < 0)
+                return "NO_CONTENT"; // no content
+            tcpInterface->CloseConnection(sa);
+
+            return (response.C_String() + contentOffset);
+        }
+        RakSleep(30);
+    }
+}
+
+std::string HTTPNetwork::getData(const char *uri)
+{
+    RakNet::RakString createRequest = RakNet::RakString::FormatForGET(uri);
+
+    if (!httpConnection->TransmitRequest(createRequest, address.c_str(), port))
+        return "UNKNOWN_ADDRESS";
+    return answer();
+}
+
+std::string HTTPNetwork::getDataPOST(const char *uri, const char* body, const char* contentType)
+{
+    RakNet::RakString createRequest = RakNet::RakString::FormatForPOST(uri, contentType, body);
+
+    if (!httpConnection->TransmitRequest(createRequest, address.c_str(), port))
+        return "UNKNOWN_ADDRESS";
+    return answer();
+}
+
+std::string HTTPNetwork::getDataPUT(const char *uri, const char* body, const char* contentType)
+{
+    RakNet::RakString createRequest = RakNet::RakString::FormatForPUT(uri, contentType, body);
+
+    if (!httpConnection->TransmitRequest(createRequest, address.c_str(), port))
+        return "UNKNOWN_ADDRESS";
+    return answer();
+}
diff --git a/apps/browser/netutils/HTTPNetwork.hpp b/apps/browser/netutils/HTTPNetwork.hpp
new file mode 100644
index 000000000..8597ddcb0
--- /dev/null
+++ b/apps/browser/netutils/HTTPNetwork.hpp
@@ -0,0 +1,35 @@
+//
+// Created by koncord on 07.01.17.
+//
+
+#ifndef NEWLAUNCHER_HTTPNETWORK_HPP
+#define NEWLAUNCHER_HTTPNETWORK_HPP
+
+
+#include <string>
+
+namespace RakNet
+{
+    class TCPInterface;
+    class HTTPConnection2;
+}
+
+class HTTPNetwork
+{
+public:
+    HTTPNetwork(std::string addr, unsigned short port);
+    ~HTTPNetwork();
+    std::string getData(const char *uri);
+    std::string getDataPOST(const char *uri, const char* body,  const char* contentType = "application/json");
+    std::string getDataPUT(const char *uri, const char* body, const char* contentType = "application/json");
+
+protected:
+    RakNet::TCPInterface *tcpInterface;
+    RakNet::HTTPConnection2 *httpConnection;
+    std::string address;
+    unsigned short port;
+    std::string answer();
+};
+
+
+#endif //NEWLAUNCHER_HTTPNETWORK_HPP
diff --git a/apps/browser/netutils/Utils.cpp b/apps/browser/netutils/Utils.cpp
new file mode 100644
index 000000000..0530776ef
--- /dev/null
+++ b/apps/browser/netutils/Utils.cpp
@@ -0,0 +1,156 @@
+//
+// Created by koncord on 07.01.17.
+//
+
+#include <RakPeer.h>
+#include <MessageIdentifiers.h>
+#include <RakSleep.h>
+#include <GetTime.h>
+
+#include <iostream>
+#include <sstream>
+#include <components/openmw-mp/Version.hpp>
+
+#include "Utils.hpp"
+
+using namespace std;
+
+unsigned int PingRakNetServer(const char *addr, unsigned short port)
+{
+    RakNet::Packet *packet;
+    bool done = false;
+    int attempts = 0;
+    RakNet::TimeMS time = PING_UNREACHABLE;
+
+    RakNet::SocketDescriptor socketDescriptor {0, ""};
+    RakNet::RakPeerInterface *peer =  RakNet::RakPeerInterface::GetInstance();
+    peer->Startup(1,&socketDescriptor, 1);
+
+    peer->Ping(addr, port, false);
+    while (!done)
+    {
+        for (packet=peer->Receive(); packet; peer->DeallocatePacket(packet), packet=peer->Receive())
+        {
+            if(packet->data[0] == ID_UNCONNECTED_PONG)
+            {
+                    RakNet::BitStream bsIn(&packet->data[1], packet->length, false);
+                    bsIn.Read(time);
+                    time = RakNet::GetTimeMS() - time - 5;
+                    done = true;
+                    break;
+            }
+        }
+
+        if (attempts >= 60) // wait 300 msec
+            done = true;
+        attempts++;
+        RakSleep(5);
+    }
+
+    peer->Shutdown(0);
+    RakNet::RakPeerInterface::DestroyInstance(peer);
+    return time;
+}
+
+ServerExtendedData getExtendedData(const char *addr, unsigned short port)
+{
+    ServerExtendedData data;
+    RakNet::SocketDescriptor socketDescriptor = {0, ""};
+    RakNet::RakPeerInterface *peer = RakNet::RakPeerInterface::GetInstance();
+    peer->Startup(1, &socketDescriptor, 1);
+
+    stringstream sstr(TES3MP_VERSION);
+    sstr << TES3MP_PROTO_VERSION;
+
+    std::string msg = "";
+
+    if (peer->Connect(addr, port, sstr.str().c_str(), (int)(sstr.str().size()), 0, 0, 3, 500, 0) != RakNet::CONNECTION_ATTEMPT_STARTED)
+        msg = "Connection attempt failed.\n";
+
+
+    int queue = 0;
+    while (queue == 0)
+    {
+        for (RakNet::Packet *packet = peer->Receive(); packet; peer->DeallocatePacket(
+                packet), packet = peer->Receive())
+        {
+            switch (packet->data[0])
+            {
+                case ID_CONNECTION_ATTEMPT_FAILED:
+                {
+                    msg = "Connection failed.\n"
+                            "Either the IP address is wrong or a firewall on either system is blocking\n"
+                            "UDP packets on the port you have chosen.";
+                    queue = -1;
+                    break;
+                }
+                case ID_INVALID_PASSWORD:
+                {
+                    msg = "Connection failed.\n"
+                            "The client or server is outdated.\n";
+                    queue = -1;
+                    break;
+                }
+                case ID_CONNECTION_REQUEST_ACCEPTED:
+                {
+                    msg = "Connection accepted.\n";
+                    queue = 1;
+                    break;
+                }
+                case ID_DISCONNECTION_NOTIFICATION:
+                    throw runtime_error("ID_DISCONNECTION_NOTIFICATION.\n");
+                case ID_CONNECTION_BANNED:
+                    throw runtime_error("ID_CONNECTION_BANNED.\n");
+                case ID_CONNECTION_LOST:
+                    throw runtime_error("ID_CONNECTION_LOST.\n");
+                default:
+                    printf("Connection message with identifier %i has arrived in initialization.\n", packet->data[0]);
+            }
+        }
+    }
+    puts(msg.c_str());
+
+    if(queue == -1) // connection is failed
+        return data;
+
+    {
+        RakNet::BitStream bs;
+        bs.Write((unsigned char) (ID_USER_PACKET_ENUM + 1));
+        peer->Send(&bs, HIGH_PRIORITY, RELIABLE_ORDERED, 0, RakNet::UNASSIGNED_SYSTEM_ADDRESS, true);
+    }
+
+    RakNet::Packet *packet;
+    bool done = false;
+    while (!done)
+    {
+        for (packet = peer->Receive(); packet; peer->DeallocatePacket(packet), packet = peer->Receive())
+        {
+            if(packet->data[0] == (ID_USER_PACKET_ENUM+1))
+            {
+                RakNet::BitStream bs(packet->data, packet->length, false);
+                bs.IgnoreBytes(1);
+                size_t length = 0;
+                bs.Read(length);
+                for(int i = 0; i < length; i++)
+                {
+                    RakNet::RakString str;
+                    bs.Read(str);
+                    data.players.push_back(str.C_String());
+                }
+                bs.Read(length);
+                for(int i = 0; i < length; i++)
+                {
+                    RakNet::RakString str;
+                    bs.Read(str);
+                    data.plugins.push_back(str.C_String());
+                }
+                done = true;
+            }
+        }
+    }
+
+    peer->Shutdown(0);
+    RakSleep(10);
+    RakNet::RakPeerInterface::DestroyInstance(peer);
+    return data;
+}
diff --git a/apps/browser/netutils/Utils.hpp b/apps/browser/netutils/Utils.hpp
new file mode 100644
index 000000000..1be5b788b
--- /dev/null
+++ b/apps/browser/netutils/Utils.hpp
@@ -0,0 +1,24 @@
+//
+// Created by koncord on 07.01.17.
+//
+
+#ifndef NEWLAUNCHER_PING_HPP
+#define NEWLAUNCHER_PING_HPP
+
+#include <vector>
+#include <string>
+
+
+#define PING_UNREACHABLE 999
+
+unsigned int PingRakNetServer(const char *addr, unsigned short port);
+
+struct ServerExtendedData
+{
+    std::vector<std::string> players;
+    std::vector<std::string> plugins;
+};
+
+ServerExtendedData getExtendedData(const char *addr, unsigned short port);
+
+#endif //NEWLAUNCHER_PING_HPP
diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index be90afec3..6d2b59ad9 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -5,6 +5,7 @@
 #include <map>
 #include <set>
 #include <fstream>
+#include <cmath>
 
 #include <boost/program_options.hpp>
 
@@ -354,12 +355,12 @@ int load(Arguments& info)
             esm.getRecHeader(flags);
 
             EsmTool::RecordBase *record = EsmTool::RecordBase::create(n);
-            if (record == 0) 
+            if (record == 0)
             {
-                if (std::find(skipped.begin(), skipped.end(), n.val) == skipped.end())
+                if (std::find(skipped.begin(), skipped.end(), n.intval) == skipped.end())
                 {
                     std::cout << "Skipping " << n.toString() << " records." << std::endl;
-                    skipped.push_back(n.val);
+                    skipped.push_back(n.intval);
                 }
 
                 esm.skipRecord();
@@ -391,20 +392,20 @@ int load(Arguments& info)
                 record->print();
             }
 
-            if (record->getType().val == ESM::REC_CELL && loadCells && interested) 
+            if (record->getType().intval == ESM::REC_CELL && loadCells && interested)
             {
                 loadCell(record->cast<ESM::Cell>()->get(), esm, info);
             }
 
-            if (save) 
+            if (save)
             {
                 info.data.mRecords.push_back(record);
-            } 
-            else 
+            }
+            else
             {
                 delete record;
             }
-            ++info.data.mRecordStats[n.val];
+            ++info.data.mRecordStats[n.intval];
         }
 
     } catch(std::exception &e) {
@@ -442,23 +443,18 @@ int clone(Arguments& info)
     size_t recordCount = info.data.mRecords.size();
 
     int digitCount = 1; // For a nicer output
-    if (recordCount > 9) ++digitCount;
-    if (recordCount > 99) ++digitCount;
-    if (recordCount > 999) ++digitCount;
-    if (recordCount > 9999) ++digitCount;
-    if (recordCount > 99999) ++digitCount;
-    if (recordCount > 999999) ++digitCount;
+    if (recordCount > 0)
+        digitCount = (int)std::log10(recordCount) + 1;
 
     std::cout << "Loaded " << recordCount << " records:" << std::endl << std::endl;
 
-    ESM::NAME name;
-
     int i = 0;
     typedef std::map<int, int> Stats;
     Stats &stats = info.data.mRecordStats;
     for (Stats::iterator it = stats.begin(); it != stats.end(); ++it)
     {
-        name.val = it->first;
+        ESM::NAME name;
+        name.intval = it->first;
         int amount = it->second;
         std::cout << std::setw(digitCount) << amount << " " << name.toString() << "  ";
 
@@ -491,12 +487,12 @@ int clone(Arguments& info)
     for (Records::iterator it = records.begin(); it != records.end() && i > 0; ++it)
     {
         EsmTool::RecordBase *record = *it;
-        name.val = record->getType().val;
+        const ESM::NAME& typeName = record->getType();
 
-        esm.startRecord(name.toString(), record->getFlags());
+        esm.startRecord(typeName.toString(), record->getFlags());
 
         record->save(esm);
-        if (name.val == ESM::REC_CELL) {
+        if (typeName.intval == ESM::REC_CELL) {
             ESM::Cell *ptr = &record->cast<ESM::Cell>()->get();
             if (!info.data.mCellRefs[ptr].empty()) {
                 typedef std::deque<std::pair<ESM::CellRef, bool> > RefList;
@@ -508,7 +504,7 @@ int clone(Arguments& info)
             }
         }
 
-        esm.endRecord(name.toString());
+        esm.endRecord(typeName.toString());
 
         saved++;
         int perc = (int)((saved / (float)recordCount)*100);
diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp
index d7cbea73b..3123308ef 100644
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@@ -179,7 +179,7 @@ RecordBase::create(ESM::NAME type)
 {
     RecordBase *record = 0;
 
-    switch (type.val) {
+    switch (type.intval) {
     case ESM::REC_ACTI:
     {
         record = new EsmTool::Record<ESM::Activator>;
@@ -494,7 +494,7 @@ void Record<ESM::Book>::print()
     std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
     std::cout << "  Value: " << mData.mData.mValue << std::endl;
     std::cout << "  IsScroll: " << mData.mData.mIsScroll << std::endl;
-    std::cout << "  SkillID: " << mData.mData.mSkillID << std::endl;
+    std::cout << "  SkillId: " << mData.mData.mSkillId << std::endl;
     std::cout << "  Enchantment Points: " << mData.mData.mEnchant << std::endl;
     if (mPrintPlain)
     {
diff --git a/apps/essimporter/CMakeLists.txt b/apps/essimporter/CMakeLists.txt
index 84e31dad9..93f53d0e8 100644
--- a/apps/essimporter/CMakeLists.txt
+++ b/apps/essimporter/CMakeLists.txt
@@ -42,3 +42,7 @@ if (BUILD_WITH_CODE_COVERAGE)
   add_definitions (--coverage)
   target_link_libraries(openmw-essimporter gcov)
 endif()
+
+if (WIN32)
+  INSTALL(TARGETS openmw-essimporter RUNTIME DESTINATION ".")
+endif(WIN32)
diff --git a/apps/essimporter/convertacdt.cpp b/apps/essimporter/convertacdt.cpp
index 8f090b3fc..5c2bcc402 100644
--- a/apps/essimporter/convertacdt.cpp
+++ b/apps/essimporter/convertacdt.cpp
@@ -1,3 +1,9 @@
+#include <string>
+#include <iostream>
+#include <limits>
+
+#include <components/misc/stringops.hpp>
+
 #include "convertacdt.hpp"
 
 namespace ESSImport
@@ -49,4 +55,49 @@ namespace ESSImport
         npcStats.mTimeToStartDrowning = actorData.mACDT.mBreathMeter;
     }
 
+    void convertANIS (const ANIS& anis, ESM::AnimationState& state)
+    {
+        static const char* animGroups[] =
+        {
+            "Idle", "Idle2", "Idle3", "Idle4", "Idle5", "Idle6", "Idle7", "Idle8", "Idle9", "Idlehh", "Idle1h", "Idle2c",
+            "Idle2w", "IdleSwim", "IdleSpell", "IdleCrossbow", "IdleSneak", "IdleStorm", "Torch", "Hit1", "Hit2", "Hit3",
+            "Hit4", "Hit5", "SwimHit1", "SwimHit2", "SwimHit3", "Death1", "Death2", "Death3", "Death4", "Death5",
+            "DeathKnockDown", "DeathKnockOut", "KnockDown", "KnockOut", "SwimDeath", "SwimDeath2", "SwimDeath3",
+            "SwimDeathKnockDown", "SwimDeathKnockOut", "SwimKnockOut", "SwimKnockDown", "SwimWalkForward",
+            "SwimWalkBack", "SwimWalkLeft", "SwimWalkRight", "SwimRunForward", "SwimRunBack", "SwimRunLeft",
+            "SwimRunRight", "SwimTurnLeft", "SwimTurnRight", "WalkForward", "WalkBack", "WalkLeft", "WalkRight",
+            "TurnLeft", "TurnRight", "RunForward", "RunBack", "RunLeft", "RunRight", "SneakForward", "SneakBack",
+            "SneakLeft", "SneakRight", "Jump", "WalkForwardhh", "WalkBackhh", "WalkLefthh", "WalkRighthh",
+            "TurnLefthh", "TurnRighthh", "RunForwardhh", "RunBackhh", "RunLefthh", "RunRighthh", "SneakForwardhh",
+            "SneakBackhh", "SneakLefthh", "SneakRighthh", "Jumphh", "WalkForward1h", "WalkBack1h", "WalkLeft1h",
+            "WalkRight1h", "TurnLeft1h", "TurnRight1h", "RunForward1h", "RunBack1h", "RunLeft1h", "RunRight1h",
+            "SneakForward1h", "SneakBack1h", "SneakLeft1h", "SneakRight1h", "Jump1h", "WalkForward2c", "WalkBack2c",
+            "WalkLeft2c", "WalkRight2c", "TurnLeft2c", "TurnRight2c", "RunForward2c", "RunBack2c", "RunLeft2c",
+            "RunRight2c", "SneakForward2c", "SneakBack2c", "SneakLeft2c", "SneakRight2c", "Jump2c", "WalkForward2w",
+            "WalkBack2w", "WalkLeft2w", "WalkRight2w", "TurnLeft2w", "TurnRight2w", "RunForward2w", "RunBack2w",
+            "RunLeft2w", "RunRight2w", "SneakForward2w", "SneakBack2w", "SneakLeft2w", "SneakRight2w", "Jump2w",
+            "SpellCast", "SpellTurnLeft", "SpellTurnRight", "Attack1", "Attack2", "Attack3", "SwimAttack1",
+            "SwimAttack2", "SwimAttack3", "HandToHand", "Crossbow", "BowAndArrow", "ThrowWeapon", "WeaponOneHand",
+            "WeaponTwoHand", "WeaponTwoWide", "Shield", "PickProbe", "InventoryHandToHand", "InventoryWeaponOneHand",
+            "InventoryWeaponTwoHand", "InventoryWeaponTwoWide"
+        };
+
+        if (anis.mGroupIndex < (sizeof(animGroups) / sizeof(*animGroups)))
+        {
+            std::string group(animGroups[anis.mGroupIndex]);
+            Misc::StringUtils::lowerCaseInPlace(group);
+
+            ESM::AnimationState::ScriptedAnimation scriptedAnim;
+            scriptedAnim.mGroup = group;
+            scriptedAnim.mTime = anis.mTime;
+            scriptedAnim.mAbsolute = true;
+            // Neither loop count nor queueing seems to be supported by the ess format.
+            scriptedAnim.mLoopCount = std::numeric_limits<size_t>::max();
+            state.mScriptedAnims.push_back(scriptedAnim);
+        }
+        else
+            // TODO: Handle 0xFF index, which seems to be used for finished animations.
+            std::cerr << "unknown animation group index: " << static_cast<unsigned int>(anis.mGroupIndex) << std::endl;
+    }
+
 }
diff --git a/apps/essimporter/convertacdt.hpp b/apps/essimporter/convertacdt.hpp
index bc9a7bd00..4059dd1af 100644
--- a/apps/essimporter/convertacdt.hpp
+++ b/apps/essimporter/convertacdt.hpp
@@ -4,6 +4,7 @@
 #include <components/esm/creaturestats.hpp>
 #include <components/esm/npcstats.hpp>
 #include <components/esm/loadskil.hpp>
+#include <components/esm/animationstate.hpp>
 
 #include "importacdt.hpp"
 
@@ -18,6 +19,8 @@ namespace ESSImport
     void convertACSC (const ACSC& acsc, ESM::CreatureStats& cStats);
 
     void convertNpcData (const ActorData& actorData, ESM::NpcStats& npcStats);
+
+    void convertANIS (const ANIS& anis, ESM::AnimationState& state);
 }
 
 #endif
diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp
index afd0ef131..a428a8c71 100644
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@@ -34,6 +34,9 @@ namespace
             objstate.mCount = 0;
         convertSCRI(cellref.mSCRI, objstate.mLocals);
         objstate.mHasLocals = !objstate.mLocals.mVariables.empty();
+
+        if (cellref.mHasANIS)
+            convertANIS(cellref.mANIS, objstate.mAnimationState);
     }
 
     bool isIndexedRefId(const std::string& indexedRefId)
diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp
index 81b2bec14..e4985f993 100644
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@@ -121,7 +121,7 @@ public:
         {
             mContext->mPlayer.mObject.mCreatureStats.mLevel = npc.mNpdt52.mLevel;
             mContext->mPlayerBase = npc;
-            std::map<int, float> empty;
+            ESM::SpellState::SpellParams empty;
             // FIXME: player start spells and birthsign spells aren't listed here,
             // need to fix openmw to account for this
             for (std::vector<std::string>::const_iterator it = npc.mSpells.mList.begin(); it != npc.mSpells.mList.end(); ++it)
@@ -202,7 +202,7 @@ public:
         bool isDeleted = false;
 
         book.load(esm, isDeleted);
-        if (book.mData.mSkillID == -1)
+        if (book.mData.mSkillId == -1)
             mContext->mPlayer.mObject.mNpcStats.mUsedIds.push_back(Misc::StringUtils::lowerCase(book.mId));
 
         mRecords[book.mId] = book;
@@ -271,23 +271,34 @@ private:
 class ConvertPCDT : public Converter
 {
 public:
-    ConvertPCDT() : mFirstPersonCam(true) {}
+    ConvertPCDT()
+        : mFirstPersonCam(true),
+          mTeleportingEnabled(true),
+          mLevitationEnabled(true)
+    {}
 
     virtual void read(ESM::ESMReader &esm)
     {
         PCDT pcdt;
         pcdt.load(esm);
 
-        convertPCDT(pcdt, mContext->mPlayer, mContext->mDialogueState.mKnownTopics, mFirstPersonCam);
+        convertPCDT(pcdt, mContext->mPlayer, mContext->mDialogueState.mKnownTopics, mFirstPersonCam, mTeleportingEnabled, mLevitationEnabled, mContext->mControlsState);
     }
     virtual void write(ESM::ESMWriter &esm)
     {
+        esm.startRecord(ESM::REC_ENAB);
+        esm.writeHNT("TELE", mTeleportingEnabled);
+        esm.writeHNT("LEVT", mLevitationEnabled);
+        esm.endRecord(ESM::REC_ENAB);
+
         esm.startRecord(ESM::REC_CAM_);
         esm.writeHNT("FIRS", mFirstPersonCam);
         esm.endRecord(ESM::REC_CAM_);
     }
 private:
     bool mFirstPersonCam;
+    bool mTeleportingEnabled;
+    bool mLevitationEnabled;
 };
 
 class ConvertCNTC : public Converter
diff --git a/apps/essimporter/convertplayer.cpp b/apps/essimporter/convertplayer.cpp
index 5718201f7..4a4a9a573 100644
--- a/apps/essimporter/convertplayer.cpp
+++ b/apps/essimporter/convertplayer.cpp
@@ -5,7 +5,7 @@
 namespace ESSImport
 {
 
-    void convertPCDT(const PCDT& pcdt, ESM::Player& out, std::vector<std::string>& outDialogueTopics, bool& firstPersonCam)
+    void convertPCDT(const PCDT& pcdt, ESM::Player& out, std::vector<std::string>& outDialogueTopics, bool& firstPersonCam, bool& teleportingEnabled, bool& levitationEnabled, ESM::ControlsState& controls)
     {
         out.mBirthsign = pcdt.mBirthsign;
         out.mObject.mNpcStats.mBounty = pcdt.mBounty;
@@ -17,24 +17,72 @@ namespace ESSImport
             faction.mReputation = it->mReputation;
             out.mObject.mNpcStats.mFactions[Misc::StringUtils::lowerCase(it->mFactionName.toString())] = faction;
         }
+        for (int i=0; i<3; ++i)
+            out.mObject.mNpcStats.mSpecIncreases[i] = pcdt.mPNAM.mSpecIncreases[i];
         for (int i=0; i<8; ++i)
             out.mObject.mNpcStats.mSkillIncrease[i] = pcdt.mPNAM.mSkillIncreases[i];
         for (int i=0; i<27; ++i)
             out.mObject.mNpcStats.mSkills[i].mProgress = pcdt.mPNAM.mSkillProgress[i];
         out.mObject.mNpcStats.mLevelProgress = pcdt.mPNAM.mLevelProgress;
 
-        if (pcdt.mPNAM.mDrawState & PCDT::DrawState_Weapon)
+        if (pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_WeaponDrawn)
             out.mObject.mCreatureStats.mDrawState = 1;
-        if (pcdt.mPNAM.mDrawState & PCDT::DrawState_Spell)
+        if (pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_SpellDrawn)
             out.mObject.mCreatureStats.mDrawState = 2;
 
-        firstPersonCam = (pcdt.mPNAM.mCameraState == PCDT::CameraState_FirstPerson);
+        firstPersonCam = !(pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_ThirdPerson);
+        teleportingEnabled = !(pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_TeleportingDisabled);
+        levitationEnabled = !(pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_LevitationDisabled);
 
         for (std::vector<std::string>::const_iterator it = pcdt.mKnownDialogueTopics.begin();
              it != pcdt.mKnownDialogueTopics.end(); ++it)
         {
             outDialogueTopics.push_back(Misc::StringUtils::lowerCase(*it));
         }
+
+        controls.mViewSwitchDisabled = pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_ViewSwitchDisabled;
+        controls.mControlsDisabled = pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_ControlsDisabled;
+        controls.mJumpingDisabled = pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_JumpingDisabled;
+        controls.mLookingDisabled = pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_LookingDisabled;
+        controls.mVanityModeDisabled = pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_VanityModeDisabled;
+        controls.mWeaponDrawingDisabled = pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_WeaponDrawingDisabled;
+        controls.mSpellDrawingDisabled = pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_SpellDrawingDisabled;
+
+        if (pcdt.mHasMark)
+        {
+            out.mHasMark = 1;
+
+            const PCDT::PNAM::MarkLocation& mark = pcdt.mPNAM.mMarkLocation;
+
+            ESM::CellId cell;
+            cell.mWorldspace = ESM::CellId::sDefaultWorldspace;
+            cell.mPaged = true;
+
+            cell.mIndex.mX = mark.mCellX;
+            cell.mIndex.mY = mark.mCellY;
+
+            // TODO: Figure out a better way to detect interiors. (0, 0) is a valid exterior cell.
+            if (mark.mCellX == 0 && mark.mCellY == 0)
+            {
+                cell.mWorldspace = pcdt.mMNAM;
+                cell.mPaged = false;
+            }
+
+            out.mMarkedCell = cell;
+            out.mMarkedPosition.pos[0] = mark.mX;
+            out.mMarkedPosition.pos[1] = mark.mY;
+            out.mMarkedPosition.pos[2] = mark.mZ;
+            out.mMarkedPosition.rot[0] = out.mMarkedPosition.rot[1] = 0.0f;
+            out.mMarkedPosition.rot[2] = mark.mRotZ;
+        }
+
+        if (pcdt.mHasENAM)
+        {
+            const int cellSize = 8192;
+            out.mLastKnownExteriorPosition[0] = (pcdt.mENAM.mCellX + 0.5f) * cellSize;
+            out.mLastKnownExteriorPosition[1] = (pcdt.mENAM.mCellY + 0.5f) * cellSize;
+            out.mLastKnownExteriorPosition[2] = 0.0f;
+        }
     }
 
 }
diff --git a/apps/essimporter/convertplayer.hpp b/apps/essimporter/convertplayer.hpp
index f6731eed7..1d2fdc87a 100644
--- a/apps/essimporter/convertplayer.hpp
+++ b/apps/essimporter/convertplayer.hpp
@@ -4,11 +4,12 @@
 #include "importplayer.hpp"
 
 #include <components/esm/player.hpp>
+#include <components/esm/controlsstate.hpp>
 
 namespace ESSImport
 {
 
-    void convertPCDT(const PCDT& pcdt, ESM::Player& out, std::vector<std::string>& outDialogueTopics, bool& firstPersonCam);
+    void convertPCDT(const PCDT& pcdt, ESM::Player& out, std::vector<std::string>& outDialogueTopics, bool& firstPersonCam, bool& teleportingEnabled, bool& levitationEnabled, ESM::ControlsState& controls);
 
 }
 
diff --git a/apps/essimporter/importacdt.cpp b/apps/essimporter/importacdt.cpp
index 239c46698..0ddd2eb64 100644
--- a/apps/essimporter/importacdt.cpp
+++ b/apps/essimporter/importacdt.cpp
@@ -75,7 +75,7 @@ namespace ESSImport
         // unsure at which point between TGTN and CRED
         if (esm.isNextSub("AADT"))
         {
-            // occured when a creature was in the middle of its attack, 44 bytes
+            // occurred when a creature was in the middle of its attack, 44 bytes
             esm.skipHSub();
         }
 
@@ -123,8 +123,13 @@ namespace ESSImport
 
         if (esm.isNextSub("ND3D"))
             esm.skipHSub();
+
+        mHasANIS = false;
         if (esm.isNextSub("ANIS"))
-            esm.skipHSub();
+        {
+            mHasANIS = true;
+            esm.getHT(mANIS);
+        }
     }
 
 }
diff --git a/apps/essimporter/importacdt.hpp b/apps/essimporter/importacdt.hpp
index eacb2edf1..bf48d1f78 100644
--- a/apps/essimporter/importacdt.hpp
+++ b/apps/essimporter/importacdt.hpp
@@ -55,6 +55,12 @@ namespace ESSImport
         unsigned char mCorpseClearCountdown; // hours?
         unsigned char mUnknown3[71];
     };
+    struct ANIS
+    {
+        unsigned char mGroupIndex;
+        unsigned char mUnknown[3];
+        float mTime;
+    };
 #pragma pack(pop)
 
     struct ActorData : public ESM::CellRef
@@ -77,6 +83,9 @@ namespace ESSImport
 
         SCRI mSCRI;
 
+        bool mHasANIS;
+        ANIS mANIS; // scripted animation state
+
         void load(ESM::ESMReader& esm);
     };
 
diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 3d94f2b90..a420d08da 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -51,6 +51,7 @@ namespace
         {
             for (int x=0; x<128; ++x)
             {
+                assert(image->data(x,y));
                 *(image->data(x,y)+2) = *it++;
                 *(image->data(x,y)+1) = *it++;
                 *image->data(x,y) = *it++;
@@ -322,14 +323,14 @@ namespace ESSImport
             ESM::NAME n = esm.getRecName();
             esm.getRecHeader();
 
-            std::map<unsigned int, boost::shared_ptr<Converter> >::iterator it = converters.find(n.val);
+            std::map<unsigned int, boost::shared_ptr<Converter> >::iterator it = converters.find(n.intval);
             if (it != converters.end())
             {
                 it->second->read(esm);
             }
             else
             {
-                if (unknownRecords.insert(n.val).second)
+                if (unknownRecords.insert(n.intval).second)
                 {
                     std::ios::fmtflags f(std::cerr.flags());
                     std::cerr << "unknown record " << n.toString() << " (0x" << std::hex << esm.getFileOffset() << ")" << std::endl;
@@ -422,6 +423,10 @@ namespace ESSImport
         writer.startRecord (ESM::REC_DIAS);
         context.mDialogueState.save(writer);
         writer.endRecord(ESM::REC_DIAS);
+
+        writer.startRecord(ESM::REC_INPU);
+        context.mControlsState.save(writer);
+        writer.endRecord(ESM::REC_INPU);
     }
 
 
diff --git a/apps/essimporter/importercontext.hpp b/apps/essimporter/importercontext.hpp
index c93dff269..0ad73c267 100644
--- a/apps/essimporter/importercontext.hpp
+++ b/apps/essimporter/importercontext.hpp
@@ -9,6 +9,7 @@
 #include <components/esm/globalmap.hpp>
 #include <components/esm/loadcrea.hpp>
 #include <components/esm/loadnpc.hpp>
+#include <components/esm/controlsstate.hpp>
 
 #include "importnpcc.hpp"
 #include "importcrec.hpp"
@@ -32,6 +33,8 @@ namespace ESSImport
 
         ESM::DialogueState mDialogueState;
 
+        ESM::ControlsState mControlsState;
+
         // cells which should show an explored overlay on the global map
         std::set<std::pair<int, int> > mExploredCells;
 
@@ -59,10 +62,14 @@ namespace ESSImport
             playerCellId.mPaged = true;
             playerCellId.mIndex.mX = playerCellId.mIndex.mY = 0;
             mPlayer.mCellId = playerCellId;
-            //mPlayer.mLastKnownExteriorPosition
-            mPlayer.mHasMark = 0; // TODO
+            mPlayer.mLastKnownExteriorPosition[0]
+                = mPlayer.mLastKnownExteriorPosition[1]
+                = mPlayer.mLastKnownExteriorPosition[2]
+                = 0.0f;
+            mPlayer.mHasMark = 0;
             mPlayer.mCurrentCrimeId = 0; // TODO
             mPlayer.mObject.blank();
+            mPlayer.mObject.mEnabled = true;
             mPlayer.mObject.mRef.mRefID = "player"; // REFR.mRefID would be PlayerSaveGame
 
             mGlobalMapState.mBounds.mMinX = 0;
diff --git a/apps/essimporter/importinventory.cpp b/apps/essimporter/importinventory.cpp
index 3ec640d3d..2c87a9a19 100644
--- a/apps/essimporter/importinventory.cpp
+++ b/apps/essimporter/importinventory.cpp
@@ -21,13 +21,18 @@ namespace ESSImport
             item.mCount = contItem.mCount;
             item.mRelativeEquipmentSlot = -1;
 
-            // seems that a stack of items can have a set of subrecords for each item? rings0000.ess
-            // doesn't make any sense to me, if the values were different then the items shouldn't stack in the first place?
-            // I guess we should double check the stacking logic in OpenMW
-            for (int i=0;i<std::abs(item.mCount);++i)
+            unsigned int itemCount = std::abs(item.mCount);
+            bool separateStacks = false;
+            for (unsigned int i=0;i<itemCount;++i)
             {
-                if (esm.isNextSub("XIDX")) // index in the stack?
-                    esm.skipHSub();
+                bool newStack = esm.isNextSub("XIDX");
+                if (newStack)
+                {
+                    unsigned int idx;
+                    esm.getHT(idx);
+                    separateStacks = true;
+                    item.mCount = 1;
+                }
 
                 item.mSCRI.load(esm);
 
@@ -38,9 +43,13 @@ namespace ESSImport
                 int charge=-1;
                 esm.getHNOT(charge, "XHLT");
                 item.mChargeInt = charge;
+
+                if (newStack)
+                    mItems.push_back(item);
             }
 
-            mItems.push_back(item);
+            if (!separateStacks)
+                mItems.push_back(item);
         }
 
         // equipped items
diff --git a/apps/essimporter/importplayer.cpp b/apps/essimporter/importplayer.cpp
index 9845ab072..8c275a286 100644
--- a/apps/essimporter/importplayer.cpp
+++ b/apps/essimporter/importplayer.cpp
@@ -23,9 +23,12 @@ namespace ESSImport
             mKnownDialogueTopics.push_back(esm.getHString());
         }
 
+        mHasMark = false;
         if (esm.isNextSub("MNAM"))
-            esm.skipHSub(); // If this field is here it seems to specify the interior cell the player is in,
-                            // but it's not always here, so it's kinda useless
+        {
+            mHasMark = true;
+            mMNAM = esm.getHString();
+        }
 
         esm.getHNT(mPNAM, "PNAM");
 
@@ -34,6 +37,14 @@ namespace ESSImport
         if (esm.isNextSub("NAM9"))
             esm.skipHSub();
 
+        // Rest state. You shouldn't even be able to save during rest, but skip just in case.
+        if (esm.isNextSub("RNAM"))
+            /*
+                int hoursLeft;
+                float x, y, z; // resting position
+            */
+            esm.skipHSub(); // 16 bytes
+
         mBounty = 0;
         esm.getHNOT(mBounty, "CNAM");
 
@@ -50,8 +61,12 @@ namespace ESSImport
         if (esm.isNextSub("NAM3"))
             esm.skipHSub();
 
+        mHasENAM = false;
         if (esm.isNextSub("ENAM"))
-            esm.skipHSub();
+        {
+            mHasENAM = true;
+            esm.getHT(mENAM);
+        }
 
         if (esm.isNextSub("LNAM"))
             esm.skipHSub();
@@ -63,12 +78,19 @@ namespace ESSImport
             mFactions.push_back(fnam);
         }
 
-        if (esm.isNextSub("AADT"))
-            esm.skipHSub(); // 44 bytes, no clue
+        mHasAADT = false;
+        if (esm.isNextSub("AADT")) // Attack animation data?
+        {
+            mHasAADT = true;
+            esm.getHT(mAADT);
+        }
 
         if (esm.isNextSub("KNAM"))
             esm.skipHSub(); // assigned Quick Keys, I think
 
+        if (esm.isNextSub("ANIS"))
+            esm.skipHSub(); // 16 bytes
+
         if (esm.isNextSub("WERE"))
         {
             // some werewolf data, 152 bytes
@@ -76,10 +98,6 @@ namespace ESSImport
             esm.getSubHeader();
             esm.skip(152);
         }
-
-        // unsure if before or after WERE
-        if (esm.isNextSub("ANIS"))
-            esm.skipHSub();
     }
 
 }
diff --git a/apps/essimporter/importplayer.hpp b/apps/essimporter/importplayer.hpp
index bc6b94be2..924522383 100644
--- a/apps/essimporter/importplayer.hpp
+++ b/apps/essimporter/importplayer.hpp
@@ -38,15 +38,23 @@ struct PCDT
 
     std::vector<std::string> mKnownDialogueTopics;
 
-    enum DrawState_
+    enum PlayerFlags
     {
-        DrawState_Weapon = 0x80,
-        DrawState_Spell = 0x100
-    };
-    enum CameraState
-    {
-        CameraState_FirstPerson = 0x8,
-        CameraState_ThirdPerson = 0xa
+        PlayerFlags_ViewSwitchDisabled = 0x1,
+        PlayerFlags_ControlsDisabled = 0x4,
+        PlayerFlags_Sleeping = 0x10,
+        PlayerFlags_Waiting = 0x40,
+        PlayerFlags_WeaponDrawn = 0x80,
+        PlayerFlags_SpellDrawn = 0x100,
+        PlayerFlags_InJail = 0x200,
+        PlayerFlags_JumpingDisabled = 0x1000,
+        PlayerFlags_LookingDisabled = 0x2000,
+        PlayerFlags_VanityModeDisabled = 0x4000,
+        PlayerFlags_WeaponDrawingDisabled = 0x8000,
+        PlayerFlags_SpellDrawingDisabled = 0x10000,
+        PlayerFlags_ThirdPerson = 0x20000,
+        PlayerFlags_TeleportingDisabled = 0x40000,
+        PlayerFlags_LevitationDisabled = 0x80000
     };
 
 #pragma pack(push)
@@ -63,18 +71,53 @@ struct PCDT
 
     struct PNAM
     {
-        short mDrawState; // DrawState
-        short mCameraState; // CameraState
+        struct MarkLocation
+        {
+            float mX, mY, mZ; // worldspace position
+            float mRotZ; // Z angle in radians
+            int mCellX, mCellY; // grid coordinates; for interior cells this is always (0, 0)
+        };
+
+        int mPlayerFlags; // controls, camera and draw state
         unsigned int mLevelProgress;
         float mSkillProgress[27]; // skill progress, non-uniform scaled
         unsigned char mSkillIncreases[8]; // number of skill increases for each attribute
-        unsigned char mUnknown3[88];
+        int mTelekinesisRangeBonus; // in units; seems redundant
+        float mVisionBonus; // range: <0.0, 1.0>; affected by light spells and Get/Mod/SetPCVisionBonus
+        int mDetectKeyMagnitude; // seems redundant
+        int mDetectEnchantmentMagnitude; // seems redundant
+        int mDetectAnimalMagnitude; // seems redundant
+        MarkLocation mMarkLocation;
+        unsigned char mUnknown3[40];
+        unsigned char mSpecIncreases[3]; // number of skill increases for each specialization
+        unsigned char mUnknown4;
+    };
+
+    struct ENAM
+    {
+        int mCellX;
+        int mCellY;
+    };
+
+    struct AADT // 44 bytes
+    {
+        int animGroupIndex; // See convertANIS() for the mapping.
+        unsigned char mUnknown5[40];
     };
 #pragma pack(pop)
 
     std::vector<FNAM> mFactions;
     PNAM mPNAM;
 
+    bool mHasMark;
+    std::string mMNAM; // mark cell name; can also be sDefaultCellname or region name
+
+    bool mHasENAM;
+    ENAM mENAM; // last exterior cell
+
+    bool mHasAADT;
+    AADT mAADT;
+
     void load(ESM::ESMReader& esm);
 };
 
diff --git a/apps/essimporter/importscri.hpp b/apps/essimporter/importscri.hpp
index 5123f84aa..fe68e5051 100644
--- a/apps/essimporter/importscri.hpp
+++ b/apps/essimporter/importscri.hpp
@@ -13,7 +13,7 @@ namespace ESM
 namespace ESSImport
 {
 
-    /// Local variable assigments for a running script
+    /// Local variable assignments for a running script
     struct SCRI
     {
         std::string mScript;
diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index 207f6a84b..8cbe18d51 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -87,6 +87,10 @@ add_executable(openmw-launcher
     ${UI_HDRS}
 )
 
+if (WIN32)
+    INSTALL(TARGETS openmw-launcher RUNTIME DESTINATION ".")
+endif (WIN32)
+
 target_link_libraries(openmw-launcher
     ${SDL2_LIBRARY_ONLY}
     components
diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp
index eadec64d0..96cadc8a7 100644
--- a/apps/launcher/main.cpp
+++ b/apps/launcher/main.cpp
@@ -35,14 +35,6 @@ int main(int argc, char *argv[])
         // Now we make sure the current dir is set to application path
         QDir dir(QCoreApplication::applicationDirPath());
 
-        #ifdef Q_OS_MAC
-        if (dir.dirName() == "MacOS") {
-            dir.cdUp();
-            dir.cdUp();
-            dir.cdUp();
-        }
-        #endif
-
         QDir::setCurrent(dir.absolutePath());
 
         Launcher::MainDialog mainWin;
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 60ae5b3a0..1c1d57016 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -293,6 +293,7 @@ bool Launcher::MainDialog::setupGameSettings()
 {
     mGameSettings.clear();
 
+    QString localPath = QString::fromUtf8(mCfgMgr.getLocalPath().string().c_str());
     QString userPath = QString::fromUtf8(mCfgMgr.getUserConfigPath().string().c_str());
     QString globalPath = QString::fromUtf8(mCfgMgr.getGlobalPath().string().c_str());
 
@@ -320,13 +321,13 @@ bool Launcher::MainDialog::setupGameSettings()
     // Now the rest - priority: user > local > global
     QStringList paths;
     paths.append(globalPath + QString("openmw.cfg"));
-    paths.append(QString("openmw.cfg"));
+    paths.append(localPath + QString("openmw.cfg"));
     paths.append(userPath + QString("openmw.cfg"));
 
-    foreach (const QString &path, paths) {
-        qDebug() << "Loading config file:" << path.toUtf8().constData();
+    foreach (const QString &path2, paths) {
+        qDebug() << "Loading config file:" << path2.toUtf8().constData();
 
-        QFile file(path);
+        file.setFileName(path2);
         if (file.exists()) {
             if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
                 cfgError(tr("Error opening OpenMW configuration file"),
@@ -346,13 +347,13 @@ bool Launcher::MainDialog::setupGameSettings()
     QStringList dataDirs;
 
     // Check if the paths actually contain data files
-    foreach (const QString path, mGameSettings.getDataDirs()) {
-        QDir dir(path);
+    foreach (const QString path3, mGameSettings.getDataDirs()) {
+        QDir dir(path3);
         QStringList filters;
         filters << "*.esp" << "*.esm" << "*.omwgame" << "*.omwaddon";
 
         if (!dir.entryList(filters).isEmpty())
-            dataDirs.append(path);
+            dataDirs.append(path3);
     }
 
     if (dataDirs.isEmpty())
@@ -579,6 +580,6 @@ void Launcher::MainDialog::play()
 
     // Launch the game detached
 
-    if (mGameInvoker->startProcess(QLatin1String("openmw"), true))
+    if (mGameInvoker->startProcess(QLatin1String("tes3mp-browser"), true))
         return qApp->quit();
 }
diff --git a/apps/mwiniimporter/CMakeLists.txt b/apps/mwiniimporter/CMakeLists.txt
index 4024c0b42..4bd661685 100644
--- a/apps/mwiniimporter/CMakeLists.txt
+++ b/apps/mwiniimporter/CMakeLists.txt
@@ -22,7 +22,8 @@ target_link_libraries(openmw-iniimporter
 if (WIN32)
     target_link_libraries(openmw-iniimporter
     ${Boost_LOCALE_LIBRARY})
-endif()
+    INSTALL(TARGETS openmw-iniimporter RUNTIME DESTINATION ".")
+endif(WIN32)
 
 if (MINGW)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -municode")
diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index f2fcdb711..fb3144814 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -824,8 +824,8 @@ void MwIniImporter::importArchives(multistrmap &cfg, const multistrmap &ini) con
     // does not appears in the ini file
     cfg["fallback-archive"].push_back("Morrowind.bsa");
 
-    for(std::vector<std::string>::const_iterator it=archives.begin(); it!=archives.end(); ++it) {
-        cfg["fallback-archive"].push_back(*it);
+    for(std::vector<std::string>::const_iterator iter=archives.begin(); iter!=archives.end(); ++iter) {
+        cfg["fallback-archive"].push_back(*iter);
     }
 }
 
@@ -865,8 +865,8 @@ void MwIniImporter::importGameFiles(multistrmap &cfg, const multistrmap &ini, co
 
     // this will sort files by time order first, then alphabetical (maybe), I suspect non ASCII filenames will be stuffed.
     sort(contentFiles.begin(), contentFiles.end());
-    for(std::vector<std::pair<std::time_t, std::string> >::const_iterator it=contentFiles.begin(); it!=contentFiles.end(); ++it) {
-        cfg["content"].push_back(it->second);
+    for(std::vector<std::pair<std::time_t, std::string> >::const_iterator iter=contentFiles.begin(); iter!=contentFiles.end(); ++iter) {
+        cfg["content"].push_back(iter->second);
     }
 }
 
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 0bde541bf..e7e19be94 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -26,7 +26,7 @@ opencs_units_noqt (model/world
     universalid record commands columnbase columnimp scriptcontext cell refidcollection
     refidadapter refiddata refidadapterimp ref collectionbase refcollection columns infocollection tablemimedata cellcoordinates cellselection resources resourcesmanager scope
     pathgrid landtexture land nestedtablewrapper nestedcollection nestedcoladapterimp nestedinfocollection
-    idcompletionmanager metadata defaultgmsts
+    idcompletionmanager metadata defaultgmsts infoselectwrapper commandmacro
     )
 
 opencs_hdrs_noqt (model/world
@@ -35,14 +35,14 @@ opencs_hdrs_noqt (model/world
 
 
 opencs_units (model/tools
-    tools reportmodel mergeoperation 
+    tools reportmodel mergeoperation
     )
 
 opencs_units_noqt (model/tools
     mandatoryid skillcheck classcheck factioncheck racecheck soundcheck regioncheck
     birthsigncheck spellcheck referencecheck referenceablecheck scriptcheck bodypartcheck
     startscriptcheck search searchoperation searchstage pathgridcheck soundgencheck magiceffectcheck
-    mergestages gmstcheck
+    mergestages gmstcheck topicinfocheck journalcheck
     )
 
 opencs_hdrs_noqt (model/tools
@@ -66,8 +66,8 @@ opencs_hdrs_noqt (view/doc
 
 
 opencs_units (view/world
-    table tablesubview scriptsubview util regionmapsubview tablebottombox creator genericcreator
-    cellcreator referenceablecreator startscriptcreator referencecreator scenesubview
+    table tablesubview scriptsubview util regionmapsubview tablebottombox creator genericcreator globalcreator
+    cellcreator pathgridcreator referenceablecreator startscriptcreator referencecreator scenesubview
     infocreator scriptedit dialoguesubview previewsubview regionmap dragrecordtable nestedtable
     dialoguespinbox recordbuttonbar tableeditidaction scripterrortable extendedcommandconfigurator
     )
@@ -85,12 +85,14 @@ opencs_units (view/widget
 
 opencs_units (view/render
     scenewidget worldspacewidget pagedworldspacewidget unpagedworldspacewidget
-    previewwidget editmode instancemode instanceselectionmode
+    previewwidget editmode instancemode instanceselectionmode instancemovemode
+    orbitcameramode pathgridmode selectionmode pathgridselectionmode cameracontroller
+    cellwater
     )
 
 opencs_units_noqt (view/render
-    lighting lightingday lightingnight
-    lightingbright object cell terrainstorage tagbase cellarrow
+    lighting lightingday lightingnight lightingbright object cell terrainstorage tagbase
+    cellarrow cellmarker cellborder pathgrid
     )
 
 opencs_hdrs_noqt (view/render
@@ -107,11 +109,12 @@ opencs_units_noqt (view/tools
     )
 
 opencs_units (view/prefs
-    dialogue pagebase page
+    dialogue pagebase page keybindingpage
     )
 
 opencs_units (model/prefs
-    state setting intsetting doublesetting boolsetting enumsetting coloursetting
+    state setting intsetting doublesetting boolsetting enumsetting coloursetting shortcut
+    shortcuteventhandler shortcutmanager shortcutsetting modifiersetting
     )
 
 opencs_units_noqt (model/prefs
@@ -159,9 +162,15 @@ endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 if(APPLE)
-    set (OPENCS_MAC_ICON ${CMAKE_SOURCE_DIR}/files/mac/openmw-cs.icns)
+    set (OPENCS_MAC_ICON "${CMAKE_SOURCE_DIR}/files/mac/openmw-cs.icns")
+    set (OPENCS_CFG "${OpenMW_BINARY_DIR}/openmw-cs.cfg")
+    set (OPENCS_DEFAULT_FILTERS_FILE "${OpenMW_BINARY_DIR}/resources/defaultfilters")
+    set (OPENCS_OPENMW_CFG "${OpenMW_BINARY_DIR}/openmw.cfg")
 else()
     set (OPENCS_MAC_ICON "")
+    set (OPENCS_CFG "")
+    set (OPENCS_DEFAULT_FILTERS_FILE "")
+    set (OPENCS_OPENMW_CFG "")
 endif(APPLE)
 
 add_executable(openmw-cs
@@ -171,12 +180,23 @@ add_executable(openmw-cs
     ${OPENCS_MOC_SRC}
     ${OPENCS_RES_SRC}
     ${OPENCS_MAC_ICON}
+    ${OPENCS_CFG}
+    ${OPENCS_DEFAULT_FILTERS_FILE}
+    ${OPENCS_OPENMW_CFG}
 )
 
 if(APPLE)
+    set(OPENCS_BUNDLE_NAME "OpenMW-CS")
+    set(OPENCS_BUNDLE_RESOURCES_DIR "${OpenMW_BINARY_DIR}/${OPENCS_BUNDLE_NAME}.app/Contents/Resources")
+
+    set(OPENMW_MYGUI_FILES_ROOT ${OPENCS_BUNDLE_RESOURCES_DIR})
+    set(OPENMW_SHADERS_ROOT ${OPENCS_BUNDLE_RESOURCES_DIR})
+
+    add_subdirectory(../../files/ ${CMAKE_CURRENT_BINARY_DIR}/files)
+
     set_target_properties(openmw-cs PROPERTIES
         RUNTIME_OUTPUT_DIRECTORY "${OpenMW_BINARY_DIR}"
-        OUTPUT_NAME "OpenMW-CS"
+        OUTPUT_NAME ${OPENCS_BUNDLE_NAME}
         MACOSX_BUNDLE_ICON_FILE "openmw-cs.icns"
         MACOSX_BUNDLE_BUNDLE_NAME "OpenCS"
         MACOSX_BUNDLE_GUI_IDENTIFIER "org.openmw.opencs"
@@ -187,16 +207,27 @@ if(APPLE)
 
     set_source_files_properties(${OPENCS_MAC_ICON} PROPERTIES
         MACOSX_PACKAGE_LOCATION Resources)
+    set_source_files_properties(${OPENCS_CFG} PROPERTIES
+        MACOSX_PACKAGE_LOCATION Resources)
+    set_source_files_properties(${OPENCS_DEFAULT_FILTERS_FILE} PROPERTIES
+        MACOSX_PACKAGE_LOCATION Resources/resources)
+    set_source_files_properties(${OPENCS_OPENMW_CFG} PROPERTIES
+        MACOSX_PACKAGE_LOCATION Resources)
+
+    add_custom_command(TARGET openmw-cs
+        POST_BUILD
+        COMMAND cp "${OpenMW_BINARY_DIR}/resources/version" "${OPENCS_BUNDLE_RESOURCES_DIR}/resources")
 endif(APPLE)
 
 target_link_libraries(openmw-cs
     ${OSG_LIBRARIES}
     ${OPENTHREADS_LIBRARIES}
+    ${OSGTEXT_LIBRARIES}
     ${OSGUTIL_LIBRARIES}
     ${OSGVIEWER_LIBRARIES}
     ${OSGGA_LIBRARIES}
     ${OSGFX_LIBRARIES}
-    ${OSGQT_LIBRARIES}
+    ${EXTERN_OSGQT_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
@@ -219,9 +250,18 @@ endif()
 
 if (WIN32)
     target_link_libraries(openmw-cs ${Boost_LOCALE_LIBRARY})
+    INSTALL(TARGETS openmw-cs RUNTIME DESTINATION ".")
+    INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-cs.cfg" DESTINATION ".")
 endif()
 
+if (MSVC)
+    # Debug version needs increased number of sections beyond 2^16
+    if (CMAKE_CL_64)
+        set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
+    endif (CMAKE_CL_64)
+endif (MSVC)
+
 
 if(APPLE)
-    INSTALL(TARGETS openmw-cs BUNDLE DESTINATION OpenMW COMPONENT BUNDLE)
+    INSTALL(TARGETS openmw-cs BUNDLE DESTINATION "." COMPONENT BUNDLE)
 endif()
diff --git a/apps/opencs/Networking.cpp b/apps/opencs/Networking.cpp
new file mode 100644
index 000000000..c6fe34835
--- /dev/null
+++ b/apps/opencs/Networking.cpp
@@ -0,0 +1,90 @@
+#include "editor.hpp"
+
+#include <exception>
+#include <iostream>
+#include <string>
+
+#include <QApplication>
+#include <QIcon>
+#include <QMetaType>
+
+#include "model/doc/messages.hpp"
+
+#include "model/world/universalid.hpp"
+
+#ifdef Q_OS_MAC
+#include <QDir>
+#endif
+
+Q_DECLARE_METATYPE (std::string)
+
+class Application : public QApplication
+{
+    private:
+
+        bool notify (QObject *receiver, QEvent *event)
+        {
+            try
+            {
+                return QApplication::notify (receiver, event);
+            }
+            catch (const std::exception& exception)
+            {
+                std::cerr << "An exception has been caught: " << exception.what() << std::endl;
+            }
+
+            return false;
+        }
+
+    public:
+
+        Application (int& argc, char *argv[]) : QApplication (argc, argv) {}
+};
+
+int main(int argc, char *argv[])
+{
+    #ifdef Q_OS_MAC
+        setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
+    #endif
+
+    try
+    {
+        // To allow background thread drawing in OSG
+        QApplication::setAttribute(Qt::AA_X11InitThreads, true);
+
+        Q_INIT_RESOURCE (resources);
+
+        qRegisterMetaType<std::string> ("std::string");
+        qRegisterMetaType<CSMWorld::UniversalId> ("CSMWorld::UniversalId");
+        qRegisterMetaType<CSMDoc::Message> ("CSMDoc::Message");
+
+        Application application (argc, argv);
+
+    #ifdef Q_OS_MAC
+        QDir dir(QCoreApplication::applicationDirPath());
+        if (dir.dirName() == "MacOS") {
+            dir.cdUp();
+            dir.cdUp();
+            dir.cdUp();
+        }
+        QDir::setCurrent(dir.absolutePath());
+    #endif
+
+        application.setWindowIcon (QIcon (":./openmw-cs.png"));
+
+        CS::Editor editor;
+
+        if(!editor.makeIPCServer())
+        {
+            editor.connectToIPCServer();
+            return 0;
+        }
+        return editor.run();
+    }
+    catch (std::exception& e)
+    {
+        std::cerr << "ERROR: " << e.what() << std::endl;
+        return 0;
+    }
+
+}
diff --git a/apps/opencs/main.cpp b/apps/opencs/main.cpp
index c6fe34835..fc5e8fc7a 100644
--- a/apps/opencs/main.cpp
+++ b/apps/opencs/main.cpp
@@ -62,11 +62,6 @@ int main(int argc, char *argv[])
 
     #ifdef Q_OS_MAC
         QDir dir(QCoreApplication::applicationDirPath());
-        if (dir.dirName() == "MacOS") {
-            dir.cdUp();
-            dir.cdUp();
-            dir.cdUp();
-        }
         QDir::setCurrent(dir.absolutePath());
     #endif
 
diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 19891363f..87fbccb3f 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -274,7 +274,7 @@ CSMDoc::Document::Document (const VFS::Manager* vfs, const Files::ConfigurationM
     const Fallback::Map* fallback,
     ToUTF8::FromType encoding, const CSMWorld::ResourcesManager& resourcesManager,
     const std::vector<std::string>& blacklistedScripts)
-: mVFS(vfs), mSavePath (savePath), mContentFiles (files), mNew (new_), mData (encoding, resourcesManager, fallback),
+: mVFS(vfs), mSavePath (savePath), mContentFiles (files), mNew (new_), mData (encoding, resourcesManager, fallback, resDir),
   mTools (*this, encoding),
   mProjectPath ((configuration.getUserDataPath() / "projects") /
   (savePath.filename().string() + ".project")),
diff --git a/apps/opencs/model/doc/documentmanager.cpp b/apps/opencs/model/doc/documentmanager.cpp
index cbb255ebb..87fb960c1 100644
--- a/apps/opencs/model/doc/documentmanager.cpp
+++ b/apps/opencs/model/doc/documentmanager.cpp
@@ -41,6 +41,7 @@ CSMDoc::DocumentManager::DocumentManager (const Files::ConfigurationManager& con
 CSMDoc::DocumentManager::~DocumentManager()
 {
     mLoaderThread.quit();
+    mLoader.stop();
     mLoader.hasThingsToDo().wakeAll();
     mLoaderThread.wait();
 
diff --git a/apps/opencs/model/doc/loader.cpp b/apps/opencs/model/doc/loader.cpp
index 166e6f3db..44d6883ef 100644
--- a/apps/opencs/model/doc/loader.cpp
+++ b/apps/opencs/model/doc/loader.cpp
@@ -1,6 +1,6 @@
 #include "loader.hpp"
 
-#include <QTimer>
+#include <iostream>
 
 #include "../tools/reportmodel.hpp"
 
@@ -11,11 +11,12 @@ CSMDoc::Loader::Stage::Stage() : mFile (0), mRecordsLoaded (0), mRecordsLeft (fa
 
 
 CSMDoc::Loader::Loader()
+    : mShouldStop(false)
 {
-    QTimer *timer = new QTimer (this);
+    mTimer = new QTimer (this);
 
-    connect (timer, SIGNAL (timeout()), this, SLOT (load()));
-    timer->start();
+    connect (mTimer, SIGNAL (timeout()), this, SLOT (load()));
+    mTimer->start();
 }
 
 QWaitCondition& CSMDoc::Loader::hasThingsToDo()
@@ -23,6 +24,11 @@ QWaitCondition& CSMDoc::Loader::hasThingsToDo()
     return mThingsToDo;
 }
 
+void CSMDoc::Loader::stop()
+{
+    mShouldStop = true;
+}
+
 void CSMDoc::Loader::load()
 {
     if (mDocuments.empty())
@@ -30,6 +36,10 @@ void CSMDoc::Loader::load()
         mMutex.lock();
         mThingsToDo.wait (&mMutex);
         mMutex.unlock();
+
+        if (mShouldStop)
+            mTimer->stop();
+
         return;
     }
 
@@ -63,11 +73,11 @@ void CSMDoc::Loader::load()
             CSMWorld::UniversalId log (CSMWorld::UniversalId::Type_LoadErrorLog, 0);
 
             { // silence a g++ warning
-            for (CSMDoc::Messages::Iterator iter (messages.begin());
-                iter!=messages.end(); ++iter)
+            for (CSMDoc::Messages::Iterator messageIter (messages.begin());
+                messageIter!=messages.end(); ++messageIter)
             {
-                document->getReport (log)->add (*iter);
-                emit loadMessage (document, iter->mMessage);
+                document->getReport (log)->add (*messageIter);
+                emit loadMessage (document, messageIter->mMessage);
             }
             }
 
diff --git a/apps/opencs/model/doc/loader.hpp b/apps/opencs/model/doc/loader.hpp
index d1ee38f9f..ce5bc5848 100644
--- a/apps/opencs/model/doc/loader.hpp
+++ b/apps/opencs/model/doc/loader.hpp
@@ -5,6 +5,7 @@
 
 #include <QObject>
 #include <QMutex>
+#include <QTimer>
 #include <QWaitCondition>
 
 namespace CSMDoc
@@ -28,12 +29,17 @@ namespace CSMDoc
             QWaitCondition mThingsToDo;
             std::vector<std::pair<Document *, Stage> > mDocuments;
 
+            QTimer* mTimer;
+            bool mShouldStop;
+
         public:
 
             Loader();
 
             QWaitCondition& hasThingsToDo();
 
+            void stop();
+
         private slots:
 
             void load();
diff --git a/apps/opencs/model/doc/runner.cpp b/apps/opencs/model/doc/runner.cpp
index 5a0bc39be..84bc61a9a 100644
--- a/apps/opencs/model/doc/runner.cpp
+++ b/apps/opencs/model/doc/runner.cpp
@@ -81,7 +81,7 @@ void CSMDoc::Runner::start (bool delayed)
         arguments << ("--script-run="+mStartup->fileName());;
 
         arguments <<
-            QString::fromUtf8 (("--data="+mProjectPath.parent_path().string()).c_str());
+            QString::fromUtf8 (("--data=\""+mProjectPath.parent_path().string()+"\"").c_str());
 
         for (std::vector<std::string>::const_iterator iter (mContentFiles.begin());
             iter!=mContentFiles.end(); ++iter)
diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index af9c380a3..82a965ae4 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -11,6 +11,7 @@
 #include <components/misc/stringops.hpp>
 
 #include "../world/infocollection.hpp"
+#include "../world/cellcoordinates.hpp"
 
 #include "document.hpp"
 #include "savingstate.hpp"
@@ -238,7 +239,7 @@ void CSMDoc::CollectionReferencesStage::perform (int stage, Messages& messages)
             // An empty mOriginalCell is meant to indicate that it is the same as
             // the current cell.  It is possible that a moved ref is moved again.
             if ((record.get().mOriginalCell.empty() ?
-                    record.get().mCell : record.get().mOriginalCell) != stream.str() && !interior)
+                    record.get().mCell : record.get().mOriginalCell) != stream.str() && !interior && record.mState!=CSMWorld::RecordBase::State_ModifiedOnly && !record.get().mNew)
                 indices.push_back (i);
             else
                 indices.push_front (i);
@@ -265,13 +266,32 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
     std::map<std::string, std::deque<int> >::const_iterator references =
         mState.getSubRecords().find (Misc::StringUtils::lowerCase (cell.get().mId));
 
-    if (cell.isModified() || 
+    if (cell.isModified() ||
         cell.mState == CSMWorld::RecordBase::State_Deleted ||
         references!=mState.getSubRecords().end())
     {
         CSMWorld::Cell cellRecord = cell.get();
         bool interior = cellRecord.mId.substr (0, 1)!="#";
 
+        // count new references and adjust RefNumCount accordingsly
+        int newRefNum = cellRecord.mRefNumCounter;
+
+        if (references!=mState.getSubRecords().end())
+        {
+            for (std::deque<int>::const_iterator iter (references->second.begin());
+                iter!=references->second.end(); ++iter)
+            {
+                const CSMWorld::Record<CSMWorld::CellRef>& ref =
+                    mDocument.getData().getReferences().getRecord (*iter);
+
+                if (ref.get().mNew ||
+                    (!interior && ref.mState==CSMWorld::RecordBase::State_ModifiedOnly &&
+                    /// \todo consider worldspace
+                    CSMWorld::CellCoordinates (ref.get().getCellIndex()).getId("")!=ref.get().mCell))
+                    ++cellRecord.mRefNumCounter;
+            }
+        }
+
         // write cell data
         writer.startRecord (cellRecord.sRecordId);
 
@@ -301,6 +321,10 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
                 {
                     CSMWorld::CellRef refRecord = ref.get();
 
+                    // Check for uninitialized content file
+                    if (!refRecord.mRefNum.hasContentFile())
+                        refRecord.mRefNum.mContentFile = 0;
+
                     // recalculate the ref's cell location
                     std::ostringstream stream;
                     if (!interior)
@@ -309,11 +333,18 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
                         stream << "#" << index.first << " " << index.second;
                     }
 
-                    // An empty mOriginalCell is meant to indicate that it is the same as
-                    // the current cell.  It is possible that a moved ref is moved again.
-                    if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell)
+                    if (refRecord.mNew ||
+                        (!interior && ref.mState==CSMWorld::RecordBase::State_ModifiedOnly &&
+                        refRecord.mCell!=stream.str()))
+                    {
+                        refRecord.mRefNum.mIndex = newRefNum++;
+                    }
+                    else if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell)
                             != stream.str() && !interior)
                     {
+                        // An empty mOriginalCell is meant to indicate that it is the same as
+                        // the current cell.  It is possible that a moved ref is moved again.
+
                         ESM::MovedCellRef moved;
                         moved.mRefNum = refRecord.mRefNum;
 
@@ -350,7 +381,7 @@ int CSMDoc::WritePathgridCollectionStage::setup()
 void CSMDoc::WritePathgridCollectionStage::perform (int stage, Messages& messages)
 {
     ESM::ESMWriter& writer = mState.getWriter();
-    const CSMWorld::Record<CSMWorld::Pathgrid>& pathgrid = 
+    const CSMWorld::Record<CSMWorld::Pathgrid>& pathgrid =
         mDocument.getData().getPathgrids().getRecord (stage);
 
     if (pathgrid.isModified() || pathgrid.mState == CSMWorld::RecordBase::State_Deleted)
@@ -386,7 +417,7 @@ int CSMDoc::WriteLandCollectionStage::setup()
 void CSMDoc::WriteLandCollectionStage::perform (int stage, Messages& messages)
 {
     ESM::ESMWriter& writer = mState.getWriter();
-    const CSMWorld::Record<CSMWorld::Land>& land = 
+    const CSMWorld::Record<CSMWorld::Land>& land =
         mDocument.getData().getLand().getRecord (stage);
 
     if (land.isModified() || land.mState == CSMWorld::RecordBase::State_Deleted)
@@ -412,7 +443,7 @@ int CSMDoc::WriteLandTextureCollectionStage::setup()
 void CSMDoc::WriteLandTextureCollectionStage::perform (int stage, Messages& messages)
 {
     ESM::ESMWriter& writer = mState.getWriter();
-    const CSMWorld::Record<CSMWorld::LandTexture>& landTexture = 
+    const CSMWorld::Record<CSMWorld::LandTexture>& landTexture =
         mDocument.getData().getLandTextures().getRecord (stage);
 
     if (landTexture.isModified() || landTexture.mState == CSMWorld::RecordBase::State_Deleted)
diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp
index 7936a1ae2..c0c089169 100644
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@@ -313,7 +313,7 @@ boost::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseNAry (const Token& ke
 
         nodes.push_back (node);
 
-        Token token = getNextToken();
+        token = getNextToken();
 
         if (!token || (token.mType!=Token::Type_Close && token.mType!=Token::Type_Comma))
         {
diff --git a/apps/opencs/model/prefs/doublesetting.cpp b/apps/opencs/model/prefs/doublesetting.cpp
index 7c247777d..531196174 100644
--- a/apps/opencs/model/prefs/doublesetting.cpp
+++ b/apps/opencs/model/prefs/doublesetting.cpp
@@ -15,10 +15,16 @@
 CSMPrefs::DoubleSetting::DoubleSetting (Category *parent, Settings::Manager *values,
   QMutex *mutex, const std::string& key, const std::string& label, double default_)
 : Setting (parent, values, mutex, key, label),
-  mMin (0), mMax (std::numeric_limits<double>::max()),
+  mPrecision(2), mMin (0), mMax (std::numeric_limits<double>::max()),
   mDefault (default_)
 {}
 
+CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setPrecision(int precision)
+{
+    mPrecision = precision;
+    return *this;
+}
+
 CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setRange (double min, double max)
 {
     mMin = min;
@@ -49,6 +55,7 @@ std::pair<QWidget *, QWidget *> CSMPrefs::DoubleSetting::makeWidgets (QWidget *p
     QLabel *label = new QLabel (QString::fromUtf8 (getLabel().c_str()), parent);
 
     QDoubleSpinBox *widget = new QDoubleSpinBox (parent);
+    widget->setDecimals(mPrecision);
     widget->setRange (mMin, mMax);
     widget->setValue (mDefault);
 
diff --git a/apps/opencs/model/prefs/doublesetting.hpp b/apps/opencs/model/prefs/doublesetting.hpp
index 3868f014e..8fd345f4d 100644
--- a/apps/opencs/model/prefs/doublesetting.hpp
+++ b/apps/opencs/model/prefs/doublesetting.hpp
@@ -9,6 +9,7 @@ namespace CSMPrefs
     {
             Q_OBJECT
 
+            int mPrecision;
             double mMin;
             double mMax;
             std::string mTooltip;
@@ -20,6 +21,8 @@ namespace CSMPrefs
                 QMutex *mutex, const std::string& key, const std::string& label,
                 double default_);
 
+            DoubleSetting& setPrecision (int precision);
+
             // defaults to [0, std::numeric_limits<double>::max()]
             DoubleSetting& setRange (double min, double max);
 
diff --git a/apps/opencs/model/prefs/modifiersetting.cpp b/apps/opencs/model/prefs/modifiersetting.cpp
new file mode 100644
index 000000000..4f4fac248
--- /dev/null
+++ b/apps/opencs/model/prefs/modifiersetting.cpp
@@ -0,0 +1,147 @@
+#include "modifiersetting.hpp"
+
+#include <QEvent>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QMouseEvent>
+#include <QPushButton>
+#include <QWidget>
+
+#include "state.hpp"
+#include "shortcutmanager.hpp"
+
+namespace CSMPrefs
+{
+    ModifierSetting::ModifierSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
+        const std::string& label)
+        : Setting(parent, values, mutex, key, label)
+        , mButton(0)
+        , mEditorActive(false)
+    {
+    }
+
+    std::pair<QWidget*, QWidget*> ModifierSetting::makeWidgets(QWidget* parent)
+    {
+        int modifier = 0;
+        State::get().getShortcutManager().getModifier(getKey(), modifier);
+
+        QString text = QString::fromUtf8(State::get().getShortcutManager().convertToString(modifier).c_str());
+
+        QLabel* label = new QLabel(QString::fromUtf8(getLabel().c_str()), parent);
+        QPushButton* widget = new QPushButton(text, parent);
+
+        widget->setCheckable(true);
+        widget->installEventFilter(this);
+        mButton = widget;
+
+        connect(widget, SIGNAL(toggled(bool)), this, SLOT(buttonToggled(bool)));
+
+        return std::make_pair(label, widget);
+    }
+
+    bool ModifierSetting::eventFilter(QObject* target, QEvent* event)
+    {
+        if (event->type() == QEvent::KeyPress)
+        {
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            if (keyEvent->isAutoRepeat())
+                return true;
+
+            int mod = keyEvent->modifiers();
+            int key = keyEvent->key();
+
+            return handleEvent(target, mod, key);
+        }
+        else if (event->type() == QEvent::MouseButtonPress)
+        {
+            QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
+            int mod = mouseEvent->modifiers();
+            int button = mouseEvent->button();
+
+            return handleEvent(target, mod, button);
+        }
+        else if (event->type() == QEvent::FocusOut)
+        {
+            resetState();
+        }
+
+        return false;
+    }
+
+    bool ModifierSetting::handleEvent(QObject* target, int mod, int value)
+    {
+        // For potential future exceptions
+        const int Blacklist[] =
+        {
+            0
+        };
+
+        const size_t BlacklistSize = sizeof(Blacklist) / sizeof(int);
+
+        if (!mEditorActive)
+        {
+            if (value == Qt::RightButton)
+            {
+                // Clear modifier
+                int modifier = 0;
+                storeValue(modifier);
+
+                resetState();
+            }
+
+            return false;
+        }
+
+        // Handle blacklist
+        for (size_t i = 0; i < BlacklistSize; ++i)
+        {
+            if (value == Blacklist[i])
+                return true;
+        }
+
+
+        // Update modifier
+        int modifier = value;
+        storeValue(modifier);
+
+        resetState();
+
+        return true;
+    }
+
+    void ModifierSetting::storeValue(int modifier)
+    {
+        State::get().getShortcutManager().setModifier(getKey(), modifier);
+
+        // Convert to string and assign
+        std::string value = State::get().getShortcutManager().convertToString(modifier);
+
+        {
+            QMutexLocker lock(getMutex());
+            getValues().setString(getKey(), getParent()->getKey(), value);
+        }
+
+        getParent()->getState()->update(*this);
+    }
+
+    void ModifierSetting::resetState()
+    {
+        mButton->setChecked(false);
+        mEditorActive = false;
+
+        // Button text
+        int modifier = 0;
+        State::get().getShortcutManager().getModifier(getKey(), modifier);
+
+        QString text = QString::fromUtf8(State::get().getShortcutManager().convertToString(modifier).c_str());
+        mButton->setText(text);
+    }
+
+    void ModifierSetting::buttonToggled(bool checked)
+    {
+        if (checked)
+            mButton->setText("Press keys or click here...");
+
+        mEditorActive = checked;
+    }
+}
diff --git a/apps/opencs/model/prefs/modifiersetting.hpp b/apps/opencs/model/prefs/modifiersetting.hpp
new file mode 100644
index 000000000..95983f66d
--- /dev/null
+++ b/apps/opencs/model/prefs/modifiersetting.hpp
@@ -0,0 +1,44 @@
+#ifndef CSM_PREFS_MODIFIERSETTING_H
+#define CSM_PREFS_MODIFIERSETTING_H
+
+#include <QKeySequence>
+
+#include "setting.hpp"
+
+class QEvent;
+class QPushButton;
+
+namespace CSMPrefs
+{
+    class ModifierSetting : public Setting
+    {
+            Q_OBJECT
+
+        public:
+
+            ModifierSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
+                const std::string& label);
+
+            virtual std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent);
+
+        protected:
+
+            bool eventFilter(QObject* target, QEvent* event);
+
+        private:
+
+            bool handleEvent(QObject* target, int mod, int value);
+
+            void storeValue(int modifier);
+            void resetState();
+
+            QPushButton* mButton;
+            bool mEditorActive;
+
+        private slots:
+
+            void buttonToggled(bool checked);
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/prefs/shortcut.cpp b/apps/opencs/model/prefs/shortcut.cpp
new file mode 100644
index 000000000..27077ac83
--- /dev/null
+++ b/apps/opencs/model/prefs/shortcut.cpp
@@ -0,0 +1,214 @@
+#include "shortcut.hpp"
+
+#include <cassert>
+
+#include <QAction>
+#include <QWidget>
+
+#include "state.hpp"
+#include "shortcutmanager.hpp"
+
+namespace CSMPrefs
+{
+    Shortcut::Shortcut(const std::string& name, QWidget* parent)
+        : QObject(parent)
+        , mEnabled(true)
+        , mName(name)
+        , mModName("")
+        , mSecondaryMode(SM_Ignore)
+        , mModifier(0)
+        , mCurrentPos(0)
+        , mLastPos(0)
+        , mActivationStatus(AS_Inactive)
+        , mModifierStatus(false)
+        , mAction(0)
+    {
+        assert (parent);
+
+        State::get().getShortcutManager().addShortcut(this);
+        State::get().getShortcutManager().getSequence(name, mSequence);
+    }
+
+    Shortcut::Shortcut(const std::string& name, const std::string& modName, QWidget* parent)
+        : QObject(parent)
+        , mEnabled(true)
+        , mName(name)
+        , mModName(modName)
+        , mSecondaryMode(SM_Ignore)
+        , mModifier(0)
+        , mCurrentPos(0)
+        , mLastPos(0)
+        , mActivationStatus(AS_Inactive)
+        , mModifierStatus(false)
+        , mAction(0)
+    {
+        assert (parent);
+
+        State::get().getShortcutManager().addShortcut(this);
+        State::get().getShortcutManager().getSequence(name, mSequence);
+        State::get().getShortcutManager().getModifier(modName, mModifier);
+    }
+
+    Shortcut::Shortcut(const std::string& name, const std::string& modName, SecondaryMode secMode, QWidget* parent)
+        : QObject(parent)
+        , mEnabled(true)
+        , mName(name)
+        , mModName(modName)
+        , mSecondaryMode(secMode)
+        , mModifier(0)
+        , mCurrentPos(0)
+        , mLastPos(0)
+        , mActivationStatus(AS_Inactive)
+        , mModifierStatus(false)
+        , mAction(0)
+    {
+        assert (parent);
+
+        State::get().getShortcutManager().addShortcut(this);
+        State::get().getShortcutManager().getSequence(name, mSequence);
+        State::get().getShortcutManager().getModifier(modName, mModifier);
+    }
+
+    Shortcut::~Shortcut()
+    {
+        State::get().getShortcutManager().removeShortcut(this);
+    }
+
+    bool Shortcut::isEnabled() const
+    {
+        return mEnabled;
+    }
+
+    const std::string& Shortcut::getName() const
+    {
+        return mName;
+    }
+
+    const std::string& Shortcut::getModifierName() const
+    {
+        return mModName;
+    }
+
+    Shortcut::SecondaryMode Shortcut::getSecondaryMode() const
+    {
+        return mSecondaryMode;
+    }
+
+    const QKeySequence& Shortcut::getSequence() const
+    {
+        return mSequence;
+    }
+
+    int Shortcut::getModifier() const
+    {
+        return mModifier;
+    }
+
+    int Shortcut::getPosition() const
+    {
+        return mCurrentPos;
+    }
+
+    int Shortcut::getLastPosition() const
+    {
+        return mLastPos;
+    }
+
+    Shortcut::ActivationStatus Shortcut::getActivationStatus() const
+    {
+        return mActivationStatus;
+    }
+
+    bool Shortcut::getModifierStatus() const
+    {
+        return mModifierStatus;
+    }
+
+    void Shortcut::enable(bool state)
+    {
+        mEnabled = state;
+    }
+
+    void Shortcut::setSequence(const QKeySequence& sequence)
+    {
+        mSequence = sequence;
+        mCurrentPos = 0;
+        mLastPos = sequence.count() - 1;
+
+        if (mAction)
+        {
+            mAction->setText(mActionText + "\t" + State::get().getShortcutManager().convertToString(mSequence).data());
+        }
+    }
+
+    void Shortcut::setModifier(int modifier)
+    {
+        mModifier = modifier;
+    }
+
+    void Shortcut::setPosition(int pos)
+    {
+        mCurrentPos = pos;
+    }
+
+    void Shortcut::setActivationStatus(ActivationStatus status)
+    {
+        mActivationStatus = status;
+    }
+
+    void Shortcut::setModifierStatus(bool status)
+    {
+        mModifierStatus = status;
+    }
+
+    void Shortcut::associateAction(QAction* action)
+    {
+        if (mAction)
+        {
+            mAction->setText(mActionText);
+
+            disconnect(this, SIGNAL(activated()), mAction, SLOT(trigger()));
+            disconnect(mAction, SIGNAL(destroyed()), this, SLOT(actionDeleted()));
+        }
+
+        mAction = action;
+
+        if (mAction)
+        {
+            mActionText = mAction->text();
+            mAction->setText(mActionText + "\t" + State::get().getShortcutManager().convertToString(mSequence).data());
+
+            connect(this, SIGNAL(activated()), mAction, SLOT(trigger()));
+            connect(mAction, SIGNAL(destroyed()), this, SLOT(actionDeleted()));
+        }
+    }
+
+    void Shortcut::signalActivated(bool state)
+    {
+        emit activated(state);
+    }
+
+    void Shortcut::signalActivated()
+    {
+        emit activated();
+    }
+
+    void Shortcut::signalSecondary(bool state)
+    {
+        emit secondary(state);
+    }
+    void Shortcut::signalSecondary()
+    {
+        emit secondary();
+    }
+
+    QString Shortcut::toString() const
+    {
+        return QString(State::get().getShortcutManager().convertToString(mSequence, mModifier).data());
+    }
+
+    void Shortcut::actionDeleted()
+    {
+        mAction = 0;
+    }
+}
diff --git a/apps/opencs/model/prefs/shortcut.hpp b/apps/opencs/model/prefs/shortcut.hpp
new file mode 100644
index 000000000..4fa6f8a1a
--- /dev/null
+++ b/apps/opencs/model/prefs/shortcut.hpp
@@ -0,0 +1,122 @@
+#ifndef CSM_PREFS_SHORTCUT_H
+#define CSM_PREFS_SHORTCUT_H
+
+#include <string>
+
+#include <QKeySequence>
+#include <QObject>
+#include <QString>
+
+class QAction;
+class QWidget;
+
+namespace CSMPrefs
+{
+    /// A class similar in purpose to QShortcut, but with the ability to use mouse buttons
+    class Shortcut : public QObject
+    {
+            Q_OBJECT
+
+        public:
+
+            enum ActivationStatus
+            {
+                AS_Regular,
+                AS_Secondary,
+                AS_Inactive
+            };
+
+            enum SecondaryMode
+            {
+                SM_Replace, ///< The secondary signal replaces the regular signal when the modifier is active
+                SM_Detach,  ///< The secondary signal is emitted independent of the regular signal, even if not active
+                SM_Ignore   ///< The secondary signal will not ever be emitted
+            };
+
+            Shortcut(const std::string& name, QWidget* parent);
+            Shortcut(const std::string& name, const std::string& modName, QWidget* parent);
+            Shortcut(const std::string& name, const std::string& modName, SecondaryMode secMode, QWidget* parent);
+
+            ~Shortcut();
+
+            bool isEnabled() const;
+
+            const std::string& getName() const;
+            const std::string& getModifierName() const;
+
+            SecondaryMode getSecondaryMode() const;
+
+            const QKeySequence& getSequence() const;
+            int getModifier() const;
+
+            /// The position in the sequence
+            int getPosition() const;
+            /// The position in the sequence
+            int getLastPosition() const;
+
+            ActivationStatus getActivationStatus() const;
+            bool getModifierStatus() const;
+
+            void enable(bool state);
+
+            void setSequence(const QKeySequence& sequence);
+            void setModifier(int modifier);
+
+            /// The position in the sequence
+            void setPosition(int pos);
+
+            void setActivationStatus(ActivationStatus status);
+            void setModifierStatus(bool status);
+
+            /// Appends the sequence to the QAction text, also keeps it up to date
+            void associateAction(QAction* action);
+
+            // Workaround for Qt4 signals being "protected"
+            void signalActivated(bool state);
+            void signalActivated();
+
+            void signalSecondary(bool state);
+            void signalSecondary();
+
+            QString toString() const;
+
+        private:
+
+            bool mEnabled;
+
+            std::string mName;
+            std::string mModName;
+            SecondaryMode mSecondaryMode;
+            QKeySequence mSequence;
+            int mModifier;
+
+            int mCurrentPos;
+            int mLastPos;
+
+            ActivationStatus mActivationStatus;
+            bool mModifierStatus;
+
+            QAction* mAction;
+            QString mActionText;
+
+        private slots:
+
+            void actionDeleted();
+
+        signals:
+
+            /// Triggered when the shortcut is activated or deactivated; can be determined from \p state
+            void activated(bool state);
+
+            /// Convenience signal.
+            void activated();
+
+            /// Triggered depending on SecondaryMode
+            void secondary(bool state);
+
+            /// Convenience signal.
+            void secondary();
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/prefs/shortcuteventhandler.cpp b/apps/opencs/model/prefs/shortcuteventhandler.cpp
new file mode 100644
index 000000000..93e2d85d3
--- /dev/null
+++ b/apps/opencs/model/prefs/shortcuteventhandler.cpp
@@ -0,0 +1,338 @@
+#include "shortcuteventhandler.hpp"
+
+#include <algorithm>
+#include <cassert>
+
+#include <QEvent>
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QWidget>
+
+#include "shortcut.hpp"
+
+namespace CSMPrefs
+{
+    ShortcutEventHandler::ShortcutEventHandler(QObject* parent)
+        : QObject(parent)
+    {
+    }
+
+    void ShortcutEventHandler::addShortcut(Shortcut* shortcut)
+    {
+        // Enforced by shortcut class
+        QWidget* widget = static_cast<QWidget*>(shortcut->parent());
+
+        // Check if widget setup is needed
+        ShortcutMap::iterator shortcutListIt = mWidgetShortcuts.find(widget);
+        if (shortcutListIt == mWidgetShortcuts.end())
+        {
+            // Create list
+            shortcutListIt = mWidgetShortcuts.insert(std::make_pair(widget, ShortcutList())).first;
+
+            // Check if widget has a parent with shortcuts, unfortunately it is not typically set yet
+            updateParent(widget);
+
+            // Intercept widget events
+            widget->installEventFilter(this);
+            connect(widget, SIGNAL(destroyed()), this, SLOT(widgetDestroyed()));
+        }
+
+        // Add to list
+        shortcutListIt->second.push_back(shortcut);
+    }
+
+    void ShortcutEventHandler::removeShortcut(Shortcut* shortcut)
+    {
+        // Enforced by shortcut class
+        QWidget* widget = static_cast<QWidget*>(shortcut->parent());
+
+        ShortcutMap::iterator shortcutListIt = mWidgetShortcuts.find(widget);
+        if (shortcutListIt != mWidgetShortcuts.end())
+        {
+            std::remove(shortcutListIt->second.begin(), shortcutListIt->second.end(), shortcut);
+        }
+    }
+
+    bool ShortcutEventHandler::eventFilter(QObject* watched, QEvent* event)
+    {
+        // Process event
+        if (event->type() == QEvent::KeyPress)
+        {
+            QWidget* widget = static_cast<QWidget*>(watched);
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            unsigned int mod = (unsigned int) keyEvent->modifiers();
+            unsigned int key = (unsigned int) keyEvent->key();
+
+            if (!keyEvent->isAutoRepeat())
+                return activate(widget, mod, key);
+        }
+        else if (event->type() == QEvent::KeyRelease)
+        {
+            QWidget* widget = static_cast<QWidget*>(watched);
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            unsigned int mod = (unsigned int) keyEvent->modifiers();
+            unsigned int key = (unsigned int) keyEvent->key();
+
+            if (!keyEvent->isAutoRepeat())
+                return deactivate(widget, mod, key);
+        }
+        else if (event->type() == QEvent::MouseButtonPress)
+        {
+            QWidget* widget = static_cast<QWidget*>(watched);
+            QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
+            unsigned int mod = (unsigned int) mouseEvent->modifiers();
+            unsigned int button = (unsigned int) mouseEvent->button();
+
+            return activate(widget, mod, button);
+        }
+        else if (event->type() == QEvent::MouseButtonRelease)
+        {
+            QWidget* widget = static_cast<QWidget*>(watched);
+            QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
+            unsigned int mod = (unsigned int) mouseEvent->modifiers();
+            unsigned int button = (unsigned int) mouseEvent->button();
+
+            return deactivate(widget, mod, button);
+        }
+        else if (event->type() == QEvent::FocusOut)
+        {
+            QWidget* widget = static_cast<QWidget*>(watched);
+            ShortcutMap::iterator shortcutListIt = mWidgetShortcuts.find(widget);
+
+            // Deactivate in case events are missed
+            for (ShortcutList::iterator it = shortcutListIt->second.begin(); it != shortcutListIt->second.end(); ++it)
+            {
+                Shortcut* shortcut = *it;
+
+                shortcut->setPosition(0);
+                shortcut->setModifierStatus(false);
+
+                if (shortcut->getActivationStatus() == Shortcut::AS_Regular)
+                {
+                    shortcut->setActivationStatus(Shortcut::AS_Inactive);
+                    shortcut->signalActivated(false);
+                }
+                else if (shortcut->getActivationStatus() == Shortcut::AS_Secondary)
+                {
+                    shortcut->setActivationStatus(Shortcut::AS_Inactive);
+                    shortcut->signalSecondary(false);
+                }
+            }
+        }
+        else if (event->type() == QEvent::FocusIn)
+        {
+            QWidget* widget = static_cast<QWidget*>(watched);
+            updateParent(widget);
+        }
+
+        return false;
+    }
+
+    void ShortcutEventHandler::updateParent(QWidget* widget)
+    {
+        QWidget* parent = widget->parentWidget();
+        while (parent)
+        {
+            ShortcutMap::iterator parentIt = mWidgetShortcuts.find(parent);
+            if (parentIt != mWidgetShortcuts.end())
+            {
+                mChildParentRelations.insert(std::make_pair(widget, parent));
+                updateParent(parent);
+                break;
+            }
+
+            // Check next
+            parent = parent->parentWidget();
+        }
+    }
+
+    bool ShortcutEventHandler::activate(QWidget* widget, unsigned int mod, unsigned int button)
+    {
+        std::vector<std::pair<MatchResult, Shortcut*> > potentials;
+        bool used = false;
+
+        while (widget)
+        {
+            ShortcutMap::iterator shortcutListIt = mWidgetShortcuts.find(widget);
+            assert(shortcutListIt != mWidgetShortcuts.end());
+
+            // Find potential activations
+            for (ShortcutList::iterator it = shortcutListIt->second.begin(); it != shortcutListIt->second.end(); ++it)
+            {
+                Shortcut* shortcut = *it;
+
+                if (!shortcut->isEnabled())
+                    continue;
+
+                if (checkModifier(mod, button, shortcut, true))
+                    used = true;
+
+                if (shortcut->getActivationStatus() != Shortcut::AS_Inactive)
+                    continue;
+
+                int pos = shortcut->getPosition();
+                int lastPos = shortcut->getLastPosition();
+                MatchResult result = match(mod, button, shortcut->getSequence()[pos]);
+
+                if (result == Matches_WithMod || result == Matches_NoMod)
+                {
+                    if (pos < lastPos && (result == Matches_WithMod || pos > 0))
+                    {
+                        shortcut->setPosition(pos+1);
+                    }
+                    else if (pos == lastPos)
+                    {
+                        potentials.push_back(std::make_pair(result, shortcut));
+                    }
+                }
+            }
+
+            // Move on to parent
+            WidgetMap::iterator widgetIt = mChildParentRelations.find(widget);
+            widget = (widgetIt != mChildParentRelations.end()) ? widgetIt->second : 0;
+        }
+
+        // Only activate the best match; in exact conflicts, this will favor the first shortcut added.
+        if (!potentials.empty())
+        {
+            std::sort(potentials.begin(), potentials.end(), ShortcutEventHandler::sort);
+            Shortcut* shortcut = potentials.front().second;
+
+            if (shortcut->getModifierStatus() && shortcut->getSecondaryMode() == Shortcut::SM_Replace)
+            {
+                shortcut->setActivationStatus(Shortcut::AS_Secondary);
+                shortcut->signalSecondary(true);
+                shortcut->signalSecondary();
+            }
+            else
+            {
+                shortcut->setActivationStatus(Shortcut::AS_Regular);
+                shortcut->signalActivated(true);
+                shortcut->signalActivated();
+            }
+
+            used = true;
+        }
+
+        return used;
+    }
+
+    bool ShortcutEventHandler::deactivate(QWidget* widget, unsigned int mod, unsigned int button)
+    {
+        const int KeyMask = 0x01FFFFFF;
+
+        bool used = false;
+
+        while (widget)
+        {
+            ShortcutMap::iterator shortcutListIt = mWidgetShortcuts.find(widget);
+            assert(shortcutListIt != mWidgetShortcuts.end());
+
+            for (ShortcutList::iterator it = shortcutListIt->second.begin(); it != shortcutListIt->second.end(); ++it)
+            {
+                Shortcut* shortcut = *it;
+
+                if (checkModifier(mod, button, shortcut, false))
+                    used = true;
+
+                int pos = shortcut->getPosition();
+                MatchResult result = match(0, button, shortcut->getSequence()[pos] & KeyMask);
+
+                if (result != Matches_Not)
+                {
+                    shortcut->setPosition(0);
+
+                    if (shortcut->getActivationStatus() == Shortcut::AS_Regular)
+                    {
+                        shortcut->setActivationStatus(Shortcut::AS_Inactive);
+                        shortcut->signalActivated(false);
+                        used = true;
+                    }
+                    else if (shortcut->getActivationStatus() == Shortcut::AS_Secondary)
+                    {
+                        shortcut->setActivationStatus(Shortcut::AS_Inactive);
+                        shortcut->signalSecondary(false);
+                        used = true;
+                    }
+                }
+            }
+
+            // Move on to parent
+            WidgetMap::iterator widgetIt = mChildParentRelations.find(widget);
+            widget = (widgetIt != mChildParentRelations.end()) ? widgetIt->second : 0;
+        }
+
+        return used;
+    }
+
+    bool ShortcutEventHandler::checkModifier(unsigned int mod, unsigned int button, Shortcut* shortcut, bool activate)
+    {
+        if (!shortcut->isEnabled() || !shortcut->getModifier() || shortcut->getSecondaryMode() == Shortcut::SM_Ignore ||
+            shortcut->getModifierStatus() == activate)
+            return false;
+
+        MatchResult result = match(mod, button, shortcut->getModifier());
+        bool used = false;
+
+        if (result != Matches_Not)
+        {
+            shortcut->setModifierStatus(activate);
+
+            if (shortcut->getSecondaryMode() == Shortcut::SM_Detach)
+            {
+                if (activate)
+                {
+                    shortcut->signalSecondary(true);
+                    shortcut->signalSecondary();
+                }
+                else
+                {
+                    shortcut->signalSecondary(false);
+                }
+            }
+            else if (!activate && shortcut->getActivationStatus() == Shortcut::AS_Secondary)
+            {
+                shortcut->setActivationStatus(Shortcut::AS_Inactive);
+                shortcut->setPosition(0);
+                shortcut->signalSecondary(false);
+                used = true;
+            }
+        }
+
+        return used;
+    }
+
+    ShortcutEventHandler::MatchResult ShortcutEventHandler::match(unsigned int mod, unsigned int button,
+        unsigned int value)
+    {
+        if ((mod | button) == value)
+        {
+            return Matches_WithMod;
+        }
+        else if (button == value)
+        {
+            return Matches_NoMod;
+        }
+        else
+        {
+            return Matches_Not;
+        }
+    }
+
+    bool ShortcutEventHandler::sort(const std::pair<MatchResult, Shortcut*>& left,
+        const std::pair<MatchResult, Shortcut*>& right)
+    {
+        if (left.first == Matches_WithMod && right.first == Matches_NoMod)
+            return true;
+        else
+            return left.second->getPosition() >= right.second->getPosition();
+    }
+
+    void ShortcutEventHandler::widgetDestroyed()
+    {
+        QWidget* widget = static_cast<QWidget*>(sender());
+
+        mWidgetShortcuts.erase(widget);
+        mChildParentRelations.erase(widget);
+    }
+}
diff --git a/apps/opencs/model/prefs/shortcuteventhandler.hpp b/apps/opencs/model/prefs/shortcuteventhandler.hpp
new file mode 100644
index 000000000..6a7ba2522
--- /dev/null
+++ b/apps/opencs/model/prefs/shortcuteventhandler.hpp
@@ -0,0 +1,69 @@
+#ifndef CSM_PREFS_SHORTCUT_EVENT_HANDLER_H
+#define CSM_PREFS_SHORTCUT_EVENT_HANDLER_H
+
+#include <map>
+#include <vector>
+
+#include <QObject>
+
+class QEvent;
+class QWidget;
+
+namespace CSMPrefs
+{
+    class Shortcut;
+
+    /// Users of this class should install it as an event handler
+    class ShortcutEventHandler : public QObject
+    {
+            Q_OBJECT
+
+        public:
+
+            ShortcutEventHandler(QObject* parent);
+
+            void addShortcut(Shortcut* shortcut);
+            void removeShortcut(Shortcut* shortcut);
+
+        protected:
+
+            bool eventFilter(QObject* watched, QEvent* event);
+
+        private:
+
+            typedef std::vector<Shortcut*> ShortcutList;
+            // Child, Parent
+            typedef std::map<QWidget*, QWidget*> WidgetMap;
+            typedef std::map<QWidget*, ShortcutList> ShortcutMap;
+
+            enum MatchResult
+            {
+                Matches_WithMod,
+                Matches_NoMod,
+                Matches_Not
+            };
+
+            void updateParent(QWidget* widget);
+
+            bool activate(QWidget* widget, unsigned int mod, unsigned int button);
+
+            bool deactivate(QWidget* widget, unsigned int mod, unsigned int button);
+
+            bool checkModifier(unsigned int mod, unsigned int button, Shortcut* shortcut, bool activate);
+
+            MatchResult match(unsigned int mod, unsigned int button, unsigned int value);
+
+            // Prefers Matches_WithMod and a larger number of buttons
+            static bool sort(const std::pair<MatchResult, Shortcut*>& left,
+                const std::pair<MatchResult, Shortcut*>& right);
+
+            WidgetMap mChildParentRelations;
+            ShortcutMap mWidgetShortcuts;
+
+        private slots:
+
+            void widgetDestroyed();
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/prefs/shortcutmanager.cpp b/apps/opencs/model/prefs/shortcutmanager.cpp
new file mode 100644
index 000000000..6ae778fff
--- /dev/null
+++ b/apps/opencs/model/prefs/shortcutmanager.cpp
@@ -0,0 +1,791 @@
+#include "shortcutmanager.hpp"
+
+#include <algorithm>
+
+#include <QApplication>
+#include <QStringList>
+
+#include "shortcut.hpp"
+#include "shortcuteventhandler.hpp"
+
+namespace CSMPrefs
+{
+    ShortcutManager::ShortcutManager()
+    {
+        createLookupTables();
+        mEventHandler = new ShortcutEventHandler(this);
+    }
+
+    void ShortcutManager::addShortcut(Shortcut* shortcut)
+    {
+        mShortcuts.insert(std::make_pair(shortcut->getName(), shortcut));
+        mShortcuts.insert(std::make_pair(shortcut->getModifierName(), shortcut));
+        mEventHandler->addShortcut(shortcut);
+    }
+
+    void ShortcutManager::removeShortcut(Shortcut* shortcut)
+    {
+        std::pair<ShortcutMap::iterator, ShortcutMap::iterator> range = mShortcuts.equal_range(shortcut->getName());
+
+        for (ShortcutMap::iterator it = range.first; it != range.second;)
+        {
+            if (it->second == shortcut)
+            {
+                mShortcuts.erase(it++);
+            }
+            else
+            {
+                ++it;
+            }
+        }
+
+        mEventHandler->removeShortcut(shortcut);
+    }
+
+    bool ShortcutManager::getSequence(const std::string& name, QKeySequence& sequence) const
+    {
+        SequenceMap::const_iterator item = mSequences.find(name);
+        if (item != mSequences.end())
+        {
+            sequence = item->second;
+
+            return true;
+        }
+        else
+            return false;
+    }
+
+    void ShortcutManager::setSequence(const std::string& name, const QKeySequence& sequence)
+    {
+        // Add to map/modify
+        SequenceMap::iterator item = mSequences.find(name);
+        if (item != mSequences.end())
+        {
+            item->second = sequence;
+        }
+        else
+        {
+            mSequences.insert(std::make_pair(name, sequence));
+        }
+
+        // Change active shortcuts
+        std::pair<ShortcutMap::iterator, ShortcutMap::iterator> rangeS = mShortcuts.equal_range(name);
+
+        for (ShortcutMap::iterator it = rangeS.first; it != rangeS.second; ++it)
+        {
+            it->second->setSequence(sequence);
+        }
+    }
+
+    bool ShortcutManager::getModifier(const std::string& name, int& modifier) const
+    {
+        ModifierMap::const_iterator item = mModifiers.find(name);
+        if (item != mModifiers.end())
+        {
+            modifier = item->second;
+
+            return true;
+        }
+        else
+            return false;
+    }
+
+    void ShortcutManager::setModifier(const std::string& name, int modifier)
+    {
+        // Add to map/modify
+        ModifierMap::iterator item = mModifiers.find(name);
+        if (item != mModifiers.end())
+        {
+            item->second = modifier;
+        }
+        else
+        {
+            mModifiers.insert(std::make_pair(name, modifier));
+        }
+
+        // Change active shortcuts
+        std::pair<ShortcutMap::iterator, ShortcutMap::iterator> rangeS = mShortcuts.equal_range(name);
+
+        for (ShortcutMap::iterator it = rangeS.first; it != rangeS.second; ++it)
+        {
+            it->second->setModifier(modifier);
+        }
+    }
+
+    std::string ShortcutManager::convertToString(const QKeySequence& sequence) const
+    {
+        const int MouseKeyMask = 0x01FFFFFF;
+        const int ModMask = 0x7E000000;
+
+        std::string result;
+
+        for (int i = 0; i < (int)sequence.count(); ++i)
+        {
+            int mods = sequence[i] & ModMask;
+            int key = sequence[i] & MouseKeyMask;
+
+            if (key)
+            {
+                NameMap::const_iterator searchResult = mNames.find(key);
+                if (searchResult != mNames.end())
+                {
+                    if (mods && i == 0)
+                    {
+                        if (mods & Qt::ControlModifier)
+                            result.append("Ctl+");
+                        if (mods & Qt::ShiftModifier)
+                            result.append("Shift+");
+                        if (mods & Qt::AltModifier)
+                            result.append("Alt+");
+                        if (mods & Qt::MetaModifier)
+                            result.append("Meta+");
+                        if (mods & Qt::KeypadModifier)
+                            result.append("Keypad+");
+                        if (mods & Qt::GroupSwitchModifier)
+                            result.append("GroupSwitch+");
+                    }
+                    else if (i > 0)
+                    {
+                        result.append("+");
+                    }
+
+                    result.append(searchResult->second);
+                }
+            }
+        }
+
+        return result;
+    }
+
+    std::string ShortcutManager::convertToString(int modifier) const
+    {
+        NameMap::const_iterator searchResult = mNames.find(modifier);
+        if (searchResult != mNames.end())
+        {
+            return searchResult->second;
+        }
+        else
+            return "";
+    }
+
+    std::string ShortcutManager::convertToString(const QKeySequence& sequence, int modifier) const
+    {
+        std::string concat = convertToString(sequence) + ";" + convertToString(modifier);
+        return concat;
+    }
+
+    void ShortcutManager::convertFromString(const std::string& data, QKeySequence& sequence) const
+    {
+        const int MaxKeys = 4; // A limitation of QKeySequence
+
+        size_t end = data.find(";");
+        size_t size = std::min(end, data.size());
+
+        std::string value = data.substr(0, size);
+        size_t start = 0;
+
+        int keyPos = 0;
+        int mods = 0;
+
+        int keys[MaxKeys] = {};
+
+        while (start < value.size())
+        {
+            end = data.find("+", start);
+            end = std::min(end, value.size());
+
+            std::string name = value.substr(start, end - start);
+
+            if (name == "Ctl")
+            {
+                mods |= Qt::ControlModifier;
+            }
+            else if (name == "Shift")
+            {
+                mods |= Qt::ShiftModifier;
+            }
+            else if (name == "Alt")
+            {
+                mods |= Qt::AltModifier;
+            }
+            else if (name == "Meta")
+            {
+                mods |= Qt::MetaModifier;
+            }
+            else if (name == "Keypad")
+            {
+                mods |= Qt::KeypadModifier;
+            }
+            else if (name == "GroupSwitch")
+            {
+                mods |= Qt::GroupSwitchModifier;
+            }
+            else
+            {
+                KeyMap::const_iterator searchResult = mKeys.find(name);
+                if (searchResult != mKeys.end())
+                {
+                    keys[keyPos] = mods | searchResult->second;
+
+                    mods = 0;
+                    keyPos += 1;
+
+                    if (keyPos >= MaxKeys)
+                        break;
+                }
+            }
+
+            start = end + 1;
+        }
+
+        sequence = QKeySequence(keys[0], keys[1], keys[2], keys[3]);
+    }
+
+    void ShortcutManager::convertFromString(const std::string& data, int& modifier) const
+    {
+        size_t start = data.find(";") + 1;
+        start = std::min(start, data.size());
+
+        std::string name = data.substr(start);
+        KeyMap::const_iterator searchResult = mKeys.find(name);
+        if (searchResult != mKeys.end())
+        {
+            modifier = searchResult->second;
+        }
+        else
+        {
+            modifier = 0;
+        }
+    }
+
+    void ShortcutManager::convertFromString(const std::string& data, QKeySequence& sequence, int& modifier) const
+    {
+        convertFromString(data, sequence);
+        convertFromString(data, modifier);
+    }
+
+    void ShortcutManager::createLookupTables()
+    {
+        // Mouse buttons
+        mNames.insert(std::make_pair(Qt::LeftButton, "LMB"));
+        mNames.insert(std::make_pair(Qt::RightButton, "RMB"));
+        mNames.insert(std::make_pair(Qt::MiddleButton, "MMB"));
+        mNames.insert(std::make_pair(Qt::XButton1, "Mouse4"));
+        mNames.insert(std::make_pair(Qt::XButton2, "Mouse5"));
+
+        // Keyboard buttons
+        for (size_t i = 0; QtKeys[i].first != 0; ++i)
+        {
+            mNames.insert(QtKeys[i]);
+        }
+
+        // Generate inverse map
+        for (NameMap::const_iterator it = mNames.begin(); it != mNames.end(); ++it)
+        {
+            mKeys.insert(std::make_pair(it->second, it->first));
+        }
+    }
+
+    QString ShortcutManager::processToolTip(const QString& toolTip) const
+    {
+        const QChar SequenceStart = '{';
+        const QChar SequenceEnd = '}';
+
+        QStringList substrings;
+
+        int prevIndex = 0;
+        int startIndex = toolTip.indexOf(SequenceStart);
+        int endIndex = (startIndex != -1) ? toolTip.indexOf(SequenceEnd, startIndex) : -1;
+
+        // Process every valid shortcut escape sequence
+        while (startIndex != -1 && endIndex != -1)
+        {
+            int count = startIndex - prevIndex;
+            if (count > 0)
+            {
+                substrings.push_back(toolTip.mid(prevIndex, count));
+            }
+
+            // Find sequence name
+            startIndex += 1; // '{' character
+            count = endIndex - startIndex;
+            if (count > 0)
+            {
+                QString settingName = toolTip.mid(startIndex, count);
+
+                QKeySequence sequence;
+                int modifier;
+
+                if (getSequence(settingName.toUtf8().data(), sequence))
+                {
+                    QString value = QString::fromUtf8(convertToString(sequence).c_str());
+                    substrings.push_back(value);
+                }
+                else if (getModifier(settingName.toUtf8().data(), modifier))
+                {
+                    QString value = QString::fromUtf8(convertToString(modifier).c_str());
+                    substrings.push_back(value);
+                }
+
+                prevIndex = endIndex + 1; // '}' character
+            }
+
+            startIndex = toolTip.indexOf(SequenceStart, endIndex);
+            endIndex = (startIndex != -1) ? toolTip.indexOf(SequenceEnd, startIndex) : -1;
+        }
+
+        if (prevIndex < toolTip.size())
+        {
+            substrings.push_back(toolTip.mid(prevIndex));
+        }
+
+        return substrings.join("");
+    }
+
+    const std::pair<int, const char*> ShortcutManager::QtKeys[] =
+    {
+        std::make_pair((int)Qt::Key_Space                  , "Space"),
+        std::make_pair((int)Qt::Key_Exclam                 , "Exclam"),
+        std::make_pair((int)Qt::Key_QuoteDbl               , "QuoteDbl"),
+        std::make_pair((int)Qt::Key_NumberSign             , "NumberSign"),
+        std::make_pair((int)Qt::Key_Dollar                 , "Dollar"),
+        std::make_pair((int)Qt::Key_Percent                , "Percent"),
+        std::make_pair((int)Qt::Key_Ampersand              , "Ampersand"),
+        std::make_pair((int)Qt::Key_Apostrophe             , "Apostrophe"),
+        std::make_pair((int)Qt::Key_ParenLeft              , "ParenLeft"),
+        std::make_pair((int)Qt::Key_ParenRight             , "ParenRight"),
+        std::make_pair((int)Qt::Key_Asterisk               , "Asterisk"),
+        std::make_pair((int)Qt::Key_Plus                   , "Plus"),
+        std::make_pair((int)Qt::Key_Comma                  , "Comma"),
+        std::make_pair((int)Qt::Key_Minus                  , "Minus"),
+        std::make_pair((int)Qt::Key_Period                 , "Period"),
+        std::make_pair((int)Qt::Key_Slash                  , "Slash"),
+        std::make_pair((int)Qt::Key_0                      , "0"),
+        std::make_pair((int)Qt::Key_1                      , "1"),
+        std::make_pair((int)Qt::Key_2                      , "2"),
+        std::make_pair((int)Qt::Key_3                      , "3"),
+        std::make_pair((int)Qt::Key_4                      , "4"),
+        std::make_pair((int)Qt::Key_5                      , "5"),
+        std::make_pair((int)Qt::Key_6                      , "6"),
+        std::make_pair((int)Qt::Key_7                      , "7"),
+        std::make_pair((int)Qt::Key_8                      , "8"),
+        std::make_pair((int)Qt::Key_9                      , "9"),
+        std::make_pair((int)Qt::Key_Colon                  , "Colon"),
+        std::make_pair((int)Qt::Key_Semicolon              , "Semicolon"),
+        std::make_pair((int)Qt::Key_Less                   , "Less"),
+        std::make_pair((int)Qt::Key_Equal                  , "Equal"),
+        std::make_pair((int)Qt::Key_Greater                , "Greater"),
+        std::make_pair((int)Qt::Key_Question               , "Question"),
+        std::make_pair((int)Qt::Key_At                     , "At"),
+        std::make_pair((int)Qt::Key_A                      , "A"),
+        std::make_pair((int)Qt::Key_B                      , "B"),
+        std::make_pair((int)Qt::Key_C                      , "C"),
+        std::make_pair((int)Qt::Key_D                      , "D"),
+        std::make_pair((int)Qt::Key_E                      , "E"),
+        std::make_pair((int)Qt::Key_F                      , "F"),
+        std::make_pair((int)Qt::Key_G                      , "G"),
+        std::make_pair((int)Qt::Key_H                      , "H"),
+        std::make_pair((int)Qt::Key_I                      , "I"),
+        std::make_pair((int)Qt::Key_J                      , "J"),
+        std::make_pair((int)Qt::Key_K                      , "K"),
+        std::make_pair((int)Qt::Key_L                      , "L"),
+        std::make_pair((int)Qt::Key_M                      , "M"),
+        std::make_pair((int)Qt::Key_N                      , "N"),
+        std::make_pair((int)Qt::Key_O                      , "O"),
+        std::make_pair((int)Qt::Key_P                      , "P"),
+        std::make_pair((int)Qt::Key_Q                      , "Q"),
+        std::make_pair((int)Qt::Key_R                      , "R"),
+        std::make_pair((int)Qt::Key_S                      , "S"),
+        std::make_pair((int)Qt::Key_T                      , "T"),
+        std::make_pair((int)Qt::Key_U                      , "U"),
+        std::make_pair((int)Qt::Key_V                      , "V"),
+        std::make_pair((int)Qt::Key_W                      , "W"),
+        std::make_pair((int)Qt::Key_X                      , "X"),
+        std::make_pair((int)Qt::Key_Y                      , "Y"),
+        std::make_pair((int)Qt::Key_Z                      , "Z"),
+        std::make_pair((int)Qt::Key_BracketLeft            , "BracketLeft"),
+        std::make_pair((int)Qt::Key_Backslash              , "Backslash"),
+        std::make_pair((int)Qt::Key_BracketRight           , "BracketRight"),
+        std::make_pair((int)Qt::Key_AsciiCircum            , "AsciiCircum"),
+        std::make_pair((int)Qt::Key_Underscore             , "Underscore"),
+        std::make_pair((int)Qt::Key_QuoteLeft              , "QuoteLeft"),
+        std::make_pair((int)Qt::Key_BraceLeft              , "BraceLeft"),
+        std::make_pair((int)Qt::Key_Bar                    , "Bar"),
+        std::make_pair((int)Qt::Key_BraceRight             , "BraceRight"),
+        std::make_pair((int)Qt::Key_AsciiTilde             , "AsciiTilde"),
+        std::make_pair((int)Qt::Key_nobreakspace           , "nobreakspace"),
+        std::make_pair((int)Qt::Key_exclamdown             , "exclamdown"),
+        std::make_pair((int)Qt::Key_cent                   , "cent"),
+        std::make_pair((int)Qt::Key_sterling               , "sterling"),
+        std::make_pair((int)Qt::Key_currency               , "currency"),
+        std::make_pair((int)Qt::Key_yen                    , "yen"),
+        std::make_pair((int)Qt::Key_brokenbar              , "brokenbar"),
+        std::make_pair((int)Qt::Key_section                , "section"),
+        std::make_pair((int)Qt::Key_diaeresis              , "diaeresis"),
+        std::make_pair((int)Qt::Key_copyright              , "copyright"),
+        std::make_pair((int)Qt::Key_ordfeminine            , "ordfeminine"),
+        std::make_pair((int)Qt::Key_guillemotleft          , "guillemotleft"),
+        std::make_pair((int)Qt::Key_notsign                , "notsign"),
+        std::make_pair((int)Qt::Key_hyphen                 , "hyphen"),
+        std::make_pair((int)Qt::Key_registered             , "registered"),
+        std::make_pair((int)Qt::Key_macron                 , "macron"),
+        std::make_pair((int)Qt::Key_degree                 , "degree"),
+        std::make_pair((int)Qt::Key_plusminus              , "plusminus"),
+        std::make_pair((int)Qt::Key_twosuperior            , "twosuperior"),
+        std::make_pair((int)Qt::Key_threesuperior          , "threesuperior"),
+        std::make_pair((int)Qt::Key_acute                  , "acute"),
+        std::make_pair((int)Qt::Key_mu                     , "mu"),
+        std::make_pair((int)Qt::Key_paragraph              , "paragraph"),
+        std::make_pair((int)Qt::Key_periodcentered         , "periodcentered"),
+        std::make_pair((int)Qt::Key_cedilla                , "cedilla"),
+        std::make_pair((int)Qt::Key_onesuperior            , "onesuperior"),
+        std::make_pair((int)Qt::Key_masculine              , "masculine"),
+        std::make_pair((int)Qt::Key_guillemotright         , "guillemotright"),
+        std::make_pair((int)Qt::Key_onequarter             , "onequarter"),
+        std::make_pair((int)Qt::Key_onehalf                , "onehalf"),
+        std::make_pair((int)Qt::Key_threequarters          , "threequarters"),
+        std::make_pair((int)Qt::Key_questiondown           , "questiondown"),
+        std::make_pair((int)Qt::Key_Agrave                 , "Agrave"),
+        std::make_pair((int)Qt::Key_Aacute                 , "Aacute"),
+        std::make_pair((int)Qt::Key_Acircumflex            , "Acircumflex"),
+        std::make_pair((int)Qt::Key_Atilde                 , "Atilde"),
+        std::make_pair((int)Qt::Key_Adiaeresis             , "Adiaeresis"),
+        std::make_pair((int)Qt::Key_Aring                  , "Aring"),
+        std::make_pair((int)Qt::Key_AE                     , "AE"),
+        std::make_pair((int)Qt::Key_Ccedilla               , "Ccedilla"),
+        std::make_pair((int)Qt::Key_Egrave                 , "Egrave"),
+        std::make_pair((int)Qt::Key_Eacute                 , "Eacute"),
+        std::make_pair((int)Qt::Key_Ecircumflex            , "Ecircumflex"),
+        std::make_pair((int)Qt::Key_Ediaeresis             , "Ediaeresis"),
+        std::make_pair((int)Qt::Key_Igrave                 , "Igrave"),
+        std::make_pair((int)Qt::Key_Iacute                 , "Iacute"),
+        std::make_pair((int)Qt::Key_Icircumflex            , "Icircumflex"),
+        std::make_pair((int)Qt::Key_Idiaeresis             , "Idiaeresis"),
+        std::make_pair((int)Qt::Key_ETH                    , "ETH"),
+        std::make_pair((int)Qt::Key_Ntilde                 , "Ntilde"),
+        std::make_pair((int)Qt::Key_Ograve                 , "Ograve"),
+        std::make_pair((int)Qt::Key_Oacute                 , "Oacute"),
+        std::make_pair((int)Qt::Key_Ocircumflex            , "Ocircumflex"),
+        std::make_pair((int)Qt::Key_Otilde                 , "Otilde"),
+        std::make_pair((int)Qt::Key_Odiaeresis             , "Odiaeresis"),
+        std::make_pair((int)Qt::Key_multiply               , "multiply"),
+        std::make_pair((int)Qt::Key_Ooblique               , "Ooblique"),
+        std::make_pair((int)Qt::Key_Ugrave                 , "Ugrave"),
+        std::make_pair((int)Qt::Key_Uacute                 , "Uacute"),
+        std::make_pair((int)Qt::Key_Ucircumflex            , "Ucircumflex"),
+        std::make_pair((int)Qt::Key_Udiaeresis             , "Udiaeresis"),
+        std::make_pair((int)Qt::Key_Yacute                 , "Yacute"),
+        std::make_pair((int)Qt::Key_THORN                  , "THORN"),
+        std::make_pair((int)Qt::Key_ssharp                 , "ssharp"),
+        std::make_pair((int)Qt::Key_division               , "division"),
+        std::make_pair((int)Qt::Key_ydiaeresis             , "ydiaeresis"),
+        std::make_pair((int)Qt::Key_Escape                 , "Escape"),
+        std::make_pair((int)Qt::Key_Tab                    , "Tab"),
+        std::make_pair((int)Qt::Key_Backtab                , "Backtab"),
+        std::make_pair((int)Qt::Key_Backspace              , "Backspace"),
+        std::make_pair((int)Qt::Key_Return                 , "Return"),
+        std::make_pair((int)Qt::Key_Enter                  , "Enter"),
+        std::make_pair((int)Qt::Key_Insert                 , "Insert"),
+        std::make_pair((int)Qt::Key_Delete                 , "Delete"),
+        std::make_pair((int)Qt::Key_Pause                  , "Pause"),
+        std::make_pair((int)Qt::Key_Print                  , "Print"),
+        std::make_pair((int)Qt::Key_SysReq                 , "SysReq"),
+        std::make_pair((int)Qt::Key_Clear                  , "Clear"),
+        std::make_pair((int)Qt::Key_Home                   , "Home"),
+        std::make_pair((int)Qt::Key_End                    , "End"),
+        std::make_pair((int)Qt::Key_Left                   , "Left"),
+        std::make_pair((int)Qt::Key_Up                     , "Up"),
+        std::make_pair((int)Qt::Key_Right                  , "Right"),
+        std::make_pair((int)Qt::Key_Down                   , "Down"),
+        std::make_pair((int)Qt::Key_PageUp                 , "PageUp"),
+        std::make_pair((int)Qt::Key_PageDown               , "PageDown"),
+        std::make_pair((int)Qt::Key_Shift                  , "Shift"),
+        std::make_pair((int)Qt::Key_Control                , "Control"),
+        std::make_pair((int)Qt::Key_Meta                   , "Meta"),
+        std::make_pair((int)Qt::Key_Alt                    , "Alt"),
+        std::make_pair((int)Qt::Key_CapsLock               , "CapsLock"),
+        std::make_pair((int)Qt::Key_NumLock                , "NumLock"),
+        std::make_pair((int)Qt::Key_ScrollLock             , "ScrollLock"),
+        std::make_pair((int)Qt::Key_F1                     , "F1"),
+        std::make_pair((int)Qt::Key_F2                     , "F2"),
+        std::make_pair((int)Qt::Key_F3                     , "F3"),
+        std::make_pair((int)Qt::Key_F4                     , "F4"),
+        std::make_pair((int)Qt::Key_F5                     , "F5"),
+        std::make_pair((int)Qt::Key_F6                     , "F6"),
+        std::make_pair((int)Qt::Key_F7                     , "F7"),
+        std::make_pair((int)Qt::Key_F8                     , "F8"),
+        std::make_pair((int)Qt::Key_F9                     , "F9"),
+        std::make_pair((int)Qt::Key_F10                    , "F10"),
+        std::make_pair((int)Qt::Key_F11                    , "F11"),
+        std::make_pair((int)Qt::Key_F12                    , "F12"),
+        std::make_pair((int)Qt::Key_F13                    , "F13"),
+        std::make_pair((int)Qt::Key_F14                    , "F14"),
+        std::make_pair((int)Qt::Key_F15                    , "F15"),
+        std::make_pair((int)Qt::Key_F16                    , "F16"),
+        std::make_pair((int)Qt::Key_F17                    , "F17"),
+        std::make_pair((int)Qt::Key_F18                    , "F18"),
+        std::make_pair((int)Qt::Key_F19                    , "F19"),
+        std::make_pair((int)Qt::Key_F20                    , "F20"),
+        std::make_pair((int)Qt::Key_F21                    , "F21"),
+        std::make_pair((int)Qt::Key_F22                    , "F22"),
+        std::make_pair((int)Qt::Key_F23                    , "F23"),
+        std::make_pair((int)Qt::Key_F24                    , "F24"),
+        std::make_pair((int)Qt::Key_F25                    , "F25"),
+        std::make_pair((int)Qt::Key_F26                    , "F26"),
+        std::make_pair((int)Qt::Key_F27                    , "F27"),
+        std::make_pair((int)Qt::Key_F28                    , "F28"),
+        std::make_pair((int)Qt::Key_F29                    , "F29"),
+        std::make_pair((int)Qt::Key_F30                    , "F30"),
+        std::make_pair((int)Qt::Key_F31                    , "F31"),
+        std::make_pair((int)Qt::Key_F32                    , "F32"),
+        std::make_pair((int)Qt::Key_F33                    , "F33"),
+        std::make_pair((int)Qt::Key_F34                    , "F34"),
+        std::make_pair((int)Qt::Key_F35                    , "F35"),
+        std::make_pair((int)Qt::Key_Super_L                , "Super_L"),
+        std::make_pair((int)Qt::Key_Super_R                , "Super_R"),
+        std::make_pair((int)Qt::Key_Menu                   , "Menu"),
+        std::make_pair((int)Qt::Key_Hyper_L                , "Hyper_L"),
+        std::make_pair((int)Qt::Key_Hyper_R                , "Hyper_R"),
+        std::make_pair((int)Qt::Key_Help                   , "Help"),
+        std::make_pair((int)Qt::Key_Direction_L            , "Direction_L"),
+        std::make_pair((int)Qt::Key_Direction_R            , "Direction_R"),
+        std::make_pair((int)Qt::Key_Back                   , "Back"),
+        std::make_pair((int)Qt::Key_Forward                , "Forward"),
+        std::make_pair((int)Qt::Key_Stop                   , "Stop"),
+        std::make_pair((int)Qt::Key_Refresh                , "Refresh"),
+        std::make_pair((int)Qt::Key_VolumeDown             , "VolumeDown"),
+        std::make_pair((int)Qt::Key_VolumeMute             , "VolumeMute"),
+        std::make_pair((int)Qt::Key_VolumeUp               , "VolumeUp"),
+        std::make_pair((int)Qt::Key_BassBoost              , "BassBoost"),
+        std::make_pair((int)Qt::Key_BassUp                 , "BassUp"),
+        std::make_pair((int)Qt::Key_BassDown               , "BassDown"),
+        std::make_pair((int)Qt::Key_TrebleUp               , "TrebleUp"),
+        std::make_pair((int)Qt::Key_TrebleDown             , "TrebleDown"),
+        std::make_pair((int)Qt::Key_MediaPlay              , "MediaPlay"),
+        std::make_pair((int)Qt::Key_MediaStop              , "MediaStop"),
+        std::make_pair((int)Qt::Key_MediaPrevious          , "MediaPrevious"),
+        std::make_pair((int)Qt::Key_MediaNext              , "MediaNext"),
+        std::make_pair((int)Qt::Key_MediaRecord            , "MediaRecord"),
+        std::make_pair((int)Qt::Key_MediaPause             , "MediaPause"),
+        std::make_pair((int)Qt::Key_MediaTogglePlayPause   , "MediaTogglePlayPause"),
+        std::make_pair((int)Qt::Key_HomePage               , "HomePage"),
+        std::make_pair((int)Qt::Key_Favorites              , "Favorites"),
+        std::make_pair((int)Qt::Key_Search                 , "Search"),
+        std::make_pair((int)Qt::Key_Standby                , "Standby"),
+        std::make_pair((int)Qt::Key_OpenUrl                , "OpenUrl"),
+        std::make_pair((int)Qt::Key_LaunchMail             , "LaunchMail"),
+        std::make_pair((int)Qt::Key_LaunchMedia            , "LaunchMedia"),
+        std::make_pair((int)Qt::Key_Launch0                , "Launch0"),
+        std::make_pair((int)Qt::Key_Launch1                , "Launch1"),
+        std::make_pair((int)Qt::Key_Launch2                , "Launch2"),
+        std::make_pair((int)Qt::Key_Launch3                , "Launch3"),
+        std::make_pair((int)Qt::Key_Launch4                , "Launch4"),
+        std::make_pair((int)Qt::Key_Launch5                , "Launch5"),
+        std::make_pair((int)Qt::Key_Launch6                , "Launch6"),
+        std::make_pair((int)Qt::Key_Launch7                , "Launch7"),
+        std::make_pair((int)Qt::Key_Launch8                , "Launch8"),
+        std::make_pair((int)Qt::Key_Launch9                , "Launch9"),
+        std::make_pair((int)Qt::Key_LaunchA                , "LaunchA"),
+        std::make_pair((int)Qt::Key_LaunchB                , "LaunchB"),
+        std::make_pair((int)Qt::Key_LaunchC                , "LaunchC"),
+        std::make_pair((int)Qt::Key_LaunchD                , "LaunchD"),
+        std::make_pair((int)Qt::Key_LaunchE                , "LaunchE"),
+        std::make_pair((int)Qt::Key_LaunchF                , "LaunchF"),
+        std::make_pair((int)Qt::Key_MonBrightnessUp        , "MonBrightnessUp"),
+        std::make_pair((int)Qt::Key_MonBrightnessDown      , "MonBrightnessDown"),
+        std::make_pair((int)Qt::Key_KeyboardLightOnOff     , "KeyboardLightOnOff"),
+        std::make_pair((int)Qt::Key_KeyboardBrightnessUp   , "KeyboardBrightnessUp"),
+        std::make_pair((int)Qt::Key_KeyboardBrightnessDown , "KeyboardBrightnessDown"),
+        std::make_pair((int)Qt::Key_PowerOff               , "PowerOff"),
+        std::make_pair((int)Qt::Key_WakeUp                 , "WakeUp"),
+        std::make_pair((int)Qt::Key_Eject                  , "Eject"),
+        std::make_pair((int)Qt::Key_ScreenSaver            , "ScreenSaver"),
+        std::make_pair((int)Qt::Key_WWW                    , "WWW"),
+        std::make_pair((int)Qt::Key_Memo                   , "Memo"),
+        std::make_pair((int)Qt::Key_LightBulb              , "LightBulb"),
+        std::make_pair((int)Qt::Key_Shop                   , "Shop"),
+        std::make_pair((int)Qt::Key_History                , "History"),
+        std::make_pair((int)Qt::Key_AddFavorite            , "AddFavorite"),
+        std::make_pair((int)Qt::Key_HotLinks               , "HotLinks"),
+        std::make_pair((int)Qt::Key_BrightnessAdjust       , "BrightnessAdjust"),
+        std::make_pair((int)Qt::Key_Finance                , "Finance"),
+        std::make_pair((int)Qt::Key_Community              , "Community"),
+        std::make_pair((int)Qt::Key_AudioRewind            , "AudioRewind"),
+        std::make_pair((int)Qt::Key_BackForward            , "BackForward"),
+        std::make_pair((int)Qt::Key_ApplicationLeft        , "ApplicationLeft"),
+        std::make_pair((int)Qt::Key_ApplicationRight       , "ApplicationRight"),
+        std::make_pair((int)Qt::Key_Book                   , "Book"),
+        std::make_pair((int)Qt::Key_CD                     , "CD"),
+        std::make_pair((int)Qt::Key_Calculator             , "Calculator"),
+        std::make_pair((int)Qt::Key_ToDoList               , "ToDoList"),
+        std::make_pair((int)Qt::Key_ClearGrab              , "ClearGrab"),
+        std::make_pair((int)Qt::Key_Close                  , "Close"),
+        std::make_pair((int)Qt::Key_Copy                   , "Copy"),
+        std::make_pair((int)Qt::Key_Cut                    , "Cut"),
+        std::make_pair((int)Qt::Key_Display                , "Display"),
+        std::make_pair((int)Qt::Key_DOS                    , "DOS"),
+        std::make_pair((int)Qt::Key_Documents              , "Documents"),
+        std::make_pair((int)Qt::Key_Excel                  , "Excel"),
+        std::make_pair((int)Qt::Key_Explorer               , "Explorer"),
+        std::make_pair((int)Qt::Key_Game                   , "Game"),
+        std::make_pair((int)Qt::Key_Go                     , "Go"),
+        std::make_pair((int)Qt::Key_iTouch                 , "iTouch"),
+        std::make_pair((int)Qt::Key_LogOff                 , "LogOff"),
+        std::make_pair((int)Qt::Key_Market                 , "Market"),
+        std::make_pair((int)Qt::Key_Meeting                , "Meeting"),
+        std::make_pair((int)Qt::Key_MenuKB                 , "MenuKB"),
+        std::make_pair((int)Qt::Key_MenuPB                 , "MenuPB"),
+        std::make_pair((int)Qt::Key_MySites                , "MySites"),
+        std::make_pair((int)Qt::Key_News                   , "News"),
+        std::make_pair((int)Qt::Key_OfficeHome             , "OfficeHome"),
+        std::make_pair((int)Qt::Key_Option                 , "Option"),
+        std::make_pair((int)Qt::Key_Paste                  , "Paste"),
+        std::make_pair((int)Qt::Key_Phone                  , "Phone"),
+        std::make_pair((int)Qt::Key_Calendar               , "Calendar"),
+        std::make_pair((int)Qt::Key_Reply                  , "Reply"),
+        std::make_pair((int)Qt::Key_Reload                 , "Reload"),
+        std::make_pair((int)Qt::Key_RotateWindows          , "RotateWindows"),
+        std::make_pair((int)Qt::Key_RotationPB             , "RotationPB"),
+        std::make_pair((int)Qt::Key_RotationKB             , "RotationKB"),
+        std::make_pair((int)Qt::Key_Save                   , "Save"),
+        std::make_pair((int)Qt::Key_Send                   , "Send"),
+        std::make_pair((int)Qt::Key_Spell                  , "Spell"),
+        std::make_pair((int)Qt::Key_SplitScreen            , "SplitScreen"),
+        std::make_pair((int)Qt::Key_Support                , "Support"),
+        std::make_pair((int)Qt::Key_TaskPane               , "TaskPane"),
+        std::make_pair((int)Qt::Key_Terminal               , "Terminal"),
+        std::make_pair((int)Qt::Key_Tools                  , "Tools"),
+        std::make_pair((int)Qt::Key_Travel                 , "Travel"),
+        std::make_pair((int)Qt::Key_Video                  , "Video"),
+        std::make_pair((int)Qt::Key_Word                   , "Word"),
+        std::make_pair((int)Qt::Key_Xfer                   , "Xfer"),
+        std::make_pair((int)Qt::Key_ZoomIn                 , "ZoomIn"),
+        std::make_pair((int)Qt::Key_ZoomOut                , "ZoomOut"),
+        std::make_pair((int)Qt::Key_Away                   , "Away"),
+        std::make_pair((int)Qt::Key_Messenger              , "Messenger"),
+        std::make_pair((int)Qt::Key_WebCam                 , "WebCam"),
+        std::make_pair((int)Qt::Key_MailForward            , "MailForward"),
+        std::make_pair((int)Qt::Key_Pictures               , "Pictures"),
+        std::make_pair((int)Qt::Key_Music                  , "Music"),
+        std::make_pair((int)Qt::Key_Battery                , "Battery"),
+        std::make_pair((int)Qt::Key_Bluetooth              , "Bluetooth"),
+        std::make_pair((int)Qt::Key_WLAN                   , "WLAN"),
+        std::make_pair((int)Qt::Key_UWB                    , "UWB"),
+        std::make_pair((int)Qt::Key_AudioForward           , "AudioForward"),
+        std::make_pair((int)Qt::Key_AudioRepeat            , "AudioRepeat"),
+        std::make_pair((int)Qt::Key_AudioRandomPlay        , "AudioRandomPlay"),
+        std::make_pair((int)Qt::Key_Subtitle               , "Subtitle"),
+        std::make_pair((int)Qt::Key_AudioCycleTrack        , "AudioCycleTrack"),
+        std::make_pair((int)Qt::Key_Time                   , "Time"),
+        std::make_pair((int)Qt::Key_Hibernate              , "Hibernate"),
+        std::make_pair((int)Qt::Key_View                   , "View"),
+        std::make_pair((int)Qt::Key_TopMenu                , "TopMenu"),
+        std::make_pair((int)Qt::Key_PowerDown              , "PowerDown"),
+        std::make_pair((int)Qt::Key_Suspend                , "Suspend"),
+        std::make_pair((int)Qt::Key_ContrastAdjust         , "ContrastAdjust"),
+        std::make_pair((int)Qt::Key_LaunchG                , "LaunchG"),
+        std::make_pair((int)Qt::Key_LaunchH                , "LaunchH"),
+#if QT_VERSION >= QT_VERSION_CHECK(5,7,0)
+        std::make_pair((int)Qt::Key_TouchpadToggle         , "TouchpadToggle"),
+        std::make_pair((int)Qt::Key_TouchpadOn             , "TouchpadOn"),
+        std::make_pair((int)Qt::Key_TouchpadOff            , "TouchpadOff"),
+        std::make_pair((int)Qt::Key_MicMute                , "MicMute"),
+        std::make_pair((int)Qt::Key_Red                    , "Red"),
+        std::make_pair((int)Qt::Key_Green                  , "Green"),
+        std::make_pair((int)Qt::Key_Yellow                 , "Yellow"),
+        std::make_pair((int)Qt::Key_Blue                   , "Blue"),
+        std::make_pair((int)Qt::Key_ChannelUp              , "ChannelUp"),
+        std::make_pair((int)Qt::Key_ChannelDown            , "ChannelDown"),
+        std::make_pair((int)Qt::Key_Guide                  , "Guide"),
+        std::make_pair((int)Qt::Key_Info                   , "Info"),
+        std::make_pair((int)Qt::Key_Settings               , "Settings"),
+        std::make_pair((int)Qt::Key_MicVolumeUp            , "MicVolumeUp"),
+        std::make_pair((int)Qt::Key_MicVolumeDown          , "MicVolumeDown"),
+        std::make_pair((int)Qt::Key_New                    , "New"),
+        std::make_pair((int)Qt::Key_Open                   , "Open"),
+        std::make_pair((int)Qt::Key_Find                   , "Find"),
+        std::make_pair((int)Qt::Key_Undo                   , "Undo"),
+        std::make_pair((int)Qt::Key_Redo                   , "Redo"),
+#endif
+        std::make_pair((int)Qt::Key_AltGr                  , "AltGr"),
+        std::make_pair((int)Qt::Key_Multi_key              , "Multi_key"),
+        std::make_pair((int)Qt::Key_Kanji                  , "Kanji"),
+        std::make_pair((int)Qt::Key_Muhenkan               , "Muhenkan"),
+        std::make_pair((int)Qt::Key_Henkan                 , "Henkan"),
+        std::make_pair((int)Qt::Key_Romaji                 , "Romaji"),
+        std::make_pair((int)Qt::Key_Hiragana               , "Hiragana"),
+        std::make_pair((int)Qt::Key_Katakana               , "Katakana"),
+        std::make_pair((int)Qt::Key_Hiragana_Katakana      , "Hiragana_Katakana"),
+        std::make_pair((int)Qt::Key_Zenkaku                , "Zenkaku"),
+        std::make_pair((int)Qt::Key_Hankaku                , "Hankaku"),
+        std::make_pair((int)Qt::Key_Zenkaku_Hankaku        , "Zenkaku_Hankaku"),
+        std::make_pair((int)Qt::Key_Touroku                , "Touroku"),
+        std::make_pair((int)Qt::Key_Massyo                 , "Massyo"),
+        std::make_pair((int)Qt::Key_Kana_Lock              , "Kana_Lock"),
+        std::make_pair((int)Qt::Key_Kana_Shift             , "Kana_Shift"),
+        std::make_pair((int)Qt::Key_Eisu_Shift             , "Eisu_Shift"),
+        std::make_pair((int)Qt::Key_Eisu_toggle            , "Eisu_toggle"),
+        std::make_pair((int)Qt::Key_Hangul                 , "Hangul"),
+        std::make_pair((int)Qt::Key_Hangul_Start           , "Hangul_Start"),
+        std::make_pair((int)Qt::Key_Hangul_End             , "Hangul_End"),
+        std::make_pair((int)Qt::Key_Hangul_Hanja           , "Hangul_Hanja"),
+        std::make_pair((int)Qt::Key_Hangul_Jamo            , "Hangul_Jamo"),
+        std::make_pair((int)Qt::Key_Hangul_Romaja          , "Hangul_Romaja"),
+        std::make_pair((int)Qt::Key_Codeinput              , "Codeinput"),
+        std::make_pair((int)Qt::Key_Hangul_Jeonja          , "Hangul_Jeonja"),
+        std::make_pair((int)Qt::Key_Hangul_Banja           , "Hangul_Banja"),
+        std::make_pair((int)Qt::Key_Hangul_PreHanja        , "Hangul_PreHanja"),
+        std::make_pair((int)Qt::Key_Hangul_PostHanja       , "Hangul_PostHanja"),
+        std::make_pair((int)Qt::Key_SingleCandidate        , "SingleCandidate"),
+        std::make_pair((int)Qt::Key_MultipleCandidate      , "MultipleCandidate"),
+        std::make_pair((int)Qt::Key_PreviousCandidate      , "PreviousCandidate"),
+        std::make_pair((int)Qt::Key_Hangul_Special         , "Hangul_Special"),
+        std::make_pair((int)Qt::Key_Mode_switch            , "Mode_switch"),
+        std::make_pair((int)Qt::Key_Dead_Grave             , "Dead_Grave"),
+        std::make_pair((int)Qt::Key_Dead_Acute             , "Dead_Acute"),
+        std::make_pair((int)Qt::Key_Dead_Circumflex        , "Dead_Circumflex"),
+        std::make_pair((int)Qt::Key_Dead_Tilde             , "Dead_Tilde"),
+        std::make_pair((int)Qt::Key_Dead_Macron            , "Dead_Macron"),
+        std::make_pair((int)Qt::Key_Dead_Breve             , "Dead_Breve"),
+        std::make_pair((int)Qt::Key_Dead_Abovedot          , "Dead_Abovedot"),
+        std::make_pair((int)Qt::Key_Dead_Diaeresis         , "Dead_Diaeresis"),
+        std::make_pair((int)Qt::Key_Dead_Abovering         , "Dead_Abovering"),
+        std::make_pair((int)Qt::Key_Dead_Doubleacute       , "Dead_Doubleacute"),
+        std::make_pair((int)Qt::Key_Dead_Caron             , "Dead_Caron"),
+        std::make_pair((int)Qt::Key_Dead_Cedilla           , "Dead_Cedilla"),
+        std::make_pair((int)Qt::Key_Dead_Ogonek            , "Dead_Ogonek"),
+        std::make_pair((int)Qt::Key_Dead_Iota              , "Dead_Iota"),
+        std::make_pair((int)Qt::Key_Dead_Voiced_Sound      , "Dead_Voiced_Sound"),
+        std::make_pair((int)Qt::Key_Dead_Semivoiced_Sound  , "Dead_Semivoiced_Sound"),
+        std::make_pair((int)Qt::Key_Dead_Belowdot          , "Dead_Belowdot"),
+        std::make_pair((int)Qt::Key_Dead_Hook              , "Dead_Hook"),
+        std::make_pair((int)Qt::Key_Dead_Horn              , "Dead_Horn"),
+        std::make_pair((int)Qt::Key_MediaLast              , "MediaLast"),
+        std::make_pair((int)Qt::Key_Select                 , "Select"),
+        std::make_pair((int)Qt::Key_Yes                    , "Yes"),
+        std::make_pair((int)Qt::Key_No                     , "No"),
+        std::make_pair((int)Qt::Key_Cancel                 , "Cancel"),
+        std::make_pair((int)Qt::Key_Printer                , "Printer"),
+        std::make_pair((int)Qt::Key_Execute                , "Execute"),
+        std::make_pair((int)Qt::Key_Sleep                  , "Sleep"),
+        std::make_pair((int)Qt::Key_Play                   , "Play"),
+        std::make_pair((int)Qt::Key_Zoom                   , "Zoom"),
+#if QT_VERSION >= QT_VERSION_CHECK(5,7,0)
+        std::make_pair((int)Qt::Key_Exit                   , "Exit"),
+#endif
+        std::make_pair((int)Qt::Key_Context1               , "Context1"),
+        std::make_pair((int)Qt::Key_Context2               , "Context2"),
+        std::make_pair((int)Qt::Key_Context3               , "Context3"),
+        std::make_pair((int)Qt::Key_Context4               , "Context4"),
+        std::make_pair((int)Qt::Key_Call                   , "Call"),
+        std::make_pair((int)Qt::Key_Hangup                 , "Hangup"),
+        std::make_pair((int)Qt::Key_Flip                   , "Flip"),
+        std::make_pair((int)Qt::Key_ToggleCallHangup       , "ToggleCallHangup"),
+        std::make_pair((int)Qt::Key_VoiceDial              , "VoiceDial"),
+        std::make_pair((int)Qt::Key_LastNumberRedial       , "LastNumberRedial"),
+        std::make_pair((int)Qt::Key_Camera                 , "Camera"),
+        std::make_pair((int)Qt::Key_CameraFocus            , "CameraFocus"),
+        std::make_pair(0                                   , (const char*) 0)
+    };
+
+}
diff --git a/apps/opencs/model/prefs/shortcutmanager.hpp b/apps/opencs/model/prefs/shortcutmanager.hpp
new file mode 100644
index 000000000..99f01a5df
--- /dev/null
+++ b/apps/opencs/model/prefs/shortcutmanager.hpp
@@ -0,0 +1,73 @@
+#ifndef CSM_PREFS_SHORTCUTMANAGER_H
+#define CSM_PREFS_SHORTCUTMANAGER_H
+
+#include <map>
+
+#include <QKeySequence>
+#include <QObject>
+#include <QString>
+
+namespace CSMPrefs
+{
+    class Shortcut;
+    class ShortcutEventHandler;
+
+    /// Class used to track and update shortcuts/sequences
+    class ShortcutManager : public QObject
+    {
+            Q_OBJECT
+
+        public:
+
+            ShortcutManager();
+
+            /// The shortcut class will do this automatically
+            void addShortcut(Shortcut* shortcut);
+
+            /// The shortcut class will do this automatically
+            void removeShortcut(Shortcut* shortcut);
+
+            bool getSequence(const std::string& name, QKeySequence& sequence) const;
+            void setSequence(const std::string& name, const QKeySequence& sequence);
+
+            bool getModifier(const std::string& name, int& modifier) const;
+            void setModifier(const std::string& name, int modifier);
+
+            std::string convertToString(const QKeySequence& sequence) const;
+            std::string convertToString(int modifier) const;
+
+            std::string convertToString(const QKeySequence& sequence, int modifier) const;
+
+            void convertFromString(const std::string& data, QKeySequence& sequence) const;
+            void convertFromString(const std::string& data, int& modifier) const;
+
+            void convertFromString(const std::string& data, QKeySequence& sequence, int& modifier) const;
+
+            /// Replaces "{sequence-name}" or "{modifier-name}" with the appropriate text
+            QString processToolTip(const QString& toolTip) const;
+
+        private:
+
+            // Need a multimap in case multiple shortcuts share the same name
+            typedef std::multimap<std::string, Shortcut*> ShortcutMap;
+            typedef std::map<std::string, QKeySequence> SequenceMap;
+            typedef std::map<std::string, int> ModifierMap;
+            typedef std::map<int, std::string> NameMap;
+            typedef std::map<std::string, int> KeyMap;
+
+            ShortcutMap mShortcuts;
+            SequenceMap mSequences;
+            ModifierMap mModifiers;
+
+            NameMap mNames;
+            KeyMap mKeys;
+
+            ShortcutEventHandler* mEventHandler;
+
+            void createLookupTables();
+
+            static const std::pair<int, const char*> QtKeys[];
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/prefs/shortcutsetting.cpp b/apps/opencs/model/prefs/shortcutsetting.cpp
new file mode 100644
index 000000000..c56119deb
--- /dev/null
+++ b/apps/opencs/model/prefs/shortcutsetting.cpp
@@ -0,0 +1,197 @@
+#include "shortcutsetting.hpp"
+
+#include <QEvent>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QMouseEvent>
+#include <QPushButton>
+#include <QWidget>
+
+#include "state.hpp"
+#include "shortcutmanager.hpp"
+
+namespace CSMPrefs
+{
+    const int ShortcutSetting::MaxKeys;
+
+    ShortcutSetting::ShortcutSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
+        const std::string& label)
+        : Setting(parent, values, mutex, key, label)
+        , mButton(0)
+        , mEditorActive(false)
+        , mEditorPos(0)
+    {
+        for (int i = 0; i < MaxKeys; ++i)
+        {
+            mEditorKeys[i] = 0;
+        }
+    }
+
+    std::pair<QWidget*, QWidget*> ShortcutSetting::makeWidgets(QWidget* parent)
+    {
+        QKeySequence sequence;
+        State::get().getShortcutManager().getSequence(getKey(), sequence);
+
+        QString text = QString::fromUtf8(State::get().getShortcutManager().convertToString(sequence).c_str());
+
+        QLabel* label = new QLabel(QString::fromUtf8(getLabel().c_str()), parent);
+        QPushButton* widget = new QPushButton(text, parent);
+
+        widget->setCheckable(true);
+        widget->installEventFilter(this);
+        mButton = widget;
+
+        connect(widget, SIGNAL(toggled(bool)), this, SLOT(buttonToggled(bool)));
+
+        return std::make_pair(label, widget);
+    }
+
+    bool ShortcutSetting::eventFilter(QObject* target, QEvent* event)
+    {
+        if (event->type() == QEvent::KeyPress)
+        {
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            if (keyEvent->isAutoRepeat())
+                return true;
+
+            int mod = keyEvent->modifiers();
+            int key = keyEvent->key();
+
+            return handleEvent(target, mod, key, true);
+        }
+        else if (event->type() == QEvent::KeyRelease)
+        {
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            if (keyEvent->isAutoRepeat())
+                return true;
+
+            int mod = keyEvent->modifiers();
+            int key = keyEvent->key();
+
+            return handleEvent(target, mod, key, false);
+        }
+        else if (event->type() == QEvent::MouseButtonPress)
+        {
+            QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
+            int mod = mouseEvent->modifiers();
+            int key = mouseEvent->button();
+
+            return handleEvent(target, mod, key, true);
+        }
+        else if (event->type() == QEvent::MouseButtonRelease)
+        {
+            QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
+            int mod = mouseEvent->modifiers();
+            int key = mouseEvent->button();
+
+            return handleEvent(target, mod, key, false);
+        }
+        else if (event->type() == QEvent::FocusOut)
+        {
+            resetState();
+        }
+
+        return false;
+    }
+
+    bool ShortcutSetting::handleEvent(QObject* target, int mod, int value, bool active)
+    {
+        // Modifiers are handled differently
+        const int Blacklist[] =
+        {
+            Qt::Key_Shift,
+            Qt::Key_Control,
+            Qt::Key_Meta,
+            Qt::Key_Alt,
+            Qt::Key_AltGr
+        };
+
+        const size_t BlacklistSize = sizeof(Blacklist) / sizeof(int);
+
+        if (!mEditorActive)
+        {
+            if (value == Qt::RightButton && !active)
+            {
+                // Clear sequence
+                QKeySequence sequence = QKeySequence(0, 0, 0, 0);
+                storeValue(sequence);
+
+                resetState();
+            }
+
+            return false;
+        }
+
+        // Handle blacklist
+        for (size_t i = 0; i < BlacklistSize; ++i)
+        {
+            if (value == Blacklist[i])
+                return true;
+        }
+
+        if (!active || mEditorPos >= MaxKeys)
+        {
+            // Update key
+            QKeySequence sequence = QKeySequence(mEditorKeys[0], mEditorKeys[1], mEditorKeys[2], mEditorKeys[3]);
+            storeValue(sequence);
+
+            resetState();
+        }
+        else
+        {
+            if (mEditorPos == 0)
+            {
+                mEditorKeys[0] = mod | value;
+            }
+            else
+            {
+                mEditorKeys[mEditorPos] = value;
+            }
+
+            mEditorPos += 1;
+        }
+
+        return true;
+    }
+
+    void ShortcutSetting::storeValue(const QKeySequence& sequence)
+    {
+        State::get().getShortcutManager().setSequence(getKey(), sequence);
+
+        // Convert to string and assign
+        std::string value = State::get().getShortcutManager().convertToString(sequence);
+
+        {
+            QMutexLocker lock(getMutex());
+            getValues().setString(getKey(), getParent()->getKey(), value);
+        }
+
+        getParent()->getState()->update(*this);
+    }
+
+    void ShortcutSetting::resetState()
+    {
+        mButton->setChecked(false);
+        mEditorActive = false;
+        mEditorPos = 0;
+        for (int i = 0; i < MaxKeys; ++i)
+        {
+            mEditorKeys[i] = 0;
+        }
+
+        // Button text
+        QKeySequence sequence;
+        State::get().getShortcutManager().getSequence(getKey(), sequence);
+
+        QString text = QString::fromUtf8(State::get().getShortcutManager().convertToString(sequence).c_str());
+        mButton->setText(text);
+    }
+
+    void ShortcutSetting::buttonToggled(bool checked)
+    {
+        if (checked)
+            mButton->setText("Press keys or click here...");
+
+        mEditorActive = checked;
+    }
+}
diff --git a/apps/opencs/model/prefs/shortcutsetting.hpp b/apps/opencs/model/prefs/shortcutsetting.hpp
new file mode 100644
index 000000000..bb38b580a
--- /dev/null
+++ b/apps/opencs/model/prefs/shortcutsetting.hpp
@@ -0,0 +1,49 @@
+#ifndef CSM_PREFS_SHORTCUTSETTING_H
+#define CSM_PREFS_SHORTCUTSETTING_H
+
+#include <QKeySequence>
+
+#include "setting.hpp"
+
+class QEvent;
+class QPushButton;
+
+namespace CSMPrefs
+{
+    class ShortcutSetting : public Setting
+    {
+            Q_OBJECT
+
+        public:
+
+            ShortcutSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
+                const std::string& label);
+
+            virtual std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent);
+
+        protected:
+
+            bool eventFilter(QObject* target, QEvent* event);
+
+        private:
+
+            bool handleEvent(QObject* target, int mod, int value, bool active);
+
+            void storeValue(const QKeySequence& sequence);
+            void resetState();
+
+            static const int MaxKeys = 4;
+
+            QPushButton* mButton;
+
+            bool mEditorActive;
+            int mEditorPos;
+            int mEditorKeys[MaxKeys];
+
+        private slots:
+
+            void buttonToggled(bool checked);
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 772047961..b8d6102ac 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -9,6 +9,8 @@
 #include "doublesetting.hpp"
 #include "boolsetting.hpp"
 #include "coloursetting.hpp"
+#include "shortcutsetting.hpp"
+#include "modifiersetting.hpp"
 
 CSMPrefs::State *CSMPrefs::State::sThis = 0;
 
@@ -136,6 +138,9 @@ void CSMPrefs::State::declare()
     declareBool ("wrap-lines", "Wrap Lines", false).
         setTooltip ("Wrap lines longer than width of script editor.");
     declareBool ("mono-font", "Use monospace font", true);
+    declareInt ("tab-width", "Tab Width", 4).
+        setTooltip ("Number of characters for tab width").
+        setRange (1, 10);
     EnumValue warningsNormal ("Normal", "Report warnings as warning");
     declareEnum ("warnings", "Warning Mode", warningsNormal).
         addValue ("Ignore", "Do not report warning").
@@ -162,20 +167,17 @@ void CSMPrefs::State::declare()
         "list go to the first/last item");
 
     declareCategory ("3D Scene Input");
-    EnumValue left ("Left Mouse-Button");
-    EnumValue cLeft ("Ctrl-Left Mouse-Button");
-    EnumValue right ("Right Mouse-Button");
-    EnumValue cRight ("Ctrl-Right Mouse-Button");
-    EnumValue middle ("Middle Mouse-Button");
-    EnumValue cMiddle ("Ctrl-Middle Mouse-Button");
-    EnumValues inputButtons;
-    inputButtons.add (left).add (cLeft).add (right).add (cRight).add (middle).add (cMiddle);
-    declareEnum ("p-navi", "Primary Camera Navigation Button", left).addValues (inputButtons);
-    declareEnum ("s-navi", "Secondary Camera Navigation Button", cLeft).addValues (inputButtons);
-    declareEnum ("p-edit", "Primary Editing Button", right).addValues (inputButtons);
-    declareEnum ("s-edit", "Secondary Editing Button", cRight).addValues (inputButtons);
-    declareEnum ("p-select", "Primary Selection Button", middle).addValues (inputButtons);
-    declareEnum ("s-select", "Secondary Selection Button", cMiddle).addValues (inputButtons);
+    declareDouble ("p-navi-free-sensitivity", "Free Camera Sensitivity", 1/650.).setPrecision(5).setRange(0.0, 1.0);
+    declareBool ("p-navi-free-invert", "Invert Free Camera Mouse Input", false);
+    declareDouble ("p-navi-orbit-sensitivity", "Orbit Camera Sensitivity", 1/650.).setPrecision(5).setRange(0.0, 1.0);
+    declareBool ("p-navi-orbit-invert", "Invert Orbit Camera Mouse Input", false);
+    declareDouble ("s-navi-sensitivity", "Secondary Camera Movement Sensitivity", 50.0).setRange(-1000.0, 1000.0);
+    declareDouble ("navi-wheel-factor", "Camera Zoom Sensitivity", 8).setRange(-100.0, 100.0);
+    declareDouble ("navi-free-lin-speed", "Free Camera Linear Speed", 1000.0).setRange(1.0, 10000.0);
+    declareDouble ("navi-free-rot-speed", "Free Camera Rotational Speed", 3.14 / 2).setRange(0.001, 6.28);
+    declareDouble ("navi-free-speed-mult", "Free Camera Speed Multiplier (from Modifier)", 8).setRange(0.001, 1000.0);
+    declareDouble ("navi-orbit-rot-speed", "Orbital Camera Rotational Speed", 3.14 / 4).setRange(0.001, 6.28);
+    declareDouble ("navi-orbit-speed-mult", "Orbital Camera Speed Multiplier (from Modifier)", 4).setRange(0.001, 1000.0);
     declareSeparator();
     declareBool ("context-select", "Context Sensitive Selection", false);
     declareDouble ("drag-factor", "Mouse sensitivity during drag operations", 1.0).
@@ -186,6 +188,7 @@ void CSMPrefs::State::declare()
             "Shift-acceleration factor during drag operations", 4.0).
         setTooltip ("Acceleration factor during drag operations while holding down shift").
         setRange (0.001, 100.0);
+    declareDouble ("rotate-factor", "Free rotation factor", 0.007).setPrecision(4).setRange(0.0001, 0.1);
 
     declareCategory ("Tooltips");
     declareBool ("scene", "Show Tooltips in 3D scenes", true);
@@ -210,6 +213,119 @@ void CSMPrefs::State::declare()
         addValues (insertOutsideCell);
     declareEnum ("outside-visible-drop", "Handling drops outside of visible cells", showAndInsert).
         addValues (insertOutsideVisibleCell);
+
+    declareCategory ("Key Bindings");
+
+    declareSubcategory ("Document");
+    declareShortcut ("document-file-newgame", "New Game", QKeySequence(Qt::ControlModifier | Qt::Key_N));
+    declareShortcut ("document-file-newaddon", "New Addon", QKeySequence());
+    declareShortcut ("document-file-open", "Open", QKeySequence(Qt::ControlModifier | Qt::Key_O));
+    declareShortcut ("document-file-save", "Save", QKeySequence(Qt::ControlModifier | Qt::Key_S));
+    declareShortcut ("document-file-verify", "Verify", QKeySequence());
+    declareShortcut ("document-file-merge", "Merge", QKeySequence());
+    declareShortcut ("document-file-errorlog", "Open Load Error Log", QKeySequence());
+    declareShortcut ("document-file-metadata", "Meta Data", QKeySequence());
+    declareShortcut ("document-file-close", "Close Document", QKeySequence(Qt::ControlModifier | Qt::Key_W));
+    declareShortcut ("document-file-exit", "Exit Application", QKeySequence(Qt::ControlModifier | Qt::Key_Q));
+    declareShortcut ("document-edit-undo", "Undo", QKeySequence(Qt::ControlModifier | Qt::Key_Z));
+    declareShortcut ("document-edit-redo", "Redo", QKeySequence(Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Z));
+    declareShortcut ("document-edit-preferences", "Open Preferences", QKeySequence());
+    declareShortcut ("document-edit-search", "Search", QKeySequence(Qt::ControlModifier | Qt::Key_F));
+    declareShortcut ("document-view-newview", "New View", QKeySequence());
+    declareShortcut ("document-view-statusbar", "Toggle Status Bar", QKeySequence());
+    declareShortcut ("document-view-filters", "Open Filter List", QKeySequence());
+    declareShortcut ("document-world-regions", "Open Region List", QKeySequence());
+    declareShortcut ("document-world-cells", "Open Cell List", QKeySequence());
+    declareShortcut ("document-world-referencables", "Open Object List", QKeySequence());
+    declareShortcut ("document-world-references", "Open Instance List", QKeySequence());
+    declareShortcut ("document-world-pathgrid", "Open Pathgrid List", QKeySequence());
+    declareShortcut ("document-world-regionmap", "Open Region Map", QKeySequence());
+    declareShortcut ("document-mechanics-globals", "Open Global List", QKeySequence());
+    declareShortcut ("document-mechanics-gamesettings", "Open Game Settings", QKeySequence());
+    declareShortcut ("document-mechanics-scripts", "Open Script List", QKeySequence());
+    declareShortcut ("document-mechanics-spells", "Open Spell List", QKeySequence());
+    declareShortcut ("document-mechanics-enchantments", "Open Enchantment List", QKeySequence());
+    declareShortcut ("document-mechanics-magiceffects", "Open Magic Effect List", QKeySequence());
+    declareShortcut ("document-mechanics-startscripts", "Open Start Script List", QKeySequence());
+    declareShortcut ("document-character-skills", "Open Skill List", QKeySequence());
+    declareShortcut ("document-character-classes", "Open Class List", QKeySequence());
+    declareShortcut ("document-character-factions", "Open Faction List", QKeySequence());
+    declareShortcut ("document-character-races", "Open Race List", QKeySequence());
+    declareShortcut ("document-character-birthsigns", "Open Birthsign List", QKeySequence());
+    declareShortcut ("document-character-topics", "Open Topic List", QKeySequence());
+    declareShortcut ("document-character-journals", "Open Journal List", QKeySequence());
+    declareShortcut ("document-character-topicinfos", "Open Topic Info List", QKeySequence());
+    declareShortcut ("document-character-journalinfos", "Open Journal Info List", QKeySequence());
+    declareShortcut ("document-character-bodyparts", "Open Body Part List", QKeySequence());
+    declareShortcut ("document-assets-sounds", "Open Sound Asset List", QKeySequence());
+    declareShortcut ("document-assets-soundgens", "Open Sound Generator List", QKeySequence());
+    declareShortcut ("document-assets-meshes", "Open Mesh Asset List", QKeySequence());
+    declareShortcut ("document-assets-icons", "Open Icon Asset List", QKeySequence());
+    declareShortcut ("document-assets-music", "Open Music Asset List", QKeySequence());
+    declareShortcut ("document-assets-soundres", "Open Sound File List", QKeySequence());
+    declareShortcut ("document-assets-textures", "Open Texture Asset List", QKeySequence());
+    declareShortcut ("document-assets-videos", "Open Video Asset List", QKeySequence());
+    declareShortcut ("document-debug-run", "Run Debug", QKeySequence());
+    declareShortcut ("document-debug-shutdown", "Stop Debug", QKeySequence());
+    declareShortcut ("document-debug-runlog", "Open Run Log", QKeySequence());
+
+    declareSubcategory ("Table");
+    declareShortcut ("table-edit", "Edit Record", QKeySequence());
+    declareShortcut ("table-add", "Add Row/Record", QKeySequence(Qt::ShiftModifier | Qt::Key_A));
+    declareShortcut ("table-clone", "Clone Record", QKeySequence(Qt::ShiftModifier | Qt::Key_D));
+    declareShortcut ("table-revert", "Revert Record", QKeySequence());
+    declareShortcut ("table-remove", "Remove Row/Record", QKeySequence(Qt::Key_Delete));
+    declareShortcut ("table-moveup", "Move Record Up", QKeySequence());
+    declareShortcut ("table-movedown", "Move Record Down", QKeySequence());
+    declareShortcut ("table-view", "View Record", QKeySequence());
+    declareShortcut ("table-preview", "Preview Record", QKeySequence());
+    declareShortcut ("table-extendeddelete", "Extended Record Deletion", QKeySequence());
+    declareShortcut ("table-extendedrevert", "Extended Record Revertion", QKeySequence());
+
+    declareSubcategory ("Report Table");
+    declareShortcut ("reporttable-show", "Show Report", QKeySequence());
+    declareShortcut ("reporttable-remove", "Remove Report", QKeySequence(Qt::Key_Delete));
+    declareShortcut ("reporttable-replace", "Replace Report", QKeySequence());
+    declareShortcut ("reporttable-refresh", "Refresh Report", QKeySequence());
+
+    declareSubcategory ("Scene");
+    declareShortcut ("scene-navi-primary", "Camera Rotation From Mouse Movement", QKeySequence(Qt::LeftButton));
+    declareShortcut ("scene-navi-secondary", "Camera Translation From Mouse Movement",
+        QKeySequence(Qt::ControlModifier | (int)Qt::LeftButton));
+    declareShortcut ("scene-edit-primary", "Primary Edit", QKeySequence(Qt::RightButton));
+    declareShortcut ("scene-edit-secondary", "Secondary Edit",
+        QKeySequence(Qt::ControlModifier | (int)Qt::RightButton));
+    declareShortcut ("scene-select-primary", "Primary Select", QKeySequence(Qt::MiddleButton));
+    declareShortcut ("scene-select-secondary", "Secondary Select",
+        QKeySequence(Qt::ControlModifier | (int)Qt::MiddleButton));
+    declareModifier ("scene-speed-modifier", "Speed Modifier", Qt::Key_Shift);
+    declareShortcut ("scene-load-cam-cell", "Load Camera Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_5));
+    declareShortcut ("scene-load-cam-eastcell", "Load East Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_6));
+    declareShortcut ("scene-load-cam-northcell", "Load North Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_8));
+    declareShortcut ("scene-load-cam-westcell", "Load West Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_4));
+    declareShortcut ("scene-load-cam-southcell", "Load South Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_2));
+    declareShortcut ("scene-edit-abort", "Abort", QKeySequence(Qt::Key_Escape));
+    declareShortcut ("scene-focus-toolbar", "Toggle Toolbar Focus", QKeySequence(Qt::Key_T));
+    declareShortcut ("scene-render-stats", "Debug Rendering Stats", QKeySequence(Qt::Key_F3));
+
+    declareSubcategory ("1st/Free Camera");
+    declareShortcut ("free-forward", "Forward", QKeySequence(Qt::Key_W));
+    declareShortcut ("free-backward", "Backward", QKeySequence(Qt::Key_S));
+    declareShortcut ("free-left", "Left", QKeySequence(Qt::Key_A));
+    declareShortcut ("free-right", "Right", QKeySequence(Qt::Key_D));
+    declareShortcut ("free-roll-left", "Roll Left", QKeySequence(Qt::Key_Q));
+    declareShortcut ("free-roll-right", "Roll Right", QKeySequence(Qt::Key_E));
+    declareShortcut ("free-speed-mode", "Toggle Speed Mode", QKeySequence(Qt::Key_F));
+
+    declareSubcategory ("Orbit Camera");
+    declareShortcut ("orbit-up", "Up", QKeySequence(Qt::Key_W));
+    declareShortcut ("orbit-down", "Down", QKeySequence(Qt::Key_S));
+    declareShortcut ("orbit-left", "Left", QKeySequence(Qt::Key_A));
+    declareShortcut ("orbit-right", "Right", QKeySequence(Qt::Key_D));
+    declareShortcut ("orbit-roll-left", "Roll Left", QKeySequence(Qt::Key_Q));
+    declareShortcut ("orbit-roll-right", "Roll Right", QKeySequence(Qt::Key_E));
+    declareShortcut ("orbit-speed-mode", "Toggle Speed Mode", QKeySequence(Qt::Key_F));
+    declareShortcut ("orbit-center-selection", "Center On Selected", QKeySequence(Qt::Key_C));
 }
 
 void CSMPrefs::State::declareCategory (const std::string& key)
@@ -326,6 +442,50 @@ CSMPrefs::ColourSetting& CSMPrefs::State::declareColour (const std::string& key,
     return *setting;
 }
 
+CSMPrefs::ShortcutSetting& CSMPrefs::State::declareShortcut (const std::string& key, const std::string& label,
+    const QKeySequence& default_)
+{
+    if (mCurrentCategory==mCategories.end())
+        throw std::logic_error ("no category for setting");
+
+    std::string seqStr = getShortcutManager().convertToString(default_);
+    setDefault (key, seqStr);
+
+    // Setup with actual data
+    QKeySequence sequence;
+
+    getShortcutManager().convertFromString(mSettings.getString(key, mCurrentCategory->second.getKey()), sequence);
+    getShortcutManager().setSequence(key, sequence);
+
+    CSMPrefs::ShortcutSetting *setting = new CSMPrefs::ShortcutSetting (&mCurrentCategory->second, &mSettings, &mMutex,
+        key, label);
+    mCurrentCategory->second.addSetting (setting);
+
+    return *setting;
+}
+
+CSMPrefs::ModifierSetting& CSMPrefs::State::declareModifier(const std::string& key, const std::string& label,
+    int default_)
+{
+    if (mCurrentCategory==mCategories.end())
+        throw std::logic_error ("no category for setting");
+
+    std::string modStr = getShortcutManager().convertToString(default_);
+    setDefault (key, modStr);
+
+    // Setup with actual data
+    int modifier;
+
+    getShortcutManager().convertFromString(mSettings.getString(key, mCurrentCategory->second.getKey()), modifier);
+    getShortcutManager().setModifier(key, modifier);
+
+    CSMPrefs::ModifierSetting *setting = new CSMPrefs::ModifierSetting (&mCurrentCategory->second, &mSettings, &mMutex,
+        key, label);
+    mCurrentCategory->second.addSetting (setting);
+
+    return *setting;
+}
+
 void CSMPrefs::State::declareSeparator()
 {
     if (mCurrentCategory==mCategories.end())
@@ -337,6 +497,17 @@ void CSMPrefs::State::declareSeparator()
     mCurrentCategory->second.addSetting (setting);
 }
 
+void CSMPrefs::State::declareSubcategory(const std::string& label)
+{
+    if (mCurrentCategory==mCategories.end())
+        throw std::logic_error ("no category for setting");
+
+    CSMPrefs::Setting *setting =
+        new CSMPrefs::Setting (&mCurrentCategory->second, &mSettings, &mMutex, "", label);
+
+    mCurrentCategory->second.addSetting (setting);
+}
+
 void CSMPrefs::State::setDefault (const std::string& key, const std::string& default_)
 {
     Settings::CategorySetting fullKey (mCurrentCategory->second.getKey(), key);
@@ -355,10 +526,10 @@ CSMPrefs::State::State (const Files::ConfigurationManager& configurationManager)
     if (sThis)
         throw std::logic_error ("An instance of CSMPRefs::State already exists");
 
+    sThis = this;
+
     load();
     declare();
-
-    sThis = this;
 }
 
 CSMPrefs::State::~State()
@@ -382,6 +553,11 @@ CSMPrefs::State::Iterator CSMPrefs::State::end()
     return mCategories.end();
 }
 
+CSMPrefs::ShortcutManager& CSMPrefs::State::getShortcutManager()
+{
+    return mShortcutManager;
+}
+
 CSMPrefs::Category& CSMPrefs::State::operator[] (const std::string& key)
 {
     Iterator iter = mCategories.find (key);
diff --git a/apps/opencs/model/prefs/state.hpp b/apps/opencs/model/prefs/state.hpp
index bcd76c671..1e46c68ee 100644
--- a/apps/opencs/model/prefs/state.hpp
+++ b/apps/opencs/model/prefs/state.hpp
@@ -1,4 +1,4 @@
-#ifndef CSV_PREFS_STATE_H
+#ifndef CSM_PREFS_STATE_H
 #define CSM_PREFS_STATE_H
 
 #include <map>
@@ -16,6 +16,7 @@
 #include "category.hpp"
 #include "setting.hpp"
 #include "enumsetting.hpp"
+#include "shortcutmanager.hpp"
 
 class QColor;
 
@@ -25,6 +26,8 @@ namespace CSMPrefs
     class DoubleSetting;
     class BoolSetting;
     class ColourSetting;
+    class ShortcutSetting;
+    class ModifierSetting;
 
     /// \brief User settings state
     ///
@@ -45,6 +48,7 @@ namespace CSMPrefs
 
             const std::string mConfigFile;
             const Files::ConfigurationManager& mConfigurationManager;
+            ShortcutManager mShortcutManager;
             Settings::Manager mSettings;
             Collection mCategories;
             Iterator mCurrentCategory;
@@ -71,8 +75,15 @@ namespace CSMPrefs
 
             ColourSetting& declareColour (const std::string& key, const std::string& label, QColor default_);
 
+            ShortcutSetting& declareShortcut (const std::string& key, const std::string& label,
+                const QKeySequence& default_);
+
+            ModifierSetting& declareModifier(const std::string& key, const std::string& label, int modifier_);
+
             void declareSeparator();
 
+            void declareSubcategory(const std::string& label);
+
             void setDefault (const std::string& key, const std::string& default_);
 
         public:
@@ -87,6 +98,8 @@ namespace CSMPrefs
 
             Iterator end();
 
+            ShortcutManager& getShortcutManager();
+
             Category& operator[](const std::string& key);
 
             void update (const Setting& setting);
diff --git a/apps/opencs/model/tools/journalcheck.cpp b/apps/opencs/model/tools/journalcheck.cpp
new file mode 100644
index 000000000..bdd14ddf0
--- /dev/null
+++ b/apps/opencs/model/tools/journalcheck.cpp
@@ -0,0 +1,79 @@
+#include "journalcheck.hpp"
+
+#include <set>
+#include <sstream>
+
+CSMTools::JournalCheckStage::JournalCheckStage(const CSMWorld::IdCollection<ESM::Dialogue> &journals,
+    const CSMWorld::InfoCollection& journalInfos)
+    : mJournals(journals), mJournalInfos(journalInfos)
+{}
+
+int CSMTools::JournalCheckStage::setup()
+{
+    return mJournals.getSize();
+}
+
+void CSMTools::JournalCheckStage::perform(int stage, CSMDoc::Messages& messages)
+{
+    const CSMWorld::Record<ESM::Dialogue> &journalRecord = mJournals.getRecord(stage);
+
+    if (journalRecord.isDeleted())
+        return;
+
+    const ESM::Dialogue &journal = journalRecord.get();
+    int statusNamedCount = 0;
+    int totalInfoCount = 0;
+    std::set<int> questIndices;
+
+    CSMWorld::InfoCollection::Range range = mJournalInfos.getTopicRange(journal.mId);
+
+    for (CSMWorld::InfoCollection::RecordConstIterator it = range.first; it != range.second; ++it)
+    {
+        const CSMWorld::Record<CSMWorld::Info> infoRecord = (*it);
+
+        if (infoRecord.isDeleted())
+            continue;
+
+        const CSMWorld::Info& journalInfo = infoRecord.get();
+
+        totalInfoCount += 1;
+
+        if (journalInfo.mQuestStatus == ESM::DialInfo::QS_Name)
+        {
+            statusNamedCount += 1;
+        }
+
+        if (journalInfo.mResponse.empty())
+        {
+            CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_JournalInfo, journalInfo.mId);
+
+            messages.add(id, "Journal Info: missing description", "", CSMDoc::Message::Severity_Warning);
+        }
+
+        std::pair<std::set<int>::iterator, bool> result = questIndices.insert(journalInfo.mData.mJournalIndex);
+
+        // Duplicate index
+        if (result.second == false)
+        {
+            CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_JournalInfo, journalInfo.mId);
+
+            std::ostringstream stream;
+            stream << "Journal: duplicated quest index " << journalInfo.mData.mJournalIndex;
+
+            messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+        }
+    }
+
+    if (totalInfoCount == 0)
+    {
+        CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Journal, journal.mId);
+
+        messages.add(id, "Journal: no defined Journal Infos", "", CSMDoc::Message::Severity_Warning);
+    }
+    else if (statusNamedCount > 1)
+    {
+        CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Journal, journal.mId);
+
+        messages.add(id, "Journal: multiple infos with quest status \"Named\"", "", CSMDoc::Message::Severity_Error);
+    }
+}
diff --git a/apps/opencs/model/tools/journalcheck.hpp b/apps/opencs/model/tools/journalcheck.hpp
new file mode 100644
index 000000000..c9f619698
--- /dev/null
+++ b/apps/opencs/model/tools/journalcheck.hpp
@@ -0,0 +1,35 @@
+#ifndef CSM_TOOLS_JOURNALCHECK_H
+#define CSM_TOOLS_JOURNALCHECK_H
+
+#include <components/esm/loaddial.hpp>
+
+#include "../world/idcollection.hpp"
+#include "../world/infocollection.hpp"
+
+#include "../doc/stage.hpp"
+
+namespace CSMTools
+{
+    /// \brief VerifyStage: make sure that journal infos are good
+    class JournalCheckStage : public CSMDoc::Stage
+    {
+    public:
+
+        JournalCheckStage(const CSMWorld::IdCollection<ESM::Dialogue>& journals,
+            const CSMWorld::InfoCollection& journalInfos);
+
+        virtual int setup();
+        ///< \return number of steps
+
+        virtual void perform(int stage, CSMDoc::Messages& messages);
+        ///< Messages resulting from this stage will be appended to \a messages
+
+    private:
+
+        const CSMWorld::IdCollection<ESM::Dialogue>& mJournals;
+        const CSMWorld::InfoCollection& mJournalInfos;
+
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/tools/mergestages.cpp b/apps/opencs/model/tools/mergestages.cpp
index f52e8886f..176d35914 100644
--- a/apps/opencs/model/tools/mergestages.cpp
+++ b/apps/opencs/model/tools/mergestages.cpp
@@ -99,6 +99,7 @@ void CSMTools::MergeReferencesStage::perform (int stage, CSMDoc::Messages& messa
 
         ref.mRefNum.mIndex = mIndex[Misc::StringUtils::lowerCase (ref.mCell)]++;
         ref.mRefNum.mContentFile = 0;
+        ref.mNew = false;
 
         CSMWorld::Record<CSMWorld::CellRef> newRecord (
             CSMWorld::RecordBase::State_ModifiedOnly, 0, &ref);
@@ -128,7 +129,7 @@ void CSMTools::ListLandTexturesMergeStage::perform (int stage, CSMDoc::Messages&
 
         // make sure record is loaded
         land.loadData (ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML |
-            ESM::Land::DATA_VCLR | ESM::Land::DATA_VTEX | ESM::Land::DATA_WNAM);
+            ESM::Land::DATA_VCLR | ESM::Land::DATA_VTEX);
 
         if (const ESM::Land::LandData *data = land.getLandData (ESM::Land::DATA_VTEX))
         {
@@ -183,7 +184,7 @@ void CSMTools::MergeLandTexturesStage::perform (int stage, CSMDoc::Messages& mes
             CSMWorld::LandTexture texture =
                 mState.mSource.getData().getLandTextures().getRecord (index).get();
 
-            std::ostringstream stream;
+            stream.clear();
             stream << mNext->second-1 << "_0";
 
             texture.mIndex = mNext->second-1;
@@ -220,7 +221,7 @@ void CSMTools::MergeLandStage::perform (int stage, CSMDoc::Messages& messages)
         const CSMWorld::Land& land = record.get();
 
         land.loadData (ESM::Land::DATA_VCLR | ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML |
-            ESM::Land::DATA_VTEX | ESM::Land::DATA_WNAM);
+            ESM::Land::DATA_VTEX);
 
         CSMWorld::Land newLand (land);
 
diff --git a/apps/opencs/model/tools/pathgridcheck.cpp b/apps/opencs/model/tools/pathgridcheck.cpp
index 69ee5a809..3cd4a1b09 100644
--- a/apps/opencs/model/tools/pathgridcheck.cpp
+++ b/apps/opencs/model/tools/pathgridcheck.cpp
@@ -70,20 +70,6 @@ void CSMTools::PathgridCheckStage::perform (int stage, CSMDoc::Messages& message
 
     for (unsigned int i = 0; i < pathgrid.mPoints.size(); ++i)
     {
-        // check the connection number for each point matches the edge connections
-        if (pathgrid.mPoints[i].mConnectionNum > pointList[i].mConnectionNum)
-        {
-            std::ostringstream ss;
-            ss << " has has less edges than expected for point " << i;
-            messages.add (id, pathgrid.mId + ss.str(), "", CSMDoc::Message::Severity_Error);
-        }
-        else if (pathgrid.mPoints[i].mConnectionNum < pointList[i].mConnectionNum)
-        {
-            std::ostringstream ss;
-            ss << " has has more edges than expected for point " << i;
-            messages.add (id, pathgrid.mId + ss.str(), "", CSMDoc::Message::Severity_Error);
-        }
-
         // check that edges are bidirectional
         bool foundReverse = false;
         for (unsigned int j = 0; j < pointList[i].mOtherIndex.size(); ++j)
diff --git a/apps/opencs/model/tools/referenceablecheck.cpp b/apps/opencs/model/tools/referenceablecheck.cpp
index ce78e52b2..4dd3e1edf 100644
--- a/apps/opencs/model/tools/referenceablecheck.cpp
+++ b/apps/opencs/model/tools/referenceablecheck.cpp
@@ -425,7 +425,7 @@ void CSMTools::ReferenceableCheckStage::creatureCheck (
 
     //stats checks
     if (creature.mData.mLevel < 1)
-        messages.push_back (std::make_pair (id, creature.mId + " has non-postive level"));
+        messages.push_back (std::make_pair (id, creature.mId + " has non-positive level"));
 
     if (creature.mData.mStrength < 0)
         messages.push_back (std::make_pair (id, creature.mId + " has negative strength"));
@@ -659,7 +659,7 @@ void CSMTools::ReferenceableCheckStage::npcCheck (
     {
         if ((npc.mFlags & ESM::NPC::Autocalc) == 0) //0x0010 = autocalculated flag
         {
-            messages.push_back (std::make_pair (id, npc.mId + " mNpdtType or flags mismatch!")); //should not happend?
+            messages.push_back (std::make_pair (id, npc.mId + " mNpdtType or flags mismatch!")); //should not happen?
             return;
         }
 
@@ -915,7 +915,7 @@ void CSMTools::ReferenceableCheckStage::inventoryListCheck(
                 id + " contains non-existing item (" + itemName + ")"));
         else
         {
-            // Needs to accomodate Containers, Creatures, and NPCs
+            // Needs to accommodate containers, creatures, and NPCs
             switch (localIndex.second)
             {
             case CSMWorld::UniversalId::Type_Potion:
diff --git a/apps/opencs/model/tools/regioncheck.cpp b/apps/opencs/model/tools/regioncheck.cpp
index 2fdff5f38..734861080 100644
--- a/apps/opencs/model/tools/regioncheck.cpp
+++ b/apps/opencs/model/tools/regioncheck.cpp
@@ -29,9 +29,16 @@ void CSMTools::RegionCheckStage::perform (int stage, CSMDoc::Messages& messages)
 
     // test for empty name
     if (region.mName.empty())
-        messages.push_back (std::make_pair (id, region.mId + " has an empty name"));
+        messages.add(id, region.mId + " has an empty name", "", CSMDoc::Message::Severity_Error);
 
     /// \todo test that the ID in mSleeplist exists
 
+    // test that chances add up to 100
+    int chances = region.mData.mClear + region.mData.mCloudy + region.mData.mFoggy + region.mData.mOvercast +
+        region.mData.mRain + region.mData.mThunder + region.mData.mAsh + region.mData.mBlight +
+        region.mData.mA + region.mData.mB;
+    if (chances != 100)
+        messages.add(id, "Weather chances do not add up to 100", "", CSMDoc::Message::Severity_Error);
+
     /// \todo check data members that can't be edited in the table view
 }
diff --git a/apps/opencs/model/tools/reportmodel.cpp b/apps/opencs/model/tools/reportmodel.cpp
index 49de1d651..f9a1fdb0c 100644
--- a/apps/opencs/model/tools/reportmodel.cpp
+++ b/apps/opencs/model/tools/reportmodel.cpp
@@ -37,14 +37,18 @@ int CSMTools::ReportModel::columnCount (const QModelIndex & parent) const
 
 QVariant CSMTools::ReportModel::data (const QModelIndex & index, int role) const
 {
-    if (role!=Qt::DisplayRole)
+    if (role!=Qt::DisplayRole && role!=Qt::UserRole)
         return QVariant();
 
     switch (index.column())
     {
         case Column_Type:
 
-            return static_cast<int> (mRows.at (index.row()).mId.getType());
+            if(role == Qt::UserRole)
+                return QString::fromUtf8 (
+                    mRows.at (index.row()).mId.getTypeName().c_str());
+            else
+                return static_cast<int> (mRows.at (index.row()).mId.getType());
 
         case Column_Id:
         {
diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp
index e750092b9..f538a716e 100644
--- a/apps/opencs/model/tools/tools.cpp
+++ b/apps/opencs/model/tools/tools.cpp
@@ -30,6 +30,8 @@
 #include "magiceffectcheck.hpp"
 #include "mergeoperation.hpp"
 #include "gmstcheck.hpp"
+#include "topicinfocheck.hpp"
+#include "journalcheck.hpp"
 
 CSMDoc::OperationHolder *CSMTools::Tools::get (int type)
 {
@@ -111,9 +113,24 @@ CSMDoc::OperationHolder *CSMTools::Tools::getVerifier()
                                                                     mData.getReferenceables(),
                                                                     mData.getResources (CSMWorld::UniversalId::Type_Icons),
                                                                     mData.getResources (CSMWorld::UniversalId::Type_Textures)));
-        
+
         mVerifierOperation->appendStage (new GmstCheckStage (mData.getGmsts()));
 
+        mVerifierOperation->appendStage (new TopicInfoCheckStage (mData.getTopicInfos(),
+                                                                  mData.getCells(),
+                                                                  mData.getClasses(),
+                                                                  mData.getFactions(),
+                                                                  mData.getGmsts(),
+                                                                  mData.getGlobals(),
+                                                                  mData.getJournals(),
+                                                                  mData.getRaces(),
+                                                                  mData.getRegions(),
+                                                                  mData.getTopics(),
+                                                                  mData.getReferenceables().getDataSet(),
+                                                                  mData.getResources (CSMWorld::UniversalId::Type_SoundsRes)));
+
+        mVerifierOperation->appendStage (new JournalCheckStage(mData.getJournals(), mData.getJournalInfos()));
+
         mVerifier.setOperation (mVerifierOperation);
     }
 
diff --git a/apps/opencs/model/tools/topicinfocheck.cpp b/apps/opencs/model/tools/topicinfocheck.cpp
new file mode 100644
index 000000000..05f02c763
--- /dev/null
+++ b/apps/opencs/model/tools/topicinfocheck.cpp
@@ -0,0 +1,441 @@
+#include "topicinfocheck.hpp"
+
+#include <sstream>
+
+#include "../world/infoselectwrapper.hpp"
+
+CSMTools::TopicInfoCheckStage::TopicInfoCheckStage(
+    const CSMWorld::InfoCollection& topicInfos,
+    const CSMWorld::IdCollection<CSMWorld::Cell>& cells,
+    const CSMWorld::IdCollection<ESM::Class>& classes,
+    const CSMWorld::IdCollection<ESM::Faction>& factions,
+    const CSMWorld::IdCollection<ESM::GameSetting>& gmsts,
+    const CSMWorld::IdCollection<ESM::Global>& globals,
+    const CSMWorld::IdCollection<ESM::Dialogue>& journals,
+    const CSMWorld::IdCollection<ESM::Race>& races,
+    const CSMWorld::IdCollection<ESM::Region>& regions,
+    const CSMWorld::IdCollection<ESM::Dialogue> &topics,
+    const CSMWorld::RefIdData& referencables,
+    const CSMWorld::Resources& soundFiles)
+    : mTopicInfos(topicInfos),
+      mCells(cells),
+      mClasses(classes),
+      mFactions(factions),
+      mGameSettings(gmsts),
+      mGlobals(globals),
+      mJournals(journals),
+      mRaces(races),
+      mRegions(regions),
+      mTopics(topics),
+      mReferencables(referencables),
+      mSoundFiles(soundFiles)
+{}
+
+int CSMTools::TopicInfoCheckStage::setup()
+{
+    // Generate list of cell names for reference checking
+
+    mCellNames.clear();
+    for (int i = 0; i < mCells.getSize(); ++i)
+    {
+        const CSMWorld::Record<CSMWorld::Cell>& cellRecord = mCells.getRecord(i);
+
+        if (cellRecord.isDeleted())
+            continue;
+
+        mCellNames.insert(cellRecord.get().mName);
+    }
+    // Cell names can also include region names
+    for (int i = 0; i < mRegions.getSize(); ++i)
+    {
+        const CSMWorld::Record<ESM::Region>& regionRecord = mRegions.getRecord(i);
+
+        if (regionRecord.isDeleted())
+            continue;
+
+        mCellNames.insert(regionRecord.get().mName);
+    }
+    // Default cell name
+    int index = mGameSettings.searchId("sDefaultCellname");
+    if (index != -1)
+    {
+        const CSMWorld::Record<ESM::GameSetting>& gmstRecord = mGameSettings.getRecord(index);
+
+        if (!gmstRecord.isDeleted() && gmstRecord.get().mValue.getType() == ESM::VT_String)
+        {
+            mCellNames.insert(gmstRecord.get().mValue.getString());
+        }
+    }
+
+    return mTopicInfos.getSize();
+}
+
+void CSMTools::TopicInfoCheckStage::perform(int stage, CSMDoc::Messages& messages)
+{
+    const CSMWorld::Record<CSMWorld::Info>& infoRecord = mTopicInfos.getRecord(stage);
+
+    if (infoRecord.isDeleted())
+        return;
+
+    const CSMWorld::Info& topicInfo = infoRecord.get();
+
+    // There should always be a topic that matches
+    int topicIndex = mTopics.searchId(topicInfo.mTopicId);
+
+    const CSMWorld::Record<ESM::Dialogue>& topicRecord = mTopics.getRecord(topicIndex);
+
+    if (topicRecord.isDeleted())
+        return;
+
+    const ESM::Dialogue& topic = topicRecord.get();
+
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_TopicInfo, topicInfo.mId);
+
+    // Check fields
+
+    if (!topicInfo.mActor.empty())
+    {
+        verifyActor(topicInfo.mActor, id, messages);
+    }
+
+    if (!topicInfo.mClass.empty())
+    {
+        verifyId(topicInfo.mClass, mClasses, id, messages);
+    }
+
+    if (!topicInfo.mCell.empty())
+    {
+        verifyCell(topicInfo.mCell, id, messages);
+    }
+
+    if (!topicInfo.mFaction.empty() && !topicInfo.mFactionLess)
+    {
+        if (verifyId(topicInfo.mFaction, mFactions, id, messages))
+        {
+            verifyFactionRank(topicInfo.mFaction, topicInfo.mData.mRank, id, messages);
+        }
+    }
+
+    if (!topicInfo.mPcFaction.empty())
+    {
+        if (verifyId(topicInfo.mPcFaction, mFactions, id, messages))
+        {
+            verifyFactionRank(topicInfo.mPcFaction, topicInfo.mData.mPCrank, id, messages);
+        }
+    }
+
+    if (topicInfo.mData.mGender < -1 || topicInfo.mData.mGender > 1)
+    {
+        std::ostringstream stream;
+        messages.add(id, "Gender: Value is invalid", "", CSMDoc::Message::Severity_Error);
+    }
+
+    if (!topicInfo.mRace.empty())
+    {
+        verifyId(topicInfo.mRace, mRaces, id, messages);
+    }
+
+    if (!topicInfo.mSound.empty())
+    {
+        verifySound(topicInfo.mSound, id, messages);
+    }
+
+    if (topicInfo.mResponse.empty() && topic.mType != ESM::Dialogue::Voice)
+    {
+        messages.add(id, "Response is empty", "", CSMDoc::Message::Severity_Warning);
+    }
+
+    // Check info conditions
+
+    for (std::vector<ESM::DialInfo::SelectStruct>::const_iterator it = topicInfo.mSelects.begin();
+         it != topicInfo.mSelects.end(); ++it)
+    {
+        verifySelectStruct((*it), id, messages);
+    }
+}
+
+// Verification functions
+
+bool CSMTools::TopicInfoCheckStage::verifyActor(const std::string& actor, const CSMWorld::UniversalId& id,
+    CSMDoc::Messages& messages)
+{
+    const std::string specifier = "Actor";
+
+    CSMWorld::RefIdData::LocalIndex index = mReferencables.searchId(actor);
+
+    if (index.first == -1)
+    {
+        writeMissingIdError(specifier, actor, id, messages);
+        return false;
+    }
+    else if (mReferencables.getRecord(index).isDeleted())
+    {
+        writeDeletedRecordError(specifier, actor, id, messages);
+        return false;
+    }
+    else if (index.second != CSMWorld::UniversalId::Type_Npc && index.second != CSMWorld::UniversalId::Type_Creature)
+    {
+        writeInvalidTypeError(specifier, actor, index.second, "NPC or Creature", id, messages);
+        return false;
+    }
+
+    return true;
+}
+
+bool CSMTools::TopicInfoCheckStage::verifyCell(const std::string& cell, const CSMWorld::UniversalId& id,
+    CSMDoc::Messages& messages)
+{
+    const std::string specifier = "Cell";
+
+    if (mCellNames.find(cell) == mCellNames.end())
+    {
+        writeMissingIdError(specifier, cell, id, messages);
+        return false;
+    }
+
+    return true;
+}
+
+bool CSMTools::TopicInfoCheckStage::verifyFactionRank(const std::string& factionName, int rank, const CSMWorld::UniversalId& id,
+    CSMDoc::Messages& messages)
+{
+    if (rank < -1)
+    {
+        std::ostringstream stream;
+        stream << "Rank or PC Rank is set to " << rank << ", but should be set to -1 if no rank is required";
+
+        messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+        return false;
+    }
+
+    int index = mFactions.searchId(factionName);
+
+    const ESM::Faction &faction = mFactions.getRecord(index).get();
+
+    int limit = 0;
+    for (; limit < 10; ++limit)
+    {
+        if (faction.mRanks[limit].empty())
+            break;
+    }
+
+    if (rank >= limit)
+    {
+        std::ostringstream stream;
+        stream << "Rank or PC Rank is set to " << rank << " which is more than the maximum of " << limit - 1
+               << " for the " << factionName << " faction";
+
+        messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+        return false;
+    }
+
+    return true;
+}
+
+bool CSMTools::TopicInfoCheckStage::verifyItem(const std::string& item, const CSMWorld::UniversalId& id,
+    CSMDoc::Messages& messages)
+{
+    const std::string specifier = "Item";
+
+    CSMWorld::RefIdData::LocalIndex index = mReferencables.searchId(item);
+
+    if (index.first == -1)
+    {
+        writeMissingIdError(specifier, item, id, messages);
+        return false;
+    }
+    else if (mReferencables.getRecord(index).isDeleted())
+    {
+        writeDeletedRecordError(specifier, item, id, messages);
+        return false;
+    }
+    else
+    {
+        switch (index.second)
+        {
+            case CSMWorld::UniversalId::Type_Potion:
+            case CSMWorld::UniversalId::Type_Apparatus:
+            case CSMWorld::UniversalId::Type_Armor:
+            case CSMWorld::UniversalId::Type_Book:
+            case CSMWorld::UniversalId::Type_Clothing:
+            case CSMWorld::UniversalId::Type_Ingredient:
+            case CSMWorld::UniversalId::Type_Light:
+            case CSMWorld::UniversalId::Type_Lockpick:
+            case CSMWorld::UniversalId::Type_Miscellaneous:
+            case CSMWorld::UniversalId::Type_Probe:
+            case CSMWorld::UniversalId::Type_Repair:
+            case CSMWorld::UniversalId::Type_Weapon:
+            case CSMWorld::UniversalId::Type_ItemLevelledList:
+                break;
+
+            default:
+                writeInvalidTypeError(specifier, item, index.second, "Potion, Armor, Book, etc.", id, messages);
+                return false;
+        }
+    }
+
+    return true;
+}
+
+bool CSMTools::TopicInfoCheckStage::verifySelectStruct(const ESM::DialInfo::SelectStruct& select,
+    const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
+{
+    CSMWorld::ConstInfoSelectWrapper infoCondition(select);
+
+    if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_None)
+    {
+        messages.add(id, "Invalid Info Condition: " + infoCondition.toString(), "", CSMDoc::Message::Severity_Error);
+        return false;
+    }
+    else if (!infoCondition.variantTypeIsValid())
+    {
+        std::ostringstream stream;
+        stream << "Info Condition: Value for \"" << infoCondition.toString() << "\" has a type of ";
+
+        switch (select.mValue.getType())
+        {
+            case ESM::VT_None:   stream << "None"; break;
+            case ESM::VT_Short:  stream << "Short"; break;
+            case ESM::VT_Int:    stream << "Int"; break;
+            case ESM::VT_Long:   stream << "Long"; break;
+            case ESM::VT_Float:  stream << "Float"; break;
+            case ESM::VT_String: stream << "String"; break;
+            default:             stream << "Unknown"; break;
+        }
+
+        messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+        return false;
+    }
+    else if (infoCondition.conditionIsAlwaysTrue())
+    {
+        std::ostringstream stream;
+        stream << "Info Condition: " << infoCondition.toString() << " is always true";
+
+        messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Warning);
+        return false;
+    }
+    else if (infoCondition.conditionIsNeverTrue())
+    {
+        std::ostringstream stream;
+        stream << "Info Condition: " << infoCondition.toString() << " is never true";
+
+        messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Warning);
+        return false;
+    }
+
+    // Id checks
+    if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Global &&
+        !verifyId(infoCondition.getVariableName(), mGlobals, id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Journal &&
+        !verifyId(infoCondition.getVariableName(), mJournals, id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Item &&
+        !verifyItem(infoCondition.getVariableName(), id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Dead &&
+        !verifyActor(infoCondition.getVariableName(), id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotId &&
+        !verifyActor(infoCondition.getVariableName(), id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotFaction &&
+        !verifyId(infoCondition.getVariableName(), mFactions, id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotClass &&
+        !verifyId(infoCondition.getVariableName(), mClasses, id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotRace &&
+        !verifyId(infoCondition.getVariableName(), mRaces, id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotCell &&
+        !verifyCell(infoCondition.getVariableName(), id, messages))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool CSMTools::TopicInfoCheckStage::verifySound(const std::string& sound, const CSMWorld::UniversalId& id,
+    CSMDoc::Messages& messages)
+{
+    const std::string specifier = "Sound File";
+
+    if (mSoundFiles.searchId(sound) == -1)
+    {
+        writeMissingIdError(specifier, sound, id, messages);
+        return false;
+    }
+
+    return true;
+}
+
+template <typename T>
+bool CSMTools::TopicInfoCheckStage::verifyId(const std::string& name, const CSMWorld::IdCollection<T>& collection,
+    const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
+{
+    int index = collection.searchId(name);
+
+    if (index == -1)
+    {
+        writeMissingIdError(T::getRecordType(), name, id, messages);
+        return false;
+    }
+    else if (collection.getRecord(index).isDeleted())
+    {
+        writeDeletedRecordError(T::getRecordType(), name, id, messages);
+        return false;
+    }
+
+    return true;
+}
+
+// Error functions
+
+void CSMTools::TopicInfoCheckStage::writeMissingIdError(const std::string& specifier, const std::string& missingId,
+    const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
+{
+    std::ostringstream stream;
+    stream << specifier << ": ID or name \"" << missingId << "\" could not be found";
+
+    messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+}
+
+void CSMTools::TopicInfoCheckStage::writeDeletedRecordError(const std::string& specifier, const std::string& recordId,
+    const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
+{
+    std::ostringstream stream;
+    stream << specifier << ": Deleted record with ID \"" << recordId << "\" is being referenced";
+
+    messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+}
+
+void CSMTools::TopicInfoCheckStage::writeInvalidTypeError(const std::string& specifier, const std::string& invalidId,
+    CSMWorld::UniversalId::Type invalidType, const std::string& expectedType, const CSMWorld::UniversalId& id,
+    CSMDoc::Messages& messages)
+{
+    CSMWorld::UniversalId tempId(invalidType, invalidId);
+
+    std::ostringstream stream;
+    stream << specifier << ": invalid type of " << tempId.getTypeName() << " was found for referencable \""
+           << invalidId << "\" (can be of type " << expectedType << ")";
+
+    messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+}
diff --git a/apps/opencs/model/tools/topicinfocheck.hpp b/apps/opencs/model/tools/topicinfocheck.hpp
new file mode 100644
index 000000000..510901dac
--- /dev/null
+++ b/apps/opencs/model/tools/topicinfocheck.hpp
@@ -0,0 +1,95 @@
+#ifndef CSM_TOOLS_TOPICINFOCHECK_HPP
+#define CSM_TOOLS_TOPICINFOCHECK_HPP
+
+#include <set>
+
+#include <components/esm/loadclas.hpp>
+#include <components/esm/loaddial.hpp>
+#include <components/esm/loadfact.hpp>
+#include <components/esm/loadglob.hpp>
+#include <components/esm/loadgmst.hpp>
+#include <components/esm/loadrace.hpp>
+#include <components/esm/loadregn.hpp>
+
+#include "../world/cell.hpp"
+#include "../world/idcollection.hpp"
+#include "../world/infocollection.hpp"
+#include "../world/refiddata.hpp"
+#include "../world/resources.hpp"
+
+#include "../doc/stage.hpp"
+
+namespace CSMTools
+{
+    /// \brief VerifyStage: check topics
+    class TopicInfoCheckStage : public CSMDoc::Stage
+    {
+    public:
+
+        TopicInfoCheckStage(
+            const CSMWorld::InfoCollection& topicInfos,
+            const CSMWorld::IdCollection<CSMWorld::Cell>& cells,
+            const CSMWorld::IdCollection<ESM::Class>& classes,
+            const CSMWorld::IdCollection<ESM::Faction>& factions,
+            const CSMWorld::IdCollection<ESM::GameSetting>& gmsts,
+            const CSMWorld::IdCollection<ESM::Global>& globals,
+            const CSMWorld::IdCollection<ESM::Dialogue>& journals,
+            const CSMWorld::IdCollection<ESM::Race>& races,
+            const CSMWorld::IdCollection<ESM::Region>& regions,
+            const CSMWorld::IdCollection<ESM::Dialogue>& topics,
+            const CSMWorld::RefIdData& referencables,
+            const CSMWorld::Resources& soundFiles);
+
+        virtual int setup();
+        ///< \return number of steps
+
+        virtual void perform(int step, CSMDoc::Messages& messages);
+        ///< Messages resulting from this stage will be appended to \a messages
+
+    private:
+
+        const CSMWorld::InfoCollection& mTopicInfos;
+
+        const CSMWorld::IdCollection<CSMWorld::Cell>& mCells;
+        const CSMWorld::IdCollection<ESM::Class>& mClasses;
+        const CSMWorld::IdCollection<ESM::Faction>& mFactions;
+        const CSMWorld::IdCollection<ESM::GameSetting>& mGameSettings;
+        const CSMWorld::IdCollection<ESM::Global>& mGlobals;
+        const CSMWorld::IdCollection<ESM::Dialogue>& mJournals;
+        const CSMWorld::IdCollection<ESM::Race>& mRaces;
+        const CSMWorld::IdCollection<ESM::Region>& mRegions;
+        const CSMWorld::IdCollection<ESM::Dialogue>& mTopics;
+
+        const CSMWorld::RefIdData& mReferencables;
+        const CSMWorld::Resources& mSoundFiles;
+
+        std::set<std::string> mCellNames;
+
+        // These return false when not successful and write an error
+        bool verifyActor(const std::string& name, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+        bool verifyCell(const std::string& name, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+        bool verifyFactionRank(const std::string& name, int rank, const CSMWorld::UniversalId& id,
+            CSMDoc::Messages& messages);
+        bool verifyItem(const std::string& name, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+        bool verifySelectStruct(const ESM::DialInfo::SelectStruct& select, const CSMWorld::UniversalId& id,
+            CSMDoc::Messages& messages);
+        bool verifySound(const std::string& name, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+
+        template <typename T>
+        bool verifyId(const std::string& name, const CSMWorld::IdCollection<T>& collection,
+            const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+
+        // Common error messages
+        void writeMissingIdError(const std::string& specifier, const std::string& missingId,
+            const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+
+        void writeDeletedRecordError(const std::string& specifier, const std::string& recordId,
+            const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+
+        void writeInvalidTypeError(const std::string& specifier, const std::string& invalidId,
+            CSMWorld::UniversalId::Type invalidType, const std::string& expectedType,
+            const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/world/cellcoordinates.cpp b/apps/opencs/model/world/cellcoordinates.cpp
index 3ef3e6c69..abb3bc82e 100644
--- a/apps/opencs/model/world/cellcoordinates.cpp
+++ b/apps/opencs/model/world/cellcoordinates.cpp
@@ -1,5 +1,7 @@
 #include "cellcoordinates.hpp"
 
+#include <cmath>
+
 #include <ostream>
 #include <sstream>
 
@@ -7,6 +9,9 @@ CSMWorld::CellCoordinates::CellCoordinates() : mX (0), mY (0) {}
 
 CSMWorld::CellCoordinates::CellCoordinates (int x, int y) : mX (x), mY (y) {}
 
+CSMWorld::CellCoordinates::CellCoordinates (const std::pair<int, int>& coordinates)
+: mX (coordinates.first), mY (coordinates.second) {}
+
 int CSMWorld::CellCoordinates::getX() const
 {
     return mX;
@@ -32,11 +37,16 @@ std::string CSMWorld::CellCoordinates::getId (const std::string& worldspace) con
     return stream.str();
 }
 
+bool CSMWorld::CellCoordinates::isExteriorCell (const std::string& id)
+{
+    return (!id.empty() && id[0]=='#');
+}
+
 std::pair<CSMWorld::CellCoordinates, bool> CSMWorld::CellCoordinates::fromId (
     const std::string& id)
 {
     // no worldspace for now, needs to be changed for 1.1
-    if (!id.empty() && id[0]=='#')
+    if (isExteriorCell(id))
     {
         int x, y;
         char ignore;
@@ -49,6 +59,13 @@ std::pair<CSMWorld::CellCoordinates, bool> CSMWorld::CellCoordinates::fromId (
     return std::make_pair (CellCoordinates(), false);
 }
 
+std::pair<int, int> CSMWorld::CellCoordinates::coordinatesToCellIndex (float x, float y)
+{
+    const int cellSize = 8192;
+
+    return std::make_pair (std::floor (x/cellSize), std::floor (y/cellSize));
+}
+
 bool CSMWorld::operator== (const CellCoordinates& left, const CellCoordinates& right)
 {
     return left.getX()==right.getX() && left.getY()==right.getY();
diff --git a/apps/opencs/model/world/cellcoordinates.hpp b/apps/opencs/model/world/cellcoordinates.hpp
index 63db60c29..9207aede5 100644
--- a/apps/opencs/model/world/cellcoordinates.hpp
+++ b/apps/opencs/model/world/cellcoordinates.hpp
@@ -3,6 +3,7 @@
 
 #include <iosfwd>
 #include <string>
+#include <utility>
 
 #include <QMetaType>
 
@@ -19,6 +20,8 @@ namespace CSMWorld
 
             CellCoordinates (int x, int y);
 
+            CellCoordinates (const std::pair<int, int>& coordinates);
+
             int getX() const;
 
             int getY() const;
@@ -29,11 +32,16 @@ namespace CSMWorld
             std::string getId (const std::string& worldspace) const;
             ///< Return the ID for the cell at these coordinates.
 
+            static bool isExteriorCell (const std::string& id);
+
             /// \return first: CellCoordinates (or 0, 0 if cell does not have coordinates),
             /// second: is cell paged?
             ///
             /// \note The worldspace part of \a id is ignored
             static std::pair<CellCoordinates, bool> fromId (const std::string& id);
+
+            /// \return cell coordinates such that given world coordinates are in it.
+            static std::pair<int, int> coordinatesToCellIndex (float x, float y);
     };
 
     bool operator== (const CellCoordinates& left, const CellCoordinates& right);
diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
index c75a3c2a1..d609a6253 100644
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -85,6 +85,7 @@ namespace CSMWorld
             Display_Enchantment,
             //CONCRETE TYPES ENDS HERE
 
+            Display_UnsignedInteger8,
             Display_Integer,
             Display_Float,
             Display_Var,
@@ -130,10 +131,14 @@ namespace CSMWorld
             Display_InfoCondComp,
             Display_String32,
             Display_LongString256,
+            Display_BookType,
+            Display_BloodType,
+            Display_EmitterType,
 
             Display_EffectSkill,     // must display at least one, unlike Display_Skill
             Display_EffectAttribute, // must display at least one, unlike Display_Attribute
             Display_IngredEffectId,  // display none allowed, unlike Display_EffectId
+            Display_GenderNpc,       // must display at least one, unlike Display_Gender
 
             //top level columns that nest other columns
             Display_NestedHeader
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 4e608dbbd..33a71e97a 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -1757,6 +1757,41 @@ namespace CSMWorld
             return true;
         }
     };
+    
+    template<typename ESXRecordT>
+    struct GenderNpcColumn : public Column<ESXRecordT>
+    {
+        GenderNpcColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_GenderNpc, ColumnBase::Display_GenderNpc)
+        {}
+
+        virtual QVariant get(const Record<ESXRecordT>& record) const
+        {
+            // Implemented this way to allow additional gender types in the future.
+            if ((record.get().mData.mFlags & ESM::BodyPart::BPF_Female) == ESM::BodyPart::BPF_Female)
+                return 1;
+
+            return 0;
+        }
+
+        virtual void set(Record<ESXRecordT>& record, const QVariant& data)
+        {
+            ESXRecordT record2 = record.get();
+
+            // Implemented this way to allow additional gender types in the future.
+            if (data.toInt() == 1)
+                record2.mData.mFlags = (record2.mData.mFlags & ~ESM::BodyPart::BPF_Female) | ESM::BodyPart::BPF_Female;
+            else
+                record2.mData.mFlags = record2.mData.mFlags & ~ESM::BodyPart::BPF_Female;
+
+            record.setModified(record2);
+        }
+
+        virtual bool isEditable() const
+        {
+            return true;
+        }
+    };
 
     template<typename ESXRecordT>
     struct EnchantmentTypeColumn : public Column<ESXRecordT>
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index d0d3a1671..aeee0d208 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -3,6 +3,7 @@
 #include <components/misc/stringops.hpp>
 
 #include "universalid.hpp"
+#include "infoselectwrapper.hpp"
 
 namespace CSMWorld
 {
@@ -97,7 +98,7 @@ namespace CSMWorld
             { ColumnId_ArmorType, "Armor Type" },
             { ColumnId_Health, "Health" },
             { ColumnId_ArmorValue, "Armor Value" },
-            { ColumnId_Scroll, "Scroll" },
+            { ColumnId_BookType, "Book Type" },
             { ColumnId_ClothingType, "Clothing Type" },
             { ColumnId_WeightCapacity, "Weight Capacity" },
             { ColumnId_OrganicContainer, "Organic Container" },
@@ -111,8 +112,8 @@ namespace CSMWorld
             { ColumnId_Flies, "Flies" },
             { ColumnId_Walks, "Walks" },
             { ColumnId_Essential, "Essential" },
-            { ColumnId_SkeletonBlood, "Skeleton Blood" },
-            { ColumnId_MetalBlood, "Metal Blood" },
+            { ColumnId_BloodType, "Blood Type" },
+
             { ColumnId_OpenSound, "Open Sound" },
             { ColumnId_CloseSound, "Close Sound" },
             { ColumnId_Duration, "Duration" },
@@ -122,10 +123,8 @@ namespace CSMWorld
             { ColumnId_Dynamic, "Dynamic" },
             { ColumnId_Portable, "Portable" },
             { ColumnId_NegativeLight, "Negative Light" },
-            { ColumnId_Flickering, "Flickering" },
-            { ColumnId_SlowFlickering, "Slow Flickering" },
-            { ColumnId_Pulsing, "Pulsing" },
-            { ColumnId_SlowPulsing, "Slow Pulsing" },
+            { ColumnId_EmitterType, "Emitter Type" },
+            
             { ColumnId_Fire, "Fire" },
             { ColumnId_OffByDefault, "Off by default" },
             { ColumnId_IsKey, "Is Key" },
@@ -273,8 +272,8 @@ namespace CSMWorld
             { ColumnId_InfoList, "Info List" },
             { ColumnId_InfoCondition, "Info Conditions" },
             { ColumnId_InfoCondFunc, "Function" },
-            { ColumnId_InfoCondVar, "Func/Variable" },
-            { ColumnId_InfoCondComp, "Comp" },
+            { ColumnId_InfoCondVar, "Variable/Object" },
+            { ColumnId_InfoCondComp, "Relation" },
             { ColumnId_InfoCondValue, "Values" },
             { ColumnId_OriginalCell, "Original Cell" },
 
@@ -284,6 +283,7 @@ namespace CSMWorld
             { ColumnId_NpcMisc, "NPC Misc" },
             { ColumnId_Level, "Level" },
             { ColumnId_NpcFactionID, "Faction ID" },
+            { ColumnId_GenderNpc, "Gender"},
             { ColumnId_Mana, "Mana" },
             { ColumnId_Fatigue, "Fatigue" },
             { ColumnId_NpcDisposition, "NPC Disposition" },
@@ -325,6 +325,12 @@ namespace CSMWorld
             { ColumnId_Idle7, "Idle 7" },
             { ColumnId_Idle8, "Idle 8" },
 
+            { ColumnId_RegionWeather, "Weather" },
+            { ColumnId_WeatherName, "Type" },
+            { ColumnId_WeatherChance, "Percent Chance" },
+
+            { ColumnId_Text, "Text" },
+
             { ColumnId_UseValue1, "Use value 1" },
             { ColumnId_UseValue2, "Use value 2" },
             { ColumnId_UseValue3, "Use value 3" },
@@ -546,16 +552,19 @@ namespace
         "AI Wander", "AI Travel", "AI Follow", "AI Escort", "AI Activate", 0
     };
 
-    static const char *sInfoCondFunc[] =
+    static const char *sBookType[] =
+    {
+        "Book", "Scroll", 0
+    };
+
+    static const char *sBloodType[] =
     {
-        " ", "Function", "Global", "Local", "Journal",
-        "Item", "Dead", "Not ID", "Not Faction", "Not Class",
-        "Not Race", "Not Cell", "Not Local", 0
+        "Default (Red)", "Skeleton Blood (White)", "Metal Blood (Golden)", 0
     };
 
-    static const char *sInfoCondComp[] =
+    static const char *sEmitterType[] =
     {
-        "!=", "<", "<=", "=", ">", ">=", 0
+        "<None>", "Flickering", "Flickering (Slow)", "Pulsing", "Pulsing (Slow)", 0
     };
 
     const char **getEnumNames (CSMWorld::Columns::ColumnId column)
@@ -585,10 +594,11 @@ namespace
             case CSMWorld::Columns::ColumnId_EffectId: return sEffectId;
             case CSMWorld::Columns::ColumnId_PartRefType: return sPartRefType;
             case CSMWorld::Columns::ColumnId_AiPackageType: return sAiPackageType;
-            case CSMWorld::Columns::ColumnId_InfoCondFunc: return sInfoCondFunc;
-            // FIXME: don't have dynamic value enum delegate, use Display_String for now
-            //case CSMWorld::Columns::ColumnId_InfoCond: return sInfoCond;
-            case CSMWorld::Columns::ColumnId_InfoCondComp: return sInfoCondComp;
+            case CSMWorld::Columns::ColumnId_InfoCondFunc: return CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings;
+            case CSMWorld::Columns::ColumnId_InfoCondComp: return CSMWorld::ConstInfoSelectWrapper::RelationEnumStrings;
+            case CSMWorld::Columns::ColumnId_BookType: return sBookType;
+            case CSMWorld::Columns::ColumnId_BloodType: return sBloodType;
+            case CSMWorld::Columns::ColumnId_EmitterType: return sEmitterType;
 
             default: return 0;
         }
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index a504e5f65..b23d86367 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -92,7 +92,7 @@ namespace CSMWorld
             ColumnId_ArmorType = 77,
             ColumnId_Health = 78,
             ColumnId_ArmorValue = 79,
-            ColumnId_Scroll = 80,
+            ColumnId_BookType = 80,
             ColumnId_ClothingType = 81,
             ColumnId_WeightCapacity = 82,
             ColumnId_OrganicContainer = 83,
@@ -107,8 +107,8 @@ namespace CSMWorld
             ColumnId_Flies = 92,
             ColumnId_Walks = 93,
             ColumnId_Essential = 94,
-            ColumnId_SkeletonBlood = 95,
-            ColumnId_MetalBlood = 96,
+            ColumnId_BloodType = 95,
+            // unused
             ColumnId_OpenSound = 97,
             ColumnId_CloseSound = 98,
             ColumnId_Duration = 99,
@@ -118,10 +118,8 @@ namespace CSMWorld
             ColumnId_Dynamic = 103,
             ColumnId_Portable = 104,
             ColumnId_NegativeLight = 105,
-            ColumnId_Flickering = 106,
-            ColumnId_SlowFlickering = 107,
-            ColumnId_Pulsing = 108,
-            ColumnId_SlowPulsing = 109,
+            ColumnId_EmitterType = 106,
+            // unused (3x)
             ColumnId_Fire = 110,
             ColumnId_OffByDefault = 111,
             ColumnId_IsKey = 112,
@@ -278,7 +276,7 @@ namespace CSMWorld
             ColumnId_NpcMisc = 251,
             ColumnId_Level = 252,
             ColumnId_NpcFactionID = 253,
-            // unused
+            ColumnId_GenderNpc = 254,
             ColumnId_Mana = 255,
             ColumnId_Fatigue = 256,
             ColumnId_NpcDisposition = 257,
@@ -325,6 +323,12 @@ namespace CSMWorld
             ColumnId_Idle7 = 292,
             ColumnId_Idle8 = 293,
 
+            ColumnId_RegionWeather = 294,
+            ColumnId_WeatherName = 295,
+            ColumnId_WeatherChance = 296,
+
+            ColumnId_Text = 297,
+
             // Allocated to a separate value range, so we don't get a collision should we ever need
             // to extend the number of use values.
             ColumnId_UseValue1 = 0x10000,
diff --git a/apps/opencs/model/world/commanddispatcher.cpp b/apps/opencs/model/world/commanddispatcher.cpp
index a1fc980eb..ffbaa3dec 100644
--- a/apps/opencs/model/world/commanddispatcher.cpp
+++ b/apps/opencs/model/world/commanddispatcher.cpp
@@ -11,6 +11,7 @@
 #include "record.hpp"
 #include "commands.hpp"
 #include "idtableproxymodel.hpp"
+#include "commandmacro.hpp"
 
 std::vector<std::string> CSMWorld::CommandDispatcher::getDeletableRecords() const
 {
@@ -171,10 +172,9 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
 
     if (modifyCell.get())
     {
-        mDocument.getUndoStack().beginMacro (modifyData->text());
-        mDocument.getUndoStack().push (modifyData.release());
-        mDocument.getUndoStack().push (modifyCell.release());
-        mDocument.getUndoStack().endMacro();
+        CommandMacro macro (mDocument.getUndoStack());
+        macro.push (modifyData.release());
+        macro.push (modifyCell.release());
     }
     else
         mDocument.getUndoStack().push (modifyData.release());
@@ -194,9 +194,7 @@ void CSMWorld::CommandDispatcher::executeDelete()
 
     int columnIndex = model.findColumnIndex (Columns::ColumnId_Id);
 
-    if (rows.size()>1)
-        mDocument.getUndoStack().beginMacro (tr ("Delete multiple records"));
-
+    CommandMacro macro (mDocument.getUndoStack(), rows.size()>1 ? "Delete multiple records" : "");
     for (std::vector<std::string>::const_iterator iter (rows.begin()); iter!=rows.end(); ++iter)
     {
         std::string id = model.data (model.getModelIndex (*iter, columnIndex)).
@@ -204,7 +202,7 @@ void CSMWorld::CommandDispatcher::executeDelete()
 
         if (mId.getType() == UniversalId::Type_Referenceables)
         {
-            mDocument.getUndoStack().push ( new CSMWorld::DeleteCommand (model, id,
+            macro.push (new CSMWorld::DeleteCommand (model, id,
                 static_cast<CSMWorld::UniversalId::Type>(model.data (model.index (
                     model.getModelIndex (id, columnIndex).row(),
                     model.findColumnIndex (CSMWorld::Columns::ColumnId_RecordType))).toInt())));
@@ -212,9 +210,6 @@ void CSMWorld::CommandDispatcher::executeDelete()
         else
             mDocument.getUndoStack().push (new CSMWorld::DeleteCommand (model, id));
     }
-
-    if (rows.size()>1)
-        mDocument.getUndoStack().endMacro();
 }
 
 void CSMWorld::CommandDispatcher::executeRevert()
@@ -231,25 +226,19 @@ void CSMWorld::CommandDispatcher::executeRevert()
 
     int columnIndex = model.findColumnIndex (Columns::ColumnId_Id);
 
-    if (rows.size()>1)
-        mDocument.getUndoStack().beginMacro (tr ("Revert multiple records"));
-
+    CommandMacro macro (mDocument.getUndoStack(), rows.size()>1 ? "Revert multiple records" : "");
     for (std::vector<std::string>::const_iterator iter (rows.begin()); iter!=rows.end(); ++iter)
     {
         std::string id = model.data (model.getModelIndex (*iter, columnIndex)).
             toString().toUtf8().constData();
 
-        mDocument.getUndoStack().push (new CSMWorld::RevertCommand (model, id));
+        macro.push (new CSMWorld::RevertCommand (model, id));
     }
-
-    if (rows.size()>1)
-        mDocument.getUndoStack().endMacro();
 }
 
 void CSMWorld::CommandDispatcher::executeExtendedDelete()
 {
-    if (mExtendedTypes.size()>1)
-        mDocument.getUndoStack().beginMacro (tr ("Extended delete of multiple records"));
+    CommandMacro macro (mDocument.getUndoStack(), mExtendedTypes.size()>1 ? tr ("Extended delete of multiple records") : "");
 
     for (std::vector<UniversalId>::const_iterator iter (mExtendedTypes.begin());
         iter!=mExtendedTypes.end(); ++iter)
@@ -276,20 +265,15 @@ void CSMWorld::CommandDispatcher::executeExtendedDelete()
                     Misc::StringUtils::lowerCase (record.get().mCell)))
                     continue;
 
-                mDocument.getUndoStack().push (
-                    new CSMWorld::DeleteCommand (model, record.get().mId));
+                macro.push (new CSMWorld::DeleteCommand (model, record.get().mId));
             }
         }
     }
-
-    if (mExtendedTypes.size()>1)
-        mDocument.getUndoStack().endMacro();
 }
 
 void CSMWorld::CommandDispatcher::executeExtendedRevert()
 {
-    if (mExtendedTypes.size()>1)
-        mDocument.getUndoStack().beginMacro (tr ("Extended revert of multiple records"));
+    CommandMacro macro (mDocument.getUndoStack(), mExtendedTypes.size()>1 ? tr ("Extended revert of multiple records") : "");
 
     for (std::vector<UniversalId>::const_iterator iter (mExtendedTypes.begin());
         iter!=mExtendedTypes.end(); ++iter)
@@ -313,12 +297,8 @@ void CSMWorld::CommandDispatcher::executeExtendedRevert()
                     Misc::StringUtils::lowerCase (record.get().mCell)))
                     continue;
 
-                mDocument.getUndoStack().push (
-                    new CSMWorld::RevertCommand (model, record.get().mId));
+                macro.push (new CSMWorld::RevertCommand (model, record.get().mId));
             }
         }
     }
-
-    if (mExtendedTypes.size()>1)
-        mDocument.getUndoStack().endMacro();
 }
diff --git a/apps/opencs/model/world/commandmacro.cpp b/apps/opencs/model/world/commandmacro.cpp
new file mode 100644
index 000000000..0bd74cbe2
--- /dev/null
+++ b/apps/opencs/model/world/commandmacro.cpp
@@ -0,0 +1,26 @@
+
+#include "commandmacro.hpp"
+
+#include <QUndoStack>
+#include <QUndoCommand>
+
+CSMWorld::CommandMacro::CommandMacro (QUndoStack& undoStack, const QString& description)
+: mUndoStack (undoStack), mDescription (description), mStarted (false)
+{}
+
+CSMWorld::CommandMacro::~CommandMacro()
+{
+    if (mStarted)
+        mUndoStack.endMacro();
+}
+
+void CSMWorld::CommandMacro::push (QUndoCommand *command)
+{
+    if (!mStarted)
+    {
+        mUndoStack.beginMacro (mDescription.isEmpty() ? command->text() : mDescription);
+        mStarted = true;
+    }
+
+    mUndoStack.push (command);
+}
diff --git a/apps/opencs/model/world/commandmacro.hpp b/apps/opencs/model/world/commandmacro.hpp
new file mode 100644
index 000000000..b1f6301d9
--- /dev/null
+++ b/apps/opencs/model/world/commandmacro.hpp
@@ -0,0 +1,34 @@
+#ifndef CSM_WOLRD_COMMANDMACRO_H
+#define CSM_WOLRD_COMMANDMACRO_H
+
+class QUndoStack;
+class QUndoCommand;
+
+#include <QString>
+
+namespace CSMWorld
+{
+    class CommandMacro
+    {
+            QUndoStack& mUndoStack;
+            QString mDescription;
+            bool mStarted;
+
+            /// not implemented
+            CommandMacro (const CommandMacro&);
+
+            /// not implemented
+            CommandMacro& operator= (const CommandMacro&);
+
+        public:
+
+            /// If \a description is empty, the description of the first command is used.
+            CommandMacro (QUndoStack& undoStack, const QString& description = "");
+
+            ~CommandMacro();
+
+            void push (QUndoCommand *command);
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index 097e83f7c..5f9422376 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -8,9 +8,12 @@
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
 
+#include "cellcoordinates.hpp"
+#include "idcollection.hpp"
 #include "idtable.hpp"
 #include "idtree.hpp"
 #include "nestedtablewrapper.hpp"
+#include "pathgrid.hpp"
 
 CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelIndex& index,
                                         const QVariant& new_, QUndoCommand* parent)
@@ -68,9 +71,6 @@ void CSMWorld::ModifyCommand::undo()
 
 void CSMWorld::CreateCommand::applyModifications()
 {
-    for (std::map<int, QVariant>::const_iterator iter (mValues.begin()); iter!=mValues.end(); ++iter)
-        mModel.setData (mModel.getModelIndex (mId, iter->first), iter->second);
-
     if (!mNestedValues.empty())
     {
         CSMWorld::IdTree *tree = dynamic_cast<CSMWorld::IdTree *>(&mModel);
@@ -114,7 +114,7 @@ void CSMWorld::CreateCommand::setType (UniversalId::Type type)
 
 void CSMWorld::CreateCommand::redo()
 {
-    mModel.addRecord (mId, mType);
+    mModel.addRecordWithData (mId, mValues, mType);
     applyModifications();
 }
 
@@ -238,6 +238,29 @@ void CSMWorld::CloneCommand::undo()
     mModel.removeRow (mModel.getModelIndex (mId, 0).row());
 }
 
+CSMWorld::CreatePathgridCommand::CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent)
+    : CreateCommand(model, id, parent)
+{
+    setType(UniversalId::Type_Pathgrid);
+}
+
+void CSMWorld::CreatePathgridCommand::redo()
+{
+    CreateCommand::redo();
+
+    Record<Pathgrid> record = static_cast<const Record<Pathgrid>& >(mModel.getRecord(mId));
+    record.get().blank();
+    record.get().mCell = mId;
+
+    std::pair<CellCoordinates, bool> coords = CellCoordinates::fromId(mId);
+    if (coords.second)
+    {
+        record.get().mData.mX = coords.first.getX();
+        record.get().mData.mY = coords.first.getY();
+    }
+
+    mModel.setRecord(mId, record, mType);
+}
 
 CSMWorld::UpdateCellCommand::UpdateCellCommand (IdTable& model, int row, QUndoCommand *parent)
 : QUndoCommand (parent), mModel (model), mRow (row)
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index 23ffccbd7..b54a1d5ac 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -153,6 +153,15 @@ namespace CSMWorld
             virtual void undo();
     };
 
+    class CreatePathgridCommand : public CreateCommand
+    {
+        public:
+
+            CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent = 0);
+
+            virtual void redo();
+    };
+
     /// \brief Update cell ID according to x/y-coordinates
     ///
     /// \note The new value will be calculated in the first call to redo instead of the
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 6eccb7483..5a59f19f7 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -10,6 +10,8 @@
 #include <components/esm/loadglob.hpp>
 #include <components/esm/cellref.hpp>
 
+#include <components/resource/scenemanager.hpp>
+
 #include "idtable.hpp"
 #include "idtree.hpp"
 #include "columnimp.hpp"
@@ -59,11 +61,13 @@ int CSMWorld::Data::count (RecordBase::State state, const CollectionBase& collec
     return number;
 }
 
-CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager, const Fallback::Map* fallback)
+CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager, const Fallback::Map* fallback, const boost::filesystem::path& resDir)
 : mEncoder (encoding), mPathgrids (mCells), mRefs (mCells),
   mResourcesManager (resourcesManager), mFallbackMap(fallback),
-  mReader (0), mDialogue (0), mReaderIndex(0), mResourceSystem(new Resource::ResourceSystem(resourcesManager.getVFS()))
+  mReader (0), mDialogue (0), mReaderIndex(1), mResourceSystem(new Resource::ResourceSystem(resourcesManager.getVFS()))
 {
+    mResourceSystem->getSceneManager()->setShaderPath((resDir / "shaders").string());
+
     int index = 0;
 
     mGlobals.addColumn (new StringIdColumn<ESM::Global>);
@@ -177,6 +181,14 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
     mRegions.addColumn (new NameColumn<ESM::Region>);
     mRegions.addColumn (new MapColourColumn<ESM::Region>);
     mRegions.addColumn (new SleepListColumn<ESM::Region>);
+    // Region Weather
+    mRegions.addColumn (new NestedParentColumn<ESM::Region> (Columns::ColumnId_RegionWeather));
+    index = mRegions.getColumns()-1;
+    mRegions.addAdapter (std::make_pair(&mRegions.getColumn(index), new RegionWeatherAdapter ()));
+    mRegions.getNestableColumn(index)->addColumn(
+        new NestedChildColumn (Columns::ColumnId_WeatherName, ColumnBase::Display_String, false));
+    mRegions.getNestableColumn(index)->addColumn(
+        new NestedChildColumn (Columns::ColumnId_WeatherChance, ColumnBase::Display_UnsignedInteger8));
     // Region Sounds
     mRegions.addColumn (new NestedParentColumn<ESM::Region> (Columns::ColumnId_RegionSounds));
     index = mRegions.getColumns()-1;
@@ -271,7 +283,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
         new NestedChildColumn (Columns::ColumnId_InfoCondFunc, ColumnBase::Display_InfoCondFunc));
     // FIXME: don't have dynamic value enum delegate, use Display_String for now
     mTopicInfos.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_InfoCondVar, ColumnBase::Display_String));
+        new NestedChildColumn (Columns::ColumnId_InfoCondVar, ColumnBase::Display_InfoCondVar));
     mTopicInfos.getNestableColumn(index)->addColumn(
         new NestedChildColumn (Columns::ColumnId_InfoCondComp, ColumnBase::Display_InfoCondComp));
     mTopicInfos.getNestableColumn(index)->addColumn(
@@ -351,7 +363,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
     mBodyParts.addColumn (new FixedRecordTypeColumn<ESM::BodyPart> (UniversalId::Type_BodyPart));
     mBodyParts.addColumn (new BodyPartTypeColumn<ESM::BodyPart>);
     mBodyParts.addColumn (new VampireColumn<ESM::BodyPart>);
-    mBodyParts.addColumn (new FlagColumn<ESM::BodyPart> (Columns::ColumnId_Female, ESM::BodyPart::BPF_Female));
+    mBodyParts.addColumn(new GenderNpcColumn<ESM::BodyPart>);
     mBodyParts.addColumn (new FlagColumn<ESM::BodyPart> (Columns::ColumnId_Playable,
         ESM::BodyPart::BPF_NotPlayable, ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, true));
 
@@ -887,9 +899,11 @@ int CSMWorld::Data::startLoading (const boost::filesystem::path& path, bool base
 
     mReader = new ESM::ESMReader;
     mReader->setEncoder (&mEncoder);
-    mReader->setIndex(mReaderIndex++);
+    mReader->setIndex((project || !base) ? 0 : mReaderIndex++);
     mReader->open (path.string());
 
+    mContentFileNames.insert(std::make_pair(path.filename().string(), mReader->getIndex()));
+
     mBase = base;
     mProject = project;
 
@@ -902,6 +916,20 @@ int CSMWorld::Data::startLoading (const boost::filesystem::path& path, bool base
         mMetaData.setRecord (0, Record<MetaData> (RecordBase::State_ModifiedOnly, 0, &metaData));
     }
 
+    // Fix uninitialized master data index
+    for (std::vector<ESM::Header::MasterData>::const_iterator masterData = mReader->getGameFiles().begin();
+        masterData != mReader->getGameFiles().end(); ++masterData)
+    {
+        std::map<std::string, int>::iterator nameResult = mContentFileNames.find(masterData->name);
+        if (nameResult != mContentFileNames.end())
+        {
+            ESM::Header::MasterData& hackedMasterData = const_cast<ESM::Header::MasterData&>(*masterData);
+
+
+            hackedMasterData.index = nameResult->second;
+        }
+    }
+
     return mReader->getRecordCount();
 }
 
@@ -934,7 +962,7 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
 
     bool unhandledRecord = false;
 
-    switch (n.val)
+    switch (n.intval)
     {
         case ESM::REC_GLOB: mGlobals.load (*mReader, mBase); break;
         case ESM::REC_GMST: mGmsts.load (*mReader, mBase); break;
@@ -965,7 +993,7 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
             if (index!=-1/* && !mBase*/)
                 mLand.getRecord (index).get().loadData (
                     ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | ESM::Land::DATA_VCLR |
-                    ESM::Land::DATA_VTEX | ESM::Land::DATA_WNAM);
+                    ESM::Land::DATA_VTEX);
 
             break;
         }
@@ -1046,7 +1074,7 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
                 else
                 {
                     mTopics.load (record, mBase);
-                    mDialogue = &mTopics.getRecord (record.mId).get();   
+                    mDialogue = &mTopics.getRecord (record.mId).get();
                 }
             }
 
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index e5b8229c4..dc00a33d2 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -123,6 +123,8 @@ namespace CSMWorld
 
             std::vector<boost::shared_ptr<ESM::ESMReader> > mReaders;
 
+            std::map<std::string, int> mContentFileNames;
+
             // not implemented
             Data (const Data&);
             Data& operator= (const Data&);
@@ -138,7 +140,7 @@ namespace CSMWorld
 
         public:
 
-            Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager, const Fallback::Map* fallback);
+            Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager, const Fallback::Map* fallback, const boost::filesystem::path& resDir);
 
             virtual ~Data();
 
diff --git a/apps/opencs/model/world/defaultgmsts.cpp b/apps/opencs/model/world/defaultgmsts.cpp
index f44e98411..da83a86be 100644
--- a/apps/opencs/model/world/defaultgmsts.cpp
+++ b/apps/opencs/model/world/defaultgmsts.cpp
@@ -1627,264 +1627,264 @@ const char * CSMWorld::DefaultGmsts::OptionalStrings[CSMWorld::DefaultGmsts::Opt
 
 const float CSMWorld::DefaultGmsts::FloatsDefaultValues[CSMWorld::DefaultGmsts::FloatCount] =
 {
-    0.3,    // fAIFleeFleeMult
-    7.0,    // fAIFleeHealthMult
-    3.0,    // fAIMagicSpellMult
-    1.0,    // fAIMeleeArmorMult
-    1.0,    // fAIMeleeSummWeaponMult
-    2.0,    // fAIMeleeWeaponMult
-    5.0,    // fAIRangeMagicSpellMult
-    5.0,    // fAIRangeMeleeWeaponMult
-    2000.0, // fAlarmRadius
-    1.0,    // fAthleticsRunBonus
-    40.0,   // fAudioDefaultMaxDistance
-    5.0,    // fAudioDefaultMinDistance
-    50.0,   // fAudioMaxDistanceMult
-    20.0,   // fAudioMinDistanceMult
-    60.0,   // fAudioVoiceDefaultMaxDistance
-    10.0,   // fAudioVoiceDefaultMinDistance
-    50.0,   // fAutoPCSpellChance
-    80.0,   // fAutoSpellChance
-    50.0,   // fBargainOfferBase
-    -4.0,   // fBargainOfferMulti
-    24.0,   // fBarterGoldResetDelay
-    1.75,   // fBaseRunMultiplier
-    1.25,   // fBlockStillBonus
-    150.0,  // fBribe1000Mod
-    75.0,   // fBribe100Mod
-    35.0,   // fBribe10Mod
-    60.0,   // fCombatAngleXY
-    60.0,   // fCombatAngleZ
-    0.25,   // fCombatArmorMinMult
-    -90.0,  // fCombatBlockLeftAngle
-    30.0,   // fCombatBlockRightAngle
-    4.0,    // fCombatCriticalStrikeMult
-    0.1,    // fCombatDelayCreature
-    0.1,    // fCombatDelayNPC
-    128.0,  // fCombatDistance
-    0.3,    // fCombatDistanceWerewolfMod
-    30.0,   // fCombatForceSideAngle
-    0.2,    // fCombatInvisoMult
-    1.5,    // fCombatKODamageMult
-    45.0,   // fCombatTorsoSideAngle
-    0.3,    // fCombatTorsoStartPercent
-    0.8,    // fCombatTorsoStopPercent
-    15.0,   // fConstantEffectMult
-    72.0,   // fCorpseClearDelay
-    72.0,   // fCorpseRespawnDelay
-    0.5,    // fCrimeGoldDiscountMult
-    0.9,    // fCrimeGoldTurnInMult
-    1.0,    // fCrimeStealing
-    0.5,    // fDamageStrengthBase
-    0.1,    // fDamageStrengthMult
-    5.0,    // fDifficultyMult
-    2.5,    // fDiseaseXferChance
-    -10.0,  // fDispAttacking
-    -1.0,   // fDispBargainFailMod
-    1.0,    // fDispBargainSuccessMod
-    0.0,    // fDispCrimeMod
-    -10.0,  // fDispDiseaseMod
-    3.0,    // fDispFactionMod
-    1.0,    // fDispFactionRankBase
-    0.5,    // fDispFactionRankMult
-    1.0,    // fDispositionMod
-    50.0,   // fDispPersonalityBase
-    0.5,    // fDispPersonalityMult
-    -25.0,  // fDispPickPocketMod
-    5.0,    // fDispRaceMod
-    -0.5,   // fDispStealing
-    -5.0,   // fDispWeaponDrawn
-    0.5,    // fEffectCostMult
-    0.1,    // fElementalShieldMult
-    3.0,    // fEnchantmentChanceMult
-    0.5,    // fEnchantmentConstantChanceMult
-    100.0,  // fEnchantmentConstantDurationMult
-    0.1,    // fEnchantmentMult
-    1000.0, // fEnchantmentValueMult
-    0.3,    // fEncumberedMoveEffect
-    5.0,    // fEncumbranceStrMult
-    0.04,   // fEndFatigueMult
-    0.25,   // fFallAcroBase
-    0.01,   // fFallAcroMult
-    400.0,  // fFallDamageDistanceMin
-    0.0,    // fFallDistanceBase
-    0.07,   // fFallDistanceMult
-    2.0,    // fFatigueAttackBase
-    0.0,    // fFatigueAttackMult
-    1.25,   // fFatigueBase
-    4.0,    // fFatigueBlockBase
-    0.0,    // fFatigueBlockMult
-    5.0,    // fFatigueJumpBase
-    0.0,    // fFatigueJumpMult
-    0.5,    // fFatigueMult
-    2.5,    // fFatigueReturnBase
-    0.02,   // fFatigueReturnMult
-    5.0,    // fFatigueRunBase
-    2.0,    // fFatigueRunMult
-    1.5,    // fFatigueSneakBase
-    1.5,    // fFatigueSneakMult
-    0.0,    // fFatigueSpellBase
-    0.0,    // fFatigueSpellCostMult
-    0.0,    // fFatigueSpellMult
-    7.0,    // fFatigueSwimRunBase
-    0.0,    // fFatigueSwimRunMult
-    2.5,    // fFatigueSwimWalkBase
-    0.0,    // fFatigueSwimWalkMult
-    0.2,    // fFightDispMult
-    0.005,  // fFightDistanceMultiplier
-    50.0,   // fFightStealing
-    3000.0, // fFleeDistance
-    512.0,  // fGreetDistanceReset
-    0.1,    // fHandtoHandHealthPer
-    1.0,    // fHandToHandReach
-    0.5,    // fHoldBreathEndMult
-    20.0,   // fHoldBreathTime
-    0.75,   // fIdleChanceMultiplier
-    1.0,    // fIngredientMult
-    0.5,    // fInteriorHeadTrackMult
-    128.0,  // fJumpAcrobaticsBase
-    4.0,    // fJumpAcroMultiplier
-    0.5,    // fJumpEncumbranceBase
-    1.0,    // fJumpEncumbranceMultiplier
-    0.5,    // fJumpMoveBase
-    0.5,    // fJumpMoveMult
-    1.0,    // fJumpRunMultiplier
-    0.5,    // fKnockDownMult
-    5.0,    // fLevelMod
-    0.1,    // fLevelUpHealthEndMult
-    0.6,    // fLightMaxMod
-    10.0,   // fLuckMod
-    10.0,   // fMagesGuildTravel
-    1.5,    // fMagicCreatureCastDelay
-    0.0167, // fMagicDetectRefreshRate
-    1.0,    // fMagicItemConstantMult
-    1.0,    // fMagicItemCostMult
-    1.0,    // fMagicItemOnceMult
-    1.0,    // fMagicItemPriceMult
-    0.05,   // fMagicItemRechargePerSecond
-    1.0,    // fMagicItemStrikeMult
-    1.0,    // fMagicItemUsedMult
-    3.0,    // fMagicStartIconBlink
-    0.5,    // fMagicSunBlockedMult
-    0.75,   // fMajorSkillBonus
-    300.0,  // fMaxFlySpeed
-    0.5,    // fMaxHandToHandMult
-    400.0,  // fMaxHeadTrackDistance
-    200.0,  // fMaxWalkSpeed
-    300.0,  // fMaxWalkSpeedCreature
-    0.9,    // fMedMaxMod
-    0.1,    // fMessageTimePerChar
-    5.0,    // fMinFlySpeed
-    0.1,    // fMinHandToHandMult
-    1.0,    // fMinorSkillBonus
-    100.0,  // fMinWalkSpeed
-    5.0,    // fMinWalkSpeedCreature
-    1.25,   // fMiscSkillBonus
-    2.0,    // fNPCbaseMagickaMult
-    0.5,    // fNPCHealthBarFade
-    3.0,    // fNPCHealthBarTime
-    1.0,    // fPCbaseMagickaMult
-    0.3,    // fPerDieRollMult
-    5.0,    // fPersonalityMod
-    1.0,    // fPerTempMult
-    -1.0,   // fPickLockMult
-    0.3,    // fPickPocketMod
-    20.0,   // fPotionMinUsefulDuration
-    0.5,    // fPotionStrengthMult
-    0.5,    // fPotionT1DurMult
-    1.5,    // fPotionT1MagMult
-    20.0,   // fPotionT4BaseStrengthMult
-    12.0,   // fPotionT4EquipStrengthMult
-    3000.0, // fProjectileMaxSpeed
-    400.0,  // fProjectileMinSpeed
-    25.0,   // fProjectileThrownStoreChance
-    3.0,    // fRepairAmountMult
-    1.0,    // fRepairMult
-    1.0,    // fReputationMod
-    0.15,   // fRestMagicMult
-    0.0,    // fSeriousWoundMult
-    0.25,   // fSleepRandMod
-    0.3,    // fSleepRestMod
-    -1.0,   // fSneakBootMult
-    0.5,    // fSneakDistanceBase
-    0.002,  // fSneakDistanceMultiplier
-    0.5,    // fSneakNoViewMult
-    1.0,    // fSneakSkillMult
-    0.75,   // fSneakSpeedMultiplier
-    1.0,    // fSneakUseDelay
-    500.0,  // fSneakUseDist
-    1.5,    // fSneakViewMult
-    3.0,    // fSoulGemMult
-    0.8,    // fSpecialSkillBonus
-    7.0,    // fSpellMakingValueMult
-    2.0,    // fSpellPriceMult
-    10.0,   // fSpellValueMult
-    0.25,   // fStromWalkMult
-    0.7,    // fStromWindSpeed
-    3.0,    // fSuffocationDamage
-    0.9,    // fSwimHeightScale
-    0.1,    // fSwimRunAthleticsMult
-    0.5,    // fSwimRunBase
-    0.02,   // fSwimWalkAthleticsMult
-    0.5,    // fSwimWalkBase
-    1.0,    // fSwingBlockBase
-    1.0,    // fSwingBlockMult
-    1000.0, // fTargetSpellMaxSpeed
-    1000.0, // fThrownWeaponMaxSpeed
-    300.0,  // fThrownWeaponMinSpeed
-    0.0,    // fTrapCostMult
-    4000.0, // fTravelMult
-    16000.0,// fTravelTimeMult
-    0.1,    // fUnarmoredBase1
-    0.065,  // fUnarmoredBase2
-    30.0,   // fVanityDelay
-    10.0,   // fVoiceIdleOdds
-    0.0,    // fWaterReflectUpdateAlways
-    10.0,   // fWaterReflectUpdateSeldom
-    0.1,    // fWeaponDamageMult
-    1.0,    // fWeaponFatigueBlockMult
-    0.25,   // fWeaponFatigueMult
-    150.0,  // fWereWolfAcrobatics
-    150.0,  // fWereWolfAgility
-    1.0,    // fWereWolfAlchemy
-    1.0,    // fWereWolfAlteration
-    1.0,    // fWereWolfArmorer
-    150.0,  // fWereWolfAthletics
-    1.0,    // fWereWolfAxe
-    1.0,    // fWereWolfBlock
-    1.0,    // fWereWolfBluntWeapon
-    1.0,    // fWereWolfConjuration
-    1.0,    // fWereWolfDestruction
-    1.0,    // fWereWolfEnchant
-    150.0,  // fWereWolfEndurance
-    400.0,  // fWereWolfFatigue
-    100.0,  // fWereWolfHandtoHand
-    2.0,    // fWereWolfHealth
-    1.0,    // fWereWolfHeavyArmor
-    1.0,    // fWereWolfIllusion
-    1.0,    // fWereWolfIntellegence
-    1.0,    // fWereWolfLightArmor
-    1.0,    // fWereWolfLongBlade
-    1.0,    // fWereWolfLuck
-    100.0,  // fWereWolfMagicka
-    1.0,    // fWereWolfMarksman
-    1.0,    // fWereWolfMediumArmor
-    1.0,    // fWereWolfMerchantile
-    1.0,    // fWereWolfMysticism
-    1.0,    // fWereWolfPersonality
-    1.0,    // fWereWolfRestoration
-    1.5,    // fWereWolfRunMult
-    1.0,    // fWereWolfSecurity
-    1.0,    // fWereWolfShortBlade
-    1.5,    // fWereWolfSilverWeaponDamageMult
-    1.0,    // fWereWolfSneak
-    1.0,    // fWereWolfSpear
-    1.0,    // fWereWolfSpeechcraft
-    150.0,  // fWereWolfSpeed
-    150.0,  // fWereWolfStrength
-    100.0,  // fWereWolfUnarmored
-    1.0,    // fWereWolfWillPower
-    15.0   // fWortChanceValue
+    0.3f,    // fAIFleeFleeMult
+    7.0f,    // fAIFleeHealthMult
+    3.0f,    // fAIMagicSpellMult
+    1.0f,    // fAIMeleeArmorMult
+    1.0f,    // fAIMeleeSummWeaponMult
+    2.0f,    // fAIMeleeWeaponMult
+    5.0f,    // fAIRangeMagicSpellMult
+    5.0f,    // fAIRangeMeleeWeaponMult
+    2000.0f, // fAlarmRadius
+    1.0f,    // fAthleticsRunBonus
+    40.0f,   // fAudioDefaultMaxDistance
+    5.0f,    // fAudioDefaultMinDistance
+    50.0f,   // fAudioMaxDistanceMult
+    20.0f,   // fAudioMinDistanceMult
+    60.0f,   // fAudioVoiceDefaultMaxDistance
+    10.0f,   // fAudioVoiceDefaultMinDistance
+    50.0f,   // fAutoPCSpellChance
+    80.0f,   // fAutoSpellChance
+    50.0f,   // fBargainOfferBase
+    -4.0f,   // fBargainOfferMulti
+    24.0f,   // fBarterGoldResetDelay
+    1.75f,   // fBaseRunMultiplier
+    1.25f,   // fBlockStillBonus
+    150.0f,  // fBribe1000Mod
+    75.0f,   // fBribe100Mod
+    35.0f,   // fBribe10Mod
+    60.0f,   // fCombatAngleXY
+    60.0f,   // fCombatAngleZ
+    0.25f,   // fCombatArmorMinMult
+    -90.0f,  // fCombatBlockLeftAngle
+    30.0f,   // fCombatBlockRightAngle
+    4.0f,    // fCombatCriticalStrikeMult
+    0.1f,    // fCombatDelayCreature
+    0.1f,    // fCombatDelayNPC
+    128.0f,  // fCombatDistance
+    0.3f,    // fCombatDistanceWerewolfMod
+    30.0f,   // fCombatForceSideAngle
+    0.2f,    // fCombatInvisoMult
+    1.5f,    // fCombatKODamageMult
+    45.0f,   // fCombatTorsoSideAngle
+    0.3f,    // fCombatTorsoStartPercent
+    0.8f,    // fCombatTorsoStopPercent
+    15.0f,   // fConstantEffectMult
+    72.0f,   // fCorpseClearDelay
+    72.0f,   // fCorpseRespawnDelay
+    0.5f,    // fCrimeGoldDiscountMult
+    0.9f,    // fCrimeGoldTurnInMult
+    1.0f,    // fCrimeStealing
+    0.5f,    // fDamageStrengthBase
+    0.1f,    // fDamageStrengthMult
+    5.0f,    // fDifficultyMult
+    2.5f,    // fDiseaseXferChance
+    -10.0f,  // fDispAttacking
+    -1.0f,   // fDispBargainFailMod
+    1.0f,    // fDispBargainSuccessMod
+    0.0f,    // fDispCrimeMod
+    -10.0f,  // fDispDiseaseMod
+    3.0f,    // fDispFactionMod
+    1.0f,    // fDispFactionRankBase
+    0.5f,    // fDispFactionRankMult
+    1.0f,    // fDispositionMod
+    50.0f,   // fDispPersonalityBase
+    0.5f,    // fDispPersonalityMult
+    -25.0f,  // fDispPickPocketMod
+    5.0f,    // fDispRaceMod
+    -0.5f,   // fDispStealing
+    -5.0f,   // fDispWeaponDrawn
+    0.5f,    // fEffectCostMult
+    0.1f,    // fElementalShieldMult
+    3.0f,    // fEnchantmentChanceMult
+    0.5f,    // fEnchantmentConstantChanceMult
+    100.0f,  // fEnchantmentConstantDurationMult
+    0.1f,    // fEnchantmentMult
+    1000.0f, // fEnchantmentValueMult
+    0.3f,    // fEncumberedMoveEffect
+    5.0f,    // fEncumbranceStrMult
+    0.04f,   // fEndFatigueMult
+    0.25f,   // fFallAcroBase
+    0.01f,   // fFallAcroMult
+    400.0f,  // fFallDamageDistanceMin
+    0.0f,    // fFallDistanceBase
+    0.07f,   // fFallDistanceMult
+    2.0f,    // fFatigueAttackBase
+    0.0f,    // fFatigueAttackMult
+    1.25f,   // fFatigueBase
+    4.0f,    // fFatigueBlockBase
+    0.0f,    // fFatigueBlockMult
+    5.0f,    // fFatigueJumpBase
+    0.0f,    // fFatigueJumpMult
+    0.5f,    // fFatigueMult
+    2.5f,    // fFatigueReturnBase
+    0.02f,   // fFatigueReturnMult
+    5.0f,    // fFatigueRunBase
+    2.0f,    // fFatigueRunMult
+    1.5f,    // fFatigueSneakBase
+    1.5f,    // fFatigueSneakMult
+    0.0f,    // fFatigueSpellBase
+    0.0f,    // fFatigueSpellCostMult
+    0.0f,    // fFatigueSpellMult
+    7.0f,    // fFatigueSwimRunBase
+    0.0f,    // fFatigueSwimRunMult
+    2.5f,    // fFatigueSwimWalkBase
+    0.0f,    // fFatigueSwimWalkMult
+    0.2f,    // fFightDispMult
+    0.005f,  // fFightDistanceMultiplier
+    50.0f,   // fFightStealing
+    3000.0f, // fFleeDistance
+    512.0f,  // fGreetDistanceReset
+    0.1f,    // fHandtoHandHealthPer
+    1.0f,    // fHandToHandReach
+    0.5f,    // fHoldBreathEndMult
+    20.0f,   // fHoldBreathTime
+    0.75f,   // fIdleChanceMultiplier
+    1.0f,    // fIngredientMult
+    0.5f,    // fInteriorHeadTrackMult
+    128.0f,  // fJumpAcrobaticsBase
+    4.0f,    // fJumpAcroMultiplier
+    0.5f,    // fJumpEncumbranceBase
+    1.0f,    // fJumpEncumbranceMultiplier
+    0.5f,    // fJumpMoveBase
+    0.5f,    // fJumpMoveMult
+    1.0f,    // fJumpRunMultiplier
+    0.5f,    // fKnockDownMult
+    5.0f,    // fLevelMod
+    0.1f,    // fLevelUpHealthEndMult
+    0.6f,    // fLightMaxMod
+    10.0f,   // fLuckMod
+    10.0f,   // fMagesGuildTravel
+    1.5f,    // fMagicCreatureCastDelay
+    0.0167f, // fMagicDetectRefreshRate
+    1.0f,    // fMagicItemConstantMult
+    1.0f,    // fMagicItemCostMult
+    1.0f,    // fMagicItemOnceMult
+    1.0f,    // fMagicItemPriceMult
+    0.05f,   // fMagicItemRechargePerSecond
+    1.0f,    // fMagicItemStrikeMult
+    1.0f,    // fMagicItemUsedMult
+    3.0f,    // fMagicStartIconBlink
+    0.5f,    // fMagicSunBlockedMult
+    0.75f,   // fMajorSkillBonus
+    300.0f,  // fMaxFlySpeed
+    0.5f,    // fMaxHandToHandMult
+    400.0f,  // fMaxHeadTrackDistance
+    200.0f,  // fMaxWalkSpeed
+    300.0f,  // fMaxWalkSpeedCreature
+    0.9f,    // fMedMaxMod
+    0.1f,    // fMessageTimePerChar
+    5.0f,    // fMinFlySpeed
+    0.1f,    // fMinHandToHandMult
+    1.0f,    // fMinorSkillBonus
+    100.0f,  // fMinWalkSpeed
+    5.0f,    // fMinWalkSpeedCreature
+    1.25f,   // fMiscSkillBonus
+    2.0f,    // fNPCbaseMagickaMult
+    0.5f,    // fNPCHealthBarFade
+    3.0f,    // fNPCHealthBarTime
+    1.0f,    // fPCbaseMagickaMult
+    0.3f,    // fPerDieRollMult
+    5.0f,    // fPersonalityMod
+    1.0f,    // fPerTempMult
+    -1.0f,   // fPickLockMult
+    0.3f,    // fPickPocketMod
+    20.0f,   // fPotionMinUsefulDuration
+    0.5f,    // fPotionStrengthMult
+    0.5f,    // fPotionT1DurMult
+    1.5f,    // fPotionT1MagMult
+    20.0f,   // fPotionT4BaseStrengthMult
+    12.0f,   // fPotionT4EquipStrengthMult
+    3000.0f, // fProjectileMaxSpeed
+    400.0f,  // fProjectileMinSpeed
+    25.0f,   // fProjectileThrownStoreChance
+    3.0f,    // fRepairAmountMult
+    1.0f,    // fRepairMult
+    1.0f,    // fReputationMod
+    0.15f,   // fRestMagicMult
+    0.0f,    // fSeriousWoundMult
+    0.25f,   // fSleepRandMod
+    0.3f,    // fSleepRestMod
+    -1.0f,   // fSneakBootMult
+    0.5f,    // fSneakDistanceBase
+    0.002f,  // fSneakDistanceMultiplier
+    0.5f,    // fSneakNoViewMult
+    1.0f,    // fSneakSkillMult
+    0.75f,   // fSneakSpeedMultiplier
+    1.0f,    // fSneakUseDelay
+    500.0f,  // fSneakUseDist
+    1.5f,    // fSneakViewMult
+    3.0f,    // fSoulGemMult
+    0.8f,    // fSpecialSkillBonus
+    7.0f,    // fSpellMakingValueMult
+    2.0f,    // fSpellPriceMult
+    10.0f,   // fSpellValueMult
+    0.25f,   // fStromWalkMult
+    0.7f,    // fStromWindSpeed
+    3.0f,    // fSuffocationDamage
+    0.9f,    // fSwimHeightScale
+    0.1f,    // fSwimRunAthleticsMult
+    0.5f,    // fSwimRunBase
+    0.02f,   // fSwimWalkAthleticsMult
+    0.5f,    // fSwimWalkBase
+    1.0f,    // fSwingBlockBase
+    1.0f,    // fSwingBlockMult
+    1000.0f, // fTargetSpellMaxSpeed
+    1000.0f, // fThrownWeaponMaxSpeed
+    300.0f,  // fThrownWeaponMinSpeed
+    0.0f,    // fTrapCostMult
+    4000.0f, // fTravelMult
+    16000.0f,// fTravelTimeMult
+    0.1f,    // fUnarmoredBase1
+    0.065f,  // fUnarmoredBase2
+    30.0f,   // fVanityDelay
+    10.0f,   // fVoiceIdleOdds
+    0.0f,    // fWaterReflectUpdateAlways
+    10.0f,   // fWaterReflectUpdateSeldom
+    0.1f,    // fWeaponDamageMult
+    1.0f,    // fWeaponFatigueBlockMult
+    0.25f,   // fWeaponFatigueMult
+    150.0f,  // fWereWolfAcrobatics
+    150.0f,  // fWereWolfAgility
+    1.0f,    // fWereWolfAlchemy
+    1.0f,    // fWereWolfAlteration
+    1.0f,    // fWereWolfArmorer
+    150.0f,  // fWereWolfAthletics
+    1.0f,    // fWereWolfAxe
+    1.0f,    // fWereWolfBlock
+    1.0f,    // fWereWolfBluntWeapon
+    1.0f,    // fWereWolfConjuration
+    1.0f,    // fWereWolfDestruction
+    1.0f,    // fWereWolfEnchant
+    150.0f,  // fWereWolfEndurance
+    400.0f,  // fWereWolfFatigue
+    100.0f,  // fWereWolfHandtoHand
+    2.0f,    // fWereWolfHealth
+    1.0f,    // fWereWolfHeavyArmor
+    1.0f,    // fWereWolfIllusion
+    1.0f,    // fWereWolfIntellegence
+    1.0f,    // fWereWolfLightArmor
+    1.0f,    // fWereWolfLongBlade
+    1.0f,    // fWereWolfLuck
+    100.0f,  // fWereWolfMagicka
+    1.0f,    // fWereWolfMarksman
+    1.0f,    // fWereWolfMediumArmor
+    1.0f,    // fWereWolfMerchantile
+    1.0f,    // fWereWolfMysticism
+    1.0f,    // fWereWolfPersonality
+    1.0f,    // fWereWolfRestoration
+    1.5f,    // fWereWolfRunMult
+    1.0f,    // fWereWolfSecurity
+    1.0f,    // fWereWolfShortBlade
+    1.5f,    // fWereWolfSilverWeaponDamageMult
+    1.0f,    // fWereWolfSneak
+    1.0f,    // fWereWolfSpear
+    1.0f,    // fWereWolfSpeechcraft
+    150.0f,  // fWereWolfSpeed
+    150.0f,  // fWereWolfStrength
+    100.0f,  // fWereWolfUnarmored
+    1.0f,    // fWereWolfWillPower
+    15.0f   // fWortChanceValue
 };
 
 const int CSMWorld::DefaultGmsts::IntsDefaultValues[CSMWorld::DefaultGmsts::IntCount] =
diff --git a/apps/opencs/model/world/idcompletionmanager.cpp b/apps/opencs/model/world/idcompletionmanager.cpp
index 20cd8652c..7f3221342 100644
--- a/apps/opencs/model/world/idcompletionmanager.cpp
+++ b/apps/opencs/model/world/idcompletionmanager.cpp
@@ -60,6 +60,10 @@ std::vector<CSMWorld::ColumnBase::Display> CSMWorld::IdCompletionManager::getDis
     {
         types.push_back(current->first);
     }
+
+    // Hack for Display_InfoCondVar
+    types.push_back(CSMWorld::ColumnBase::Display_InfoCondVar);
+
     return types;
 }
 
@@ -104,7 +108,7 @@ void CSMWorld::IdCompletionManager::generateCompleters(CSMWorld::Data &data)
                 QAbstractItemView *popup = new CSVWidget::CompleterPopup();
                 completer->setPopup(popup); // The completer takes ownership of the popup
                 completer->setMaxVisibleItems(10);
-                
+
                 mCompleters[current->first] = completer;
             }
         }
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index bd1179cea..7975e05ea 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -2,6 +2,8 @@
 
 #include <stdexcept>
 
+#include <components/esm/cellid.hpp>
+
 #include "collectionbase.hpp"
 #include "columnbase.hpp"
 
@@ -149,6 +151,23 @@ void CSMWorld::IdTable::addRecord (const std::string& id, UniversalId::Type type
     endInsertRows();
 }
 
+void CSMWorld::IdTable::addRecordWithData (const std::string& id,
+    const std::map<int, QVariant>& data, UniversalId::Type type)
+{
+    int index = mIdCollection->getAppendIndex (id, type);
+
+    beginInsertRows (QModelIndex(), index, index);
+
+    mIdCollection->appendBlankRecord (id, type);
+
+    for (std::map<int, QVariant>::const_iterator iter (data.begin()); iter!=data.end(); ++iter)
+    {
+        mIdCollection->setData(index, iter->first, iter->second);
+    }
+
+    endInsertRows();
+}
+
 void CSMWorld::IdTable::cloneRecord(const std::string& origin,
                                     const std::string& destination,
                                     CSMWorld::UniversalId::Type type)
@@ -172,7 +191,7 @@ void CSMWorld::IdTable::setRecord (const std::string& id, const RecordBase& reco
 
     if (index==-1)
     {
-        int index = mIdCollection->getAppendIndex (id, type);
+        index = mIdCollection->getAppendIndex (id, type);
 
         beginInsertRows (QModelIndex(), index, index);
 
@@ -242,7 +261,7 @@ std::pair<CSMWorld::UniversalId, std::string> CSMWorld::IdTable::view (int row)
         return std::make_pair (UniversalId::Type_None, "");
 
     if (id[0]=='#')
-        id = "sys::default";
+        id = ESM::CellId::sDefaultWorldspace;
 
     return std::make_pair (UniversalId (UniversalId::Type_Scene, id), hint);
 }
diff --git a/apps/opencs/model/world/idtable.hpp b/apps/opencs/model/world/idtable.hpp
index 9ecba0214..9faf64d71 100644
--- a/apps/opencs/model/world/idtable.hpp
+++ b/apps/opencs/model/world/idtable.hpp
@@ -53,6 +53,10 @@ namespace CSMWorld
             void addRecord (const std::string& id, UniversalId::Type type = UniversalId::Type_None);
             ///< \param type Will be ignored, unless the collection supports multiple record types
 
+            void addRecordWithData (const std::string& id, const std::map<int, QVariant>& data,
+                UniversalId::Type type = UniversalId::Type_None);
+            ///< \param type Will be ignored, unless the collection supports multiple record types
+
             void cloneRecord(const std::string& origin,
                              const std::string& destination,
                              UniversalId::Type type = UniversalId::Type_None);
@@ -61,7 +65,7 @@ namespace CSMWorld
 
             void setRecord (const std::string& id, const RecordBase& record,
                     UniversalId::Type type = UniversalId::Type_None);
-            ///< Add record or overwrite existing recrod.
+            ///< Add record or overwrite existing record.
 
             const RecordBase& getRecord (const std::string& id) const;
 
diff --git a/apps/opencs/model/world/idtree.cpp b/apps/opencs/model/world/idtree.cpp
index 124a94e8c..7f43a9201 100644
--- a/apps/opencs/model/world/idtree.cpp
+++ b/apps/opencs/model/world/idtree.cpp
@@ -198,12 +198,12 @@ QModelIndex CSMWorld::IdTree::parent (const QModelIndex& index) const
         return QModelIndex();
 
     unsigned int id = index.internalId();
-    const std::pair<int, int>& adress(unfoldIndexAddress(id));
+    const std::pair<int, int>& address(unfoldIndexAddress(id));
 
-    if (adress.first >= this->rowCount() || adress.second >= this->columnCount())
+    if (address.first >= this->rowCount() || address.second >= this->columnCount())
         throw "Parent index is not present in the model";
 
-    return createIndex(adress.first, adress.second);
+    return createIndex(address.first, address.second);
 }
 
 unsigned int CSMWorld::IdTree::foldIndexAddress (const QModelIndex& index) const
@@ -264,7 +264,7 @@ void CSMWorld::IdTree::setNestedTable(const QModelIndex& index, const CSMWorld::
 CSMWorld::NestedTableWrapperBase* CSMWorld::IdTree::nestedTable(const QModelIndex& index) const
 {
     if (!hasChildren(index))
-        throw std::logic_error("Tried to retrive nested table, but index has no children");
+        throw std::logic_error("Tried to retrieve nested table, but index has no children");
 
     return mNestedCollection->nestedTable(index.row(), index.column());
 }
diff --git a/apps/opencs/model/world/idtree.hpp b/apps/opencs/model/world/idtree.hpp
index 79e93fc3d..1539bd4a2 100644
--- a/apps/opencs/model/world/idtree.hpp
+++ b/apps/opencs/model/world/idtree.hpp
@@ -8,9 +8,9 @@
 /*! \brief
  * Class for holding the model. Uses typical qt table abstraction/interface for granting access
  * to the individiual fields of the records, Some records are holding nested data (for instance
- * inventory list of the npc). In casses like this, table model offers interface to access
+ * inventory list of the npc). In cases like this, table model offers interface to access
  * nested data in the qt way - that is specify parent. Since some of those nested data require
- * multiple columns to represent informations, single int (default way to index model in the
+ * multiple columns to represent information, single int (default way to index model in the
  * qmodelindex) is not sufficiant. Therefore tablemodelindex class can hold two ints for the
  * sake of indexing two dimensions of the table. This model does not support multiple levels of
  * the nested data. Vast majority of methods makes sense only for the top level data.
diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp
index f5ec4d458..be73aece6 100644
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@@ -19,8 +19,6 @@ void CSMWorld::InfoCollection::load (const Info& record, bool base)
         record2.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
         (base ? record2.mBase : record2.mModified) = record;
 
-        int index = -1;
-
         std::string topic = Misc::StringUtils::lowerCase (record2.get().mTopicId);
 
         if (!record2.get().mPrev.empty())
diff --git a/apps/opencs/model/world/infoselectwrapper.cpp b/apps/opencs/model/world/infoselectwrapper.cpp
new file mode 100644
index 000000000..3bc9bf4d2
--- /dev/null
+++ b/apps/opencs/model/world/infoselectwrapper.cpp
@@ -0,0 +1,893 @@
+#include "infoselectwrapper.hpp"
+
+#include <limits>
+#include <sstream>
+#include <stdexcept>
+
+const size_t CSMWorld::ConstInfoSelectWrapper::RuleMinSize = 5;
+
+const size_t CSMWorld::ConstInfoSelectWrapper::FunctionPrefixOffset = 1;
+const size_t CSMWorld::ConstInfoSelectWrapper::FunctionIndexOffset = 2;
+const size_t CSMWorld::ConstInfoSelectWrapper::RelationIndexOffset = 4;
+const size_t CSMWorld::ConstInfoSelectWrapper::VarNameOffset = 5;
+
+const char* CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings[] =
+{
+    "Rank Low",
+    "Rank High",
+    "Rank Requirement",
+    "Reputation",
+    "Health Percent",
+    "PC Reputation",
+    "PC Level",
+    "PC Health Percent",
+    "PC Magicka",
+    "PC Fatigue",
+    "PC Strength",
+    "PC Block",
+    "PC Armorer",
+    "PC Medium Armor",
+    "PC Heavy Armor",
+    "PC Blunt Weapon",
+    "PC Long Blade",
+    "PC Axe",
+    "PC Spear",
+    "PC Athletics",
+    "PC Enchant",
+    "PC Detruction",
+    "PC Alteration",
+    "PC Illusion",
+    "PC Conjuration",
+    "PC Mysticism",
+    "PC Restoration",
+    "PC Alchemy",
+    "PC Unarmored",
+    "PC Security",
+    "PC Sneak",
+    "PC Acrobatics",
+    "PC Light Armor",
+    "PC Short Blade",
+    "PC Marksman",
+    "PC Merchantile",
+    "PC Speechcraft",
+    "PC Hand to Hand",
+    "PC Sex",
+    "PC Expelled",
+    "PC Common Disease",
+    "PC Blight Disease",
+    "PC Clothing Modifier",
+    "PC Crime Level",
+    "Same Sex",
+    "Same Race",
+    "Same Faction",
+    "Faction Rank Difference",
+    "Detected",
+    "Alarmed",
+    "Choice",
+    "PC Intelligence",
+    "PC Willpower",
+    "PC Agility",
+    "PC Speed",
+    "PC Endurance",
+    "PC Personality",
+    "PC Luck",
+    "PC Corpus",
+    "Weather",
+    "PC Vampire",
+    "Level",
+    "Attacked",
+    "Talked to PC",
+    "PC Health",
+    "Creature Target",
+    "Friend Hit",
+    "Fight",
+    "Hello",
+    "Alarm",
+    "Flee",
+    "Should Attack",
+    "Werewolf",
+    "PC Werewolf Kills",
+    "Global",
+    "Local",
+    "Journal",
+    "Item",
+    "Dead",
+    "Not Id",
+    "Not Faction",
+    "Not Class",
+    "Not Race",
+    "Not Cell",
+    "Not Local",
+    0
+};
+
+const char* CSMWorld::ConstInfoSelectWrapper::RelationEnumStrings[] =
+{
+    "=",
+    "!=",
+    ">",
+    ">=",
+    "<",
+    "<=",
+    0
+};
+
+const char* CSMWorld::ConstInfoSelectWrapper::ComparisonEnumStrings[] =
+{
+    "Boolean",
+    "Integer",
+    "Numeric",
+    0
+};
+
+// static functions
+
+std::string CSMWorld::ConstInfoSelectWrapper::convertToString(FunctionName name)
+{
+    if (name < Function_None)
+        return FunctionEnumStrings[name];
+    else
+        return "(Invalid Data: Function)";
+}
+
+std::string CSMWorld::ConstInfoSelectWrapper::convertToString(RelationType type)
+{
+    if (type < Relation_None)
+        return RelationEnumStrings[type];
+    else
+        return "(Invalid Data: Relation)";
+}
+
+std::string CSMWorld::ConstInfoSelectWrapper::convertToString(ComparisonType type)
+{
+    if (type < Comparison_None)
+        return ComparisonEnumStrings[type];
+    else
+        return "(Invalid Data: Comparison)";
+}
+
+// ConstInfoSelectWrapper
+
+CSMWorld::ConstInfoSelectWrapper::ConstInfoSelectWrapper(const ESM::DialInfo::SelectStruct& select)
+    : mConstSelect(select)
+{
+    readRule();
+}
+
+CSMWorld::ConstInfoSelectWrapper::FunctionName CSMWorld::ConstInfoSelectWrapper::getFunctionName() const
+{
+    return mFunctionName;
+}
+
+CSMWorld::ConstInfoSelectWrapper::RelationType CSMWorld::ConstInfoSelectWrapper::getRelationType() const
+{
+    return mRelationType;
+}
+
+CSMWorld::ConstInfoSelectWrapper::ComparisonType CSMWorld::ConstInfoSelectWrapper::getComparisonType() const
+{
+    return mComparisonType;
+}
+
+bool CSMWorld::ConstInfoSelectWrapper::hasVariable() const
+{
+    return mHasVariable;
+}
+
+const std::string& CSMWorld::ConstInfoSelectWrapper::getVariableName() const
+{
+    return mVariableName;
+}
+
+bool CSMWorld::ConstInfoSelectWrapper::conditionIsAlwaysTrue() const
+{
+    if (!variantTypeIsValid())
+        return false;
+
+    if (mComparisonType == Comparison_Boolean || mComparisonType == Comparison_Integer)
+    {
+        if (mConstSelect.mValue.getType() == ESM::VT_Float)
+            return conditionIsAlwaysTrue(getConditionFloatRange(), getValidIntRange());
+        else
+            return conditionIsAlwaysTrue(getConditionIntRange(), getValidIntRange());
+    }
+    else if (mComparisonType == Comparison_Numeric)
+    {
+        if (mConstSelect.mValue.getType() == ESM::VT_Float)
+            return conditionIsAlwaysTrue(getConditionFloatRange(), getValidFloatRange());
+        else
+            return conditionIsAlwaysTrue(getConditionIntRange(), getValidFloatRange());
+    }
+
+    return false;
+}
+
+bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue() const
+{
+    if (!variantTypeIsValid())
+        return false;
+
+    if (mComparisonType == Comparison_Boolean || mComparisonType == Comparison_Integer)
+    {
+        if (mConstSelect.mValue.getType() == ESM::VT_Float)
+            return conditionIsNeverTrue(getConditionFloatRange(), getValidIntRange());
+        else
+            return conditionIsNeverTrue(getConditionIntRange(), getValidIntRange());
+    }
+    else if (mComparisonType == Comparison_Numeric)
+    {
+        if (mConstSelect.mValue.getType() == ESM::VT_Float)
+            return conditionIsNeverTrue(getConditionFloatRange(), getValidFloatRange());
+        else
+            return conditionIsNeverTrue(getConditionIntRange(), getValidFloatRange());
+    }
+
+    return false;
+}
+
+bool CSMWorld::ConstInfoSelectWrapper::variantTypeIsValid() const
+{
+    return (mConstSelect.mValue.getType() == ESM::VT_Int || mConstSelect.mValue.getType() == ESM::VT_Float);
+}
+
+const ESM::Variant& CSMWorld::ConstInfoSelectWrapper::getVariant() const
+{
+    return mConstSelect.mValue;
+}
+
+std::string CSMWorld::ConstInfoSelectWrapper::toString() const
+{
+    std::ostringstream stream;
+    stream << convertToString(mFunctionName) << " ";
+
+    if (mHasVariable)
+        stream << mVariableName << " ";
+
+    stream << convertToString(mRelationType) << " ";
+
+    switch (mConstSelect.mValue.getType())
+    {
+        case ESM::VT_Int:
+            stream << mConstSelect.mValue.getInteger();
+            break;
+
+        case ESM::VT_Float:
+            stream << mConstSelect.mValue.getFloat();
+            break;
+
+        default:
+            stream << "(Invalid value type)";
+            break;
+    }
+
+    return stream.str();
+}
+
+void CSMWorld::ConstInfoSelectWrapper::readRule()
+{
+    if (mConstSelect.mSelectRule.size() < RuleMinSize)
+        throw std::runtime_error("InfoSelectWrapper: rule is to small");
+
+    readFunctionName();
+    readRelationType();
+    readVariableName();
+    updateHasVariable();
+    updateComparisonType();
+}
+
+void CSMWorld::ConstInfoSelectWrapper::readFunctionName()
+{
+    char functionPrefix = mConstSelect.mSelectRule[FunctionPrefixOffset];
+    std::string functionIndex = mConstSelect.mSelectRule.substr(FunctionIndexOffset, 2);
+    int convertedIndex = -1;
+
+    // Read in function index, form ## from 00 .. 73, skip leading zero
+    if (functionIndex[0] == '0')
+        functionIndex = functionIndex[1];
+
+    std::stringstream stream;
+    stream << functionIndex;
+    stream >> convertedIndex;
+
+    switch (functionPrefix)
+    {
+        case '1':
+            if (convertedIndex >= 0 && convertedIndex <= 73)
+                mFunctionName = static_cast<FunctionName>(convertedIndex);
+            else
+                mFunctionName = Function_None;
+            break;
+
+        case '2': mFunctionName = Function_Global; break;
+        case '3': mFunctionName = Function_Local; break;
+        case '4': mFunctionName = Function_Journal; break;
+        case '5': mFunctionName = Function_Item; break;
+        case '6': mFunctionName = Function_Dead; break;
+        case '7': mFunctionName = Function_NotId; break;
+        case '8': mFunctionName = Function_NotFaction; break;
+        case '9': mFunctionName = Function_NotClass; break;
+        case 'A': mFunctionName = Function_NotRace; break;
+        case 'B': mFunctionName = Function_NotCell; break;
+        case 'C': mFunctionName = Function_NotLocal; break;
+        default:  mFunctionName = Function_None; break;
+    }
+}
+
+void CSMWorld::ConstInfoSelectWrapper::readRelationType()
+{
+    char relationIndex = mConstSelect.mSelectRule[RelationIndexOffset];
+
+    switch (relationIndex)
+    {
+        case '0': mRelationType = Relation_Equal; break;
+        case '1': mRelationType = Relation_NotEqual; break;
+        case '2': mRelationType = Relation_Greater; break;
+        case '3': mRelationType = Relation_GreaterOrEqual; break;
+        case '4': mRelationType = Relation_Less; break;
+        case '5': mRelationType = Relation_LessOrEqual; break;
+        default:  mRelationType = Relation_None;
+    }
+}
+
+void CSMWorld::ConstInfoSelectWrapper::readVariableName()
+{
+    if (mConstSelect.mSelectRule.size() >= VarNameOffset)
+        mVariableName = mConstSelect.mSelectRule.substr(VarNameOffset);
+    else
+        mVariableName.clear();
+}
+
+void CSMWorld::ConstInfoSelectWrapper::updateHasVariable()
+{
+    switch (mFunctionName)
+    {
+        case Function_Global:
+        case Function_Local:
+        case Function_Journal:
+        case Function_Item:
+        case Function_Dead:
+        case Function_NotId:
+        case Function_NotFaction:
+        case Function_NotClass:
+        case Function_NotRace:
+        case Function_NotCell:
+        case Function_NotLocal:
+            mHasVariable = true;
+            break;
+
+        default:
+            mHasVariable = false;
+            break;
+    }
+}
+
+void CSMWorld::ConstInfoSelectWrapper::updateComparisonType()
+{
+    switch (mFunctionName)
+    {
+        // Boolean
+        case Function_NotId:
+        case Function_NotFaction:
+        case Function_NotClass:
+        case Function_NotRace:
+        case Function_NotCell:
+        case Function_PcExpelled:
+        case Function_PcCommonDisease:
+        case Function_PcBlightDisease:
+        case Function_SameSex:
+        case Function_SameRace:
+        case Function_SameFaction:
+        case Function_Detected:
+        case Function_Alarmed:
+        case Function_PcCorpus:
+        case Function_PcVampire:
+        case Function_Attacked:
+        case Function_TalkedToPc:
+        case Function_ShouldAttack:
+        case Function_Werewolf:
+            mComparisonType = Comparison_Boolean;
+            break;
+
+        // Integer
+        case Function_Journal:
+        case Function_Item:
+        case Function_Dead:
+        case Function_RankLow:
+        case Function_RankHigh:
+        case Function_RankRequirement:
+        case Function_Reputation:
+        case Function_PcReputation:
+        case Function_PcLevel:
+        case Function_PcStrength:
+        case Function_PcBlock:
+        case Function_PcArmorer:
+        case Function_PcMediumArmor:
+        case Function_PcHeavyArmor:
+        case Function_PcBluntWeapon:
+        case Function_PcLongBlade:
+        case Function_PcAxe:
+        case Function_PcSpear:
+        case Function_PcAthletics:
+        case Function_PcEnchant:
+        case Function_PcDestruction:
+        case Function_PcAlteration:
+        case Function_PcIllusion:
+        case Function_PcConjuration:
+        case Function_PcMysticism:
+        case Function_PcRestoration:
+        case Function_PcAlchemy:
+        case Function_PcUnarmored:
+        case Function_PcSecurity:
+        case Function_PcSneak:
+        case Function_PcAcrobatics:
+        case Function_PcLightArmor:
+        case Function_PcShortBlade:
+        case Function_PcMarksman:
+        case Function_PcMerchantile:
+        case Function_PcSpeechcraft:
+        case Function_PcHandToHand:
+        case Function_PcGender:
+        case Function_PcClothingModifier:
+        case Function_PcCrimeLevel:
+        case Function_FactionRankDifference:
+        case Function_Choice:
+        case Function_PcIntelligence:
+        case Function_PcWillpower:
+        case Function_PcAgility:
+        case Function_PcSpeed:
+        case Function_PcEndurance:
+        case Function_PcPersonality:
+        case Function_PcLuck:
+        case Function_Weather:
+        case Function_Level:
+        case Function_CreatureTarget:
+        case Function_FriendHit:
+        case Function_Fight:
+        case Function_Hello:
+        case Function_Alarm:
+        case Function_Flee:
+        case Function_PcWerewolfKills:
+            mComparisonType = Comparison_Integer;
+            break;
+
+        // Numeric
+        case Function_Global:
+        case Function_Local:
+        case Function_NotLocal:
+
+        case Function_Health_Percent:
+        case Function_PcHealthPercent:
+        case Function_PcMagicka:
+        case Function_PcFatigue:
+        case Function_PcHealth:
+            mComparisonType = Comparison_Numeric;
+            break;
+
+        default:
+            mComparisonType = Comparison_None;
+            break;
+    }
+}
+
+std::pair<int, int> CSMWorld::ConstInfoSelectWrapper::getConditionIntRange() const
+{
+    const int IntMax = std::numeric_limits<int>::max();
+    const int IntMin = std::numeric_limits<int>::min();
+    const std::pair<int, int> InvalidRange(IntMax, IntMin);
+
+    int value = mConstSelect.mValue.getInteger();
+
+    switch (mRelationType)
+    {
+        case Relation_Equal:
+        case Relation_NotEqual:
+            return std::pair<int, int>(value, value);
+
+        case Relation_Greater:
+            if (value == IntMax)
+            {
+                return InvalidRange;
+            }
+            else
+            {
+                return std::pair<int, int>(value + 1, IntMax);
+            }
+            break;
+
+        case Relation_GreaterOrEqual:
+            return std::pair<int, int>(value, IntMax);
+
+        case Relation_Less:
+            if (value == IntMin)
+            {
+                return InvalidRange;
+            }
+            else
+            {
+                return std::pair<int, int>(IntMin, value - 1);
+            }
+
+        case Relation_LessOrEqual:
+            return std::pair<int, int>(IntMin, value);
+
+        default:
+            throw std::logic_error("InfoSelectWrapper: relation does not have a range");
+    }
+}
+
+std::pair<float, float> CSMWorld::ConstInfoSelectWrapper::getConditionFloatRange() const
+{
+    const float FloatMax = std::numeric_limits<float>::infinity();
+    const float FloatMin = -std::numeric_limits<float>::infinity();
+    const float Epsilon = std::numeric_limits<float>::epsilon();
+    const std::pair<float, float> InvalidRange(FloatMax, FloatMin);
+
+    float value = mConstSelect.mValue.getFloat();
+
+    switch (mRelationType)
+    {
+        case Relation_Equal:
+        case Relation_NotEqual:
+            return std::pair<float, float>(value, value);
+
+        case Relation_Greater:
+            return std::pair<float, float>(value + Epsilon, FloatMax);
+
+        case Relation_GreaterOrEqual:
+            return std::pair<float, float>(value, FloatMax);
+
+        case Relation_Less:
+            return std::pair<float, float>(FloatMin, value - Epsilon);
+
+        case Relation_LessOrEqual:
+            return std::pair<float, float>(FloatMin, value);
+
+        default:
+            throw std::logic_error("InfoSelectWrapper: given relation does not have a range");
+    }
+}
+
+std::pair<int, int> CSMWorld::ConstInfoSelectWrapper::getValidIntRange() const
+{
+    const int IntMax = std::numeric_limits<int>::max();
+    const int IntMin = std::numeric_limits<int>::min();
+
+    switch (mFunctionName)
+    {
+        // Boolean
+        case Function_NotId:
+        case Function_NotFaction:
+        case Function_NotClass:
+        case Function_NotRace:
+        case Function_NotCell:
+        case Function_PcExpelled:
+        case Function_PcCommonDisease:
+        case Function_PcBlightDisease:
+        case Function_SameSex:
+        case Function_SameRace:
+        case Function_SameFaction:
+        case Function_Detected:
+        case Function_Alarmed:
+        case Function_PcCorpus:
+        case Function_PcVampire:
+        case Function_Attacked:
+        case Function_TalkedToPc:
+        case Function_ShouldAttack:
+        case Function_Werewolf:
+            return std::pair<int, int>(0, 1);
+
+        // Integer
+        case Function_RankLow:
+        case Function_RankHigh:
+        case Function_Reputation:
+        case Function_PcReputation:
+        case Function_Journal:
+            return std::pair<int, int>(IntMin, IntMax);
+
+        case Function_Item:
+        case Function_Dead:
+        case Function_PcLevel:
+        case Function_PcStrength:
+        case Function_PcBlock:
+        case Function_PcArmorer:
+        case Function_PcMediumArmor:
+        case Function_PcHeavyArmor:
+        case Function_PcBluntWeapon:
+        case Function_PcLongBlade:
+        case Function_PcAxe:
+        case Function_PcSpear:
+        case Function_PcAthletics:
+        case Function_PcEnchant:
+        case Function_PcDestruction:
+        case Function_PcAlteration:
+        case Function_PcIllusion:
+        case Function_PcConjuration:
+        case Function_PcMysticism:
+        case Function_PcRestoration:
+        case Function_PcAlchemy:
+        case Function_PcUnarmored:
+        case Function_PcSecurity:
+        case Function_PcSneak:
+        case Function_PcAcrobatics:
+        case Function_PcLightArmor:
+        case Function_PcShortBlade:
+        case Function_PcMarksman:
+        case Function_PcMerchantile:
+        case Function_PcSpeechcraft:
+        case Function_PcHandToHand:
+        case Function_PcClothingModifier:
+        case Function_PcCrimeLevel:
+        case Function_Choice:
+        case Function_PcIntelligence:
+        case Function_PcWillpower:
+        case Function_PcAgility:
+        case Function_PcSpeed:
+        case Function_PcEndurance:
+        case Function_PcPersonality:
+        case Function_PcLuck:
+        case Function_Level:
+        case Function_PcWerewolfKills:
+            return std::pair<int, int>(0, IntMax);
+
+        case Function_Fight:
+        case Function_Hello:
+        case Function_Alarm:
+        case Function_Flee:
+            return std::pair<int, int>(0, 100);
+
+        case Function_Weather:
+            return std::pair<int, int>(0, 9);
+
+        case Function_FriendHit:
+            return std::pair<int, int>(0, 4);
+
+        case Function_RankRequirement:
+            return std::pair<int, int>(0, 3);
+
+        case Function_CreatureTarget:
+            return std::pair<int, int>(0, 2);
+
+        case Function_PcGender:
+            return std::pair<int, int>(0, 1);
+
+        case Function_FactionRankDifference:
+            return std::pair<int, int>(-9, 9);
+
+        // Numeric
+        case Function_Global:
+        case Function_Local:
+        case Function_NotLocal:
+            return std::pair<int, int>(IntMin, IntMax);
+
+        case Function_PcMagicka:
+        case Function_PcFatigue:
+        case Function_PcHealth:
+            return std::pair<int, int>(0, IntMax);
+
+        case Function_Health_Percent:
+        case Function_PcHealthPercent:
+            return std::pair<int, int>(0, 100);
+
+        default:
+            throw std::runtime_error("InfoSelectWrapper: function does not exist");
+    }
+}
+
+std::pair<float, float> CSMWorld::ConstInfoSelectWrapper::getValidFloatRange() const
+{
+    const float FloatMax = std::numeric_limits<float>::infinity();
+    const float FloatMin = -std::numeric_limits<float>::infinity();
+
+    switch (mFunctionName)
+    {
+        // Numeric
+        case Function_Global:
+        case Function_Local:
+        case Function_NotLocal:
+            return std::pair<float, float>(FloatMin, FloatMax);
+
+        case Function_PcMagicka:
+        case Function_PcFatigue:
+        case Function_PcHealth:
+            return std::pair<float, float>(0, FloatMax);
+
+        case Function_Health_Percent:
+        case Function_PcHealthPercent:
+            return std::pair<float, float>(0, 100);
+
+        default:
+            throw std::runtime_error("InfoSelectWrapper: function does not exist or is not numeric");
+    }
+}
+
+template <typename T1, typename T2>
+bool CSMWorld::ConstInfoSelectWrapper::rangeContains(T1 value, std::pair<T2,T2> range) const
+{
+    return (value >= range.first && value <= range.second);
+}
+
+template <typename T1, typename T2>
+bool CSMWorld::ConstInfoSelectWrapper::rangeFullyContains(std::pair<T1,T1> containingRange,
+    std::pair<T2,T2> testRange) const
+{
+    return (containingRange.first <= testRange.first) && (testRange.second <= containingRange.second);
+}
+
+template <typename T1, typename T2>
+bool CSMWorld::ConstInfoSelectWrapper::rangesOverlap(std::pair<T1,T1> range1, std::pair<T2,T2> range2) const
+{
+    // One of the bounds of either range should fall within the other range
+    return
+        (range1.first <= range2.first  && range2.first  <= range1.second) ||
+        (range1.first <= range2.second && range2.second <= range1.second) ||
+        (range2.first <= range1.first  && range1.first  <= range2.second) ||
+        (range2.first <= range1.second && range1.second <= range2.second);
+}
+
+template <typename T1, typename T2>
+bool CSMWorld::ConstInfoSelectWrapper::rangesMatch(std::pair<T1,T1> range1, std::pair<T2,T2> range2) const
+{
+    return (range1.first == range2.first  && range1.second == range2.second);
+}
+
+template <typename T1, typename T2>
+bool CSMWorld::ConstInfoSelectWrapper::conditionIsAlwaysTrue(std::pair<T1,T1> conditionRange,
+    std::pair<T2,T2> validRange) const
+{
+    switch (mRelationType)
+    {
+        case Relation_Equal:
+            return false;
+
+        case Relation_NotEqual:
+            // If value is not within range, it will always be true
+            return !rangeContains(conditionRange.first, validRange);
+
+        case Relation_Greater:
+        case Relation_GreaterOrEqual:
+        case Relation_Less:
+        case Relation_LessOrEqual:
+            // If the valid range is completely within the condition range, it will always be true
+            return rangeFullyContains(conditionRange, validRange);
+
+        default:
+            throw std::logic_error("InfoCondition: operator can not be used to compare");
+    }
+
+    return false;
+}
+
+template <typename T1, typename T2>
+bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue(std::pair<T1,T1> conditionRange,
+    std::pair<T2,T2> validRange) const
+{
+    switch (mRelationType)
+    {
+        case Relation_Equal:
+            return !rangeContains(conditionRange.first, validRange);
+
+        case Relation_NotEqual:
+            return false;
+
+        case Relation_Greater:
+        case Relation_GreaterOrEqual:
+        case Relation_Less:
+        case Relation_LessOrEqual:
+            // If ranges do not overlap, it will never be true
+            return !rangesOverlap(conditionRange, validRange);
+
+        default:
+            throw std::logic_error("InfoCondition: operator can not be used to compare");
+    }
+
+    return false;
+}
+
+// InfoSelectWrapper
+
+CSMWorld::InfoSelectWrapper::InfoSelectWrapper(ESM::DialInfo::SelectStruct& select)
+    : CSMWorld::ConstInfoSelectWrapper(select), mSelect(select)
+{
+}
+
+void CSMWorld::InfoSelectWrapper::setFunctionName(FunctionName name)
+{
+    mFunctionName = name;
+    updateHasVariable();
+    updateComparisonType();
+}
+
+void CSMWorld::InfoSelectWrapper::setRelationType(RelationType type)
+{
+    mRelationType = type;
+}
+
+void CSMWorld::InfoSelectWrapper::setVariableName(const std::string& name)
+{
+    mVariableName = name;
+}
+
+void CSMWorld::InfoSelectWrapper::setDefaults()
+{
+    if (!variantTypeIsValid())
+        mSelect.mValue.setType(ESM::VT_Int);
+
+    switch (mComparisonType)
+    {
+        case Comparison_Boolean:
+            setRelationType(Relation_Equal);
+            mSelect.mValue.setInteger(1);
+            break;
+
+        case Comparison_Integer:
+        case Comparison_Numeric:
+            setRelationType(Relation_Greater);
+            mSelect.mValue.setInteger(0);
+            break;
+
+        default:
+            // Do nothing
+            break;
+    }
+
+    update();
+}
+
+void CSMWorld::InfoSelectWrapper::update()
+{
+    std::ostringstream stream;
+
+    // Leading 0
+    stream << '0';
+
+    // Write Function
+
+    bool writeIndex = false;
+    size_t functionIndex = static_cast<size_t>(mFunctionName);
+
+    switch (mFunctionName)
+    {
+        case Function_None:         stream << '0'; break;
+        case Function_Global:       stream << '2'; break;
+        case Function_Local:        stream << '3'; break;
+        case Function_Journal:      stream << '4'; break;
+        case Function_Item:         stream << '5'; break;
+        case Function_Dead:         stream << '6'; break;
+        case Function_NotId:        stream << '7'; break;
+        case Function_NotFaction:   stream << '8'; break;
+        case Function_NotClass:     stream << '9'; break;
+        case Function_NotRace:      stream << 'A'; break;
+        case Function_NotCell:      stream << 'B'; break;
+        case Function_NotLocal:     stream << 'C'; break;
+        default:                    stream << '1'; writeIndex = true; break;
+    }
+
+    if (writeIndex && functionIndex < 10) // leading 0
+        stream << '0' << functionIndex;
+    else if (writeIndex)
+        stream << functionIndex;
+    else
+        stream << "00";
+
+    // Write Relation
+    switch (mRelationType)
+    {
+        case Relation_Equal:            stream << '0'; break;
+        case Relation_NotEqual:         stream << '1'; break;
+        case Relation_Greater:          stream << '2'; break;
+        case Relation_GreaterOrEqual:   stream << '3'; break;
+        case Relation_Less:             stream << '4'; break;
+        case Relation_LessOrEqual:      stream << '5'; break;
+        default:                        stream << '0'; break;
+    }
+
+    if (mHasVariable)
+        stream << mVariableName;
+
+    mSelect.mSelectRule = stream.str();
+}
+
+ESM::Variant& CSMWorld::InfoSelectWrapper::getVariant()
+{
+    return mSelect.mValue;
+}
diff --git a/apps/opencs/model/world/infoselectwrapper.hpp b/apps/opencs/model/world/infoselectwrapper.hpp
new file mode 100644
index 000000000..ce26a46dc
--- /dev/null
+++ b/apps/opencs/model/world/infoselectwrapper.hpp
@@ -0,0 +1,243 @@
+#ifndef CSM_WORLD_INFOSELECTWRAPPER_H
+#define CSM_WORLD_INFOSELECTWRAPPER_H
+
+#include <components/esm/loadinfo.hpp>
+
+namespace CSMWorld
+{
+    // ESM::DialInfo::SelectStruct.mSelectRule
+    // 012345...
+    // ^^^ ^^
+    // ||| ||
+    // ||| |+------------- condition variable string
+    // ||| +-------------- comparison type, ['0'..'5']; e.g. !=, <, >=, etc
+    // ||+---------------- function index (encoded, where function == '1')
+    // |+----------------- function, ['1'..'C']; e.g. Global, Local, Not ID, etc
+    // +------------------ unknown
+    //
+
+    // Wrapper for DialInfo::SelectStruct
+    class ConstInfoSelectWrapper
+    {
+    public:
+
+        // Order matters
+        enum FunctionName
+        {
+            Function_RankLow=0,
+            Function_RankHigh,
+            Function_RankRequirement,
+            Function_Reputation,
+            Function_Health_Percent,
+            Function_PcReputation,
+            Function_PcLevel,
+            Function_PcHealthPercent,
+            Function_PcMagicka,
+            Function_PcFatigue,
+            Function_PcStrength,
+            Function_PcBlock,
+            Function_PcArmorer,
+            Function_PcMediumArmor,
+            Function_PcHeavyArmor,
+            Function_PcBluntWeapon,
+            Function_PcLongBlade,
+            Function_PcAxe,
+            Function_PcSpear,
+            Function_PcAthletics,
+            Function_PcEnchant,
+            Function_PcDestruction,
+            Function_PcAlteration,
+            Function_PcIllusion,
+            Function_PcConjuration,
+            Function_PcMysticism,
+            Function_PcRestoration,
+            Function_PcAlchemy,
+            Function_PcUnarmored,
+            Function_PcSecurity,
+            Function_PcSneak,
+            Function_PcAcrobatics,
+            Function_PcLightArmor,
+            Function_PcShortBlade,
+            Function_PcMarksman,
+            Function_PcMerchantile,
+            Function_PcSpeechcraft,
+            Function_PcHandToHand,
+            Function_PcGender,
+            Function_PcExpelled,
+            Function_PcCommonDisease,
+            Function_PcBlightDisease,
+            Function_PcClothingModifier,
+            Function_PcCrimeLevel,
+            Function_SameSex,
+            Function_SameRace,
+            Function_SameFaction,
+            Function_FactionRankDifference,
+            Function_Detected,
+            Function_Alarmed,
+            Function_Choice,
+            Function_PcIntelligence,
+            Function_PcWillpower,
+            Function_PcAgility,
+            Function_PcSpeed,
+            Function_PcEndurance,
+            Function_PcPersonality,
+            Function_PcLuck,
+            Function_PcCorpus,
+            Function_Weather,
+            Function_PcVampire,
+            Function_Level,
+            Function_Attacked,
+            Function_TalkedToPc,
+            Function_PcHealth,
+            Function_CreatureTarget,
+            Function_FriendHit,
+            Function_Fight,
+            Function_Hello,
+            Function_Alarm,
+            Function_Flee,
+            Function_ShouldAttack,
+            Function_Werewolf,
+            Function_PcWerewolfKills=73,
+
+            Function_Global,
+            Function_Local,
+            Function_Journal,
+            Function_Item,
+            Function_Dead,
+            Function_NotId,
+            Function_NotFaction,
+            Function_NotClass,
+            Function_NotRace,
+            Function_NotCell,
+            Function_NotLocal,
+
+            Function_None
+        };
+
+        enum RelationType
+        {
+            Relation_Equal,
+            Relation_NotEqual,
+            Relation_Greater,
+            Relation_GreaterOrEqual,
+            Relation_Less,
+            Relation_LessOrEqual,
+
+            Relation_None
+        };
+
+        enum ComparisonType
+        {
+            Comparison_Boolean,
+            Comparison_Integer,
+            Comparison_Numeric,
+
+            Comparison_None
+        };
+
+        static const size_t RuleMinSize;
+
+        static const size_t FunctionPrefixOffset;
+        static const size_t FunctionIndexOffset;
+        static const size_t RelationIndexOffset;
+        static const size_t VarNameOffset;
+
+        static const char* FunctionEnumStrings[];
+        static const char* RelationEnumStrings[];
+        static const char* ComparisonEnumStrings[];
+
+        static std::string convertToString(FunctionName name);
+        static std::string convertToString(RelationType type);
+        static std::string convertToString(ComparisonType type);
+
+        ConstInfoSelectWrapper(const ESM::DialInfo::SelectStruct& select);
+
+        FunctionName getFunctionName() const;
+        RelationType getRelationType() const;
+        ComparisonType getComparisonType() const;
+
+        bool hasVariable() const;
+        const std::string& getVariableName() const;
+
+        bool conditionIsAlwaysTrue() const;
+        bool conditionIsNeverTrue() const;
+        bool variantTypeIsValid() const;
+
+        const ESM::Variant& getVariant() const;
+
+        std::string toString() const;
+
+    protected:
+
+        void readRule();
+        void readFunctionName();
+        void readRelationType();
+        void readVariableName();
+        void updateHasVariable();
+        void updateComparisonType();
+
+        std::pair<int, int> getConditionIntRange() const;
+        std::pair<float, float> getConditionFloatRange() const;
+
+        std::pair<int, int> getValidIntRange() const;
+        std::pair<float, float> getValidFloatRange() const;
+
+        template <typename Type1, typename Type2>
+        bool rangeContains(Type1 value, std::pair<Type2,Type2> range) const;
+
+        template <typename Type1, typename Type2>
+        bool rangesOverlap(std::pair<Type1,Type1> range1, std::pair<Type2,Type2> range2) const;
+
+        template <typename Type1, typename Type2>
+        bool rangeFullyContains(std::pair<Type1,Type1> containing, std::pair<Type2,Type2> test) const;
+
+        template <typename Type1, typename Type2>
+        bool rangesMatch(std::pair<Type1,Type1> range1, std::pair<Type2,Type2> range2) const;
+
+        template <typename Type1, typename Type2>
+        bool conditionIsAlwaysTrue(std::pair<Type1,Type1> conditionRange, std::pair<Type2,Type2> validRange) const;
+
+        template <typename Type1, typename Type2>
+        bool conditionIsNeverTrue(std::pair<Type1,Type1> conditionRange, std::pair<Type2,Type2> validRange) const;
+
+        FunctionName mFunctionName;
+        RelationType mRelationType;
+        ComparisonType mComparisonType;
+
+        bool mHasVariable;
+        std::string mVariableName;
+
+    private:
+
+        const ESM::DialInfo::SelectStruct& mConstSelect;
+    };
+
+    // Wrapper for DialInfo::SelectStruct that can modify the wrapped select struct
+    class InfoSelectWrapper : public ConstInfoSelectWrapper
+    {
+    public:
+
+        InfoSelectWrapper(ESM::DialInfo::SelectStruct& select);
+
+        // Wrapped SelectStruct will not be modified until update() is called
+        void setFunctionName(FunctionName name);
+        void setRelationType(RelationType type);
+        void setVariableName(const std::string& name);
+
+        // Modified wrapped SelectStruct
+        void update();
+
+        // This sets properties based on the function name to its defaults and updates the wrapped object
+        void setDefaults();
+
+        ESM::Variant& getVariant();
+
+    private:
+
+        ESM::DialInfo::SelectStruct& mSelect;
+
+        void writeRule();
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index 92b4b9e62..464757cd4 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -6,6 +6,7 @@
 #include "idcollection.hpp"
 #include "pathgrid.hpp"
 #include "info.hpp"
+#include "infoselectwrapper.hpp"
 
 namespace CSMWorld
 {
@@ -26,20 +27,8 @@ namespace CSMWorld
         point.mConnectionNum = 0;
         point.mUnknown = 0;
 
-        // inserting a point should trigger re-indexing of the edges
-        //
-        // FIXME: does not auto refresh edges table view
-        std::vector<ESM::Pathgrid::Edge>::iterator iter = pathgrid.mEdges.begin();
-        for (;iter != pathgrid.mEdges.end(); ++iter)
-        {
-            if ((*iter).mV0 >= position)
-                (*iter).mV0++;
-            if ((*iter).mV1 >= position)
-                (*iter).mV1++;
-        }
-
         points.insert(points.begin()+position, point);
-        pathgrid.mData.mS2 += 1; // increment the number of points
+        pathgrid.mData.mS2 = pathgrid.mPoints.size();
 
         record.setModified (pathgrid);
     }
@@ -53,28 +42,10 @@ namespace CSMWorld
         if (rowToRemove < 0 || rowToRemove >= static_cast<int> (points.size()))
             throw std::runtime_error ("index out of range");
 
-        // deleting a point should trigger re-indexing of the edges
-        // dangling edges are not allowed and hence removed
-        //
-        // FIXME: does not auto refresh edges table view
-        std::vector<ESM::Pathgrid::Edge>::iterator iter = pathgrid.mEdges.begin();
-        for (; iter != pathgrid.mEdges.end();)
-        {
-            if (((*iter).mV0 == rowToRemove) || ((*iter).mV1 == rowToRemove))
-                iter = pathgrid.mEdges.erase(iter);
-            else
-            {
-                if ((*iter).mV0 > rowToRemove)
-                    (*iter).mV0--;
-
-                if ((*iter).mV1 > rowToRemove)
-                    (*iter).mV1--;
-
-                ++iter;
-            }
-        }
+        // Do not remove dangling edges, does not work with current undo mechanism
+        // Do not automatically adjust indices, what would be done with dangling edges?
         points.erase(points.begin()+rowToRemove);
-        pathgrid.mData.mS2 -= 1; // decrement the number of points
+        pathgrid.mData.mS2 = pathgrid.mPoints.size();
 
         record.setModified (pathgrid);
     }
@@ -83,14 +54,8 @@ namespace CSMWorld
             const NestedTableWrapperBase& nestedTable) const
     {
         Pathgrid pathgrid = record.get();
-
-        pathgrid.mPoints =
-            static_cast<const PathgridPointsWrap &>(nestedTable).mRecord.mPoints;
-        pathgrid.mData.mS2 =
-            static_cast<const PathgridPointsWrap &>(nestedTable).mRecord.mData.mS2;
-        // also update edges in case points were added/removed
-        pathgrid.mEdges =
-            static_cast<const PathgridPointsWrap &>(nestedTable).mRecord.mEdges;
+        pathgrid.mPoints = static_cast<const NestedTableWrapper<ESM::Pathgrid::PointList> &>(nestedTable).mNestedTable;
+        pathgrid.mData.mS2 = pathgrid.mPoints.size();
 
         record.setModified (pathgrid);
     }
@@ -98,7 +63,7 @@ namespace CSMWorld
     NestedTableWrapperBase* PathgridPointListAdapter::table(const Record<Pathgrid>& record) const
     {
         // deleted by dtor of NestedTableStoring
-        return new PathgridPointsWrap(record.get());
+        return new NestedTableWrapper<ESM::Pathgrid::PointList>(record.get().mPoints);
     }
 
     QVariant PathgridPointListAdapter::getData(const Record<Pathgrid>& record,
@@ -146,7 +111,6 @@ namespace CSMWorld
 
     PathgridEdgeListAdapter::PathgridEdgeListAdapter () {}
 
-    // ToDo: seems to be auto-sorted in the dialog table display after insertion
     void PathgridEdgeListAdapter::addRow(Record<Pathgrid>& record, int position) const
     {
         Pathgrid pathgrid = record.get();
@@ -217,7 +181,6 @@ namespace CSMWorld
         }
     }
 
-    // ToDo: detect duplicates in mEdges
     void PathgridEdgeListAdapter::setData(Record<Pathgrid>& record,
             const QVariant& value, int subRowIndex, int subColIndex) const
     {
@@ -529,16 +492,6 @@ namespace CSMWorld
         return 1; // fixed at size 1
     }
 
-    // ESM::DialInfo::SelectStruct.mSelectRule
-    // 012345...
-    // ^^^ ^^
-    // ||| ||
-    // ||| |+------------- condition variable string
-    // ||| +-------------- comparison type, ['0'..'5']; e.g. !=, <, >=, etc
-    // ||+---------------- function index (encoded, where function == '1')
-    // |+----------------- function, ['1'..'C']; e.g. Global, Local, Not ID, etc
-    // +------------------ unknown
-    //
     InfoConditionAdapter::InfoConditionAdapter () {}
 
     void InfoConditionAdapter::addRow(Record<Info>& record, int position) const
@@ -547,11 +500,11 @@ namespace CSMWorld
 
         std::vector<ESM::DialInfo::SelectStruct>& conditions = info.mSelects;
 
-        // blank row
+        // default row
         ESM::DialInfo::SelectStruct condStruct;
-        condStruct.mSelectRule = "00000";
+        condStruct.mSelectRule = "01000";
         condStruct.mValue = ESM::Variant();
-        condStruct.mValue.setType(ESM::VT_Int); // default to ints
+        condStruct.mValue.setType(ESM::VT_Int);
 
         conditions.insert(conditions.begin()+position, condStruct);
 
@@ -589,89 +542,6 @@ namespace CSMWorld
         return new NestedTableWrapper<std::vector<ESM::DialInfo::SelectStruct> >(record.get().mSelects);
     }
 
-    // See the mappings in MWDialogue::SelectWrapper::getArgument
-    // from ESM::Attribute, ESM::Skill and MWMechanics::CreatureStats (for AI)
-    static std::map<const std::string, std::string> populateEncToInfoFunc()
-    {
-        std::map<const std::string, std::string> funcMap;
-        funcMap["00"] = "Rank Low";
-        funcMap["01"] = "Rank High";
-        funcMap["02"] = "Rank Requirement";
-        funcMap["03"] = "Reputation";
-        funcMap["04"] = "Health Percent";
-        funcMap["05"] = "PC Reputation";
-        funcMap["06"] = "PC Level";
-        funcMap["07"] = "PC Health Percent";
-        funcMap["08"] = "PC Magicka";
-        funcMap["09"] = "PC Fatigue";
-        funcMap["10"] = "PC Strength";
-        funcMap["11"] = "PC Block";
-        funcMap["12"] = "PC Armorer";
-        funcMap["13"] = "PC Medium Armor";
-        funcMap["14"] = "PC Heavy Armor";
-        funcMap["15"] = "PC Blunt Weapon";
-        funcMap["16"] = "PC Long Blade";
-        funcMap["17"] = "PC Axe";
-        funcMap["18"] = "PC Spear";
-        funcMap["19"] = "PC Athletics";
-        funcMap["20"] = "PC Enchant";
-        funcMap["21"] = "PC Destruction";
-        funcMap["22"] = "PC Alteration";
-        funcMap["23"] = "PC Illusion";
-        funcMap["24"] = "PC Conjuration";
-        funcMap["25"] = "PC Mysticism";
-        funcMap["26"] = "PC Restoration";
-        funcMap["27"] = "PC Alchemy";
-        funcMap["28"] = "PC Unarmored";
-        funcMap["29"] = "PC Security";
-        funcMap["30"] = "PC Sneak";
-        funcMap["31"] = "PC Acrobatics";
-        funcMap["32"] = "PC Light Armor";
-        funcMap["33"] = "PC Short Blade";
-        funcMap["34"] = "PC Marksman";
-        funcMap["35"] = "PC Merchantile";
-        funcMap["36"] = "PC Speechcraft";
-        funcMap["37"] = "PC Hand To Hand";
-        funcMap["38"] = "PC Sex";
-        funcMap["39"] = "PC Expelled";
-        funcMap["40"] = "PC Common Disease";
-        funcMap["41"] = "PC Blight Disease";
-        funcMap["42"] = "PC Clothing Modifier";
-        funcMap["43"] = "PC Crime Level";
-        funcMap["44"] = "Same Sex";
-        funcMap["45"] = "Same Race";
-        funcMap["46"] = "Same Faction";
-        funcMap["47"] = "Faction Rank Difference";
-        funcMap["48"] = "Detected";
-        funcMap["49"] = "Alarmed";
-        funcMap["50"] = "Choice";
-        funcMap["51"] = "PC Intelligence";
-        funcMap["52"] = "PC Willpower";
-        funcMap["53"] = "PC Agility";
-        funcMap["54"] = "PC Speed";
-        funcMap["55"] = "PC Endurance";
-        funcMap["56"] = "PC Personality";
-        funcMap["57"] = "PC Luck";
-        funcMap["58"] = "PC Corpus";
-        funcMap["59"] = "Weather";
-        funcMap["60"] = "PC Vampire";
-        funcMap["61"] = "Level";
-        funcMap["62"] = "Attacked";
-        funcMap["63"] = "Talked To PC";
-        funcMap["64"] = "PC Health";
-        funcMap["65"] = "Creature Target";
-        funcMap["66"] = "Friend Hit";
-        funcMap["67"] = "Fight";
-        funcMap["68"] = "Hello";
-        funcMap["69"] = "Alarm";
-        funcMap["70"] = "Flee";
-        funcMap["71"] = "Should Attack";
-        funcMap["72"] = "Werewolf";
-        funcMap["73"] = "PC Werewolf Kills";
-        return funcMap;
-    }
-    static const std::map<const std::string, std::string> sEncToInfoFunc = populateEncToInfoFunc();
-
     QVariant InfoConditionAdapter::getData(const Record<Info>& record,
             int subRowIndex, int subColIndex) const
     {
@@ -682,70 +552,36 @@ namespace CSMWorld
         if (subRowIndex < 0 || subRowIndex >= static_cast<int> (conditions.size()))
             throw std::runtime_error ("index out of range");
 
+        ConstInfoSelectWrapper infoSelectWrapper(conditions[subRowIndex]);
+
         switch (subColIndex)
         {
             case 0:
             {
-                char condType = conditions[subRowIndex].mSelectRule[1];
-                switch (condType)
-                {
-                    case '0': return 0;  // blank space
-                    case '1': return 1;  // Function
-                    case '2': return 2;  // Global
-                    case '3': return 3;  // Local
-                    case '4': return 4;  // Journal
-                    case '5': return 5;  // Item
-                    case '6': return 6;  // Dead
-                    case '7': return 7;  // Not ID
-                    case '8': return 8;  // Not Factio
-                    case '9': return 9;  // Not Class
-                    case 'A': return 10; // Not Race
-                    case 'B': return 11; // Not Cell
-                    case 'C': return 12; // Not Local
-                    default: return QVariant(); // TODO: log an error?
-                }
+                return infoSelectWrapper.getFunctionName();
             }
             case 1:
             {
-                if (conditions[subRowIndex].mSelectRule[1] == '1')
-                {
-                    // throws an exception if the encoding is not found
-                    return sEncToInfoFunc.at(conditions[subRowIndex].mSelectRule.substr(2, 2)).c_str();
-                }
+                if (infoSelectWrapper.hasVariable())
+                    return QString(infoSelectWrapper.getVariableName().c_str());
                 else
-                    return QString(conditions[subRowIndex].mSelectRule.substr(5).c_str());
+                    return "";
             }
             case 2:
             {
-                char compType = conditions[subRowIndex].mSelectRule[4];
-                switch (compType)
-                {
-                    case '0': return 3; // =
-                    case '1': return 0; // !=
-                    case '2': return 4; // >
-                    case '3': return 5; // >=
-                    case '4': return 1; // <
-                    case '5': return 2; // <=
-                    default: return QVariant(); // TODO: log an error?
-                }
+                return infoSelectWrapper.getRelationType();
             }
             case 3:
             {
-                switch (conditions[subRowIndex].mValue.getType())
+                switch (infoSelectWrapper.getVariant().getType())
                 {
-                    case ESM::VT_String:
-                    {
-                        return QString::fromUtf8 (conditions[subRowIndex].mValue.getString().c_str());
-                    }
                     case ESM::VT_Int:
-                    case ESM::VT_Short:
-                    case ESM::VT_Long:
                     {
-                        return conditions[subRowIndex].mValue.getInteger();
+                        return infoSelectWrapper.getVariant().getInteger();
                     }
                     case ESM::VT_Float:
                     {
-                        return conditions[subRowIndex].mValue.getFloat();
+                        return infoSelectWrapper.getVariant().getFloat();
                     }
                     default: return QVariant();
                 }
@@ -764,101 +600,63 @@ namespace CSMWorld
         if (subRowIndex < 0 || subRowIndex >= static_cast<int> (conditions.size()))
             throw std::runtime_error ("index out of range");
 
+        InfoSelectWrapper infoSelectWrapper(conditions[subRowIndex]);
+        bool conversionResult = false;
+
         switch (subColIndex)
         {
-            case 0:
+            case 0: // Function
             {
-                // See sInfoCondFunc in columns.cpp for the enum values
-                switch (value.toInt())
+                infoSelectWrapper.setFunctionName(static_cast<ConstInfoSelectWrapper::FunctionName>(value.toInt()));
+
+                if (infoSelectWrapper.getComparisonType() != ConstInfoSelectWrapper::Comparison_Numeric &&
+                    infoSelectWrapper.getVariant().getType() != ESM::VT_Int)
                 {
-                    // FIXME: when these change the values of the other columns need to change
-                    // correspondingly (and automatically)
-                    case 1:
-                    {
-                        conditions[subRowIndex].mSelectRule[1] = '1';             // Function
-                        // default to "Rank Low"
-                        conditions[subRowIndex].mSelectRule[2] = '0';
-                        conditions[subRowIndex].mSelectRule[3] = '0';
-                        break;
-                    }
-                    case 2:  conditions[subRowIndex].mSelectRule[1] = '2'; break; // Global
-                    case 3:  conditions[subRowIndex].mSelectRule[1] = '3'; break; // Local
-                    case 4:  conditions[subRowIndex].mSelectRule[1] = '4'; break; // Journal
-                    case 5:  conditions[subRowIndex].mSelectRule[1] = '5'; break; // Item
-                    case 6:  conditions[subRowIndex].mSelectRule[1] = '6'; break; // Dead
-                    case 7:  conditions[subRowIndex].mSelectRule[1] = '7'; break; // Not ID
-                    case 8:  conditions[subRowIndex].mSelectRule[1] = '8'; break; // Not Faction
-                    case 9:  conditions[subRowIndex].mSelectRule[1] = '9'; break; // Not Class
-                    case 10: conditions[subRowIndex].mSelectRule[1] = 'A'; break; // Not Race
-                    case 11: conditions[subRowIndex].mSelectRule[1] = 'B'; break; // Not Cell
-                    case 12: conditions[subRowIndex].mSelectRule[1] = 'C'; break; // Not Local
-                    default: return; // return without saving
+                    infoSelectWrapper.getVariant().setType(ESM::VT_Int);
                 }
+
+                infoSelectWrapper.update();
                 break;
             }
-            case 1:
+            case 1: // Variable
             {
-                if (conditions[subRowIndex].mSelectRule[1] == '1')
-                {
-                    std::map<const std::string, std::string>::const_iterator it = sEncToInfoFunc.begin();
-                    for (;it != sEncToInfoFunc.end(); ++it)
-                    {
-                        if (it->second == value.toString().toUtf8().constData())
-                        {
-                            std::string rule = conditions[subRowIndex].mSelectRule.substr(0, 2);
-                            rule.append(it->first);
-                            // leave old values for undo (NOTE: may not be vanilla's behaviour)
-                            rule.append(conditions[subRowIndex].mSelectRule.substr(4));
-                            conditions[subRowIndex].mSelectRule = rule;
-                            break;
-                        }
-                    }
-
-                    if (it == sEncToInfoFunc.end())
-                        return; // return without saving; TODO: maybe log an error here
-                }
-                else
-                {
-                    // FIXME: validate the string values before saving, based on the current function
-                    std::string rule = conditions[subRowIndex].mSelectRule.substr(0, 5);
-                    conditions[subRowIndex].mSelectRule = rule.append(value.toString().toUtf8().constData());
-                }
+                infoSelectWrapper.setVariableName(value.toString().toUtf8().constData());
+                infoSelectWrapper.update();
                 break;
             }
-            case 2:
+            case 2: // Relation
             {
-                // See sInfoCondComp in columns.cpp for the enum values
-                switch (value.toInt())
-                {
-                    case 0: conditions[subRowIndex].mSelectRule[4] = '1'; break; // !=
-                    case 1: conditions[subRowIndex].mSelectRule[4] = '4'; break; // <
-                    case 2: conditions[subRowIndex].mSelectRule[4] = '5'; break; // <=
-                    case 3: conditions[subRowIndex].mSelectRule[4] = '0'; break; // =
-                    case 4: conditions[subRowIndex].mSelectRule[4] = '2'; break; // >
-                    case 5: conditions[subRowIndex].mSelectRule[4] = '3'; break; // >=
-                    default: return; // return without saving
-                }
+                infoSelectWrapper.setRelationType(static_cast<ConstInfoSelectWrapper::RelationType>(value.toInt()));
+                infoSelectWrapper.update();
                 break;
             }
-            case 3:
+            case 3: // Value
             {
-                switch (conditions[subRowIndex].mValue.getType())
+                switch (infoSelectWrapper.getComparisonType())
                 {
-                    case ESM::VT_String:
-                    {
-                        conditions[subRowIndex].mValue.setString (value.toString().toUtf8().constData());
-                        break;
-                    }
-                    case ESM::VT_Int:
-                    case ESM::VT_Short:
-                    case ESM::VT_Long:
+                    case ConstInfoSelectWrapper::Comparison_Numeric:
                     {
-                        conditions[subRowIndex].mValue.setInteger (value.toInt());
+                        // QVariant seems to have issues converting 0
+                        if ((value.toInt(&conversionResult) && conversionResult) || value.toString().compare("0") == 0)
+                        {
+                            infoSelectWrapper.getVariant().setType(ESM::VT_Int);
+                            infoSelectWrapper.getVariant().setInteger(value.toInt());
+                        }
+                        else if (value.toFloat(&conversionResult) && conversionResult)
+                        {
+                            infoSelectWrapper.getVariant().setType(ESM::VT_Float);
+                            infoSelectWrapper.getVariant().setFloat(value.toFloat());
+                        }
                         break;
                     }
-                    case ESM::VT_Float:
+                    case ConstInfoSelectWrapper::Comparison_Boolean:
+                    case ConstInfoSelectWrapper::Comparison_Integer:
                     {
-                        conditions[subRowIndex].mValue.setFloat (value.toFloat());
+                        if ((value.toInt(&conversionResult) && conversionResult) || value.toString().compare("0") == 0)
+                        {
+                            infoSelectWrapper.getVariant().setType(ESM::VT_Int);
+                            infoSelectWrapper.getVariant().setInteger(value.toInt());
+                        }
                         break;
                     }
                     default: break;
@@ -1079,7 +877,7 @@ namespace CSMWorld
                     cell.mAmbi.mFogDensity : QVariant(QVariant::UserType);
             case 5:
             {
-                if (isInterior && !behaveLikeExterior && interiorWater)
+                if (isInterior && interiorWater)
                     return cell.mWater;
                 else
                     return QVariant(QVariant::UserType);
@@ -1145,7 +943,7 @@ namespace CSMWorld
             }
             case 5:
             {
-                if (isInterior && !behaveLikeExterior && interiorWater)
+                if (isInterior && interiorWater)
                     cell.mWater = value.toFloat();
                 else
                     return; // return without saving
@@ -1191,4 +989,105 @@ namespace CSMWorld
     {
         return 1; // fixed at size 1
     }
+
+    RegionWeatherAdapter::RegionWeatherAdapter () {}
+
+    void RegionWeatherAdapter::addRow(Record<ESM::Region>& record, int position) const
+    {
+        throw std::logic_error ("cannot add a row to a fixed table");
+    }
+
+    void RegionWeatherAdapter::removeRow(Record<ESM::Region>& record, int rowToRemove) const
+    {
+        throw std::logic_error ("cannot remove a row from a fixed table");
+    }
+
+    void RegionWeatherAdapter::setTable(Record<ESM::Region>& record, const NestedTableWrapperBase& nestedTable) const
+    {
+        throw std::logic_error ("table operation not supported");
+    }
+
+    NestedTableWrapperBase* RegionWeatherAdapter::table(const Record<ESM::Region>& record) const
+    {
+        throw std::logic_error ("table operation not supported");
+    }
+
+    QVariant RegionWeatherAdapter::getData(const Record<ESM::Region>& record, int subRowIndex, int subColIndex) const
+    {
+        const char* WeatherNames[] = {
+            "Clear",
+            "Cloudy",
+            "Fog",
+            "Overcast",
+            "Rain",
+            "Thunder",
+            "Ash",
+            "Blight",
+            "Snow",
+            "Blizzard"
+        };
+
+        const ESM::Region& region = record.get();
+
+        if (subColIndex == 0 && subRowIndex >= 0 && subRowIndex < 10)
+        {
+            return WeatherNames[subRowIndex];
+        }
+        else if (subColIndex == 1)
+        {
+            switch (subRowIndex)
+            {
+                case 0: return region.mData.mClear;
+                case 1: return region.mData.mCloudy;
+                case 2: return region.mData.mFoggy;
+                case 3: return region.mData.mOvercast;
+                case 4: return region.mData.mRain;
+                case 5: return region.mData.mThunder;
+                case 6: return region.mData.mAsh;
+                case 7: return region.mData.mBlight;
+                case 8: return region.mData.mA; // Snow
+                case 9: return region.mData.mB; // Blizzard
+                default: break;
+            }
+        }
+
+        throw std::runtime_error("index out of range");
+    }
+
+    void RegionWeatherAdapter::setData(Record<ESM::Region>& record, const QVariant& value, int subRowIndex,
+        int subColIndex) const
+    {
+        ESM::Region region = record.get();
+        unsigned char chance = static_cast<unsigned char>(value.toInt());
+
+        if (subColIndex == 1)
+        {
+            switch (subRowIndex)
+            {
+                case 0: region.mData.mClear = chance; break;
+                case 1: region.mData.mCloudy = chance; break;
+                case 2: region.mData.mFoggy = chance; break;
+                case 3: region.mData.mOvercast = chance; break;
+                case 4: region.mData.mRain = chance; break;
+                case 5: region.mData.mThunder = chance; break;
+                case 6: region.mData.mAsh = chance; break;
+                case 7: region.mData.mBlight = chance; break;
+                case 8: region.mData.mA = chance; break;
+                case 9: region.mData.mB = chance; break;
+                default: throw std::runtime_error("index out of range");
+            }
+
+            record.setModified (region);
+        }
+    }
+
+    int RegionWeatherAdapter::getColumnsCount(const Record<ESM::Region>& record) const
+    {
+        return 2;
+    }
+
+    int RegionWeatherAdapter::getRowsCount(const Record<ESM::Region>& record) const
+    {
+        return 10;
+    }
 }
diff --git a/apps/opencs/model/world/nestedcoladapterimp.hpp b/apps/opencs/model/world/nestedcoladapterimp.hpp
index 2fd569bd0..131f547a5 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.hpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.hpp
@@ -25,21 +25,6 @@ namespace CSMWorld
     struct Pathgrid;
     struct Info;
 
-    struct PathgridPointsWrap : public NestedTableWrapperBase
-    {
-        ESM::Pathgrid mRecord;
-
-        PathgridPointsWrap(ESM::Pathgrid pathgrid)
-            : mRecord(pathgrid) {}
-
-        virtual ~PathgridPointsWrap() {}
-
-        virtual int size() const
-        {
-            return mRecord.mPoints.size(); // used in IdTree::setNestedTable()
-        }
-    };
-
     class PathgridPointListAdapter : public NestedColumnAdapter<Pathgrid>
     {
     public:
@@ -540,6 +525,31 @@ namespace CSMWorld
 
         virtual int getRowsCount(const Record<CSMWorld::Cell>& record) const;
     };
+
+    class RegionWeatherAdapter : public NestedColumnAdapter<ESM::Region>
+    {
+    public:
+        RegionWeatherAdapter ();
+
+        virtual void addRow(Record<ESM::Region>& record, int position) const;
+
+        virtual void removeRow(Record<ESM::Region>& record, int rowToRemove) const;
+
+        virtual void setTable(Record<ESM::Region>& record,
+                const NestedTableWrapperBase& nestedTable) const;
+
+        virtual NestedTableWrapperBase* table(const Record<ESM::Region>& record) const;
+
+        virtual QVariant getData(const Record<ESM::Region>& record,
+                int subRowIndex, int subColIndex) const;
+
+        virtual void setData(Record<ESM::Region>& record,
+                const QVariant& value, int subRowIndex, int subColIndex) const;
+
+        virtual int getColumnsCount(const Record<ESM::Region>& record) const;
+
+        virtual int getRowsCount(const Record<ESM::Region>& record) const;
+    };
 }
 
 #endif // CSM_WOLRD_NESTEDCOLADAPTERIMP_H
diff --git a/apps/opencs/model/world/ref.cpp b/apps/opencs/model/world/ref.cpp
index 638f7ec9c..0439b9448 100644
--- a/apps/opencs/model/world/ref.cpp
+++ b/apps/opencs/model/world/ref.cpp
@@ -2,7 +2,11 @@
 
 #include <cmath>
 
-CSMWorld::CellRef::CellRef()
+#include <sstream>
+
+#include "cellcoordinates.hpp"
+
+CSMWorld::CellRef::CellRef() : mNew (true)
 {
     mRefNum.mIndex = 0;
     mRefNum.mContentFile = 0;
@@ -10,8 +14,5 @@ CSMWorld::CellRef::CellRef()
 
 std::pair<int, int> CSMWorld::CellRef::getCellIndex() const
 {
-    const int cellSize = 8192;
-
-    return std::make_pair (
-        std::floor (mPos.pos[0]/cellSize), std::floor (mPos.pos[1]/cellSize));
+    return CellCoordinates::coordinatesToCellIndex (mPos.pos[0], mPos.pos[1]);
 }
diff --git a/apps/opencs/model/world/ref.hpp b/apps/opencs/model/world/ref.hpp
index c60392221..5d10a3a1b 100644
--- a/apps/opencs/model/world/ref.hpp
+++ b/apps/opencs/model/world/ref.hpp
@@ -13,6 +13,7 @@ namespace CSMWorld
         std::string mId;
         std::string mCell;
         std::string mOriginalCell;
+        bool mNew; // new reference, not counted yet, ref num not assigned yet
 
         CellRef();
 
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 65251a81d..6b586dcec 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -19,6 +19,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
     Cell& cell2 = base ? cell.mBase : cell.mModified;
 
     CellRef ref;
+    ref.mNew = false;
     ESM::MovedCellRef mref;
     bool isDeleted = false;
 
@@ -62,7 +63,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
                     std::cerr << "Position: #" << index.first << " " << index.second
                         <<", Target #"<< mref.mTarget[0] << " " << mref.mTarget[1] << std::endl;
 
-                    std::ostringstream stream;
+                    stream.clear();
                     stream << "#" << mref.mTarget[0] << " " << mref.mTarget[1];
                     ref.mCell = stream.str(); // overwrite
                 }
diff --git a/apps/opencs/model/world/refidadapter.hpp b/apps/opencs/model/world/refidadapter.hpp
index ba9da577d..116adb69a 100644
--- a/apps/opencs/model/world/refidadapter.hpp
+++ b/apps/opencs/model/world/refidadapter.hpp
@@ -8,7 +8,7 @@
  * Adapters acts as indirection layer, abstracting details of the record types (in the wrappers) from the higher levels of model.
  * Please notice that nested adaptor uses helper classes for actually performing any actions. Different record types require different helpers (needs to be created in the subclass and then fetched via member function).
  *
- * Important point: don't forget to make sure that getData on the nestedColumn returns true (otherwise code will not treat the index pointing to the column as having childs!
+ * Important point: don't forget to make sure that getData on the nestedColumn returns true (otherwise code will not treat the index pointing to the column as having children!
  */
 
 class QVariant;
diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index 039624c84..e8f921580 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -108,7 +108,7 @@ void CSMWorld::IngredEffectRefIdAdapter::setNestedTable (const RefIdColumn* colu
     ESM::Ingredient ingredient = record.get();
 
     ingredient.mData =
-        static_cast<const NestedTableWrapper<std::vector<typename ESM::Ingredient::IRDTstruct> >&>(nestedTable).mNestedTable.at(0);
+        static_cast<const NestedTableWrapper<std::vector<ESM::Ingredient::IRDTstruct> >&>(nestedTable).mNestedTable.at(0);
 
     record.setModified (ingredient);
 }
@@ -120,11 +120,11 @@ CSMWorld::NestedTableWrapperBase* CSMWorld::IngredEffectRefIdAdapter::nestedTabl
         static_cast<const Record<ESM::Ingredient>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
 
     // return the whole struct
-    std::vector<typename ESM::Ingredient::IRDTstruct> wrap;
+    std::vector<ESM::Ingredient::IRDTstruct> wrap;
     wrap.push_back(record.get().mData);
 
     // deleted by dtor of NestedTableStoring
-    return new NestedTableWrapper<std::vector<typename ESM::Ingredient::IRDTstruct> >(wrap);
+    return new NestedTableWrapper<std::vector<ESM::Ingredient::IRDTstruct> >(wrap);
 }
 
 QVariant CSMWorld::IngredEffectRefIdAdapter::getNestedData (const RefIdColumn *column,
@@ -301,9 +301,9 @@ void CSMWorld::ArmorRefIdAdapter::setData (const RefIdColumn *column, RefIdData&
 }
 
 CSMWorld::BookRefIdAdapter::BookRefIdAdapter (const EnchantableColumns& columns,
-    const RefIdColumn *scroll, const RefIdColumn *skill)
+    const RefIdColumn *bookType, const RefIdColumn *skill, const RefIdColumn *text)
 : EnchantableRefIdAdapter<ESM::Book> (UniversalId::Type_Book, columns),
-    mScroll (scroll), mSkill (skill)
+    mBookType (bookType), mSkill (skill), mText (text)
 {}
 
 QVariant CSMWorld::BookRefIdAdapter::getData (const RefIdColumn *column,
@@ -312,11 +312,14 @@ QVariant CSMWorld::BookRefIdAdapter::getData (const RefIdColumn *column,
     const Record<ESM::Book>& record = static_cast<const Record<ESM::Book>&> (
         data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Book)));
 
-    if (column==mScroll)
-        return record.get().mData.mIsScroll!=0;
+    if (column==mBookType)
+        return record.get().mData.mIsScroll;
 
     if (column==mSkill)
-        return record.get().mData.mSkillID;
+        return record.get().mData.mSkillId;
+
+    if (column==mText)
+        return QString::fromUtf8 (record.get().mText.c_str());
 
     return EnchantableRefIdAdapter<ESM::Book>::getData (column, data, index);
 }
@@ -329,10 +332,12 @@ void CSMWorld::BookRefIdAdapter::setData (const RefIdColumn *column, RefIdData&
 
     ESM::Book book = record.get();
 
-    if (column==mScroll)
+    if (column==mBookType)
         book.mData.mIsScroll = value.toInt();
     else if (column==mSkill)
-        book.mData.mSkillID = value.toInt();
+        book.mData.mSkillId = value.toInt();
+    else if (column==mText)
+        book.mText = value.toString().toUtf8().data();
     else
     {
         EnchantableRefIdAdapter<ESM::Book>::setData (column, data, index, value);
@@ -453,7 +458,8 @@ CSMWorld::CreatureColumns::CreatureColumns (const ActorColumns& actorColumns)
   mOriginal(NULL),
   mAttributes(NULL),
   mAttacks(NULL),
-  mMisc(NULL)
+  mMisc(NULL),
+  mBloodType(NULL)
 {}
 
 CSMWorld::CreatureRefIdAdapter::CreatureRefIdAdapter (const CreatureColumns& columns)
@@ -484,6 +490,19 @@ QVariant CSMWorld::CreatureRefIdAdapter::getData (const RefIdColumn *column, con
     if (column==mColumns.mMisc)
         return QVariant::fromValue(ColumnBase::TableEdit_Full);
 
+    if (column == mColumns.mBloodType)
+    {
+        int mask = ESM::Creature::Skeleton | ESM::Creature::Metal;
+
+        if ((record.get().mFlags & mask) == ESM::Creature::Skeleton)
+            return 1;
+
+        if ((record.get().mFlags & mask) == ESM::Creature::Metal)
+            return 2;
+
+        return 0;
+    }
+
     std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
         mColumns.mFlags.find (column);
 
@@ -507,6 +526,17 @@ void CSMWorld::CreatureRefIdAdapter::setData (const RefIdColumn *column, RefIdDa
         creature.mScale = value.toFloat();
     else if (column==mColumns.mOriginal)
         creature.mOriginal = value.toString().toUtf8().constData();
+    else if (column == mColumns.mBloodType)
+    {
+        int mask = ~(ESM::Creature::Skeleton | ESM::Creature::Metal);
+
+        if (value.toInt() == 1)
+            creature.mFlags = (creature.mFlags & mask) | ESM::Creature::Skeleton;
+        else if (value.toInt() == 2)
+            creature.mFlags = (creature.mFlags & mask) | ESM::Creature::Metal;
+        else
+            creature.mFlags = creature.mFlags & mask;
+    }
     else
     {
         std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
@@ -598,6 +628,25 @@ QVariant CSMWorld::LightRefIdAdapter::getData (const RefIdColumn *column, const
     if (column==mColumns.mSound)
         return QString::fromUtf8 (record.get().mSound.c_str());
 
+    if (column == mColumns.mEmitterType)
+    {
+        int mask = ESM::Light::Flicker | ESM::Light::FlickerSlow | ESM::Light::Pulse | ESM::Light::PulseSlow;
+
+        if ((record.get().mData.mFlags & mask) == ESM::Light::Flicker)
+            return 1;
+
+        if ((record.get().mData.mFlags & mask) == ESM::Light::FlickerSlow)
+            return 2;
+
+        if ((record.get().mData.mFlags & mask) == ESM::Light::Pulse)
+            return 3;
+
+        if ((record.get().mData.mFlags & mask) == ESM::Light::PulseSlow)
+            return 4;
+
+        return 0;
+    }
+
     std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
         mColumns.mFlags.find (column);
 
@@ -623,6 +672,21 @@ void CSMWorld::LightRefIdAdapter::setData (const RefIdColumn *column, RefIdData&
         light.mData.mColor = value.toInt();
     else if (column==mColumns.mSound)
         light.mSound = value.toString().toUtf8().constData();
+    else if (column == mColumns.mEmitterType)
+    {
+        int mask = ~(ESM::Light::Flicker | ESM::Light::FlickerSlow | ESM::Light::Pulse | ESM::Light::PulseSlow);
+
+        if (value.toInt() == 0)
+            light.mData.mFlags = light.mData.mFlags & mask;
+        else if (value.toInt() == 1)
+            light.mData.mFlags = (light.mData.mFlags & mask) | ESM::Light::Flicker;
+        else if (value.toInt() == 2)
+            light.mData.mFlags = (light.mData.mFlags & mask) | ESM::Light::FlickerSlow;
+        else if (value.toInt() == 3)
+            light.mData.mFlags = (light.mData.mFlags & mask) | ESM::Light::Pulse;
+        else
+            light.mData.mFlags = (light.mData.mFlags & mask) | ESM::Light::PulseSlow;
+    }
     else
     {
         std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
@@ -691,7 +755,9 @@ CSMWorld::NpcColumns::NpcColumns (const ActorColumns& actorColumns)
   mHead(NULL),
   mAttributes(NULL),
   mSkills(NULL),
-  mMisc(NULL)
+  mMisc(NULL),
+  mBloodType(NULL),
+  mGender(NULL)
 {}
 
 CSMWorld::NpcRefIdAdapter::NpcRefIdAdapter (const NpcColumns& columns)
@@ -730,6 +796,28 @@ QVariant CSMWorld::NpcRefIdAdapter::getData (const RefIdColumn *column, const Re
     if (column==mColumns.mMisc)
         return QVariant::fromValue(ColumnBase::TableEdit_Full);
 
+    if (column == mColumns.mBloodType)
+    {
+        int mask = ESM::NPC::Skeleton | ESM::NPC::Metal;
+
+        if ((record.get().mFlags & mask) == ESM::NPC::Skeleton)
+            return 1;
+
+        if ((record.get().mFlags & mask) == ESM::NPC::Metal)
+            return 2;
+
+        return 0;
+    }
+
+    if (column == mColumns.mGender)
+    {
+        // Implemented this way to allow additional gender types in the future.
+        if ((record.get().mFlags & ESM::NPC::Female) == ESM::NPC::Female)
+            return 1;
+
+        return 0;
+    }
+
     std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
         mColumns.mFlags.find (column);
 
@@ -757,6 +845,25 @@ void CSMWorld::NpcRefIdAdapter::setData (const RefIdColumn *column, RefIdData& d
         npc.mHair = value.toString().toUtf8().constData();
     else if (column==mColumns.mHead)
         npc.mHead = value.toString().toUtf8().constData();
+    else if (column == mColumns.mBloodType)
+    {
+        int mask = ~(ESM::NPC::Skeleton | ESM::NPC::Metal);
+
+        if (value.toInt() == 1)
+            npc.mFlags = (npc.mFlags & mask) | ESM::NPC::Skeleton;
+        else if (value.toInt() == 2)
+            npc.mFlags = (npc.mFlags & mask) | ESM::NPC::Metal;
+        else
+            npc.mFlags = npc.mFlags & mask;
+    }
+    else if (column == mColumns.mGender)
+    {
+        // Implemented this way to allow additional gender types in the future.
+        if (value.toInt() == 1)
+            npc.mFlags = (npc.mFlags & ~ESM::NPC::Female) | ESM::NPC::Female;
+        else
+            npc.mFlags = npc.mFlags & ~ESM::NPC::Female;
+    }
     else
     {
         std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
@@ -1129,7 +1236,7 @@ void CSMWorld::CreatureAttributesRefIdAdapter::setNestedTable (const RefIdColumn
 
     // store the whole struct
     creature.mData =
-        static_cast<const NestedTableWrapper<std::vector<typename ESM::Creature::NPDTstruct> > &>(nestedTable).mNestedTable.at(0);
+        static_cast<const NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct> > &>(nestedTable).mNestedTable.at(0);
 
     record.setModified (creature);
 }
@@ -1141,10 +1248,10 @@ CSMWorld::NestedTableWrapperBase* CSMWorld::CreatureAttributesRefIdAdapter::nest
         static_cast<const Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
 
     // return the whole struct
-    std::vector<typename ESM::Creature::NPDTstruct> wrap;
+    std::vector<ESM::Creature::NPDTstruct> wrap;
     wrap.push_back(record.get().mData);
     // deleted by dtor of NestedTableStoring
-    return new NestedTableWrapper<std::vector<typename ESM::Creature::NPDTstruct> >(wrap);
+    return new NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct> >(wrap);
 }
 
 QVariant CSMWorld::CreatureAttributesRefIdAdapter::getNestedData (const RefIdColumn *column,
@@ -1235,7 +1342,7 @@ void CSMWorld::CreatureAttackRefIdAdapter::setNestedTable (const RefIdColumn* co
 
     // store the whole struct
     creature.mData =
-        static_cast<const NestedTableWrapper<std::vector<typename ESM::Creature::NPDTstruct> > &>(nestedTable).mNestedTable.at(0);
+        static_cast<const NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct> > &>(nestedTable).mNestedTable.at(0);
 
     record.setModified (creature);
 }
@@ -1247,10 +1354,10 @@ CSMWorld::NestedTableWrapperBase* CSMWorld::CreatureAttackRefIdAdapter::nestedTa
         static_cast<const Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
 
     // return the whole struct
-    std::vector<typename ESM::Creature::NPDTstruct> wrap;
+    std::vector<ESM::Creature::NPDTstruct> wrap;
     wrap.push_back(record.get().mData);
     // deleted by dtor of NestedTableStoring
-    return new NestedTableWrapper<std::vector<typename ESM::Creature::NPDTstruct> >(wrap);
+    return new NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct> >(wrap);
 }
 
 QVariant CSMWorld::CreatureAttackRefIdAdapter::getNestedData (const RefIdColumn *column,
@@ -1440,26 +1547,28 @@ void CSMWorld::WeaponRefIdAdapter::setData (const RefIdColumn *column, RefIdData
     Record<ESM::Weapon>& record = static_cast<Record<ESM::Weapon>&> (
         data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Weapon)));
 
+    ESM::Weapon weapon = record.get();
+
     if (column==mColumns.mType)
-        record.get().mData.mType = value.toInt();
+        weapon.mData.mType = value.toInt();
     else if (column==mColumns.mHealth)
-        record.get().mData.mHealth = value.toInt();
+        weapon.mData.mHealth = value.toInt();
     else if (column==mColumns.mSpeed)
-        record.get().mData.mSpeed = value.toFloat();
+        weapon.mData.mSpeed = value.toFloat();
     else if (column==mColumns.mReach)
-        record.get().mData.mReach = value.toFloat();
+        weapon.mData.mReach = value.toFloat();
     else if (column==mColumns.mChop[0])
-        record.get().mData.mChop[0] = value.toInt();
+        weapon.mData.mChop[0] = value.toInt();
     else if (column==mColumns.mChop[1])
-        record.get().mData.mChop[1] = value.toInt();
+        weapon.mData.mChop[1] = value.toInt();
     else if (column==mColumns.mSlash[0])
-        record.get().mData.mSlash[0] = value.toInt();
+        weapon.mData.mSlash[0] = value.toInt();
     else if (column==mColumns.mSlash[1])
-        record.get().mData.mSlash[1] = value.toInt();
+        weapon.mData.mSlash[1] = value.toInt();
     else if (column==mColumns.mThrust[0])
-        record.get().mData.mThrust[0] = value.toInt();
+        weapon.mData.mThrust[0] = value.toInt();
     else if (column==mColumns.mThrust[1])
-        record.get().mData.mThrust[1] = value.toInt();
+        weapon.mData.mThrust[1] = value.toInt();
     else
     {
         std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
@@ -1468,11 +1577,16 @@ void CSMWorld::WeaponRefIdAdapter::setData (const RefIdColumn *column, RefIdData
         if (iter!=mColumns.mFlags.end())
         {
             if (value.toInt()!=0)
-                record.get().mData.mFlags |= iter->second;
+                weapon.mData.mFlags |= iter->second;
             else
-                record.get().mData.mFlags &= ~iter->second;
+                weapon.mData.mFlags &= ~iter->second;
         }
         else
+        {
             EnchantableRefIdAdapter<ESM::Weapon>::setData (column, data, index, value);
+            return; // Don't overwrite changes made by base class
+        }
     }
+
+    record.setModified(weapon);
 }
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index eff7167de..c05a20d07 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -694,13 +694,14 @@ namespace CSMWorld
 
     class BookRefIdAdapter : public EnchantableRefIdAdapter<ESM::Book>
     {
-            const RefIdColumn *mScroll;
+            const RefIdColumn *mBookType;
             const RefIdColumn *mSkill;
+            const RefIdColumn *mText;
 
         public:
 
-            BookRefIdAdapter (const EnchantableColumns& columns, const RefIdColumn *scroll,
-                const RefIdColumn *skill);
+            BookRefIdAdapter (const EnchantableColumns& columns, const RefIdColumn *bookType,
+                const RefIdColumn *skill, const RefIdColumn *text);
 
             virtual QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
                 const;
@@ -756,6 +757,7 @@ namespace CSMWorld
         const RefIdColumn *mAttributes;
         const RefIdColumn *mAttacks;
         const RefIdColumn *mMisc;
+        const RefIdColumn *mBloodType;
 
         CreatureColumns (const ActorColumns& actorColumns);
     };
@@ -800,6 +802,7 @@ namespace CSMWorld
         const RefIdColumn *mRadius;
         const RefIdColumn *mColor;
         const RefIdColumn *mSound;
+        const RefIdColumn *mEmitterType;
         std::map<const RefIdColumn *, unsigned int> mFlags;
 
         LightColumns (const InventoryColumns& columns);
@@ -848,6 +851,8 @@ namespace CSMWorld
         const RefIdColumn *mAttributes; // depends on npc type
         const RefIdColumn *mSkills;     // depends on npc type
         const RefIdColumn *mMisc;       // may depend on npc type, e.g. FactionID
+        const RefIdColumn *mBloodType;
+        const RefIdColumn *mGender;
 
         NpcColumns (const ActorColumns& actorColumns);
     };
@@ -1187,7 +1192,7 @@ namespace CSMWorld
 
             std::vector<ESM::ContItem>& list = container.mInventory.mList;
 
-            ESM::ContItem newRow = {0, {""}};
+            ESM::ContItem newRow = ESM::ContItem();
 
             if (position >= (int)list.size())
                 list.push_back(newRow);
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index c4c8f8605..c0ce575b7 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -291,11 +291,14 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.push_back (RefIdColumn (Columns::ColumnId_ArmorValue, ColumnBase::Display_Integer));
     const RefIdColumn *armor = &mColumns.back();
 
-    mColumns.push_back (RefIdColumn (Columns::ColumnId_Scroll, ColumnBase::Display_Boolean));
-    const RefIdColumn *scroll = &mColumns.back();
+    mColumns.push_back (RefIdColumn (Columns::ColumnId_BookType, ColumnBase::Display_BookType));
+    const RefIdColumn *bookType = &mColumns.back();
 
-    mColumns.push_back (RefIdColumn (Columns::ColumnId_Attribute, ColumnBase::Display_Attribute));
-    const RefIdColumn *attribute = &mColumns.back();
+    mColumns.push_back (RefIdColumn (Columns::ColumnId_Skill, ColumnBase::Display_SkillId));
+    const RefIdColumn *skill = &mColumns.back();
+
+    mColumns.push_back (RefIdColumn (Columns::ColumnId_Text, ColumnBase::Display_LongString));
+    const RefIdColumn *text = &mColumns.back();
 
     mColumns.push_back (RefIdColumn (Columns::ColumnId_ClothingType, ColumnBase::Display_ClothingType));
     const RefIdColumn *clothingType = &mColumns.back();
@@ -343,15 +346,11 @@ CSMWorld::RefIdCollection::RefIdCollection()
         { Columns::ColumnId_Flies, ESM::Creature::Flies },
         { Columns::ColumnId_Walks, ESM::Creature::Walks },
         { Columns::ColumnId_Essential, ESM::Creature::Essential },
-        { Columns::ColumnId_SkeletonBlood, ESM::Creature::Skeleton },
-        { Columns::ColumnId_MetalBlood, ESM::Creature::Metal },
         { -1, 0 }
     };
 
     // for re-use in NPC records
     const RefIdColumn *essential = 0;
-    const RefIdColumn *skeletonBlood = 0;
-    const RefIdColumn *metalBlood = 0;
 
     for (int i=0; sCreatureFlagTable[i].mName!=-1; ++i)
     {
@@ -361,11 +360,14 @@ CSMWorld::RefIdCollection::RefIdCollection()
         switch (sCreatureFlagTable[i].mFlag)
         {
             case ESM::Creature::Essential: essential = &mColumns.back(); break;
-            case ESM::Creature::Skeleton: skeletonBlood = &mColumns.back(); break;
-            case ESM::Creature::Metal: metalBlood = &mColumns.back(); break;
         }
     }
 
+    mColumns.push_back(RefIdColumn(Columns::ColumnId_BloodType, ColumnBase::Display_BloodType));
+    // For re-use in NPC records.
+    const RefIdColumn *bloodType = &mColumns.back();
+    creatureColumns.mBloodType = bloodType;
+
     creatureColumns.mFlags.insert (std::make_pair (respawn, ESM::Creature::Respawn));
 
     // Nested table
@@ -441,6 +443,9 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.push_back (RefIdColumn (Columns::ColumnId_Sound, ColumnBase::Display_Sound));
     lightColumns.mSound = &mColumns.back();
 
+    mColumns.push_back(RefIdColumn(Columns::ColumnId_EmitterType, ColumnBase::Display_EmitterType));
+    lightColumns.mEmitterType = &mColumns.back();
+
     static const struct
     {
         int mName;
@@ -450,10 +455,6 @@ CSMWorld::RefIdCollection::RefIdCollection()
         { Columns::ColumnId_Dynamic, ESM::Light::Dynamic },
         { Columns::ColumnId_Portable, ESM::Light::Carry },
         { Columns::ColumnId_NegativeLight, ESM::Light::Negative },
-        { Columns::ColumnId_Flickering, ESM::Light::Flicker },
-        { Columns::ColumnId_SlowFlickering, ESM::Light::FlickerSlow },
-        { Columns::ColumnId_Pulsing, ESM::Light::Pulse },
-        { Columns::ColumnId_SlowPulsing, ESM::Light::PulseSlow },
         { Columns::ColumnId_Fire, ESM::Light::Fire },
         { Columns::ColumnId_OffByDefault, ESM::Light::OffDefault },
         { -1, 0 }
@@ -485,8 +486,8 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.push_back (RefIdColumn (Columns::ColumnId_Head, ColumnBase::Display_BodyPart));
     npcColumns.mHead = &mColumns.back();
 
-    mColumns.push_back (RefIdColumn (Columns::ColumnId_Female, ColumnBase::Display_Boolean));
-    npcColumns.mFlags.insert (std::make_pair (&mColumns.back(), ESM::NPC::Female));
+    mColumns.push_back (RefIdColumn (Columns::ColumnId_GenderNpc, ColumnBase::Display_GenderNpc));
+    npcColumns.mGender = &mColumns.back();
 
     npcColumns.mFlags.insert (std::make_pair (essential, ESM::NPC::Essential));
 
@@ -494,9 +495,8 @@ CSMWorld::RefIdCollection::RefIdCollection()
 
     npcColumns.mFlags.insert (std::make_pair (autoCalc, ESM::NPC::Autocalc));
 
-    npcColumns.mFlags.insert (std::make_pair (skeletonBlood, ESM::NPC::Skeleton));
-
-    npcColumns.mFlags.insert (std::make_pair (metalBlood, ESM::NPC::Metal));
+    // Re-used from Creature records.
+    npcColumns.mBloodType = bloodType;
 
     // Need a way to add a table of stats and values (rather than adding a long list of
     // entries in the dialogue subview) E.g. attributes+stats(health, mana, fatigue), skills
@@ -656,7 +656,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mAdapters.insert (std::make_pair (UniversalId::Type_Armor,
         new ArmorRefIdAdapter (enchantableColumns, armorType, health, armor, partRef)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Book,
-        new BookRefIdAdapter (enchantableColumns, scroll, attribute)));
+        new BookRefIdAdapter (enchantableColumns, bookType, skill, text)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Clothing,
         new ClothingRefIdAdapter (enchantableColumns, clothingType, partRef)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Container,
diff --git a/apps/opencs/model/world/refiddata.hpp b/apps/opencs/model/world/refiddata.hpp
index 59cad6a66..94f641edc 100644
--- a/apps/opencs/model/world/refiddata.hpp
+++ b/apps/opencs/model/world/refiddata.hpp
@@ -175,6 +175,12 @@ namespace CSMWorld
             {
                 mContainer[index].setModified(record);
             }
+            else
+            {
+                // Overwrite
+                mContainer[index].setModified(record);
+                mContainer[index].merge();
+            }
         }
 
         return index;
diff --git a/apps/opencs/model/world/resources.cpp b/apps/opencs/model/world/resources.cpp
index b31e211ee..5fe9194d7 100644
--- a/apps/opencs/model/world/resources.cpp
+++ b/apps/opencs/model/world/resources.cpp
@@ -25,12 +25,12 @@ CSMWorld::Resources::Resources (const VFS::Manager* vfs, const std::string& base
 
         if (extensions)
         {
-            std::string::size_type index = filepath.find_last_of ('.');
+            std::string::size_type extensionIndex = filepath.find_last_of ('.');
 
-            if (index==std::string::npos)
+            if (extensionIndex==std::string::npos)
                 continue;
 
-            std::string extension = filepath.substr (index+1);
+            std::string extension = filepath.substr (extensionIndex+1);
 
             int i = 0;
 
diff --git a/apps/opencs/model/world/tablemimedata.hpp b/apps/opencs/model/world/tablemimedata.hpp
index a42e97561..3be8054bd 100644
--- a/apps/opencs/model/world/tablemimedata.hpp
+++ b/apps/opencs/model/world/tablemimedata.hpp
@@ -21,7 +21,7 @@ namespace CSMWorld
 ///
 /// This class provides way to construct mimedata object holding the universalid copy
 /// Universalid is used in the majority of the tables to store type, id, argument types.
-/// This way universalid grants a way to retrive record from the concrete table.
+/// This way universalid grants a way to retrieve record from the concrete table.
 /// Please note, that tablemimedata object can hold multiple universalIds in the vector.
 
     class TableMimeData : public QMimeData
diff --git a/apps/opencs/view/doc/subview.cpp b/apps/opencs/view/doc/subview.cpp
index 67a8f8c70..82cbe835e 100644
--- a/apps/opencs/view/doc/subview.cpp
+++ b/apps/opencs/view/doc/subview.cpp
@@ -47,7 +47,7 @@ void CSVDoc::SubView::setUniversalId (const CSMWorld::UniversalId& id)
 
 void CSVDoc::SubView::closeEvent (QCloseEvent *event)
 {
-    emit updateSubViewIndicies (this);
+    emit updateSubViewIndices (this);
 }
 
 std::string CSVDoc::SubView::getTitle() const
diff --git a/apps/opencs/view/doc/subview.hpp b/apps/opencs/view/doc/subview.hpp
index 1c5f8a786..8402bf79a 100644
--- a/apps/opencs/view/doc/subview.hpp
+++ b/apps/opencs/view/doc/subview.hpp
@@ -64,7 +64,7 @@ namespace CSVDoc
 
             void updateTitle();
 
-            void updateSubViewIndicies (SubView *view = 0);
+            void updateSubViewIndices (SubView *view = NULL);
 
             void universalIdChanged (const CSMWorld::UniversalId& universalId);
 
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 3491c9de2..ff49a90fd 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -16,6 +16,7 @@
 
 #include "../../model/doc/document.hpp"
 #include "../../model/prefs/state.hpp"
+#include "../../model/prefs/shortcut.hpp"
 
 #include "../../model/world/idtable.hpp"
 
@@ -44,83 +45,98 @@ void CSVDoc::View::closeEvent (QCloseEvent *event)
 
 void CSVDoc::View::setupFileMenu()
 {
-    QMenu *file = menuBar()->addMenu (tr ("&File"));
+    QMenu *file = menuBar()->addMenu (tr ("File"));
 
     QAction *newGame = new QAction (tr ("New Game"), this);
     connect (newGame, SIGNAL (triggered()), this, SIGNAL (newGameRequest()));
+    setupShortcut("document-file-newgame", newGame);
     file->addAction (newGame);
 
+
     QAction *newAddon = new QAction (tr ("New Addon"), this);
     connect (newAddon, SIGNAL (triggered()), this, SIGNAL (newAddonRequest()));
+    setupShortcut("document-file-newaddon", newAddon);
     file->addAction (newAddon);
 
-    QAction *open = new QAction (tr ("&Open"), this);
+    QAction *open = new QAction (tr ("Open"), this);
     connect (open, SIGNAL (triggered()), this, SIGNAL (loadDocumentRequest()));
+    setupShortcut("document-file-open", open);
     file->addAction (open);
 
-    mSave = new QAction (tr ("&Save"), this);
+    mSave = new QAction (tr ("Save"), this);
     connect (mSave, SIGNAL (triggered()), this, SLOT (save()));
+    setupShortcut("document-file-save", mSave);
     file->addAction (mSave);
 
-    mVerify = new QAction (tr ("&Verify"), this);
+    mVerify = new QAction (tr ("Verify"), this);
     connect (mVerify, SIGNAL (triggered()), this, SLOT (verify()));
+    setupShortcut("document-file-verify", mVerify);
     file->addAction (mVerify);
 
     mMerge = new QAction (tr ("Merge"), this);
     connect (mMerge, SIGNAL (triggered()), this, SLOT (merge()));
+    setupShortcut("document-file-merge", mMerge);
     file->addAction (mMerge);
 
-    QAction *loadErrors = new QAction (tr ("Load Error Log"), this);
+    QAction *loadErrors = new QAction (tr ("Open Load Error Log"), this);
     connect (loadErrors, SIGNAL (triggered()), this, SLOT (loadErrorLog()));
+    setupShortcut("document-file-errorlog", loadErrors);
     file->addAction (loadErrors);
 
     QAction *meta = new QAction (tr ("Meta Data"), this);
     connect (meta, SIGNAL (triggered()), this, SLOT (addMetaDataSubView()));
+    setupShortcut("document-file-metadata", meta);
     file->addAction (meta);
 
-    QAction *close = new QAction (tr ("&Close"), this);
+    QAction *close = new QAction (tr ("Close Document"), this);
     connect (close, SIGNAL (triggered()), this, SLOT (close()));
+    setupShortcut("document-file-close", close);
     file->addAction(close);
 
-    QAction *exit = new QAction (tr ("&Exit"), this);
+    QAction *exit = new QAction (tr ("Exit Application"), this);
     connect (exit, SIGNAL (triggered()), this, SLOT (exit()));
     connect (this, SIGNAL(exitApplicationRequest(CSVDoc::View *)), &mViewManager, SLOT(exitApplication(CSVDoc::View *)));
+    setupShortcut("document-file-exit", exit);
 
     file->addAction(exit);
 }
 
 void CSVDoc::View::setupEditMenu()
 {
-    QMenu *edit = menuBar()->addMenu (tr ("&Edit"));
+    QMenu *edit = menuBar()->addMenu (tr ("Edit"));
 
-    mUndo = mDocument->getUndoStack().createUndoAction (this, tr("&Undo"));
-    mUndo->setShortcuts (QKeySequence::Undo);
+    mUndo = mDocument->getUndoStack().createUndoAction (this, tr("Undo"));
+    setupShortcut("document-edit-undo", mUndo);
     edit->addAction (mUndo);
 
-    mRedo= mDocument->getUndoStack().createRedoAction (this, tr("&Redo"));
-    mRedo->setShortcuts (QKeySequence::Redo);
+    mRedo= mDocument->getUndoStack().createRedoAction (this, tr("Redo"));
+    setupShortcut("document-edit-redo", mRedo);
     edit->addAction (mRedo);
 
-    QAction *userSettings = new QAction (tr ("&Preferences"), this);
+    QAction *userSettings = new QAction (tr ("Preferences"), this);
     connect (userSettings, SIGNAL (triggered()), this, SIGNAL (editSettingsRequest()));
+    setupShortcut("document-edit-preferences", userSettings);
     edit->addAction (userSettings);
 
     QAction *search = new QAction (tr ("Search"), this);
     connect (search, SIGNAL (triggered()), this, SLOT (addSearchSubView()));
+    setupShortcut("document-edit-search", search);
     edit->addAction (search);
 }
 
 void CSVDoc::View::setupViewMenu()
 {
-    QMenu *view = menuBar()->addMenu (tr ("&View"));
+    QMenu *view = menuBar()->addMenu (tr ("View"));
 
-    QAction *newWindow = new QAction (tr ("&New View"), this);
+    QAction *newWindow = new QAction (tr ("New View"), this);
     connect (newWindow, SIGNAL (triggered()), this, SLOT (newView()));
+    setupShortcut("document-view-newview", newWindow);
     view->addAction (newWindow);
 
-    mShowStatusBar = new QAction (tr ("Show Status Bar"), this);
+    mShowStatusBar = new QAction (tr ("Toggle Status Bar"), this);
     mShowStatusBar->setCheckable (true);
     connect (mShowStatusBar, SIGNAL (toggled (bool)), this, SLOT (toggleShowStatusBar (bool)));
+    setupShortcut("document-view-statusbar", mShowStatusBar);
 
     mShowStatusBar->setChecked (CSMPrefs::get()["Windows"]["show-statusbar"].isTrue());
 
@@ -128,70 +144,84 @@ void CSVDoc::View::setupViewMenu()
 
     QAction *filters = new QAction (tr ("Filters"), this);
     connect (filters, SIGNAL (triggered()), this, SLOT (addFiltersSubView()));
+    setupShortcut("document-view-filters", filters);
     view->addAction (filters);
 }
 
 void CSVDoc::View::setupWorldMenu()
 {
-    QMenu *world = menuBar()->addMenu (tr ("&World"));
+    QMenu *world = menuBar()->addMenu (tr ("World"));
 
     QAction *regions = new QAction (tr ("Regions"), this);
     connect (regions, SIGNAL (triggered()), this, SLOT (addRegionsSubView()));
+    setupShortcut("document-world-regions", regions);
     world->addAction (regions);
 
     QAction *cells = new QAction (tr ("Cells"), this);
     connect (cells, SIGNAL (triggered()), this, SLOT (addCellsSubView()));
+    setupShortcut("document-world-cells", cells);
     world->addAction (cells);
 
     QAction *referenceables = new QAction (tr ("Objects"), this);
     connect (referenceables, SIGNAL (triggered()), this, SLOT (addReferenceablesSubView()));
+    setupShortcut("document-world-referencables", referenceables);
     world->addAction (referenceables);
 
     QAction *references = new QAction (tr ("Instances"), this);
     connect (references, SIGNAL (triggered()), this, SLOT (addReferencesSubView()));
+    setupShortcut("document-world-references", references);
     world->addAction (references);
 
     QAction *grid = new QAction (tr ("Pathgrid"), this);
     connect (grid, SIGNAL (triggered()), this, SLOT (addPathgridSubView()));
+    setupShortcut("document-world-pathgrid", grid);
     world->addAction (grid);
 
     world->addSeparator(); // items that don't represent single record lists follow here
 
     QAction *regionMap = new QAction (tr ("Region Map"), this);
     connect (regionMap, SIGNAL (triggered()), this, SLOT (addRegionMapSubView()));
+    setupShortcut("document-world-regionmap", regionMap);
     world->addAction (regionMap);
 }
 
 void CSVDoc::View::setupMechanicsMenu()
 {
-    QMenu *mechanics = menuBar()->addMenu (tr ("&Mechanics"));
+    QMenu *mechanics = menuBar()->addMenu (tr ("Mechanics"));
 
     QAction *globals = new QAction (tr ("Globals"), this);
     connect (globals, SIGNAL (triggered()), this, SLOT (addGlobalsSubView()));
+    setupShortcut("document-mechanics-globals", globals);
     mechanics->addAction (globals);
 
-    QAction *gmsts = new QAction (tr ("Game settings"), this);
+    QAction *gmsts = new QAction (tr ("Game Settings"), this);
     connect (gmsts, SIGNAL (triggered()), this, SLOT (addGmstsSubView()));
+    setupShortcut("document-mechanics-gamesettings", gmsts);
     mechanics->addAction (gmsts);
 
     QAction *scripts = new QAction (tr ("Scripts"), this);
     connect (scripts, SIGNAL (triggered()), this, SLOT (addScriptsSubView()));
+    setupShortcut("document-mechanics-scripts", scripts);
     mechanics->addAction (scripts);
 
     QAction *spells = new QAction (tr ("Spells"), this);
     connect (spells, SIGNAL (triggered()), this, SLOT (addSpellsSubView()));
+    setupShortcut("document-mechanics-spells", spells);
     mechanics->addAction (spells);
 
     QAction *enchantments = new QAction (tr ("Enchantments"), this);
     connect (enchantments, SIGNAL (triggered()), this, SLOT (addEnchantmentsSubView()));
+    setupShortcut("document-mechanics-enchantments", enchantments);
     mechanics->addAction (enchantments);
 
     QAction *effects = new QAction (tr ("Magic Effects"), this);
     connect (effects, SIGNAL (triggered()), this, SLOT (addMagicEffectsSubView()));
+    setupShortcut("document-mechanics-magiceffects", effects);
     mechanics->addAction (effects);
 
     QAction *startScripts = new QAction (tr ("Start Scripts"), this);
     connect (startScripts, SIGNAL (triggered()), this, SLOT (addStartScriptsSubView()));
+    setupShortcut("document-mechanics-startscripts", startScripts);
     mechanics->addAction (startScripts);
 }
 
@@ -201,81 +231,99 @@ void CSVDoc::View::setupCharacterMenu()
 
     QAction *skills = new QAction (tr ("Skills"), this);
     connect (skills, SIGNAL (triggered()), this, SLOT (addSkillsSubView()));
+    setupShortcut("document-character-skills", skills);
     characters->addAction (skills);
 
     QAction *classes = new QAction (tr ("Classes"), this);
     connect (classes, SIGNAL (triggered()), this, SLOT (addClassesSubView()));
+    setupShortcut("document-character-classes", classes);
     characters->addAction (classes);
 
     QAction *factions = new QAction (tr ("Factions"), this);
     connect (factions, SIGNAL (triggered()), this, SLOT (addFactionsSubView()));
+    setupShortcut("document-character-factions", factions);
     characters->addAction (factions);
 
     QAction *races = new QAction (tr ("Races"), this);
     connect (races, SIGNAL (triggered()), this, SLOT (addRacesSubView()));
+    setupShortcut("document-character-races", races);
     characters->addAction (races);
 
     QAction *birthsigns = new QAction (tr ("Birthsigns"), this);
     connect (birthsigns, SIGNAL (triggered()), this, SLOT (addBirthsignsSubView()));
+    setupShortcut("document-character-birthsigns", birthsigns);
     characters->addAction (birthsigns);
 
     QAction *topics = new QAction (tr ("Topics"), this);
     connect (topics, SIGNAL (triggered()), this, SLOT (addTopicsSubView()));
+    setupShortcut("document-character-topics", topics);
     characters->addAction (topics);
 
     QAction *journals = new QAction (tr ("Journals"), this);
     connect (journals, SIGNAL (triggered()), this, SLOT (addJournalsSubView()));
+    setupShortcut("document-character-journals", journals);
     characters->addAction (journals);
 
     QAction *topicInfos = new QAction (tr ("Topic Infos"), this);
     connect (topicInfos, SIGNAL (triggered()), this, SLOT (addTopicInfosSubView()));
+    setupShortcut("document-character-topicinfos", topicInfos);
     characters->addAction (topicInfos);
 
     QAction *journalInfos = new QAction (tr ("Journal Infos"), this);
     connect (journalInfos, SIGNAL (triggered()), this, SLOT (addJournalInfosSubView()));
+    setupShortcut("document-character-journalinfos", journalInfos);
     characters->addAction (journalInfos);
 
     QAction *bodyParts = new QAction (tr ("Body Parts"), this);
     connect (bodyParts, SIGNAL (triggered()), this, SLOT (addBodyPartsSubView()));
+    setupShortcut("document-character-bodyparts", bodyParts);
     characters->addAction (bodyParts);
 }
 
 void CSVDoc::View::setupAssetsMenu()
 {
-    QMenu *assets = menuBar()->addMenu (tr ("&Assets"));
+    QMenu *assets = menuBar()->addMenu (tr ("Assets"));
 
     QAction *sounds = new QAction (tr ("Sounds"), this);
     connect (sounds, SIGNAL (triggered()), this, SLOT (addSoundsSubView()));
+    setupShortcut("document-assets-sounds", sounds);
     assets->addAction (sounds);
 
     QAction *soundGens = new QAction (tr ("Sound Generators"), this);
     connect (soundGens, SIGNAL (triggered()), this, SLOT (addSoundGensSubView()));
+    setupShortcut("document-assets-soundgens", soundGens);
     assets->addAction (soundGens);
 
     assets->addSeparator(); // resources follow here
 
     QAction *meshes = new QAction (tr ("Meshes"), this);
     connect (meshes, SIGNAL (triggered()), this, SLOT (addMeshesSubView()));
+    setupShortcut("document-assets-meshes", meshes);
     assets->addAction (meshes);
 
     QAction *icons = new QAction (tr ("Icons"), this);
     connect (icons, SIGNAL (triggered()), this, SLOT (addIconsSubView()));
+    setupShortcut("document-assets-icons", icons);
     assets->addAction (icons);
 
     QAction *musics = new QAction (tr ("Music"), this);
     connect (musics, SIGNAL (triggered()), this, SLOT (addMusicsSubView()));
+    setupShortcut("document-assets-music", musics);
     assets->addAction (musics);
 
     QAction *soundsRes = new QAction (tr ("Sound Files"), this);
     connect (soundsRes, SIGNAL (triggered()), this, SLOT (addSoundsResSubView()));
+    setupShortcut("document-assets-soundres", soundsRes);
     assets->addAction (soundsRes);
 
     QAction *textures = new QAction (tr ("Textures"), this);
     connect (textures, SIGNAL (triggered()), this, SLOT (addTexturesSubView()));
+    setupShortcut("document-assets-textures", textures);
     assets->addAction (textures);
 
     QAction *videos = new QAction (tr ("Videos"), this);
     connect (videos, SIGNAL (triggered()), this, SLOT (addVideosSubView()));
+    setupShortcut("document-assets-videos", videos);
     assets->addAction (videos);
 }
 
@@ -299,12 +347,16 @@ void CSVDoc::View::setupDebugMenu()
     QAction *runDebug = debug->addMenu (mGlobalDebugProfileMenu);
     runDebug->setText (tr ("Run OpenMW"));
 
+    setupShortcut("document-debug-run", runDebug);
+
     mStopDebug = new QAction (tr ("Shutdown OpenMW"), this);
     connect (mStopDebug, SIGNAL (triggered()), this, SLOT (stop()));
+    setupShortcut("document-debug-shutdown", mStopDebug);
     debug->addAction (mStopDebug);
 
-    QAction *runLog = new QAction (tr ("Run Log"), this);
+    QAction *runLog = new QAction (tr ("Open Run Log"), this);
     connect (runLog, SIGNAL (triggered()), this, SLOT (addRunLogSubView()));
+    setupShortcut("document-debug-runlog", runLog);
     debug->addAction (runLog);
 }
 
@@ -320,6 +372,12 @@ void CSVDoc::View::setupUi()
     setupDebugMenu();
 }
 
+void CSVDoc::View::setupShortcut(const char* name, QAction* action)
+{
+    CSMPrefs::Shortcut* shortcut = new CSMPrefs::Shortcut(name, this);
+    shortcut->associateAction(action);
+}
+
 void CSVDoc::View::updateTitle()
 {
     std::ostringstream stream;
@@ -343,7 +401,7 @@ void CSVDoc::View::updateTitle()
     setWindowTitle (QString::fromUtf8(stream.str().c_str()));
 }
 
-void CSVDoc::View::updateSubViewIndicies(SubView *view)
+void CSVDoc::View::updateSubViewIndices(SubView *view)
 {
     CSMPrefs::Category& windows = CSMPrefs::State::get()["Windows"];
 
@@ -373,7 +431,7 @@ void CSVDoc::View::updateSubViewIndicies(SubView *view)
             else
             {
                 delete subView->titleBarWidget();
-                subView->setTitleBarWidget (0);
+                subView->setTitleBarWidget (NULL);
             }
         }
     }
@@ -402,7 +460,7 @@ void CSVDoc::View::updateActions()
 
 CSVDoc::View::View (ViewManager& viewManager, CSMDoc::Document *document, int totalViews)
     : mViewManager (viewManager), mDocument (document), mViewIndex (totalViews-1),
-      mViewTotal (totalViews), mScroll(0), mScrollbarOnly(false)
+      mViewTotal (totalViews), mScroll(NULL), mScrollbarOnly(false)
 {
     CSMPrefs::Category& windows = CSMPrefs::State::get()["Windows"];
 
@@ -419,10 +477,7 @@ CSVDoc::View::View (ViewManager& viewManager, CSMDoc::Document *document, int to
     }
     else
     {
-        mScroll = new QScrollArea(this);
-        mScroll->setWidgetResizable(true);
-        mScroll->setWidget(&mSubViewWindow);
-        setCentralWidget(mScroll);
+        createScrollArea();
     }
 
     mOperations = new Operations;
@@ -570,36 +625,11 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
     //
     mScrollbarOnly = windows["mainwindow-scrollbar"].toString() == "Scrollbar Only";
 
-    QDesktopWidget *dw = QApplication::desktop();
-    QRect rect;
-    if (windows["grow-limit"].isTrue())
-        rect = dw->screenGeometry(this);
-    else
-        rect = dw->screenGeometry(dw->screen(dw->screenNumber(this)));
-
-    if (!mScrollbarOnly && mScroll && mSubViews.size() > 1)
-    {
-        int newWidth = width()+minWidth;
-        int frameWidth = frameGeometry().width() - width();
-        if (newWidth+frameWidth <= rect.width())
-        {
-            resize(newWidth, height());
-            // WARNING: below code assumes that new subviews are added to the right
-            if (x() > rect.width()-(newWidth+frameWidth))
-                move(rect.width()-(newWidth+frameWidth), y()); // shift left to stay within the screen
-        }
-        else
-        {
-            // full width
-            resize(rect.width()-frameWidth, height());
-            mSubViewWindow.setMinimumWidth(mSubViewWindow.width()+minWidth);
-            move(0, y());
-        }
-    }
+    updateWidth(windows["grow-limit"].isTrue(), minWidth);
 
     mSubViewWindow.addDockWidget (Qt::TopDockWidgetArea, view);
 
-    updateSubViewIndicies();
+    updateSubViewIndices();
 
     connect (view, SIGNAL (focusId (const CSMWorld::UniversalId&, const std::string&)), this,
         SLOT (addSubView (const CSMWorld::UniversalId&, const std::string&)));
@@ -608,8 +638,8 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
 
     connect (view, SIGNAL (updateTitle()), this, SLOT (updateTitle()));
 
-    connect (view, SIGNAL (updateSubViewIndicies (SubView *)),
-        this, SLOT (updateSubViewIndicies (SubView *)));
+    connect (view, SIGNAL (updateSubViewIndices (SubView *)),
+        this, SLOT (updateSubViewIndices (SubView *)));
 
     view->show();
 
@@ -631,7 +661,7 @@ void CSVDoc::View::moveScrollBarToEnd(int min, int max)
 void CSVDoc::View::settingChanged (const CSMPrefs::Setting *setting)
 {
     if (*setting=="Windows/hide-subview")
-        updateSubViewIndicies (0);
+        updateSubViewIndices (NULL);
     else if (*setting=="Windows/mainwindow-scrollbar")
     {
         if (setting->toString()!="Grow Only")
@@ -651,10 +681,7 @@ void CSVDoc::View::settingChanged (const CSMPrefs::Setting *setting)
             }
             else
             {
-                mScroll = new QScrollArea(this);
-                mScroll->setWidgetResizable(true);
-                mScroll->setWidget(&mSubViewWindow);
-                setCentralWidget(mScroll);
+                createScrollArea();
             }
         }
         else  if (mScroll)
@@ -662,7 +689,7 @@ void CSVDoc::View::settingChanged (const CSMPrefs::Setting *setting)
             mScroll->takeWidget();
             setCentralWidget (&mSubViewWindow);
             mScroll->deleteLater();
-            mScroll = 0;
+            mScroll = NULL;
         }
     }
 }
@@ -959,3 +986,41 @@ void CSVDoc::View::merge()
 {
     emit mergeDocument (mDocument);
 }
+
+void CSVDoc::View::updateWidth(bool isGrowLimit, int minSubViewWidth)
+{
+    QDesktopWidget *dw = QApplication::desktop();
+    QRect rect;
+    if (isGrowLimit)
+        rect = dw->screenGeometry(this);
+    else
+        rect = dw->screenGeometry(dw->screen(dw->screenNumber(this)));
+
+    if (!mScrollbarOnly && mScroll && mSubViews.size() > 1)
+    {
+        int newWidth = width()+minSubViewWidth;
+        int frameWidth = frameGeometry().width() - width();
+        if (newWidth+frameWidth <= rect.width())
+        {
+            resize(newWidth, height());
+            // WARNING: below code assumes that new subviews are added to the right
+            if (x() > rect.width()-(newWidth+frameWidth))
+                move(rect.width()-(newWidth+frameWidth), y()); // shift left to stay within the screen
+        }
+        else
+        {
+            // full width
+            resize(rect.width()-frameWidth, height());
+            mSubViewWindow.setMinimumWidth(mSubViewWindow.width()+minSubViewWidth);
+            move(0, y());
+        }
+    }
+}
+
+void CSVDoc::View::createScrollArea()
+{
+    mScroll = new QScrollArea(this);
+    mScroll->setWidgetResizable(true);
+    mScroll->setWidget(&mSubViewWindow);
+    setCentralWidget(mScroll);
+}
diff --git a/apps/opencs/view/doc/view.hpp b/apps/opencs/view/doc/view.hpp
index 7d5304269..834407be0 100644
--- a/apps/opencs/view/doc/view.hpp
+++ b/apps/opencs/view/doc/view.hpp
@@ -84,6 +84,8 @@ namespace CSVDoc
 
             void setupUi();
 
+            void setupShortcut(const char* name, QAction* action);
+
             void updateActions();
 
             void exitApplication();
@@ -95,7 +97,8 @@ namespace CSVDoc
             void resizeViewHeight (int height);
 
             void updateScrollbar();
-
+            void updateWidth(bool isGrowLimit, int minSubViewWidth);
+            void createScrollArea();
         public:
 
             View (ViewManager& viewManager, CSMDoc::Document *document, int totalViews);
@@ -143,7 +146,7 @@ namespace CSVDoc
             void updateTitle();
 
             // called when subviews are added or removed
-            void updateSubViewIndicies (SubView *view = 0);
+            void updateSubViewIndices (SubView *view = NULL);
 
         private slots:
 
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index 024636f34..8cca3a849 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -107,6 +107,10 @@ CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
         { CSMWorld::ColumnBase::Display_IngredEffectId, CSMWorld::Columns::ColumnId_EffectId, true },
         { CSMWorld::ColumnBase::Display_EffectSkill, CSMWorld::Columns::ColumnId_Skill, false },
         { CSMWorld::ColumnBase::Display_EffectAttribute, CSMWorld::Columns::ColumnId_Attribute, false },
+        { CSMWorld::ColumnBase::Display_BookType, CSMWorld::Columns::ColumnId_BookType, false },
+        { CSMWorld::ColumnBase::Display_BloodType, CSMWorld::Columns::ColumnId_BloodType, false },
+        { CSMWorld::ColumnBase::Display_EmitterType, CSMWorld::Columns::ColumnId_EmitterType, false },
+        { CSMWorld::ColumnBase::Display_GenderNpc, CSMWorld::Columns::ColumnId_Gender, false }
     };
 
     for (std::size_t i=0; i<sizeof (sMapping)/sizeof (Mapping); ++i)
diff --git a/apps/opencs/view/filter/filterbox.cpp b/apps/opencs/view/filter/filterbox.cpp
index c6c6cc6cc..4c252e7d9 100644
--- a/apps/opencs/view/filter/filterbox.cpp
+++ b/apps/opencs/view/filter/filterbox.cpp
@@ -38,9 +38,9 @@ void CSVFilter::FilterBox::dropEvent (QDropEvent* event)
     if (!mime) // May happen when non-records (e.g. plain text) are dragged and dropped
         return;
 
-    std::vector<CSMWorld::UniversalId> data = mime->getData();
+    std::vector<CSMWorld::UniversalId> universalIdData = mime->getData();
 
-    emit recordDropped(data, event->proposedAction());
+    emit recordDropped(universalIdData, event->proposedAction());
 }
 
 void CSVFilter::FilterBox::dragEnterEvent (QDragEnterEvent* event)
diff --git a/apps/opencs/view/prefs/dialogue.cpp b/apps/opencs/view/prefs/dialogue.cpp
index f04092653..6848bcaba 100644
--- a/apps/opencs/view/prefs/dialogue.cpp
+++ b/apps/opencs/view/prefs/dialogue.cpp
@@ -11,6 +11,7 @@
 #include "../../model/prefs/state.hpp"
 
 #include "page.hpp"
+#include "keybindingpage.hpp"
 
 void CSVPrefs::Dialogue::buildCategorySelector (QSplitter *main)
 {
@@ -52,8 +53,10 @@ void CSVPrefs::Dialogue::buildContentArea (QSplitter *main)
 CSVPrefs::PageBase *CSVPrefs::Dialogue::makePage (const std::string& key)
 {
     // special case page code goes here
-
-    return new Page (CSMPrefs::get()[key], mContent);
+    if (key == "Key Bindings")
+        return new KeyBindingPage(CSMPrefs::get()[key], mContent);
+    else
+        return new Page (CSMPrefs::get()[key], mContent);
 }
 
 CSVPrefs::Dialogue::Dialogue()
diff --git a/apps/opencs/view/prefs/keybindingpage.cpp b/apps/opencs/view/prefs/keybindingpage.cpp
new file mode 100644
index 000000000..143665f4a
--- /dev/null
+++ b/apps/opencs/view/prefs/keybindingpage.cpp
@@ -0,0 +1,88 @@
+#include "keybindingpage.hpp"
+
+#include <cassert>
+
+#include <QComboBox>
+#include <QGridLayout>
+#include <QStackedLayout>
+#include <QVBoxLayout>
+
+#include "../../model/prefs/setting.hpp"
+#include "../../model/prefs/category.hpp"
+
+namespace CSVPrefs
+{
+    KeyBindingPage::KeyBindingPage(CSMPrefs::Category& category, QWidget* parent)
+        : PageBase(category, parent)
+        , mStackedLayout(0)
+        , mPageLayout(0)
+        , mPageSelector(0)
+    {
+        // Need one widget for scroll area
+        QWidget* topWidget = new QWidget();
+        QVBoxLayout* topLayout = new QVBoxLayout(topWidget);
+
+        // Allows switching between "pages"
+        QWidget* stackedWidget = new QWidget();
+        mStackedLayout = new QStackedLayout(stackedWidget);
+
+        mPageSelector = new QComboBox();
+        connect(mPageSelector, SIGNAL(currentIndexChanged(int)), mStackedLayout, SLOT(setCurrentIndex(int)));
+
+        topLayout->addWidget(mPageSelector);
+        topLayout->addWidget(stackedWidget);
+        topLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
+
+        // Add each option
+        for (CSMPrefs::Category::Iterator iter = category.begin(); iter!=category.end(); ++iter)
+            addSetting (*iter);
+
+        setWidgetResizable(true);
+        setWidget(topWidget);
+    }
+
+    void KeyBindingPage::addSetting(CSMPrefs::Setting *setting)
+    {
+        std::pair<QWidget*, QWidget*> widgets = setting->makeWidgets (this);
+
+        if (widgets.first)
+        {
+            // Label, Option widgets
+            assert(mPageLayout);
+
+            int next = mPageLayout->rowCount();
+            mPageLayout->addWidget(widgets.first, next, 0);
+            mPageLayout->addWidget(widgets.second, next, 1);
+        }
+        else if (widgets.second)
+        {
+            // Wide single widget
+            assert(mPageLayout);
+
+            int next = mPageLayout->rowCount();
+            mPageLayout->addWidget(widgets.second, next, 0, 1, 2);
+        }
+        else
+        {
+            if (setting->getLabel().empty())
+            {
+                // Insert empty space
+                assert(mPageLayout);
+
+                int next = mPageLayout->rowCount();
+                mPageLayout->addWidget(new QWidget(), next, 0);
+            }
+            else
+            {
+                // Create new page
+                QWidget* pageWidget = new QWidget();
+                mPageLayout = new QGridLayout(pageWidget);
+                mPageLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
+
+                mStackedLayout->addWidget(pageWidget);
+
+                mPageSelector->addItem(QString::fromUtf8(setting->getLabel().c_str()));
+            }
+        }
+    }
+}
diff --git a/apps/opencs/view/prefs/keybindingpage.hpp b/apps/opencs/view/prefs/keybindingpage.hpp
new file mode 100644
index 000000000..8a0cb2952
--- /dev/null
+++ b/apps/opencs/view/prefs/keybindingpage.hpp
@@ -0,0 +1,35 @@
+#ifndef CSV_PREFS_KEYBINDINGPAGE_H
+#define CSV_PREFS_KEYBINDINGPAGE_H
+
+#include "pagebase.hpp"
+
+class QComboBox;
+class QGridLayout;
+class QStackedLayout;
+
+namespace CSMPrefs
+{
+    class Setting;
+}
+
+namespace CSVPrefs
+{
+    class KeyBindingPage : public PageBase
+    {
+            Q_OBJECT
+
+        public:
+
+            KeyBindingPage(CSMPrefs::Category& category, QWidget* parent);
+
+            void addSetting(CSMPrefs::Setting* setting);
+
+        private:
+
+            QStackedLayout* mStackedLayout;
+            QGridLayout* mPageLayout;
+            QComboBox* mPageSelector;
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
new file mode 100644
index 000000000..7e3570657
--- /dev/null
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -0,0 +1,776 @@
+#include "cameracontroller.hpp"
+
+#include <cmath>
+
+#include <QWidget>
+
+#include <osg/BoundingBox>
+#include <osg/Camera>
+#include <osg/ComputeBoundsVisitor>
+#include <osg/Drawable>
+#include <osg/Group>
+#include <osg/Matrixd>
+#include <osg/Quat>
+
+#include <osgUtil/LineSegmentIntersector>
+
+#include "../../model/prefs/shortcut.hpp"
+
+#include "scenewidget.hpp"
+
+namespace CSVRender
+{
+
+    /*
+    Camera Controller
+    */
+
+    const osg::Vec3d CameraController::WorldUp = osg::Vec3d(0, 0, 1);
+
+    const osg::Vec3d CameraController::LocalUp = osg::Vec3d(0, 1, 0);
+    const osg::Vec3d CameraController::LocalLeft = osg::Vec3d(1, 0, 0);
+    const osg::Vec3d CameraController::LocalForward = osg::Vec3d(0, 0, 1);
+
+    CameraController::CameraController(QObject* parent)
+        : QObject(parent)
+        , mActive(false)
+        , mInverted(false)
+        , mCameraSensitivity(1/650.f)
+        , mSecondaryMoveMult(50)
+        , mWheelMoveMult(8)
+        , mCamera(NULL)
+    {
+    }
+
+    CameraController::~CameraController()
+    {
+    }
+
+    bool CameraController::isActive() const
+    {
+        return mActive;
+    }
+
+    osg::Camera* CameraController::getCamera() const
+    {
+        return mCamera;
+    }
+
+    double CameraController::getCameraSensitivity() const
+    {
+        return mCameraSensitivity;
+    }
+
+    bool CameraController::getInverted() const
+    {
+        return mInverted;
+    }
+
+    double CameraController::getSecondaryMovementMultiplier() const
+    {
+        return mSecondaryMoveMult;
+    }
+
+    double CameraController::getWheelMovementMultiplier() const
+    {
+        return mWheelMoveMult;
+    }
+
+    void CameraController::setCamera(osg::Camera* camera)
+    {
+        bool wasActive = mActive;
+
+        mCamera = camera;
+        mActive = (mCamera != NULL);
+
+        if (mActive != wasActive)
+        {
+            for (std::vector<CSMPrefs::Shortcut*>::iterator it = mShortcuts.begin(); it != mShortcuts.end(); ++it)
+            {
+                CSMPrefs::Shortcut* shortcut = *it;
+                shortcut->enable(mActive);
+            }
+        }
+    }
+
+    void CameraController::setCameraSensitivity(double value)
+    {
+        mCameraSensitivity = value;
+    }
+
+    void CameraController::setInverted(bool value)
+    {
+        mInverted = value;
+    }
+
+    void CameraController::setSecondaryMovementMultiplier(double value)
+    {
+        mSecondaryMoveMult = value;
+    }
+
+    void CameraController::setWheelMovementMultiplier(double value)
+    {
+        mWheelMoveMult = value;
+    }
+
+    void CameraController::setup(osg::Group* root, unsigned int mask, const osg::Vec3d& up)
+    {
+        // Find World bounds
+        osg::ComputeBoundsVisitor boundsVisitor;
+        osg::BoundingBox& boundingBox = boundsVisitor.getBoundingBox();
+
+        boundsVisitor.setTraversalMask(mask);
+        root->accept(boundsVisitor);
+
+        if (!boundingBox.valid())
+        {
+            // Try again without any mask
+            boundsVisitor.reset();
+            boundsVisitor.setTraversalMask(~0);
+            root->accept(boundsVisitor);
+
+            // Last resort, set a default
+            if (!boundingBox.valid())
+            {
+                boundingBox.set(-1, -1, -1, 1, 1, 1);
+            }
+        }
+
+        // Calculate a good starting position
+        osg::Vec3d minBounds = boundingBox.corner(0) - boundingBox.center();
+        osg::Vec3d maxBounds = boundingBox.corner(7) - boundingBox.center();
+
+        osg::Vec3d camOffset = up * maxBounds > 0 ? maxBounds : minBounds;
+        camOffset *= 2;
+
+        osg::Vec3d eye = camOffset + boundingBox.center();
+        osg::Vec3d center = boundingBox.center();
+
+        getCamera()->setViewMatrixAsLookAt(eye, center, up);
+    }
+
+    void CameraController::addShortcut(CSMPrefs::Shortcut* shortcut)
+    {
+        mShortcuts.push_back(shortcut);
+    }
+
+    /*
+    Free Camera Controller
+    */
+
+    FreeCameraController::FreeCameraController(QWidget* widget)
+        : CameraController(widget)
+        , mLockUpright(false)
+        , mModified(false)
+        , mNaviPrimary(false)
+        , mNaviSecondary(false)
+        , mFast(false)
+        , mFastAlternate(false)
+        , mLeft(false)
+        , mRight(false)
+        , mForward(false)
+        , mBackward(false)
+        , mRollLeft(false)
+        , mRollRight(false)
+        , mUp(LocalUp)
+        , mLinSpeed(1000)
+        , mRotSpeed(osg::PI / 2)
+        , mSpeedMult(8)
+    {
+        CSMPrefs::Shortcut* naviPrimaryShortcut = new CSMPrefs::Shortcut("scene-navi-primary", widget);
+        naviPrimaryShortcut->enable(false);
+        connect(naviPrimaryShortcut, SIGNAL(activated(bool)), this, SLOT(naviPrimary(bool)));
+
+        addShortcut(naviPrimaryShortcut);
+
+        CSMPrefs::Shortcut* naviSecondaryShortcut = new CSMPrefs::Shortcut("scene-navi-secondary", widget);
+        naviSecondaryShortcut->enable(false);
+        connect(naviSecondaryShortcut, SIGNAL(activated(bool)), this, SLOT(naviSecondary(bool)));
+
+        addShortcut(naviSecondaryShortcut);
+
+        CSMPrefs::Shortcut* forwardShortcut = new CSMPrefs::Shortcut("free-forward", "scene-speed-modifier",
+            CSMPrefs::Shortcut::SM_Detach, widget);
+        forwardShortcut->enable(false);
+        connect(forwardShortcut, SIGNAL(activated(bool)), this, SLOT(forward(bool)));
+        connect(forwardShortcut, SIGNAL(secondary(bool)), this, SLOT(alternateFast(bool)));
+
+        addShortcut(forwardShortcut);
+
+        CSMPrefs::Shortcut* leftShortcut = new CSMPrefs::Shortcut("free-left", widget);
+        leftShortcut->enable(false);
+        connect(leftShortcut, SIGNAL(activated(bool)), this, SLOT(left(bool)));
+
+        addShortcut(leftShortcut);
+
+        CSMPrefs::Shortcut* backShortcut = new CSMPrefs::Shortcut("free-backward", widget);
+        backShortcut->enable(false);
+        connect(backShortcut, SIGNAL(activated(bool)), this, SLOT(backward(bool)));
+
+        addShortcut(backShortcut);
+
+        CSMPrefs::Shortcut* rightShortcut = new CSMPrefs::Shortcut("free-right", widget);
+        rightShortcut->enable(false);
+        connect(rightShortcut, SIGNAL(activated(bool)), this, SLOT(right(bool)));
+
+        addShortcut(rightShortcut);
+
+        CSMPrefs::Shortcut* rollLeftShortcut = new CSMPrefs::Shortcut("free-roll-left", widget);
+        rollLeftShortcut->enable(false);
+        connect(rollLeftShortcut, SIGNAL(activated(bool)), this, SLOT(rollLeft(bool)));
+
+        addShortcut(rollLeftShortcut);
+
+        CSMPrefs::Shortcut* rollRightShortcut = new CSMPrefs::Shortcut("free-roll-right", widget);
+        rollRightShortcut->enable(false);
+        connect(rollRightShortcut, SIGNAL(activated(bool)), this, SLOT(rollRight(bool)));
+
+        addShortcut(rollRightShortcut);
+
+        CSMPrefs::Shortcut* speedModeShortcut = new CSMPrefs::Shortcut("free-speed-mode", widget);
+        speedModeShortcut->enable(false);
+        connect(speedModeShortcut, SIGNAL(activated()), this, SLOT(swapSpeedMode()));
+
+        addShortcut(speedModeShortcut);
+    }
+
+    double FreeCameraController::getLinearSpeed() const
+    {
+        return mLinSpeed;
+    }
+
+    double FreeCameraController::getRotationalSpeed() const
+    {
+        return mRotSpeed;
+    }
+
+    double FreeCameraController::getSpeedMultiplier() const
+    {
+        return mSpeedMult;
+    }
+
+    void FreeCameraController::setLinearSpeed(double value)
+    {
+        mLinSpeed = value;
+    }
+
+    void FreeCameraController::setRotationalSpeed(double value)
+    {
+        mRotSpeed = value;
+    }
+
+    void FreeCameraController::setSpeedMultiplier(double value)
+    {
+        mSpeedMult = value;
+    }
+
+    void FreeCameraController::fixUpAxis(const osg::Vec3d& up)
+    {
+        mLockUpright = true;
+        mUp = up;
+        mModified = true;
+    }
+
+    void FreeCameraController::unfixUpAxis()
+    {
+        mLockUpright = false;
+    }
+
+    void FreeCameraController::handleMouseMoveEvent(int x, int y)
+    {
+        if (!isActive())
+            return;
+
+        if (mNaviPrimary)
+        {
+            double scalar = getCameraSensitivity() * (getInverted() ? -1.0 : 1.0);
+            yaw(x * scalar);
+            pitch(y * scalar);
+        }
+        else if (mNaviSecondary)
+        {
+            osg::Vec3d movement;
+            movement += LocalLeft * -x * getSecondaryMovementMultiplier();
+            movement += LocalUp * y * getSecondaryMovementMultiplier();
+
+            translate(movement);
+        }
+    }
+
+    void FreeCameraController::handleMouseScrollEvent(int x)
+    {
+        if (!isActive())
+            return;
+
+        translate(LocalForward * x * ((mFast ^ mFastAlternate) ? getWheelMovementMultiplier() : 1));
+    }
+
+    void FreeCameraController::update(double dt)
+    {
+        if (!isActive())
+            return;
+
+        double linDist = mLinSpeed * dt;
+        double rotDist = mRotSpeed * dt;
+
+        if (mFast ^ mFastAlternate)
+            linDist *= mSpeedMult;
+
+        if (mLeft)
+            translate(LocalLeft * linDist);
+        if (mRight)
+            translate(LocalLeft * -linDist);
+        if (mForward)
+            translate(LocalForward * linDist);
+        if (mBackward)
+            translate(LocalForward * -linDist);
+
+        if (!mLockUpright)
+        {
+            if (mRollLeft)
+                roll(-rotDist);
+            if (mRollRight)
+                roll(rotDist);
+        }
+        else if(mModified)
+        {
+            stabilize();
+            mModified = false;
+        }
+
+        // Normalize the matrix to counter drift
+        getCamera()->getViewMatrix().orthoNormal(getCamera()->getViewMatrix());
+    }
+
+    void FreeCameraController::yaw(double value)
+    {
+        getCamera()->getViewMatrix() *= osg::Matrixd::rotate(value, LocalUp);
+        mModified = true;
+    }
+
+    void FreeCameraController::pitch(double value)
+    {
+        const double Constraint = osg::PI / 2 - 0.1;
+
+        if (mLockUpright)
+        {
+            osg::Vec3d eye, center, up;
+            getCamera()->getViewMatrixAsLookAt(eye, center, up);
+
+            osg::Vec3d forward = center - eye;
+            osg::Vec3d left = up ^ forward;
+
+            double pitchAngle = std::acos(up * mUp);
+            if ((mUp ^ up) * left < 0)
+                pitchAngle *= -1;
+
+            if (std::abs(pitchAngle + value) > Constraint)
+                value = (pitchAngle > 0 ? 1 : -1) * Constraint - pitchAngle;
+        }
+
+        getCamera()->getViewMatrix() *= osg::Matrixd::rotate(value, LocalLeft);
+        mModified = true;
+    }
+
+    void FreeCameraController::roll(double value)
+    {
+        getCamera()->getViewMatrix() *= osg::Matrixd::rotate(value, LocalForward);
+        mModified = true;
+    }
+
+    void FreeCameraController::translate(const osg::Vec3d& offset)
+    {
+        getCamera()->getViewMatrix() *= osg::Matrixd::translate(offset);
+        mModified = true;
+    }
+
+    void FreeCameraController::stabilize()
+    {
+        osg::Vec3d eye, center, up;
+        getCamera()->getViewMatrixAsLookAt(eye, center, up);
+        getCamera()->setViewMatrixAsLookAt(eye, center, mUp);
+    }
+
+    void FreeCameraController::naviPrimary(bool active)
+    {
+        mNaviPrimary = active;
+    }
+
+    void FreeCameraController::naviSecondary(bool active)
+    {
+        mNaviSecondary = active;
+    }
+
+    void FreeCameraController::forward(bool active)
+    {
+        mForward = active;
+    }
+
+    void FreeCameraController::left(bool active)
+    {
+        mLeft = active;
+    }
+
+    void FreeCameraController::backward(bool active)
+    {
+        mBackward = active;
+    }
+
+    void FreeCameraController::right(bool active)
+    {
+        mRight = active;
+    }
+
+    void FreeCameraController::rollLeft(bool active)
+    {
+        mRollLeft = active;
+    }
+
+    void FreeCameraController::rollRight(bool active)
+    {
+        mRollRight = active;
+    }
+
+    void FreeCameraController::alternateFast(bool active)
+    {
+        mFastAlternate = active;
+    }
+
+    void FreeCameraController::swapSpeedMode()
+    {
+        mFast = !mFast;
+    }
+
+    /*
+    Orbit Camera Controller
+    */
+
+    OrbitCameraController::OrbitCameraController(QWidget* widget)
+        : CameraController(widget)
+        , mInitialized(false)
+        , mNaviPrimary(false)
+        , mNaviSecondary(false)
+        , mFast(false)
+        , mFastAlternate(false)
+        , mLeft(false)
+        , mRight(false)
+        , mUp(false)
+        , mDown(false)
+        , mRollLeft(false)
+        , mRollRight(false)
+        , mPickingMask(~0)
+        , mCenter(0,0,0)
+        , mDistance(0)
+        , mOrbitSpeed(osg::PI / 4)
+        , mOrbitSpeedMult(4)
+    {
+        CSMPrefs::Shortcut* naviPrimaryShortcut = new CSMPrefs::Shortcut("scene-navi-primary", widget);
+        naviPrimaryShortcut->enable(false);
+        connect(naviPrimaryShortcut, SIGNAL(activated(bool)), this, SLOT(naviPrimary(bool)));
+
+        addShortcut(naviPrimaryShortcut);
+
+        CSMPrefs::Shortcut* naviSecondaryShortcut = new CSMPrefs::Shortcut("scene-navi-secondary", widget);
+        naviSecondaryShortcut->enable(false);
+        connect(naviSecondaryShortcut, SIGNAL(activated(bool)), this, SLOT(naviSecondary(bool)));
+
+        addShortcut(naviSecondaryShortcut);
+
+        CSMPrefs::Shortcut* upShortcut = new CSMPrefs::Shortcut("orbit-up", "scene-speed-modifier",
+            CSMPrefs::Shortcut::SM_Detach, widget);
+        upShortcut->enable(false);
+        connect(upShortcut, SIGNAL(activated(bool)), this, SLOT(up(bool)));
+        connect(upShortcut, SIGNAL(secondary(bool)), this, SLOT(alternateFast(bool)));
+
+        addShortcut(upShortcut);
+
+        CSMPrefs::Shortcut* leftShortcut = new CSMPrefs::Shortcut("orbit-left", widget);
+        leftShortcut->enable(false);
+        connect(leftShortcut, SIGNAL(activated(bool)), this, SLOT(left(bool)));
+
+        addShortcut(leftShortcut);
+
+        CSMPrefs::Shortcut* downShortcut = new CSMPrefs::Shortcut("orbit-down", widget);
+        downShortcut->enable(false);
+        connect(downShortcut, SIGNAL(activated(bool)), this, SLOT(down(bool)));
+
+        addShortcut(downShortcut);
+
+        CSMPrefs::Shortcut* rightShortcut = new CSMPrefs::Shortcut("orbit-right", widget);
+        rightShortcut->enable(false);
+        connect(rightShortcut, SIGNAL(activated(bool)), this, SLOT(right(bool)));
+
+        addShortcut(rightShortcut);
+
+        CSMPrefs::Shortcut* rollLeftShortcut = new CSMPrefs::Shortcut("orbit-roll-left", widget);
+        rollLeftShortcut->enable(false);
+        connect(rollLeftShortcut, SIGNAL(activated(bool)), this, SLOT(rollLeft(bool)));
+
+        addShortcut(rollLeftShortcut);
+
+        CSMPrefs::Shortcut* rollRightShortcut = new CSMPrefs::Shortcut("orbit-roll-right", widget);
+        rollRightShortcut->enable(false);
+        connect(rollRightShortcut, SIGNAL(activated(bool)), this, SLOT(rollRight(bool)));
+
+        addShortcut(rollRightShortcut);
+
+        CSMPrefs::Shortcut* speedModeShortcut = new CSMPrefs::Shortcut("orbit-speed-mode", widget);
+        speedModeShortcut->enable(false);
+        connect(speedModeShortcut, SIGNAL(activated()), this, SLOT(swapSpeedMode()));
+
+        addShortcut(speedModeShortcut);
+    }
+
+    osg::Vec3d OrbitCameraController::getCenter() const
+    {
+        return mCenter;
+    }
+
+    double OrbitCameraController::getOrbitSpeed() const
+    {
+        return mOrbitSpeed;
+    }
+
+    double OrbitCameraController::getOrbitSpeedMultiplier() const
+    {
+        return mOrbitSpeedMult;
+    }
+
+    unsigned int OrbitCameraController::getPickingMask() const
+    {
+        return mPickingMask;
+    }
+
+    void OrbitCameraController::setCenter(const osg::Vec3d& value)
+    {
+        osg::Vec3d eye, center, up;
+        getCamera()->getViewMatrixAsLookAt(eye, center, up);
+
+        mCenter = value;
+        mDistance = (eye - mCenter).length();
+
+        getCamera()->setViewMatrixAsLookAt(eye, mCenter, up);
+
+        mInitialized = true;
+    }
+
+    void OrbitCameraController::setOrbitSpeed(double value)
+    {
+        mOrbitSpeed = value;
+    }
+
+    void OrbitCameraController::setOrbitSpeedMultiplier(double value)
+    {
+        mOrbitSpeedMult = value;
+    }
+
+    void OrbitCameraController::setPickingMask(unsigned int value)
+    {
+        mPickingMask = value;
+    }
+
+    void OrbitCameraController::handleMouseMoveEvent(int x, int y)
+    {
+        if (!isActive())
+            return;
+
+        if (!mInitialized)
+            initialize();
+
+        if (mNaviPrimary)
+        {
+            double scalar = getCameraSensitivity() * (getInverted() ? -1.0 : 1.0);
+            rotateHorizontal(x * scalar);
+            rotateVertical(-y * scalar);
+        }
+        else if (mNaviSecondary)
+        {
+            osg::Vec3d movement;
+            movement += LocalLeft * x * getSecondaryMovementMultiplier();
+            movement += LocalUp * -y * getSecondaryMovementMultiplier();
+
+            translate(movement);
+        }
+    }
+
+    void OrbitCameraController::handleMouseScrollEvent(int x)
+    {
+        if (!isActive())
+            return;
+
+        zoom(-x * ((mFast ^ mFastAlternate) ? getWheelMovementMultiplier() : 1));
+    }
+
+    void OrbitCameraController::update(double dt)
+    {
+        if (!isActive())
+            return;
+
+        if (!mInitialized)
+            initialize();
+
+        double rotDist = mOrbitSpeed * dt;
+
+        if (mFast ^ mFastAlternate)
+            rotDist *= mOrbitSpeedMult;
+
+        if (mLeft)
+            rotateHorizontal(-rotDist);
+        if (mRight)
+            rotateHorizontal(rotDist);
+        if (mUp)
+            rotateVertical(rotDist);
+        if (mDown)
+            rotateVertical(-rotDist);
+
+        if (mRollLeft)
+            roll(-rotDist);
+        if (mRollRight)
+            roll(rotDist);
+
+        // Normalize the matrix to counter drift
+        getCamera()->getViewMatrix().orthoNormal(getCamera()->getViewMatrix());
+    }
+
+    void OrbitCameraController::onActivate()
+    {
+        mInitialized = false;
+    }
+
+    void OrbitCameraController::initialize()
+    {
+        static const int DefaultStartDistance = 10000.f;
+
+        // Try to intelligently pick focus object
+        osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(
+            osgUtil::Intersector::PROJECTION, osg::Vec3d(0, 0, 0), LocalForward));
+
+        intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::LIMIT_NEAREST);
+        osgUtil::IntersectionVisitor visitor(intersector);
+
+        visitor.setTraversalMask(mPickingMask);
+
+        getCamera()->accept(visitor);
+
+        osg::Vec3d eye, center, up;
+        getCamera()->getViewMatrixAsLookAt(eye, center, up, DefaultStartDistance);
+
+        if (intersector->getIntersections().begin() != intersector->getIntersections().end())
+        {
+            mCenter = intersector->getIntersections().begin()->getWorldIntersectPoint();
+            mDistance = (eye - mCenter).length();
+        }
+        else
+        {
+            mCenter = center;
+            mDistance = DefaultStartDistance;
+        }
+
+        mInitialized = true;
+    }
+
+    void OrbitCameraController::rotateHorizontal(double value)
+    {
+        osg::Vec3d eye, center, up;
+        getCamera()->getViewMatrixAsLookAt(eye, center, up);
+
+        osg::Quat rotation = osg::Quat(value, up);
+        osg::Vec3d oldOffset = eye - mCenter;
+        osg::Vec3d newOffset = rotation * oldOffset;
+
+        getCamera()->setViewMatrixAsLookAt(mCenter + newOffset, mCenter, up);
+    }
+
+    void OrbitCameraController::rotateVertical(double value)
+    {
+        osg::Vec3d eye, center, up;
+        getCamera()->getViewMatrixAsLookAt(eye, center, up);
+
+        osg::Vec3d forward = center - eye;
+        osg::Quat rotation = osg::Quat(value, up ^ forward);
+        osg::Vec3d oldOffset = eye - mCenter;
+        osg::Vec3d newOffset = rotation * oldOffset;
+
+        getCamera()->setViewMatrixAsLookAt(mCenter + newOffset, mCenter, up);
+    }
+
+    void OrbitCameraController::roll(double value)
+    {
+        getCamera()->getViewMatrix() *= osg::Matrixd::rotate(value, LocalForward);
+    }
+
+    void OrbitCameraController::translate(const osg::Vec3d& offset)
+    {
+        osg::Vec3d eye, center, up;
+        getCamera()->getViewMatrixAsLookAt(eye, center, up);
+
+        osg::Vec3d newOffset = getCamera()->getViewMatrix().getRotate().inverse() * offset;
+        mCenter += newOffset;
+        eye += newOffset;
+
+        getCamera()->setViewMatrixAsLookAt(eye, mCenter, up);
+    }
+
+    void OrbitCameraController::zoom(double value)
+    {
+        mDistance = std::max(10., mDistance + value);
+
+        osg::Vec3d eye, center, up;
+        getCamera()->getViewMatrixAsLookAt(eye, center, up, 1.f);
+
+        osg::Vec3d offset = (eye - center) * mDistance;
+
+        getCamera()->setViewMatrixAsLookAt(mCenter + offset, mCenter, up);
+    }
+
+    void OrbitCameraController::naviPrimary(bool active)
+    {
+        mNaviPrimary = active;
+    }
+
+    void OrbitCameraController::naviSecondary(bool active)
+    {
+        mNaviSecondary = active;
+    }
+
+    void OrbitCameraController::up(bool active)
+    {
+        mUp = active;
+    }
+
+    void OrbitCameraController::left(bool active)
+    {
+        mLeft = active;
+    }
+
+    void OrbitCameraController::down(bool active)
+    {
+        mDown = active;
+    }
+
+    void OrbitCameraController::right(bool active)
+    {
+        mRight = active;
+    }
+
+    void OrbitCameraController::rollLeft(bool active)
+    {
+        if (isActive())
+            mRollLeft = active;
+    }
+
+    void OrbitCameraController::rollRight(bool active)
+    {
+        mRollRight = active;
+    }
+
+    void OrbitCameraController::alternateFast(bool active)
+    {
+        mFastAlternate = active;
+    }
+
+    void OrbitCameraController::swapSpeedMode()
+    {
+        mFast = !mFast;
+    }
+}
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
new file mode 100644
index 000000000..97af85790
--- /dev/null
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -0,0 +1,200 @@
+#ifndef OPENCS_VIEW_CAMERACONTROLLER_H
+#define OPENCS_VIEW_CAMERACONTROLLER_H
+
+#include <string>
+#include <vector>
+
+#include <QObject>
+
+#include <osg/ref_ptr>
+#include <osg/Vec3d>
+
+namespace osg
+{
+    class Camera;
+    class Group;
+}
+
+namespace CSMPrefs
+{
+    class Shortcut;
+}
+
+namespace CSVRender
+{
+    class SceneWidget;
+
+    class CameraController : public QObject
+    {
+            Q_OBJECT
+
+        public:
+
+            static const osg::Vec3d WorldUp;
+
+            static const osg::Vec3d LocalUp;
+            static const osg::Vec3d LocalLeft;
+            static const osg::Vec3d LocalForward;
+
+            CameraController(QObject* parent);
+            virtual ~CameraController();
+
+            bool isActive() const;
+
+            osg::Camera* getCamera() const;
+            double getCameraSensitivity() const;
+            bool getInverted() const;
+            double getSecondaryMovementMultiplier() const;
+            double getWheelMovementMultiplier() const;
+
+            void setCamera(osg::Camera*);
+            void setCameraSensitivity(double value);
+            void setInverted(bool value);
+            void setSecondaryMovementMultiplier(double value);
+            void setWheelMovementMultiplier(double value);
+
+            // moves the camera to an intelligent position
+            void setup(osg::Group* root, unsigned int mask, const osg::Vec3d& up);
+
+            virtual void handleMouseMoveEvent(int x, int y) = 0;
+            virtual void handleMouseScrollEvent(int x) = 0;
+
+            virtual void update(double dt) = 0;
+
+        protected:
+
+            virtual void onActivate(){}
+
+            void addShortcut(CSMPrefs::Shortcut* shortcut);
+
+        private:
+
+            bool mActive, mInverted;
+            double mCameraSensitivity;
+            double mSecondaryMoveMult;
+            double mWheelMoveMult;
+
+            osg::Camera* mCamera;
+
+            std::vector<CSMPrefs::Shortcut*> mShortcuts;
+    };
+
+    class FreeCameraController : public CameraController
+    {
+            Q_OBJECT
+
+        public:
+
+            FreeCameraController(QWidget* parent);
+
+            double getLinearSpeed() const;
+            double getRotationalSpeed() const;
+            double getSpeedMultiplier() const;
+
+            void setLinearSpeed(double value);
+            void setRotationalSpeed(double value);
+            void setSpeedMultiplier(double value);
+
+            void fixUpAxis(const osg::Vec3d& up);
+            void unfixUpAxis();
+
+            void handleMouseMoveEvent(int x, int y);
+            void handleMouseScrollEvent(int x);
+
+            void update(double dt);
+
+        private:
+
+            void yaw(double value);
+            void pitch(double value);
+            void roll(double value);
+            void translate(const osg::Vec3d& offset);
+
+            void stabilize();
+
+            bool mLockUpright, mModified;
+            bool mNaviPrimary, mNaviSecondary;
+            bool mFast, mFastAlternate;
+            bool mLeft, mRight, mForward, mBackward, mRollLeft, mRollRight;
+            osg::Vec3d mUp;
+
+            double mLinSpeed;
+            double mRotSpeed;
+            double mSpeedMult;
+
+        private slots:
+
+            void naviPrimary(bool active);
+            void naviSecondary(bool active);
+            void forward(bool active);
+            void left(bool active);
+            void backward(bool active);
+            void right(bool active);
+            void rollLeft(bool active);
+            void rollRight(bool active);
+            void alternateFast(bool active);
+            void swapSpeedMode();
+    };
+
+    class OrbitCameraController : public CameraController
+    {
+            Q_OBJECT
+
+        public:
+
+            OrbitCameraController(QWidget* parent);
+
+            osg::Vec3d getCenter() const;
+            double getOrbitSpeed() const;
+            double getOrbitSpeedMultiplier() const;
+            unsigned int getPickingMask() const;
+
+            void setCenter(const osg::Vec3d& center);
+            void setOrbitSpeed(double value);
+            void setOrbitSpeedMultiplier(double value);
+            void setPickingMask(unsigned int value);
+
+            void handleMouseMoveEvent(int x, int y);
+            void handleMouseScrollEvent(int x);
+
+            void update(double dt);
+
+        private:
+
+            void onActivate();
+
+            void initialize();
+
+            void rotateHorizontal(double value);
+            void rotateVertical(double value);
+            void roll(double value);
+            void translate(const osg::Vec3d& offset);
+            void zoom(double value);
+
+            bool mInitialized;
+            bool mNaviPrimary, mNaviSecondary;
+            bool mFast, mFastAlternate;
+            bool mLeft, mRight, mUp, mDown, mRollLeft, mRollRight;
+            unsigned int mPickingMask;
+            osg::Vec3d mCenter;
+            double mDistance;
+
+            double mOrbitSpeed;
+            double mOrbitSpeedMult;
+
+        private slots:
+
+            void naviPrimary(bool active);
+            void naviSecondary(bool active);
+            void up(bool active);
+            void left(bool active);
+            void down(bool active);
+            void right(bool active);
+            void rollLeft(bool active);
+            void rollRight(bool active);
+            void alternateFast(bool active);
+            void swapSpeedMode();
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index bd85c8a14..adc038836 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -1,9 +1,14 @@
 #include "cell.hpp"
 
+#include <osg/PositionAttitudeTransform>
+#include <osg/Geode>
+#include <osg/Geometry>
 #include <osg/Group>
 
 #include <components/misc/stringops.hpp>
+#include <components/esm/loadcell.hpp>
 #include <components/esm/loadland.hpp>
+#include <components/sceneutil/pathgridutil.hpp>
 
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/columns.hpp"
@@ -11,7 +16,9 @@
 #include "../../model/world/refcollection.hpp"
 #include "../../model/world/cellcoordinates.hpp"
 
+#include "cellwater.hpp"
 #include "mask.hpp"
+#include "pathgrid.hpp"
 #include "terrainstorage.hpp"
 
 bool CSVRender::Cell::removeObject (const std::string& id)
@@ -50,7 +57,12 @@ bool CSVRender::Cell::addObjects (int start, int end)
         {
             std::string id = Misc::StringUtils::lowerCase (collection.getRecord (i).get().mId);
 
-            mObjects.insert (std::make_pair (id, new Object (mData, mCellNode, id, false)));
+            std::auto_ptr<Object> object (new Object (mData, mCellNode, id, false));
+
+            if (mSubModeElementMask & Mask_Reference)
+                object->setSubMode (mSubMode);
+
+            mObjects.insert (std::make_pair (id, object.release()));
             modified = true;
         }
     }
@@ -60,7 +72,8 @@ bool CSVRender::Cell::addObjects (int start, int end)
 
 CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::string& id,
     bool deleted)
-: mData (data), mId (Misc::StringUtils::lowerCase (id)), mDeleted (deleted)
+: mData (data), mId (Misc::StringUtils::lowerCase (id)), mDeleted (deleted), mSubMode (0),
+  mSubModeElementMask (0)
 {
     std::pair<CSMWorld::CellCoordinates, bool> result = CSMWorld::CellCoordinates::fromId (id);
 
@@ -70,6 +83,8 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
     mCellNode = new osg::Group;
     rootNode->addChild(mCellNode);
 
+    setCellMarker();
+
     if (!mDeleted)
     {
         CSMWorld::IdTable& references = dynamic_cast<CSMWorld::IdTable&> (
@@ -90,8 +105,14 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
                 mTerrain.reset(new Terrain::TerrainGrid(mCellNode, data.getResourceSystem().get(), NULL, new TerrainStorage(mData), Mask_Terrain));
                 mTerrain->loadCell(esmLand.mX,
                                    esmLand.mY);
+
+                mCellBorder.reset(new CellBorder(mCellNode, mCoordinates));
+                mCellBorder->buildShape(esmLand);
             }
         }
+
+        mPathgrid.reset(new Pathgrid(mData, mCellNode, mId, mCoordinates));
+        mCellWater.reset(new CellWater(mData, mCellNode, mId, mCoordinates));
     }
 }
 
@@ -104,6 +125,11 @@ CSVRender::Cell::~Cell()
     mCellNode->getParent(0)->removeChild(mCellNode);
 }
 
+CSVRender::Pathgrid* CSVRender::Cell::getPathgrid() const
+{
+    return mPathgrid.get();
+}
+
 bool CSVRender::Cell::referenceableDataChanged (const QModelIndex& topLeft,
     const QModelIndex& bottomRight)
 {
@@ -193,12 +219,12 @@ bool CSVRender::Cell::referenceDataChanged (const QModelIndex& topLeft,
     }
 
     // add new objects
-    for (std::map<std::string, bool>::iterator iter (ids.begin()); iter!=ids.end(); ++iter)
+    for (std::map<std::string, bool>::iterator mapIter (ids.begin()); mapIter!=ids.end(); ++mapIter)
     {
-        if (!iter->second)
+        if (!mapIter->second)
         {
             mObjects.insert (std::make_pair (
-                iter->first, new Object (mData, mCellNode, iter->first, false)));
+                mapIter->first, new Object (mData, mCellNode, mapIter->first, false)));
 
             modified = true;
         }
@@ -242,6 +268,16 @@ bool CSVRender::Cell::referenceAdded (const QModelIndex& parent, int start, int
     return addObjects (start, end);
 }
 
+void CSVRender::Cell::pathgridModified()
+{
+    mPathgrid->recreateGeometry();
+}
+
+void CSVRender::Cell::pathgridRemoved()
+{
+    mPathgrid->removeGeometry();
+}
+
 void CSVRender::Cell::setSelection (int elementMask, Selection mode)
 {
     if (elementMask & Mask_Reference)
@@ -261,6 +297,27 @@ void CSVRender::Cell::setSelection (int elementMask, Selection mode)
             iter->second->setSelected (selected);
         }
     }
+    if (elementMask & Mask_Pathgrid)
+    {
+        // Only one pathgrid may be selected, so some operations will only have an effect
+        // if the pathgrid is already focused
+        switch (mode)
+        {
+            case Selection_Clear:
+                mPathgrid->clearSelected();
+                break;
+
+            case Selection_All:
+                if (mPathgrid->isSelected())
+                    mPathgrid->selectAll();
+                break;
+
+            case Selection_Invert:
+                if (mPathgrid->isSelected())
+                    mPathgrid->invertSelected();
+                break;
+        }
+    }
 }
 
 void CSVRender::Cell::selectAllWithSameParentId (int elementMask)
@@ -303,6 +360,24 @@ void CSVRender::Cell::setCellArrows (int mask)
     }
 }
 
+void CSVRender::Cell::setCellMarker()
+{
+    bool cellExists = false;
+    bool isInteriorCell = false;
+
+    int cellIndex = mData.getCells().searchId(mId);
+    if (cellIndex > -1)
+    {
+        const CSMWorld::Record<CSMWorld::Cell>& cellRecord = mData.getCells().getRecord(cellIndex);
+        cellExists = !cellRecord.isDeleted();
+        isInteriorCell = cellRecord.get().mData.mFlags & ESM::Cell::Interior;
+    }
+
+    if (!isInteriorCell) {
+        mCellMarker.reset(new CellMarker(mCellNode, mCoordinates, cellExists));
+    }
+}
+
 CSMWorld::CellCoordinates CSVRender::Cell::getCoordinates() const
 {
     return mCoordinates;
@@ -322,6 +397,43 @@ std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::Cell::getSelection (un
             iter!=mObjects.end(); ++iter)
             if (iter->second->getSelected())
                 result.push_back (iter->second->getTag());
+    if (elementMask & Mask_Pathgrid)
+        if (mPathgrid->isSelected())
+            result.push_back(mPathgrid->getTag());
 
     return result;
 }
+
+std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::Cell::getEdited (unsigned int elementMask) const
+{
+    std::vector<osg::ref_ptr<TagBase> > result;
+
+    if (elementMask & Mask_Reference)
+        for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
+            iter!=mObjects.end(); ++iter)
+            if (iter->second->isEdited())
+                result.push_back (iter->second->getTag());
+
+    return result;
+}
+
+void CSVRender::Cell::setSubMode (int subMode, unsigned int elementMask)
+{
+    mSubMode = subMode;
+    mSubModeElementMask = elementMask;
+
+    if (elementMask & Mask_Reference)
+        for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
+            iter!=mObjects.end(); ++iter)
+                iter->second->setSubMode (subMode);
+}
+
+void CSVRender::Cell::reset (unsigned int elementMask)
+{
+    if (elementMask & Mask_Reference)
+        for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
+            iter!=mObjects.end(); ++iter)
+            iter->second->reset();
+    if (elementMask & Mask_Pathgrid)
+        mPathgrid->resetIndicators();
+}
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 85b9bf21b..8f68e9f53 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -15,12 +15,16 @@
 
 #include "object.hpp"
 #include "cellarrow.hpp"
+#include "cellmarker.hpp"
+#include "cellborder.hpp"
 
 class QModelIndex;
 
 namespace osg
 {
     class Group;
+    class Geometry;
+    class Geode;
 }
 
 namespace CSMWorld
@@ -31,6 +35,8 @@ namespace CSMWorld
 
 namespace CSVRender
 {
+    class CellWater;
+    class Pathgrid;
     class TagBase;
 
     class Cell
@@ -42,7 +48,13 @@ namespace CSVRender
             std::auto_ptr<Terrain::TerrainGrid> mTerrain;
             CSMWorld::CellCoordinates mCoordinates;
             std::auto_ptr<CellArrow> mCellArrows[4];
+            std::auto_ptr<CellMarker> mCellMarker;
+            std::auto_ptr<CellBorder> mCellBorder;
+            std::auto_ptr<CellWater> mCellWater;
+            std::auto_ptr<Pathgrid> mPathgrid;
             bool mDeleted;
+            int mSubMode;
+            unsigned int mSubModeElementMask;
 
             /// Ignored if cell does not have an object with the given ID.
             ///
@@ -76,6 +88,9 @@ namespace CSVRender
 
             ~Cell();
 
+            /// \note Returns the pathgrid representation which will exist as long as the cell exists
+            Pathgrid* getPathgrid() const;
+
             /// \return Did this call result in a modification of the visual representation of
             /// this cell?
             bool referenceableDataChanged (const QModelIndex& topLeft,
@@ -97,6 +112,10 @@ namespace CSVRender
             /// this cell?
             bool referenceAdded (const QModelIndex& parent, int start, int end);
 
+            void pathgridModified();
+
+            void pathgridRemoved();
+
             void setSelection (int elementMask, Selection mode);
 
             // Select everything that references the same ID as at least one of the elements
@@ -105,12 +124,23 @@ namespace CSVRender
 
             void setCellArrows (int mask);
 
+            /// \brief Set marker for this cell.
+            void setCellMarker();
+
             /// Returns 0, 0 in case of an unpaged cell.
             CSMWorld::CellCoordinates getCoordinates() const;
 
             bool isDeleted() const;
 
             std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask) const;
+
+            std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask) const;
+
+            void setSubMode (int subMode, unsigned int elementMask);
+
+            /// Erase all overrides and restore the visual representation of the cell to its
+            /// true state.
+            void reset (unsigned int elementMask);
     };
 }
 
diff --git a/apps/opencs/view/render/cellarrow.cpp b/apps/opencs/view/render/cellarrow.cpp
index 6d8fa1c6c..b8c89c83d 100644
--- a/apps/opencs/view/render/cellarrow.cpp
+++ b/apps/opencs/view/render/cellarrow.cpp
@@ -7,6 +7,9 @@
 #include <osg/Geometry>
 #include <osg/PrimitiveSet>
 
+#include "../../model/prefs/state.hpp"
+#include "../../model/prefs/shortcutmanager.hpp"
+
 #include "mask.hpp"
 
 CSVRender::CellArrowTag::CellArrowTag (CellArrow *arrow)
@@ -35,14 +38,19 @@ QString CSVRender::CellArrowTag::getToolTip (bool hideBasics) const
         text +=
             "<p>"
             "Modify which cells are shown"
-            "<ul><li>Primary-Edit: Add cell in given direction</li>"
-            "<li>Secondary-Edit: Add cell and remove old cell</li>"
-            "<li>Shift Primary-Edit: Add cells in given direction</li>"
-            "<li>Shift Secondary-Edit: Add cells and remove old cells</li>"
+            "<ul><li>{scene-edit-primary}: Add cell in given direction</li>"
+            "<li>{scene-edit-secondary}: Add cell and remove old cell</li>"
+            "<li>{scene-select-primary}: Add cells in given direction</li>"
+            "<li>{scene-select-secondary}: Add cells and remove old cells</li>"
+            "<li>{scene-load-cam-cell}: Load cell where camera is located</li>"
+            "<li>{scene-load-cam-eastcell}: Load cell to east</li>"
+            "<li>{scene-load-cam-northcell}: Load cell to north</li>"
+            "<li>{scene-load-cam-westcell}: Load cell to west</li>"
+            "<li>{scene-load-cam-southcell}: Load cell to south</li>"
             "</ul>";
     }
 
-    return text;
+    return CSMPrefs::State::get().getShortcutManager().processToolTip(text);
 }
 
 
diff --git a/apps/opencs/view/render/cellborder.cpp b/apps/opencs/view/render/cellborder.cpp
new file mode 100644
index 000000000..6073807ce
--- /dev/null
+++ b/apps/opencs/view/render/cellborder.cpp
@@ -0,0 +1,96 @@
+#include "cellborder.hpp"
+
+#include <osg/Group>
+#include <osg/PositionAttitudeTransform>
+#include <osg/Geode>
+#include <osg/Geometry>
+#include <osg/PrimitiveSet>
+
+#include <components/esm/loadland.hpp>
+
+#include "mask.hpp"
+
+#include "../../model/world/cellcoordinates.hpp"
+
+const int CSVRender::CellBorder::CellSize = ESM::Land::REAL_SIZE;
+const int CSVRender::CellBorder::VertexCount = (ESM::Land::LAND_SIZE * 4) - 3;
+
+
+CSVRender::CellBorder::CellBorder(osg::Group* cellNode, const CSMWorld::CellCoordinates& coords)
+    : mParentNode(cellNode)
+{
+    mBaseNode = new osg::PositionAttitudeTransform();
+    mBaseNode->setNodeMask(Mask_CellBorder);
+    mBaseNode->setPosition(osg::Vec3f(coords.getX() * CellSize, coords.getY() * CellSize, 10));
+
+    mParentNode->addChild(mBaseNode);
+}
+
+CSVRender::CellBorder::~CellBorder()
+{
+    mParentNode->removeChild(mBaseNode);
+}
+
+void CSVRender::CellBorder::buildShape(const ESM::Land& esmLand)
+{
+    const ESM::Land::LandData* landData = esmLand.getLandData(ESM::Land::DATA_VHGT);
+
+    if (!landData)
+        return;
+
+    osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry();
+
+    // Vertices
+    osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array();
+
+    int x = 0, y = 0;
+    for (; x < ESM::Land::LAND_SIZE; ++x)
+        vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
+
+    x = ESM::Land::LAND_SIZE - 1;
+    for (; y < ESM::Land::LAND_SIZE; ++y)
+        vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
+
+    y = ESM::Land::LAND_SIZE - 1;
+    for (; x >= 0; --x)
+        vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
+
+    x = 0;
+    for (; y >= 0; --y)
+        vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
+
+    geometry->setVertexArray(vertices);
+
+    // Color
+    osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array();
+    colors->push_back(osg::Vec4f(0.f, 0.5f, 0.f, 1.f));
+
+    geometry->setColorArray(colors, osg::Array::BIND_PER_PRIMITIVE_SET);
+
+    // Primitive
+    osg::ref_ptr<osg::DrawElementsUShort> primitives =
+        new osg::DrawElementsUShort(osg::PrimitiveSet::LINE_STRIP, VertexCount+1);
+
+    for (size_t i = 0; i < VertexCount; ++i)
+        primitives->setElement(i, i);
+
+    primitives->setElement(VertexCount, 0);
+
+    geometry->addPrimitiveSet(primitives);
+    geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+
+
+    osg::ref_ptr<osg::Geode> geode = new osg::Geode();
+    geode->addDrawable(geometry);
+    mBaseNode->addChild(geode);
+}
+
+size_t CSVRender::CellBorder::landIndex(int x, int y)
+{
+    return y * ESM::Land::LAND_SIZE + x;
+}
+
+float CSVRender::CellBorder::scaleToWorld(int value)
+{
+    return (CellSize + 128) * (float)value / ESM::Land::LAND_SIZE;
+}
diff --git a/apps/opencs/view/render/cellborder.hpp b/apps/opencs/view/render/cellborder.hpp
new file mode 100644
index 000000000..c91aa46c6
--- /dev/null
+++ b/apps/opencs/view/render/cellborder.hpp
@@ -0,0 +1,54 @@
+#ifndef OPENCS_VIEW_CELLBORDER_H
+#define OPENCS_VIEW_CELLBORDER_H
+
+#include <cstddef>
+
+#include <osg/ref_ptr>
+
+namespace osg
+{
+    class Group;
+    class PositionAttitudeTransform;
+}
+
+namespace ESM
+{
+    struct Land;
+}
+
+namespace CSMWorld
+{
+    class CellCoordinates;
+}
+
+namespace CSVRender
+{
+
+    class CellBorder
+    {
+    public:
+
+        CellBorder(osg::Group* cellNode, const CSMWorld::CellCoordinates& coords);
+        ~CellBorder();
+
+        void buildShape(const ESM::Land& esmLand);
+
+    private:
+
+        static const int CellSize;
+        static const int VertexCount;
+
+        size_t landIndex(int x, int y);
+        float scaleToWorld(int val);
+
+        // unimplemented
+        CellBorder(const CellBorder&);
+        CellBorder& operator=(const CellBorder&);
+
+        osg::Group* mParentNode;
+        osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
+
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/cellmarker.cpp b/apps/opencs/view/render/cellmarker.cpp
new file mode 100644
index 000000000..abc337ce2
--- /dev/null
+++ b/apps/opencs/view/render/cellmarker.cpp
@@ -0,0 +1,92 @@
+#include "cellmarker.hpp"
+
+#include <boost/lexical_cast.hpp>
+
+#include <osg/AutoTransform>
+#include <osg/Geode>
+#include <osg/Group>
+#include <osgText/Text>
+
+#include "mask.hpp"
+
+CSVRender::CellMarkerTag::CellMarkerTag(CellMarker *marker)
+: TagBase(Mask_CellMarker), mMarker(marker)
+{}
+
+CSVRender::CellMarker *CSVRender::CellMarkerTag::getCellMarker() const
+{
+    return mMarker;
+}
+
+void CSVRender::CellMarker::buildMarker()
+{
+    const int characterSize = 20;
+
+    // Set up attributes of marker text.
+    osg::ref_ptr<osgText::Text> markerText (new osgText::Text);
+    markerText->setLayout(osgText::Text::LEFT_TO_RIGHT);
+    markerText->setCharacterSize(characterSize);
+    markerText->setAlignment(osgText::Text::CENTER_CENTER);
+    markerText->setDrawMode(osgText::Text::TEXT | osgText::Text::FILLEDBOUNDINGBOX);
+
+    // If cell exists then show black bounding box otherwise show red.
+    if (mExists)
+    {
+        markerText->setBoundingBoxColor(osg::Vec4f(0.0f, 0.0f, 0.0f, 1.0f));
+    }
+    else
+    {
+        markerText->setBoundingBoxColor(osg::Vec4f(1.0f, 0.0f, 0.0f, 1.0f));
+    }
+
+    // Add text containing cell's coordinates.
+    std::string coordinatesText =
+        boost::lexical_cast<std::string>(mCoordinates.getX()) + "," +
+        boost::lexical_cast<std::string>(mCoordinates.getY());
+    markerText->setText(coordinatesText);
+
+    // Add text to marker node.
+    osg::ref_ptr<osg::Geode> geode (new osg::Geode);
+    geode->addDrawable(markerText);
+    mMarkerNode->addChild(geode);
+}
+
+void CSVRender::CellMarker::positionMarker()
+{
+    const int cellSize = 8192;
+    const int markerHeight = 0;
+
+    // Move marker to center of cell.
+    int x = (mCoordinates.getX() * cellSize) + (cellSize / 2);
+    int y = (mCoordinates.getY() * cellSize) + (cellSize / 2);
+    mMarkerNode->setPosition(osg::Vec3f(x, y, markerHeight));
+}
+
+CSVRender::CellMarker::CellMarker(
+    osg::Group *cellNode,
+    const CSMWorld::CellCoordinates& coordinates,
+    const bool cellExists
+) : mCellNode(cellNode),
+    mCoordinates(coordinates),
+    mExists(cellExists)
+{
+    // Set up node for cell marker.
+    mMarkerNode = new osg::AutoTransform();
+    mMarkerNode->setAutoRotateMode(osg::AutoTransform::ROTATE_TO_SCREEN);
+    mMarkerNode->setAutoScaleToScreen(true);
+    mMarkerNode->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+    mMarkerNode->getOrCreateStateSet()->setRenderBinDetails(osg::StateSet::TRANSPARENT_BIN + 1, "RenderBin");
+
+    mMarkerNode->setUserData(new CellMarkerTag(this));
+    mMarkerNode->setNodeMask(Mask_CellMarker);
+
+    mCellNode->addChild(mMarkerNode);
+
+    buildMarker();
+    positionMarker();
+}
+
+CSVRender::CellMarker::~CellMarker()
+{
+    mCellNode->removeChild(mMarkerNode);
+}
diff --git a/apps/opencs/view/render/cellmarker.hpp b/apps/opencs/view/render/cellmarker.hpp
new file mode 100644
index 000000000..4246b20b8
--- /dev/null
+++ b/apps/opencs/view/render/cellmarker.hpp
@@ -0,0 +1,68 @@
+#ifndef OPENCS_VIEW_CELLMARKER_H
+#define OPENCS_VIEW_CELLMARKER_H
+
+#include "tagbase.hpp"
+
+#include <osg/ref_ptr>
+
+#include "../../model/world/cellcoordinates.hpp"
+
+namespace osg
+{
+    class AutoTransform;
+    class Group;
+}
+
+namespace CSVRender
+{
+    class CellMarker;
+
+    class CellMarkerTag : public TagBase
+    {
+        private:
+
+            CellMarker *mMarker;
+
+        public:
+
+            CellMarkerTag(CellMarker *marker);
+
+            CellMarker *getCellMarker() const;
+    };
+
+    /// \brief Marker to display cell coordinates.
+    class CellMarker
+    {
+        private:
+
+            osg::Group* mCellNode;
+            osg::ref_ptr<osg::AutoTransform> mMarkerNode;
+            CSMWorld::CellCoordinates mCoordinates;
+            bool mExists;
+
+            // Not implemented.
+            CellMarker(const CellMarker&);
+            CellMarker& operator=(const CellMarker&);
+
+            /// \brief Build marker containing cell's coordinates.
+            void buildMarker();
+
+            /// \brief Position marker at center of cell.
+            void positionMarker();
+
+        public:
+
+            /// \brief Constructor.
+            /// \param cellNode Cell to create marker for.
+            /// \param coordinates Coordinates of cell.
+            /// \param cellExists Whether or not cell exists.
+            CellMarker(
+                osg::Group *cellNode,
+                const CSMWorld::CellCoordinates& coordinates,
+                const bool cellExists);
+
+            ~CellMarker();
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/cellwater.cpp b/apps/opencs/view/render/cellwater.cpp
new file mode 100644
index 000000000..15ea15cc4
--- /dev/null
+++ b/apps/opencs/view/render/cellwater.cpp
@@ -0,0 +1,177 @@
+#include "cellwater.hpp"
+
+#include <osg/Geode>
+#include <osg/Geometry>
+#include <osg/Group>
+#include <osg/PositionAttitudeTransform>
+
+#include <components/esm/loadland.hpp>
+#include <components/fallback/fallback.hpp>
+#include <components/misc/stringops.hpp>
+#include <components/resource/imagemanager.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/sceneutil/waterutil.hpp>
+
+#include "../../model/world/cell.hpp"
+#include "../../model/world/cellcoordinates.hpp"
+#include "../../model/world/data.hpp"
+
+#include "mask.hpp"
+
+namespace CSVRender
+{
+    const int CellWater::CellSize = ESM::Land::REAL_SIZE;
+
+    CellWater::CellWater(CSMWorld::Data& data, osg::Group* cellNode, const std::string& id,
+        const CSMWorld::CellCoordinates& cellCoords)
+        : mData(data)
+        , mId(id)
+        , mParentNode(cellNode)
+        , mWaterTransform(0)
+        , mWaterNode(0)
+        , mWaterGeometry(0)
+        , mDeleted(false)
+        , mExterior(false)
+        , mHasWater(false)
+    {
+        mWaterTransform = new osg::PositionAttitudeTransform();
+        mWaterTransform->setPosition(osg::Vec3f(cellCoords.getX() * CellSize + CellSize / 2.f,
+            cellCoords.getY() * CellSize + CellSize / 2.f, 0));
+
+        mWaterTransform->setNodeMask(Mask_Water);
+        mParentNode->addChild(mWaterTransform);
+
+        mWaterNode = new osg::Geode();
+        mWaterTransform->addChild(mWaterNode);
+
+        int cellIndex = mData.getCells().searchId(mId);
+        if (cellIndex > -1)
+        {
+            updateCellData(mData.getCells().getRecord(cellIndex));
+        }
+
+        // Keep water existence/height up to date
+        QAbstractItemModel* cells = mData.getTableModel(CSMWorld::UniversalId::Type_Cells);
+        connect(cells, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)),
+            this, SLOT(cellDataChanged(const QModelIndex&, const QModelIndex&)));
+    }
+
+    CellWater::~CellWater()
+    {
+        mParentNode->removeChild(mWaterTransform);
+    }
+
+    void CellWater::updateCellData(const CSMWorld::Record<CSMWorld::Cell>& cellRecord)
+    {
+        mDeleted = cellRecord.isDeleted();
+        if (!mDeleted)
+        {
+            const CSMWorld::Cell& cell = cellRecord.get();
+
+            if (mExterior != cell.isExterior() || mHasWater != cell.hasWater())
+            {
+                mExterior = cellRecord.get().isExterior();
+                mHasWater = cellRecord.get().hasWater();
+
+                recreate();
+            }
+
+            float waterHeight = -1;
+            if (!mExterior)
+            {
+                waterHeight = cellRecord.get().mWater;
+            }
+
+            osg::Vec3d pos = mWaterTransform->getPosition();
+            pos.z() = waterHeight;
+            mWaterTransform->setPosition(pos);
+        }
+        else
+        {
+            recreate();
+        }
+    }
+
+    void CellWater::cellDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
+    {
+        const CSMWorld::Collection<CSMWorld::Cell>& cells = mData.getCells();
+
+        int rowStart = -1;
+        int rowEnd = -1;
+
+        if (topLeft.parent().isValid())
+        {
+            rowStart = topLeft.parent().row();
+            rowEnd = bottomRight.parent().row();
+        }
+        else
+        {
+            rowStart = topLeft.row();
+            rowEnd = bottomRight.row();
+        }
+
+        for (int row = rowStart; row <= rowEnd; ++row)
+        {
+            const CSMWorld::Record<CSMWorld::Cell>& cellRecord = cells.getRecord(row);
+
+            if (Misc::StringUtils::lowerCase(cellRecord.get().mId) == mId)
+                updateCellData(cellRecord);
+        }
+    }
+
+    void CellWater::recreate()
+    {
+        const int InteriorScalar = 20;
+        const int SegmentsPerCell = 1;
+        const int TextureRepeatsPerCell = 6;
+
+        const float Alpha = 0.5f;
+
+        const int RenderBin = osg::StateSet::TRANSPARENT_BIN - 1;
+
+        if (mWaterGeometry)
+        {
+            mWaterNode->removeDrawable(mWaterGeometry);
+            mWaterGeometry = 0;
+        }
+
+        if (mDeleted || !mHasWater)
+            return;
+
+        float size;
+        int segments;
+        float textureRepeats;
+
+        if (mExterior)
+        {
+            size = CellSize;
+            segments = SegmentsPerCell;
+            textureRepeats = TextureRepeatsPerCell;
+        }
+        else
+        {
+            size = CellSize * InteriorScalar;
+            segments = SegmentsPerCell * InteriorScalar;
+            textureRepeats = TextureRepeatsPerCell * InteriorScalar;
+        }
+
+        mWaterGeometry = SceneUtil::createWaterGeometry(size, segments, textureRepeats);
+        mWaterGeometry->setStateSet(SceneUtil::createSimpleWaterStateSet(Alpha, RenderBin));
+
+        // Add water texture
+        std::string textureName = mData.getFallbackMap()->getFallbackString("Water_SurfaceTexture");
+        textureName = "textures/water/" + textureName + "00.dds";
+
+        Resource::ImageManager* imageManager = mData.getResourceSystem()->getImageManager();
+
+        osg::ref_ptr<osg::Texture2D> waterTexture = new osg::Texture2D();
+        waterTexture->setImage(imageManager->getImage(textureName));
+        waterTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+        waterTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+
+        mWaterGeometry->getStateSet()->setTextureAttributeAndModes(0, waterTexture, osg::StateAttribute::ON);
+
+
+        mWaterNode->addDrawable(mWaterGeometry);
+    }
+}
diff --git a/apps/opencs/view/render/cellwater.hpp b/apps/opencs/view/render/cellwater.hpp
new file mode 100644
index 000000000..d2ed9b458
--- /dev/null
+++ b/apps/opencs/view/render/cellwater.hpp
@@ -0,0 +1,70 @@
+#ifndef CSV_RENDER_CELLWATER_H
+#define CSV_RENDER_CELLWATER_H
+
+#include <string>
+
+#include <osg/ref_ptr>
+
+#include <QObject>
+#include <QModelIndex>
+
+#include "../../model/world/record.hpp"
+
+namespace osg
+{
+    class Geode;
+    class Geometry;
+    class Group;
+    class PositionAttitudeTransform;
+}
+
+namespace CSMWorld
+{
+    struct Cell;
+    class CellCoordinates;
+    class Data;
+}
+
+namespace CSVRender
+{
+    /// For exterior cells, this adds a patch of water to fit the size of the cell. For interior cells with water, this
+    /// adds a large patch of water much larger than the typical size of a cell.
+    class CellWater : public QObject
+    {
+            Q_OBJECT
+
+        public:
+
+            CellWater(CSMWorld::Data& data, osg::Group* cellNode, const std::string& id,
+                const CSMWorld::CellCoordinates& cellCoords);
+
+            ~CellWater();
+
+            void updateCellData(const CSMWorld::Record<CSMWorld::Cell>& cellRecord);
+
+        private slots:
+
+            void cellDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+        private:
+
+            void recreate();
+
+            static const int CellSize;
+
+            CSMWorld::Data& mData;
+            std::string mId;
+
+            osg::Group* mParentNode;
+
+            osg::ref_ptr<osg::PositionAttitudeTransform> mWaterTransform;
+            osg::ref_ptr<osg::Geode> mWaterNode;
+            osg::ref_ptr<osg::Geometry> mWaterGeometry;
+
+            bool mDeleted;
+            bool mExterior;
+            bool mHasWater;
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/editmode.cpp b/apps/opencs/view/render/editmode.cpp
index b325e31fb..5f0852c90 100644
--- a/apps/opencs/view/render/editmode.cpp
+++ b/apps/opencs/view/render/editmode.cpp
@@ -29,37 +29,37 @@ void CSVRender::EditMode::setEditLock (bool locked)
 
 }
 
-void CSVRender::EditMode::primaryEditPressed (osg::ref_ptr<TagBase> tag) {}
+void CSVRender::EditMode::primaryEditPressed (const WorldspaceHitResult& hit) {}
 
-void CSVRender::EditMode::secondaryEditPressed (osg::ref_ptr<TagBase> tag) {}
+void CSVRender::EditMode::secondaryEditPressed (const WorldspaceHitResult& hit) {}
 
-void CSVRender::EditMode::primarySelectPressed (osg::ref_ptr<TagBase> tag) {}
+void CSVRender::EditMode::primarySelectPressed (const WorldspaceHitResult& hit) {}
 
-void CSVRender::EditMode::secondarySelectPressed (osg::ref_ptr<TagBase> tag) {}
+void CSVRender::EditMode::secondarySelectPressed (const WorldspaceHitResult& hit) {}
 
-bool CSVRender::EditMode::primaryEditStartDrag (osg::ref_ptr<TagBase> tag)
+bool CSVRender::EditMode::primaryEditStartDrag (const QPoint& pos)
 {
     return false;
 }
 
-bool CSVRender::EditMode::secondaryEditStartDrag (osg::ref_ptr<TagBase> tag)
+bool CSVRender::EditMode::secondaryEditStartDrag (const QPoint& pos)
 {
     return false;
 }
 
-bool CSVRender::EditMode::primarySelectStartDrag (osg::ref_ptr<TagBase> tag)
+bool CSVRender::EditMode::primarySelectStartDrag (const QPoint& pos)
 {
     return false;
 }
 
-bool CSVRender::EditMode::secondarySelectStartDrag (osg::ref_ptr<TagBase> tag)
+bool CSVRender::EditMode::secondarySelectStartDrag (const QPoint& pos)
 {
     return false;
 }
 
-void CSVRender::EditMode::drag (int diffX, int diffY, double speedFactor) {}
+void CSVRender::EditMode::drag (const QPoint& pos, int diffX, int diffY, double speedFactor) {}
 
-void CSVRender::EditMode::dragCompleted() {}
+void CSVRender::EditMode::dragCompleted(const QPoint& pos) {}
 
 void CSVRender::EditMode::dragAborted() {}
 
@@ -67,6 +67,11 @@ void CSVRender::EditMode::dragWheel (int diff, double speedFactor) {}
 
 void CSVRender::EditMode::dragEnterEvent (QDragEnterEvent *event) {}
 
-void CSVRender::EditMode::dropEvent (QDropEvent* event) {}
+void CSVRender::EditMode::dropEvent (QDropEvent *event) {}
 
 void CSVRender::EditMode::dragMoveEvent (QDragMoveEvent *event) {}
+
+int CSVRender::EditMode::getSubMode() const
+{
+    return -1;
+}
diff --git a/apps/opencs/view/render/editmode.hpp b/apps/opencs/view/render/editmode.hpp
index 3ba97cf00..f9b7027f9 100644
--- a/apps/opencs/view/render/editmode.hpp
+++ b/apps/opencs/view/render/editmode.hpp
@@ -8,10 +8,12 @@
 class QDragEnterEvent;
 class QDropEvent;
 class QDragMoveEvent;
+class QPoint;
 
 namespace CSVRender
 {
     class WorldspaceWidget;
+    struct WorldspaceHitResult;
     class TagBase;
 
     class EditMode : public CSVWidget::ModeButton
@@ -38,42 +40,42 @@ namespace CSVRender
             virtual void setEditLock (bool locked);
 
             /// Default-implementation: Ignored.
-            virtual void primaryEditPressed (osg::ref_ptr<TagBase> tag);
+            virtual void primaryEditPressed (const WorldspaceHitResult& hit);
 
             /// Default-implementation: Ignored.
-            virtual void secondaryEditPressed (osg::ref_ptr<TagBase> tag);
+            virtual void secondaryEditPressed (const WorldspaceHitResult& hit);
 
             /// Default-implementation: Ignored.
-            virtual void primarySelectPressed (osg::ref_ptr<TagBase> tag);
+            virtual void primarySelectPressed (const WorldspaceHitResult& hit);
 
             /// Default-implementation: Ignored.
-            virtual void secondarySelectPressed (osg::ref_ptr<TagBase> tag);
+            virtual void secondarySelectPressed (const WorldspaceHitResult& hit);
 
             /// Default-implementation: ignore and return false
             ///
             /// \return Drag accepted?
-            virtual bool primaryEditStartDrag (osg::ref_ptr<TagBase> tag);
+            virtual bool primaryEditStartDrag (const QPoint& pos);
 
             /// Default-implementation: ignore and return false
             ///
             /// \return Drag accepted?
-            virtual bool secondaryEditStartDrag (osg::ref_ptr<TagBase> tag);
+            virtual bool secondaryEditStartDrag (const QPoint& pos);
 
             /// Default-implementation: ignore and return false
             ///
             /// \return Drag accepted?
-            virtual bool primarySelectStartDrag (osg::ref_ptr<TagBase> tag);
+            virtual bool primarySelectStartDrag (const QPoint& pos);
 
             /// Default-implementation: ignore and return false
             ///
             /// \return Drag accepted?
-            virtual bool secondarySelectStartDrag (osg::ref_ptr<TagBase> tag);
+            virtual bool secondarySelectStartDrag (const QPoint& pos);
 
             /// Default-implementation: ignored
-            virtual void drag (int diffX, int diffY, double speedFactor);
+            virtual void drag (const QPoint& pos, int diffX, int diffY, double speedFactor);
 
             /// Default-implementation: ignored
-            virtual void dragCompleted();
+            virtual void dragCompleted(const QPoint& pos);
 
             /// Default-implementation: ignored
             ///
@@ -88,10 +90,13 @@ namespace CSVRender
             virtual void dragEnterEvent (QDragEnterEvent *event);
 
             /// Default-implementation: ignored
-            virtual void dropEvent (QDropEvent* event);
+            virtual void dropEvent (QDropEvent *event);
 
             /// Default-implementation: ignored
             virtual void dragMoveEvent (QDragMoveEvent *event);
+
+            /// Default: return -1
+            virtual int getSubMode() const;
     };
 }
 
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 4b6b2e41f..3373daa4a 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -2,12 +2,14 @@
 #include "instancemode.hpp"
 
 #include <QDragEnterEvent>
+#include <QPoint>
 
 #include "../../model/prefs/state.hpp"
 
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/idtree.hpp"
 #include "../../model/world/commands.hpp"
+#include "../../model/world/commandmacro.hpp"
 
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetoolmode.hpp"
@@ -18,10 +20,81 @@
 #include "worldspacewidget.hpp"
 #include "pagedworldspacewidget.hpp"
 #include "instanceselectionmode.hpp"
+#include "instancemovemode.hpp"
+
+int CSVRender::InstanceMode::getSubModeFromId (const std::string& id) const
+{
+    return id=="move" ? 0 : (id=="rotate" ? 1 : 2);
+}
+
+osg::Vec3f CSVRender::InstanceMode::quatToEuler(const osg::Quat& rot) const
+{
+    const float Pi = 3.14159265f;
+
+    float x, y, z;
+    float test = 2 * (rot.w() * rot.y() + rot.x() * rot.z());
+
+    if (std::abs(test) >= 1.f)
+    {
+        x = atan2(rot.x(), rot.w());
+        y = (test > 0) ? (Pi / 2) : (-Pi / 2);
+        z = 0;
+    }
+    else
+    {
+        x = std::atan2(2 * (rot.w() * rot.x() - rot.y() * rot.z()), 1 - 2 * (rot.x() * rot.x() + rot.y() * rot.y()));
+        y = std::asin(test);
+        z = std::atan2(2 * (rot.w() * rot.z() - rot.x() * rot.y()), 1 - 2 * (rot.y() * rot.y() + rot.z() * rot.z()));
+    }
+
+    return osg::Vec3f(-x, -y, -z);
+}
+
+osg::Quat CSVRender::InstanceMode::eulerToQuat(const osg::Vec3f& euler) const
+{
+    osg::Quat xr = osg::Quat(-euler[0], osg::Vec3f(1,0,0));
+    osg::Quat yr = osg::Quat(-euler[1], osg::Vec3f(0,1,0));
+    osg::Quat zr = osg::Quat(-euler[2], osg::Vec3f(0,0,1));
+
+    return zr * yr * xr;
+}
+
+osg::Vec3f CSVRender::InstanceMode::getSelectionCenter(const std::vector<osg::ref_ptr<TagBase> >& selection) const
+{
+    osg::Vec3f center = osg::Vec3f(0, 0, 0);
+    int objectCount = 0;
+
+    for (std::vector<osg::ref_ptr<TagBase> >::const_iterator iter (selection.begin()); iter!=selection.end(); ++iter)
+    {
+        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
+        {
+            const ESM::Position& position = objectTag->mObject->getPosition();
+            center += osg::Vec3f(position.pos[0], position.pos[1], position.pos[2]);
+
+            ++objectCount;
+        }
+    }
+
+    if (objectCount > 0)
+        center /= objectCount;
+
+    return center;
+}
+
+osg::Vec3f CSVRender::InstanceMode::getScreenCoords(const osg::Vec3f& pos)
+{
+    osg::Matrix viewMatrix = getWorldspaceWidget().getCamera()->getViewMatrix();
+    osg::Matrix projMatrix = getWorldspaceWidget().getCamera()->getProjectionMatrix();
+    osg::Matrix windowMatrix = getWorldspaceWidget().getCamera()->getViewport()->computeWindowMatrix();
+    osg::Matrix combined = viewMatrix * projMatrix * windowMatrix;
+
+    return pos * combined;
+}
 
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
-: EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference, "Instance editing",
-  parent), mSubMode (0), mSelectionMode (0)
+: EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference | Mask_Terrain, "Instance editing",
+  parent), mSubMode (0), mSubModeId ("move"), mSelectionMode (0), mDragMode (DragMode_None),
+  mDragAxis (-1), mLocked (false), mUnitScaleDist(1)
 {
 }
 
@@ -30,37 +103,48 @@ void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
     if (!mSubMode)
     {
         mSubMode = new CSVWidget::SceneToolMode (toolbar, "Edit Sub-Mode");
-        mSubMode->addButton (":placeholder", "move",
-            "Move selected instances"
-            "<ul><li>Use primary edit to move instances around freely</li>"
-            "<li>Use secondary edit to move instances around within the grid</li>"
-            "</ul>"
-            "<font color=Red>Not implemented yet</font color>");
+        mSubMode->addButton (new InstanceMoveMode (this), "move");
         mSubMode->addButton (":placeholder", "rotate",
             "Rotate selected instances"
-            "<ul><li>Use primary edit to rotate instances freely</li>"
-            "<li>Use secondary edit to rotate instances within the grid</li>"
+            "<ul><li>Use {scene-edit-primary} to rotate instances freely</li>"
+            "<li>Use {scene-edit-secondary} to rotate instances within the grid</li>"
+            "<li>The center of the view acts as the axis of rotation</li>"
             "</ul>"
-            "<font color=Red>Not implemented yet</font color>");
+            "<font color=Red>Grid rotate not implemented yet</font color>");
         mSubMode->addButton (":placeholder", "scale",
             "Scale selected instances"
-            "<ul><li>Use primary edit to scale instances freely</li>"
-            "<li>Use secondary edit to scale instances along the grid</li>"
+            "<ul><li>Use {scene-edit-primary} to scale instances freely</li>"
+            "<li>Use {scene-edit-secondary} to scale instances along the grid</li>"
+            "<li>The scaling rate is based on how close the start of a drag is to the center of the screen</li>"
             "</ul>"
-            "<font color=Red>Not implemented yet</font color>");
+            "<font color=Red>Grid scale not implemented yet</font color>");
+
+        mSubMode->setButton (mSubModeId);
+
+        connect (mSubMode, SIGNAL (modeChanged (const std::string&)),
+            this, SLOT (subModeChanged (const std::string&)));
     }
 
     if (!mSelectionMode)
         mSelectionMode = new InstanceSelectionMode (toolbar, getWorldspaceWidget());
 
+    mDragMode = DragMode_None;
+
     EditMode::activate (toolbar);
 
     toolbar->addTool (mSubMode);
     toolbar->addTool (mSelectionMode);
+
+    std::string subMode = mSubMode->getCurrentId();
+
+    getWorldspaceWidget().setSubMode (getSubModeFromId (subMode), Mask_Reference);
 }
 
 void CSVRender::InstanceMode::deactivate (CSVWidget::SceneToolbar *toolbar)
 {
+    mDragMode = DragMode_None;
+    getWorldspaceWidget().reset (Mask_Reference);
+
     if (mSelectionMode)
     {
         toolbar->removeTool (mSelectionMode);
@@ -78,25 +162,33 @@ void CSVRender::InstanceMode::deactivate (CSVWidget::SceneToolbar *toolbar)
     EditMode::deactivate (toolbar);
 }
 
-void CSVRender::InstanceMode::primaryEditPressed (osg::ref_ptr<TagBase> tag)
+void CSVRender::InstanceMode::setEditLock (bool locked)
+{
+    mLocked = locked;
+
+    if (mLocked)
+        getWorldspaceWidget().abortDrag();
+}
+
+void CSVRender::InstanceMode::primaryEditPressed (const WorldspaceHitResult& hit)
 {
     if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
-        primarySelectPressed (tag);
+        primarySelectPressed (hit);
 }
 
-void CSVRender::InstanceMode::secondaryEditPressed (osg::ref_ptr<TagBase> tag)
+void CSVRender::InstanceMode::secondaryEditPressed (const WorldspaceHitResult& hit)
 {
     if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
-        secondarySelectPressed (tag);
+        secondarySelectPressed (hit);
 }
 
-void CSVRender::InstanceMode::primarySelectPressed (osg::ref_ptr<TagBase> tag)
+void CSVRender::InstanceMode::primarySelectPressed (const WorldspaceHitResult& hit)
 {
     getWorldspaceWidget().clearSelection (Mask_Reference);
 
-    if (tag)
+    if (hit.tag)
     {
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (tag.get()))
+        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (hit.tag.get()))
         {
             // hit an Object, select it
             CSVRender::Object* object = objectTag->mObject;
@@ -106,11 +198,11 @@ void CSVRender::InstanceMode::primarySelectPressed (osg::ref_ptr<TagBase> tag)
     }
 }
 
-void CSVRender::InstanceMode::secondarySelectPressed (osg::ref_ptr<TagBase> tag)
+void CSVRender::InstanceMode::secondarySelectPressed (const WorldspaceHitResult& hit)
 {
-    if (tag)
+    if (hit.tag)
     {
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (tag.get()))
+        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (hit.tag.get()))
         {
             // hit an Object, toggle its selection state
             CSVRender::Object* object = objectTag->mObject;
@@ -120,6 +212,313 @@ void CSVRender::InstanceMode::secondarySelectPressed (osg::ref_ptr<TagBase> tag)
     }
 }
 
+bool CSVRender::InstanceMode::primaryEditStartDrag (const QPoint& pos)
+{
+    if (mDragMode!=DragMode_None || mLocked)
+        return false;
+
+    WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+
+    std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Reference);
+    if (selection.empty())
+    {
+        // Only change selection at the start of drag if no object is already selected
+        if (hit.tag && CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
+        {
+            getWorldspaceWidget().clearSelection (Mask_Reference);
+            if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (hit.tag.get()))
+            {
+                CSVRender::Object* object = objectTag->mObject;
+                object->setSelected (true);
+            }
+        }
+
+        selection = getWorldspaceWidget().getSelection (Mask_Reference);
+        if (selection.empty())
+            return false;
+    }
+
+    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
+        iter!=selection.end(); ++iter)
+    {
+        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
+        {
+            if (mSubModeId == "move")
+            {
+                objectTag->mObject->setEdited (Object::Override_Position);
+                mDragMode = DragMode_Move;
+            }
+            else if (mSubModeId == "rotate")
+            {
+                objectTag->mObject->setEdited (Object::Override_Rotation);
+                mDragMode = DragMode_Rotate;
+            }
+            else if (mSubModeId == "scale")
+            {
+                objectTag->mObject->setEdited (Object::Override_Scale);
+                mDragMode = DragMode_Scale;
+
+                // Calculate scale factor
+                std::vector<osg::ref_ptr<TagBase> > editedSelection = getWorldspaceWidget().getEdited (Mask_Reference);
+                osg::Vec3f center = getScreenCoords(getSelectionCenter(editedSelection));
+
+                int widgetHeight = getWorldspaceWidget().height();
+
+                float dx = pos.x() - center.x();
+                float dy = (widgetHeight - pos.y()) - center.y();
+
+                mUnitScaleDist = std::sqrt(dx * dx + dy * dy);
+            }
+        }
+    }
+
+    if (CSVRender::ObjectMarkerTag *objectTag = dynamic_cast<CSVRender::ObjectMarkerTag *> (hit.tag.get()))
+    {
+        mDragAxis = objectTag->mAxis;
+    }
+    else
+        mDragAxis = -1;
+
+    return true;
+}
+
+bool CSVRender::InstanceMode::secondaryEditStartDrag (const QPoint& pos)
+{
+    if (mLocked)
+        return false;
+
+    return false;
+}
+
+void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, double speedFactor)
+{
+    osg::Vec3f offset;
+    osg::Quat rotation;
+
+    std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getEdited (Mask_Reference);
+
+    if (mDragMode == DragMode_Move)
+    {
+        osg::Vec3f eye, centre, up;
+        getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, centre, up);
+
+        if (diffY)
+        {
+            offset += up * diffY * speedFactor;
+        }
+        if (diffX)
+        {
+            offset += ((centre-eye) ^ up) * diffX * speedFactor;
+        }
+
+        if (mDragAxis!=-1)
+        {
+            for (int i=0; i<3; ++i)
+            {
+                if (i!=mDragAxis)
+                    offset[i] = 0;
+            }
+        }
+    }
+    else if (mDragMode == DragMode_Rotate)
+    {
+        osg::Vec3f eye, centre, up;
+        getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, centre, up);
+
+        float angle;
+        osg::Vec3f axis;
+
+        if (mDragAxis == -1)
+        {
+            // Free rotate
+            float rotationFactor = CSMPrefs::get()["3D Scene Input"]["rotate-factor"].toDouble() * speedFactor;
+
+            osg::Quat cameraRotation = getWorldspaceWidget().getCamera()->getInverseViewMatrix().getRotate();
+
+            osg::Vec3f camForward = centre - eye;
+            osg::Vec3f screenDir = cameraRotation * osg::Vec3f(diffX, diffY, 0);
+            screenDir.normalize();
+
+            angle = std::sqrt(diffX*diffX + diffY*diffY) * rotationFactor;
+            axis = screenDir ^ camForward;
+        }
+        else
+        {
+            // Global axis rotation
+            osg::Vec3f camBack = eye - centre;
+
+            for (int i = 0; i < 3; ++i)
+            {
+                if (i == mDragAxis)
+                    axis[i] = 1;
+                else
+                    axis[i] = 0;
+            }
+
+            // Flip axis if facing opposite side
+            if (camBack * axis < 0)
+                axis *= -1;
+
+            // Convert coordinate system
+            osg::Vec3f screenCenter = getScreenCoords(getSelectionCenter(selection));
+
+            int widgetHeight = getWorldspaceWidget().height();
+
+            float newX = pos.x() - screenCenter.x();
+            float newY = (widgetHeight - pos.y()) - screenCenter.y();
+
+            float oldX = newX - diffX;
+            float oldY = newY - diffY; // diffY appears to already be flipped
+
+            osg::Vec3f oldVec = osg::Vec3f(oldX, oldY, 0);
+            oldVec.normalize();
+
+            osg::Vec3f newVec = osg::Vec3f(newX, newY, 0);
+            newVec.normalize();
+
+            // Find angle and axis of rotation
+            angle = std::acos(oldVec * newVec) * speedFactor;
+            if (((oldVec ^ newVec) * camBack < 0) ^ (camBack.z() < 0))
+                angle *= -1;
+        }
+
+        rotation = osg::Quat(angle, axis);
+    }
+    else if (mDragMode == DragMode_Scale)
+    {
+        osg::Vec3f center = getScreenCoords(getSelectionCenter(selection));
+
+        // Calculate scaling distance/rate
+        int widgetHeight = getWorldspaceWidget().height();
+
+        float dx = pos.x() - center.x();
+        float dy = (widgetHeight - pos.y()) - center.y();
+
+        float dist = std::sqrt(dx * dx + dy * dy);
+        float scale = dist / mUnitScaleDist;
+
+        // Only uniform scaling is currently supported
+        offset = osg::Vec3f(scale, scale, scale);
+    }
+
+    // Apply
+    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin()); iter!=selection.end(); ++iter)
+    {
+        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
+        {
+            if (mDragMode == DragMode_Move)
+            {
+                ESM::Position position = objectTag->mObject->getPosition();
+                for (int i=0; i<3; ++i)
+                {
+                    position.pos[i] += offset[i];
+                }
+
+                objectTag->mObject->setPosition(position.pos);
+            }
+            else if (mDragMode == DragMode_Rotate)
+            {
+                ESM::Position position = objectTag->mObject->getPosition();
+
+                osg::Quat currentRot = eulerToQuat(osg::Vec3f(position.rot[0], position.rot[1], position.rot[2]));
+                osg::Quat combined = currentRot * rotation;
+
+                osg::Vec3f euler = quatToEuler(combined);
+                // There appears to be a very rare rounding error that can cause asin to return NaN
+                if (!euler.isNaN())
+                {
+                    position.rot[0] = euler.x();
+                    position.rot[1] = euler.y();
+                    position.rot[2] = euler.z();
+                }
+
+                objectTag->mObject->setRotation(position.rot);
+            }
+            else if (mDragMode == DragMode_Scale)
+            {
+                // Reset scale
+                objectTag->mObject->setEdited(0);
+                objectTag->mObject->setEdited(Object::Override_Scale);
+
+                float scale = objectTag->mObject->getScale();
+                scale *= offset.x();
+
+                objectTag->mObject->setScale (scale);
+            }
+        }
+    }
+}
+
+void CSVRender::InstanceMode::dragCompleted(const QPoint& pos)
+{
+    std::vector<osg::ref_ptr<TagBase> > selection =
+        getWorldspaceWidget().getEdited (Mask_Reference);
+
+    QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+
+    QString description;
+
+    switch (mDragMode)
+    {
+        case DragMode_Move: description = "Move Instances"; break;
+        case DragMode_Rotate: description = "Rotate Instances"; break;
+        case DragMode_Scale: description = "Scale Instances"; break;
+
+        case DragMode_None: break;
+    }
+
+
+    CSMWorld::CommandMacro macro (undoStack, description);
+
+    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
+        iter!=selection.end(); ++iter)
+    {
+        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
+        {
+            objectTag->mObject->apply (macro);
+        }
+    }
+
+    mDragMode = DragMode_None;
+}
+
+void CSVRender::InstanceMode::dragAborted()
+{
+    getWorldspaceWidget().reset (Mask_Reference);
+    mDragMode = DragMode_None;
+}
+
+void CSVRender::InstanceMode::dragWheel (int diff, double speedFactor)
+{
+    if (mDragMode==DragMode_Move)
+    {
+        osg::Vec3f eye;
+        osg::Vec3f centre;
+        osg::Vec3f up;
+
+        getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, centre, up);
+
+        osg::Vec3f offset = centre - eye;
+        offset.normalize();
+        offset *= diff * speedFactor;
+
+        std::vector<osg::ref_ptr<TagBase> > selection =
+            getWorldspaceWidget().getEdited (Mask_Reference);
+
+        for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
+            iter!=selection.end(); ++iter)
+        {
+            if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
+            {
+                ESM::Position position = objectTag->mObject->getPosition();
+                for (int i=0; i<3; ++i)
+                    position.pos[i] += offset[i];
+                objectTag->mObject->setPosition (position.pos);
+            }
+        }
+    }
+}
+
 void CSVRender::InstanceMode::dragEnterEvent (QDragEnterEvent *event)
 {
     if (const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData()))
@@ -141,9 +540,9 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
         if (!mime->fromDocument (document))
             return;
 
-        osg::Vec3f insertPoint = getWorldspaceWidget().getIntersectionPoint (event->pos());
+        WorldspaceHitResult hit = getWorldspaceWidget().mousePick (event->pos(), getWorldspaceWidget().getInteractionMask());
 
-        std::string cellId = getWorldspaceWidget().getCellId (insertPoint);
+        std::string cellId = getWorldspaceWidget().getCellId (hit.worldPos);
 
         CSMWorld::IdTree& cellTable = dynamic_cast<CSMWorld::IdTree&> (
             *document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
@@ -176,8 +575,6 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
                     selection.add (CSMWorld::CellCoordinates::fromId (cellId).first);
                     paged->setCellSelection (selection);
                 }
-
-                noCell = false;
             }
         }
         else if (CSVRender::PagedWorldspaceWidget *paged =
@@ -220,34 +617,16 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
                  createCommand->addValue (referencesTable.findColumnIndex (
                      CSMWorld::Columns::ColumnId_Cell), QString::fromUtf8 (cellId.c_str()));
                  createCommand->addValue (referencesTable.findColumnIndex (
-                     CSMWorld::Columns::ColumnId_PositionXPos), insertPoint.x());
+                     CSMWorld::Columns::ColumnId_PositionXPos), hit.worldPos.x());
                  createCommand->addValue (referencesTable.findColumnIndex (
-                     CSMWorld::Columns::ColumnId_PositionYPos), insertPoint.y());
+                     CSMWorld::Columns::ColumnId_PositionYPos), hit.worldPos.y());
                  createCommand->addValue (referencesTable.findColumnIndex (
-                     CSMWorld::Columns::ColumnId_PositionZPos), insertPoint.z());
+                     CSMWorld::Columns::ColumnId_PositionZPos), hit.worldPos.z());
                  createCommand->addValue (referencesTable.findColumnIndex (
                      CSMWorld::Columns::ColumnId_ReferenceableId),
                      QString::fromUtf8 (iter->getId().c_str()));
 
-                std::auto_ptr<CSMWorld::ModifyCommand> incrementCommand;
-
-                if (!noCell)
-                {
-                    // increase reference count in cell
-                    QModelIndex countIndex = cellTable.getModelIndex (cellId,
-                        cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_RefNumCounter));
-
-                    int count = cellTable.data (countIndex).toInt();
-
-                    incrementCommand.reset (
-                        new CSMWorld::ModifyCommand (cellTable, countIndex, count+1));
-                }
-
-                document.getUndoStack().beginMacro (createCommand->text());
                 document.getUndoStack().push (createCommand.release());
-                if (incrementCommand.get())
-                    document.getUndoStack().push (incrementCommand.release());
-                document.getUndoStack().endMacro();
 
                 dropped = true;
             }
@@ -256,3 +635,15 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
             event->accept();
     }
 }
+
+int CSVRender::InstanceMode::getSubMode() const
+{
+    return mSubMode ? getSubModeFromId (mSubMode->getCurrentId()) : 0;
+}
+
+void CSVRender::InstanceMode::subModeChanged (const std::string& id)
+{
+    mSubModeId = id;
+    getWorldspaceWidget().abortDrag();
+    getWorldspaceWidget().setSubMode (getSubModeFromId (id), Mask_Reference);
+}
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 78836878a..933cae529 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -1,6 +1,10 @@
 #ifndef CSV_RENDER_INSTANCEMODE_H
 #define CSV_RENDER_INSTANCEMODE_H
 
+#include <osg/ref_ptr>
+#include <osg/Quat>
+#include <osg/Vec3f>
+
 #include "editmode.hpp"
 
 namespace CSVWidget
@@ -10,13 +14,36 @@ namespace CSVWidget
 
 namespace CSVRender
 {
+    class TagBase;
     class InstanceSelectionMode;
 
     class InstanceMode : public EditMode
     {
             Q_OBJECT
+
+            enum DragMode
+            {
+                DragMode_None,
+                DragMode_Move,
+                DragMode_Rotate,
+                DragMode_Scale
+            };
+
             CSVWidget::SceneToolMode *mSubMode;
+            std::string mSubModeId;
             InstanceSelectionMode *mSelectionMode;
+            DragMode mDragMode;
+            int mDragAxis;
+            bool mLocked;
+            float mUnitScaleDist;
+
+            int getSubModeFromId (const std::string& id) const;
+
+            osg::Vec3f quatToEuler(const osg::Quat& quat) const;
+            osg::Quat eulerToQuat(const osg::Vec3f& euler) const;
+
+            osg::Vec3f getSelectionCenter(const std::vector<osg::ref_ptr<TagBase> >& selection) const;
+            osg::Vec3f getScreenCoords(const osg::Vec3f& pos);
 
         public:
 
@@ -26,17 +53,39 @@ namespace CSVRender
 
             virtual void deactivate (CSVWidget::SceneToolbar *toolbar);
 
-            virtual void primaryEditPressed (osg::ref_ptr<TagBase> tag);
+            virtual void setEditLock (bool locked);
+
+            virtual void primaryEditPressed (const WorldspaceHitResult& hit);
+
+            virtual void secondaryEditPressed (const WorldspaceHitResult& hit);
 
-            virtual void secondaryEditPressed (osg::ref_ptr<TagBase> tag);
+            virtual void primarySelectPressed (const WorldspaceHitResult& hit);
 
-            virtual void primarySelectPressed (osg::ref_ptr<TagBase> tag);
+            virtual void secondarySelectPressed (const WorldspaceHitResult& hit);
 
-            virtual void secondarySelectPressed (osg::ref_ptr<TagBase> tag);
+            virtual bool primaryEditStartDrag (const QPoint& pos);
+
+            virtual bool secondaryEditStartDrag (const QPoint& pos);
+
+            virtual void drag (const QPoint& pos, int diffX, int diffY, double speedFactor);
+
+            virtual void dragCompleted(const QPoint& pos);
+
+            /// \note dragAborted will not be called, if the drag is aborted via changing
+            /// editing mode
+            virtual void dragAborted();
+
+            virtual void dragWheel (int diff, double speedFactor);
 
             virtual void dragEnterEvent (QDragEnterEvent *event);
 
-            virtual void dropEvent (QDropEvent* event);
+            virtual void dropEvent (QDropEvent *event);
+
+            virtual int getSubMode() const;
+
+        private slots:
+
+            void subModeChanged (const std::string& id);
     };
 }
 
diff --git a/apps/opencs/view/render/instancemovemode.cpp b/apps/opencs/view/render/instancemovemode.cpp
new file mode 100644
index 000000000..fe58b581b
--- /dev/null
+++ b/apps/opencs/view/render/instancemovemode.cpp
@@ -0,0 +1,12 @@
+
+#include "instancemovemode.hpp"
+
+CSVRender::InstanceMoveMode::InstanceMoveMode (QWidget *parent)
+: ModeButton (QIcon (QPixmap (":placeholder")),
+  "Move selected instances"
+  "<ul><li>Use {scene-edit-primary} to move instances around freely</li>"
+  "<li>Use {scene-edit-secondary} to move instances around within the grid</li>"
+  "</ul>"
+  "<font color=Red>Grid move not implemented yet</font color>",
+  parent)
+{}
diff --git a/apps/opencs/view/render/instancemovemode.hpp b/apps/opencs/view/render/instancemovemode.hpp
new file mode 100644
index 000000000..bd0e28dac
--- /dev/null
+++ b/apps/opencs/view/render/instancemovemode.hpp
@@ -0,0 +1,18 @@
+#ifndef CSV_RENDER_INSTANCEMOVEMODE_H
+#define CSV_RENDER_INSTANCEMOVEMODE_H
+
+#include "../widget/modebutton.hpp"
+
+namespace CSVRender
+{
+    class InstanceMoveMode : public CSVWidget::ModeButton
+    {
+            Q_OBJECT
+
+        public:
+
+            InstanceMoveMode (QWidget *parent = 0);
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/instanceselectionmode.cpp b/apps/opencs/view/render/instanceselectionmode.cpp
index 5c3aaa8d1..bf8ede0eb 100644
--- a/apps/opencs/view/render/instanceselectionmode.cpp
+++ b/apps/opencs/view/render/instanceselectionmode.cpp
@@ -1,4 +1,3 @@
-
 #include "instanceselectionmode.hpp"
 
 #include <QMenu>
@@ -10,84 +9,49 @@
 #include "worldspacewidget.hpp"
 #include "object.hpp"
 
-bool CSVRender::InstanceSelectionMode::createContextMenu (QMenu *menu)
+namespace CSVRender
 {
-    if (menu)
+    InstanceSelectionMode::InstanceSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget)
+        : SelectionMode(parent, worldspaceWidget, Mask_Reference)
     {
-        menu->addAction (mSelectAll);
-        menu->addAction (mDeselectAll);
-        menu->addAction (mSelectSame);
-        menu->addAction (mDeleteSelection);
-    }
+        mSelectSame = new QAction("Extend selection to instances with same object ID", this);
+        mDeleteSelection = new QAction("Delete selected instances", this);
 
-    return true;
-}
+        connect(mSelectSame, SIGNAL(triggered()), this, SLOT(selectSame()));
+        connect(mDeleteSelection, SIGNAL(triggered()), this, SLOT(deleteSelection()));
+    }
 
-CSVRender::InstanceSelectionMode::InstanceSelectionMode (CSVWidget::SceneToolbar *parent,
-    WorldspaceWidget& worldspaceWidget)
-: CSVWidget::SceneToolMode (parent, "Selection Mode"), mWorldspaceWidget (worldspaceWidget)
-{
-    addButton (":placeholder", "cube-centre",
-        "Centred cube"
-        "<ul><li>Drag with primary (make instances the selection) or secondary (invert selection state) select button from the centre of the selection cube outwards</li>"
-        "<li>The selection cube is aligned to the word space axis</li>"
-        "<li>If context selection mode is enabled, a drag with primary/secondary edit not starting on an instance will have the same effect</li>"
-        "</ul>"
-        "<font color=Red>Not implemented yet</font color>");
-    addButton (":placeholder", "cube-corner",
-        "Cube corner to corner"
-        "<ul><li>Drag with primary (make instances the selection) or secondary (invert selection state) select button from one corner of the selection cube to the opposite corner</li>"
-        "<li>The selection cube is aligned to the word space axis</li>"
-        "<li>If context selection mode is enabled, a drag with primary/secondary edit not starting on an instance will have the same effect</li>"
-        "</ul>"
-        "<font color=Red>Not implemented yet</font color>");
-    addButton (":placeholder", "sphere",
-        "Centred sphere"
-        "<ul><li>Drag with primary (make instances the selection) or secondary (invert selection state) select button from the centre of the selection sphere outwards</li>"
-        "<li>If context selection mode is enabled, a drag with primary/secondary edit not starting on an instance will have the same effect</li>"
-        "</ul>"
-        "<font color=Red>Not implemented yet</font color>");
+    bool InstanceSelectionMode::createContextMenu(QMenu* menu)
+    {
+        if (menu)
+        {
+            SelectionMode::createContextMenu(menu);
 
-    mSelectAll = new QAction ("Select all instances", this);
-    mDeselectAll = new QAction ("Clear selection", this);
-    mDeleteSelection = new QAction ("Delete selected instances", this);
-    mSelectSame = new QAction ("Extend selection to instances with same object ID", this);
-    connect (mSelectAll, SIGNAL (triggered ()), this, SLOT (selectAll()));
-    connect (mDeselectAll, SIGNAL (triggered ()), this, SLOT (clearSelection()));
-    connect (mDeleteSelection, SIGNAL (triggered ()), this, SLOT (deleteSelection()));
-    connect (mSelectSame, SIGNAL (triggered ()), this, SLOT (selectSame()));
-}
+            menu->addAction(mSelectSame);
+            menu->addAction(mDeleteSelection);
+        }
 
-void CSVRender::InstanceSelectionMode::selectAll()
-{
-    mWorldspaceWidget.selectAll (Mask_Reference);
-}
+        return true;
+    }
 
-void CSVRender::InstanceSelectionMode::clearSelection()
-{
-    mWorldspaceWidget.clearSelection (Mask_Reference);
-}
+    void InstanceSelectionMode::selectSame()
+    {
+        getWorldspaceWidget().selectAllWithSameParentId(Mask_Reference);
+    }
 
-void CSVRender::InstanceSelectionMode::deleteSelection()
-{
-    std::vector<osg::ref_ptr<TagBase> > selection =
-        mWorldspaceWidget.getSelection (Mask_Reference);
+    void InstanceSelectionMode::deleteSelection()
+    {
+        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection(Mask_Reference);
 
-    CSMWorld::IdTable& referencesTable =
-            dynamic_cast<CSMWorld::IdTable&> (*mWorldspaceWidget.getDocument().getData().
-            getTableModel (CSMWorld::UniversalId::Type_References));
+        CSMWorld::IdTable& referencesTable = dynamic_cast<CSMWorld::IdTable&>(
+            *getWorldspaceWidget().getDocument().getData().getTableModel(CSMWorld::UniversalId::Type_References));
 
-    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
-        iter!=selection.end(); ++iter)
-    {
-        CSMWorld::DeleteCommand *command = new CSMWorld::DeleteCommand (referencesTable,
-            static_cast<ObjectTag *> (iter->get())->mObject->getReferenceId());
+        for (std::vector<osg::ref_ptr<TagBase> >::iterator iter = selection.begin(); iter != selection.end(); ++iter)
+        {
+            CSMWorld::DeleteCommand* command = new CSMWorld::DeleteCommand(referencesTable,
+                static_cast<ObjectTag*>(iter->get())->mObject->getReferenceId());
 
-        mWorldspaceWidget.getDocument().getUndoStack().push (command);
+            getWorldspaceWidget().getDocument().getUndoStack().push(command);
+        }
     }
 }
-
-void CSVRender::InstanceSelectionMode::selectSame()
-{
-    mWorldspaceWidget.selectAllWithSameParentId (Mask_Reference);
-}
diff --git a/apps/opencs/view/render/instanceselectionmode.hpp b/apps/opencs/view/render/instanceselectionmode.hpp
index cac2ca8c2..a590240d9 100644
--- a/apps/opencs/view/render/instanceselectionmode.hpp
+++ b/apps/opencs/view/render/instanceselectionmode.hpp
@@ -1,23 +1,19 @@
 #ifndef CSV_RENDER_INSTANCE_SELECTION_MODE_H
 #define CSV_RENDER_INSTANCE_SELECTION_MODE_H
 
-#include "../widget/scenetoolmode.hpp"
-
-class QAction;
+#include "selectionmode.hpp"
 
 namespace CSVRender
 {
-    class WorldspaceWidget;
-
-    class InstanceSelectionMode : public CSVWidget::SceneToolMode
+    class InstanceSelectionMode : public SelectionMode
     {
             Q_OBJECT
 
-            WorldspaceWidget& mWorldspaceWidget;
-            QAction *mSelectAll;
-            QAction *mDeselectAll;
-            QAction *mDeleteSelection;
-            QAction *mSelectSame;
+        public:
+
+            InstanceSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget);
+
+        protected:
 
             /// Add context menu items to \a menu.
             ///
@@ -25,20 +21,16 @@ namespace CSVRender
             ///
             /// \return Have there been any menu items to be added (if menu is 0 and there
             /// items to be added, the function must return true anyway.
-            virtual bool createContextMenu (QMenu *menu);
+            bool createContextMenu(QMenu* menu);
 
-        public:
+        private:
 
-            InstanceSelectionMode (CSVWidget::SceneToolbar *parent, WorldspaceWidget& worldspaceWidget);
+            QAction* mDeleteSelection;
+            QAction* mSelectSame;
 
         private slots:
 
-            void selectAll();
-
-            void clearSelection();
-
             void deleteSelection();
-
             void selectSame();
     };
 }
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 33939625d..eb90e9db3 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -9,12 +9,18 @@
 #include <osg/ShapeDrawable>
 #include <osg/Shape>
 #include <osg/Geode>
+#include <osg/Geometry>
+#include <osg/PrimitiveSet>
 
 #include <osgFX/Scribe>
 
 #include "../../model/world/data.hpp"
 #include "../../model/world/ref.hpp"
 #include "../../model/world/refidcollection.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/universalid.hpp"
+#include "../../model/world/commandmacro.hpp"
+#include "../../model/world/cellcoordinates.hpp"
 
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/lightutil.hpp>
@@ -23,6 +29,13 @@
 
 #include "mask.hpp"
 
+
+const float CSVRender::Object::MarkerShaftWidth = 30;
+const float CSVRender::Object::MarkerShaftBaseLength = 70;
+const float CSVRender::Object::MarkerHeadWidth = 50;
+const float CSVRender::Object::MarkerHeadLength = 50;
+
+
 namespace
 {
 
@@ -50,6 +63,11 @@ QString CSVRender::ObjectTag::getToolTip (bool hideBasics) const
 }
 
 
+CSVRender::ObjectMarkerTag::ObjectMarkerTag (Object* object, int axis)
+: ObjectTag (object), mAxis (axis)
+{}
+
+
 void CSVRender::Object::clear()
 {
 }
@@ -130,18 +148,20 @@ void CSVRender::Object::adjustTransform()
     if (mReferenceId.empty())
         return;
 
-    const CSMWorld::CellRef& reference = getReference();
+    ESM::Position position = getPosition();
 
     // position
-    mBaseNode->setPosition(mForceBaseToZero ? osg::Vec3() : osg::Vec3f(reference.mPos.pos[0], reference.mPos.pos[1], reference.mPos.pos[2]));
+    mRootNode->setPosition(mForceBaseToZero ? osg::Vec3() : osg::Vec3f(position.pos[0], position.pos[1], position.pos[2]));
 
     // orientation
-    osg::Quat xr (-reference.mPos.rot[0], osg::Vec3f(1,0,0));
-    osg::Quat yr (-reference.mPos.rot[1], osg::Vec3f(0,1,0));
-    osg::Quat zr (-reference.mPos.rot[2], osg::Vec3f(0,0,1));
+    osg::Quat xr (-position.rot[0], osg::Vec3f(1,0,0));
+    osg::Quat yr (-position.rot[1], osg::Vec3f(0,1,0));
+    osg::Quat zr (-position.rot[2], osg::Vec3f(0,0,1));
     mBaseNode->setAttitude(zr*yr*xr);
 
-    mBaseNode->setScale(osg::Vec3(reference.mScale, reference.mScale, reference.mScale));
+    float scale = getScale();
+
+    mBaseNode->setScale(osg::Vec3(scale, scale, scale));
 }
 
 const CSMWorld::CellRef& CSVRender::Object::getReference() const
@@ -152,21 +172,249 @@ const CSMWorld::CellRef& CSVRender::Object::getReference() const
     return mData.getReferences().getRecord (mReferenceId).get();
 }
 
+void CSVRender::Object::updateMarker()
+{
+    for (int i=0; i<3; ++i)
+    {
+        if (mMarker[i])
+        {
+            mRootNode->removeChild (mMarker[i]);
+            mMarker[i] = osg::ref_ptr<osg::Node>();
+        }
+
+        if (mSelected)
+        {
+            if (mSubMode==0)
+            {
+                mMarker[i] = makeMoveOrScaleMarker (i);
+                mMarker[i]->setUserData(new ObjectMarkerTag (this, i));
+
+                mRootNode->addChild (mMarker[i]);
+            }
+            else if (mSubMode==1)
+            {
+                mMarker[i] = makeRotateMarker (i);
+                mMarker[i]->setUserData(new ObjectMarkerTag (this, i));
+
+                mRootNode->addChild (mMarker[i]);
+            }
+            else if (mSubMode==2)
+            {
+                mMarker[i] = makeMoveOrScaleMarker (i);
+                mMarker[i]->setUserData(new ObjectMarkerTag (this, i));
+
+                mRootNode->addChild (mMarker[i]);
+            }
+        }
+    }
+}
+
+osg::ref_ptr<osg::Node> CSVRender::Object::makeMoveOrScaleMarker (int axis)
+{
+    osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
+
+    float shaftLength = MarkerShaftBaseLength + mBaseNode->getBound().radius();
+
+    // shaft
+    osg::Vec3Array *vertices = new osg::Vec3Array;
+
+    for (int i=0; i<2; ++i)
+    {
+        float length = i ? shaftLength : 0;
+
+        vertices->push_back (getMarkerPosition (-MarkerShaftWidth/2, -MarkerShaftWidth/2, length, axis));
+        vertices->push_back (getMarkerPosition (-MarkerShaftWidth/2, MarkerShaftWidth/2, length, axis));
+        vertices->push_back (getMarkerPosition (MarkerShaftWidth/2, MarkerShaftWidth/2, length, axis));
+        vertices->push_back (getMarkerPosition (MarkerShaftWidth/2, -MarkerShaftWidth/2, length, axis));
+    }
+
+    // head backside
+    vertices->push_back (getMarkerPosition (-MarkerHeadWidth/2, -MarkerHeadWidth/2, shaftLength, axis));
+    vertices->push_back (getMarkerPosition (-MarkerHeadWidth/2, MarkerHeadWidth/2, shaftLength, axis));
+    vertices->push_back (getMarkerPosition (MarkerHeadWidth/2, MarkerHeadWidth/2, shaftLength, axis));
+    vertices->push_back (getMarkerPosition (MarkerHeadWidth/2, -MarkerHeadWidth/2, shaftLength, axis));
+
+    // head
+    vertices->push_back (getMarkerPosition (0, 0, shaftLength+MarkerHeadLength, axis));
+
+    geometry->setVertexArray (vertices);
+
+    osg::DrawElementsUShort *primitives = new osg::DrawElementsUShort (osg::PrimitiveSet::TRIANGLES, 0);
+
+    // shaft
+    for (int i=0; i<4; ++i)
+    {
+        int i2 = i==3 ? 0 : i+1;
+        primitives->push_back (i);
+        primitives->push_back (4+i);
+        primitives->push_back (i2);
+
+        primitives->push_back (4+i);
+        primitives->push_back (4+i2);
+        primitives->push_back (i2);
+    }
+
+    // cap
+    primitives->push_back (0);
+    primitives->push_back (1);
+    primitives->push_back (2);
+
+    primitives->push_back (2);
+    primitives->push_back (3);
+    primitives->push_back (0);
+
+    // head, backside
+    primitives->push_back (0+8);
+    primitives->push_back (1+8);
+    primitives->push_back (2+8);
+
+    primitives->push_back (2+8);
+    primitives->push_back (3+8);
+    primitives->push_back (0+8);
+
+    for (int i=0; i<4; ++i)
+    {
+        primitives->push_back (12);
+        primitives->push_back (8+(i==3 ? 0 : i+1));
+        primitives->push_back (8+i);
+    }
+
+    geometry->addPrimitiveSet (primitives);
+
+    osg::Vec4Array *colours = new osg::Vec4Array;
+
+    for (int i=0; i<8; ++i)
+        colours->push_back (osg::Vec4f (axis==0 ? 1.0f : 0.2f, axis==1 ? 1.0f : 0.2f,
+            axis==2 ? 1.0f : 0.2f, 1.0f));
+
+    for (int i=8; i<8+4+1; ++i)
+        colours->push_back (osg::Vec4f (axis==0 ? 1.0f : 0.0f, axis==1 ? 1.0f : 0.0f,
+            axis==2 ? 1.0f : 0.0f, 1.0f));
+
+    geometry->setColorArray (colours, osg::Array::BIND_PER_VERTEX);
+
+    geometry->getOrCreateStateSet()->setMode (GL_LIGHTING, osg::StateAttribute::OFF);
+
+    osg::ref_ptr<osg::Geode> geode (new osg::Geode);
+    geode->addDrawable (geometry);
+
+    return geode;
+}
+
+osg::ref_ptr<osg::Node> CSVRender::Object::makeRotateMarker (int axis)
+{
+    const float Pi = 3.14159265f;
+
+    const float InnerRadius = mBaseNode->getBound().radius();
+    const float OuterRadius = InnerRadius + MarkerShaftWidth;
+
+    const float SegmentDistance = 100.f;
+    const size_t SegmentCount = std::min(64, std::max(8, (int)(OuterRadius * 2 * Pi / SegmentDistance)));
+    const size_t VerticesPerSegment = 4;
+    const size_t IndicesPerSegment = 24;
+
+    const size_t VertexCount = SegmentCount * VerticesPerSegment;
+    const size_t IndexCount = SegmentCount * IndicesPerSegment;
+
+    const float Angle = 2 * Pi / SegmentCount;
+
+    const unsigned short IndexPattern[IndicesPerSegment] =
+    {
+        0, 4, 5, 0, 5, 1,
+        2, 6, 4, 2, 4, 0,
+        3, 7, 6, 3, 6, 2,
+        1, 5, 7, 1, 7, 3
+    };
+
+
+    osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry();
+
+    osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(VertexCount);
+    osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(1);
+    osg::ref_ptr<osg::DrawElementsUShort> primitives = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES,
+        IndexCount);
+
+    for (size_t i = 0; i < SegmentCount; ++i)
+    {
+        size_t index = i * VerticesPerSegment;
+
+        float innerX = InnerRadius * std::cos(i * Angle);
+        float innerY = InnerRadius * std::sin(i * Angle);
+
+        float outerX = OuterRadius * std::cos(i * Angle);
+        float outerY = OuterRadius * std::sin(i * Angle);
+
+        vertices->at(index++) = getMarkerPosition(innerX, innerY,  MarkerShaftWidth / 2, axis);
+        vertices->at(index++) = getMarkerPosition(innerX, innerY, -MarkerShaftWidth / 2, axis);
+        vertices->at(index++) = getMarkerPosition(outerX, outerY,  MarkerShaftWidth / 2, axis);
+        vertices->at(index++) = getMarkerPosition(outerX, outerY, -MarkerShaftWidth / 2, axis);
+    }
+
+    colors->at(0) = osg::Vec4f (axis==0 ? 1.0f : 0.2f, axis==1 ? 1.0f : 0.2f, axis==2 ? 1.0f : 0.2f, 1.0f);
+
+    for (size_t i = 0; i < SegmentCount; ++i)
+    {
+        size_t indices[IndicesPerSegment];
+        for (size_t j = 0; j < IndicesPerSegment; ++j)
+        {
+            indices[j] = i * VerticesPerSegment + j;
+
+            if (indices[j] >= VertexCount)
+                indices[j] -= VertexCount;
+        }
+
+        size_t offset = i * IndicesPerSegment;
+        for (size_t j = 0; j < IndicesPerSegment; ++j)
+        {
+            primitives->setElement(offset++, indices[IndexPattern[j]]);
+        }
+    }
+
+    geometry->setVertexArray(vertices);
+    geometry->setColorArray(colors, osg::Array::BIND_OVERALL);
+    geometry->addPrimitiveSet(primitives);
+
+    geometry->getOrCreateStateSet()->setMode (GL_LIGHTING, osg::StateAttribute::OFF);
+
+    osg::ref_ptr<osg::Geode> geode = new osg::Geode();
+    geode->addDrawable (geometry);
+
+    return geode;
+}
+
+osg::Vec3f CSVRender::Object::getMarkerPosition (float x, float y, float z, int axis)
+{
+    switch (axis)
+    {
+        case 2: return osg::Vec3f (x, y, z);
+        case 0: return osg::Vec3f (z, x, y);
+        case 1: return osg::Vec3f (y, z, x);
+
+        default:
+
+            throw std::logic_error ("invalid axis for marker geometry");
+    }
+}
+
 CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
     const std::string& id, bool referenceable, bool forceBaseToZero)
-: mData (data), mBaseNode(0), mSelected(false), mParentNode(parentNode), mResourceSystem(data.getResourceSystem().get()), mForceBaseToZero (forceBaseToZero)
+: mData (data), mBaseNode(0), mSelected(false), mParentNode(parentNode), mResourceSystem(data.getResourceSystem().get()), mForceBaseToZero (forceBaseToZero),
+  mScaleOverride (1), mOverrideFlags (0), mSubMode (-1)
 {
+    mRootNode = new osg::PositionAttitudeTransform;
+
     mBaseNode = new osg::PositionAttitudeTransform;
     mBaseNode->addCullCallback(new SceneUtil::LightListCallback);
 
     mOutline = new osgFX::Scribe;
-    mOutline->addChild(mBaseNode);
 
     mBaseNode->setUserData(new ObjectTag(this));
 
-    parentNode->addChild(mBaseNode);
+    mRootNode->addChild (mBaseNode);
+
+    parentNode->addChild (mRootNode);
 
-    mBaseNode->setNodeMask(Mask_Reference);
+    mRootNode->setNodeMask(Mask_Reference);
 
     if (referenceable)
     {
@@ -180,26 +428,32 @@ CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
 
     adjustTransform();
     update();
+    updateMarker();
 }
 
 CSVRender::Object::~Object()
 {
     clear();
 
-    mParentNode->removeChild(mBaseNode);
-    mParentNode->removeChild(mOutline);
+    mParentNode->removeChild (mRootNode);
 }
 
 void CSVRender::Object::setSelected(bool selected)
 {
     mSelected = selected;
 
-    mParentNode->removeChild(mOutline);
-    mParentNode->removeChild(mBaseNode);
+    mOutline->removeChild(mBaseNode);
+    mRootNode->removeChild(mOutline);
+    mRootNode->removeChild(mBaseNode);
     if (selected)
-        mParentNode->addChild(mOutline);
+    {
+        mOutline->addChild(mBaseNode);
+        mRootNode->addChild(mOutline);
+    }
     else
-        mParentNode->addChild(mBaseNode);
+        mRootNode->addChild(mBaseNode);
+
+    updateMarker();
 }
 
 bool CSVRender::Object::getSelected() const
@@ -218,6 +472,7 @@ bool CSVRender::Object::referenceableDataChanged (const QModelIndex& topLeft,
     {
         adjustTransform();
         update();
+        updateMarker();
         return true;
     }
 
@@ -268,6 +523,7 @@ bool CSVRender::Object::referenceDataChanged (const QModelIndex& topLeft,
                 references.getData (index, columnIndex).toString().toUtf8().constData();
 
             update();
+            updateMarker();
         }
 
         return true;
@@ -290,3 +546,151 @@ osg::ref_ptr<CSVRender::TagBase> CSVRender::Object::getTag() const
 {
     return static_cast<CSVRender::TagBase *> (mBaseNode->getUserData());
 }
+
+bool CSVRender::Object::isEdited() const
+{
+    return mOverrideFlags;
+}
+
+void CSVRender::Object::setEdited (int flags)
+{
+    bool discard = mOverrideFlags & ~flags;
+    int added = flags & ~mOverrideFlags;
+
+    mOverrideFlags = flags;
+
+    if (added & Override_Position)
+        for (int i=0; i<3; ++i)
+            mPositionOverride.pos[i] = getReference().mPos.pos[i];
+
+    if (added & Override_Rotation)
+        for (int i=0; i<3; ++i)
+            mPositionOverride.rot[i] = getReference().mPos.rot[i];
+
+    if (added & Override_Scale)
+        mScaleOverride = getReference().mScale;
+
+    if (discard)
+        adjustTransform();
+}
+
+ESM::Position CSVRender::Object::getPosition() const
+{
+    ESM::Position position = getReference().mPos;
+
+    if (mOverrideFlags & Override_Position)
+        for (int i=0; i<3; ++i)
+            position.pos[i] = mPositionOverride.pos[i];
+
+    if (mOverrideFlags & Override_Rotation)
+        for (int i=0; i<3; ++i)
+            position.rot[i] = mPositionOverride.rot[i];
+
+    return position;
+}
+
+float CSVRender::Object::getScale() const
+{
+    return (mOverrideFlags & Override_Scale) ? mScaleOverride : getReference().mScale;
+}
+
+void CSVRender::Object::setPosition (const float position[3])
+{
+    mOverrideFlags |= Override_Position;
+
+    for (int i=0; i<3; ++i)
+        mPositionOverride.pos[i] = position[i];
+
+    adjustTransform();
+}
+
+void CSVRender::Object::setRotation (const float rotation[3])
+{
+    mOverrideFlags |= Override_Rotation;
+
+    for (int i=0; i<3; ++i)
+        mPositionOverride.rot[i] = rotation[i];
+
+    adjustTransform();
+}
+
+void CSVRender::Object::setScale (float scale)
+{
+    mOverrideFlags |= Override_Scale;
+
+    mScaleOverride = scale;
+
+    adjustTransform();
+}
+
+void CSVRender::Object::apply (CSMWorld::CommandMacro& commands)
+{
+    const CSMWorld::RefCollection& collection = mData.getReferences();
+    QAbstractItemModel *model = mData.getTableModel (CSMWorld::UniversalId::Type_References);
+
+    int recordIndex = collection.getIndex (mReferenceId);
+
+    if (mOverrideFlags & Override_Position)
+    {
+        for (int i=0; i<3; ++i)
+        {
+            int column = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (
+                CSMWorld::Columns::ColumnId_PositionXPos+i));
+
+            commands.push (new CSMWorld::ModifyCommand (*model,
+                model->index (recordIndex, column), mPositionOverride.pos[i]));
+        }
+
+        int column = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (
+            CSMWorld::Columns::ColumnId_Cell));
+
+        if (CSMWorld::CellCoordinates::isExteriorCell(collection.getRecord (recordIndex).get().mCell))
+        {
+            std::pair<int, int> cellIndex = collection.getRecord (recordIndex).get().getCellIndex();
+
+            /// \todo figure out worldspace (not important until multiple worldspaces are supported)
+            std::string cellId = CSMWorld::CellCoordinates (cellIndex).getId ("");
+
+            commands.push (new CSMWorld::ModifyCommand (*model,
+                model->index (recordIndex, column), QString::fromUtf8 (cellId.c_str())));
+        }
+    }
+
+    if (mOverrideFlags & Override_Rotation)
+    {
+        for (int i=0; i<3; ++i)
+        {
+            int column = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (
+                CSMWorld::Columns::ColumnId_PositionXRot+i));
+
+            commands.push (new CSMWorld::ModifyCommand (*model,
+                model->index (recordIndex, column), mPositionOverride.rot[i]));
+        }
+    }
+
+    if (mOverrideFlags & Override_Scale)
+    {
+        int column = collection.findColumnIndex (CSMWorld::Columns::ColumnId_Scale);
+
+        commands.push (new CSMWorld::ModifyCommand (*model,
+            model->index (recordIndex, column), mScaleOverride));
+    }
+
+    mOverrideFlags = 0;
+}
+
+void CSVRender::Object::setSubMode (int subMode)
+{
+    if (subMode!=mSubMode)
+    {
+        mSubMode = subMode;
+        updateMarker();
+    }
+}
+
+void CSVRender::Object::reset()
+{
+    mOverrideFlags = 0;
+    adjustTransform();
+    updateMarker();
+}
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index 4a89fe201..d3cba6c55 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -8,14 +8,19 @@
 #include <osg/ref_ptr>
 #include <osg/Referenced>
 
+#include <components/esm/defs.hpp>
+
 #include "tagbase.hpp"
 
 class QModelIndex;
+class QUndoStack;
 
 namespace osg
 {
     class PositionAttitudeTransform;
     class Group;
+    class Node;
+    class Geode;
 }
 
 namespace osgFX
@@ -32,6 +37,7 @@ namespace CSMWorld
 {
     class Data;
     struct CellRef;
+    class CommandMacro;
 }
 
 namespace CSVRender
@@ -50,18 +56,48 @@ namespace CSVRender
             virtual QString getToolTip (bool hideBasics) const;
     };
 
+    class ObjectMarkerTag : public ObjectTag
+    {
+        public:
+
+            ObjectMarkerTag (Object* object, int axis);
+
+            int mAxis;
+    };
 
     class Object
     {
-            const CSMWorld::Data& mData;
+        public:
+
+            enum OverrideFlags
+            {
+                Override_Position = 1,
+                Override_Rotation = 2,
+                Override_Scale = 4
+            };
+
+        private:
+
+            static const float MarkerShaftWidth;
+            static const float MarkerShaftBaseLength;
+            static const float MarkerHeadWidth;
+            static const float MarkerHeadLength;
+
+            CSMWorld::Data& mData;
             std::string mReferenceId;
             std::string mReferenceableId;
+            osg::ref_ptr<osg::PositionAttitudeTransform> mRootNode;
             osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
             osg::ref_ptr<osgFX::Scribe> mOutline;
             bool mSelected;
             osg::Group* mParentNode;
             Resource::ResourceSystem* mResourceSystem;
             bool mForceBaseToZero;
+            ESM::Position mPositionOverride;
+            float mScaleOverride;
+            int mOverrideFlags;
+            osg::ref_ptr<osg::Node> mMarker[3];
+            int mSubMode;
 
             /// Not implemented
             Object (const Object&);
@@ -82,6 +118,13 @@ namespace CSVRender
             /// Throws an exception if *this was constructed with referenceable
             const CSMWorld::CellRef& getReference() const;
 
+            void updateMarker();
+
+            osg::ref_ptr<osg::Node> makeMoveOrScaleMarker (int axis);
+            osg::ref_ptr<osg::Node> makeRotateMarker (int axis);
+
+            osg::Vec3f getMarkerPosition (float x, float y, float z, int axis);
+
         public:
 
             Object (CSMWorld::Data& data, osg::Group *cellNode,
@@ -116,6 +159,33 @@ namespace CSVRender
             std::string getReferenceableId() const;
 
             osg::ref_ptr<TagBase> getTag() const;
+
+            /// Is there currently an editing operation running on this object?
+            bool isEdited() const;
+
+            void setEdited (int flags);
+
+            ESM::Position getPosition() const;
+
+            float getScale() const;
+
+            /// Set override position.
+            void setPosition (const float position[3]);
+
+            /// Set override rotation
+            void setRotation (const float rotation[3]);
+
+            /// Set override scale
+            void setScale (float scale);
+
+            /// Apply override changes via command and end edit mode
+            void apply (CSMWorld::CommandMacro& commands);
+
+            void setSubMode (int subMode);
+
+            /// Erase all overrides and restore the visual representation of the object to its
+            /// true state.
+            void reset();
     };
 }
 
diff --git a/apps/opencs/view/render/orbitcameramode.cpp b/apps/opencs/view/render/orbitcameramode.cpp
new file mode 100644
index 000000000..ba25beaba
--- /dev/null
+++ b/apps/opencs/view/render/orbitcameramode.cpp
@@ -0,0 +1,56 @@
+#include "orbitcameramode.hpp"
+
+#include <QMenu>
+
+#include "../../model/prefs/shortcut.hpp"
+#include "../../model/prefs/shortcuteventhandler.hpp"
+
+#include "worldspacewidget.hpp"
+
+namespace CSVRender
+{
+    OrbitCameraMode::OrbitCameraMode(WorldspaceWidget* worldspaceWidget, const QIcon& icon, const QString& tooltip,
+        QWidget* parent)
+        : ModeButton(icon, tooltip, parent)
+        , mWorldspaceWidget(worldspaceWidget)
+        , mCenterOnSelection(0)
+    {
+        mCenterShortcut = new CSMPrefs::Shortcut("orbit-center-selection", worldspaceWidget);
+        mCenterShortcut->enable(false);
+        connect(mCenterShortcut, SIGNAL(activated()), this, SLOT(centerSelection()));
+    }
+
+    OrbitCameraMode::~OrbitCameraMode()
+    {
+    }
+
+    void OrbitCameraMode::activate(CSVWidget::SceneToolbar* toolbar)
+    {
+        mCenterOnSelection = new QAction("Center on selected object", this);
+        mCenterShortcut->associateAction(mCenterOnSelection);
+        connect(mCenterOnSelection, SIGNAL(triggered()), this, SLOT(centerSelection()));
+
+        mCenterShortcut->enable(true);
+    }
+
+    void OrbitCameraMode::deactivate(CSVWidget::SceneToolbar* toolbar)
+    {
+        mCenterShortcut->associateAction(0);
+        mCenterShortcut->enable(false);
+    }
+
+    bool OrbitCameraMode::createContextMenu(QMenu* menu)
+    {
+        if (menu)
+        {
+            menu->addAction(mCenterOnSelection);
+        }
+
+        return true;
+    }
+
+    void OrbitCameraMode::centerSelection()
+    {
+        mWorldspaceWidget->centerOrbitCameraOnSelection();
+    }
+}
diff --git a/apps/opencs/view/render/orbitcameramode.hpp b/apps/opencs/view/render/orbitcameramode.hpp
new file mode 100644
index 000000000..312cd1756
--- /dev/null
+++ b/apps/opencs/view/render/orbitcameramode.hpp
@@ -0,0 +1,43 @@
+#ifndef CSV_RENDER_ORBITCAMERAPICKMODE_H
+#define CSV_RENDER_ORBITCAMERAPICKMODE_H
+
+#include <memory>
+
+#include "../widget/modebutton.hpp"
+
+namespace CSMPrefs
+{
+    class Shortcut;
+}
+
+namespace CSVRender
+{
+    class WorldspaceWidget;
+
+    class OrbitCameraMode : public CSVWidget::ModeButton
+    {
+            Q_OBJECT
+
+        public:
+
+            OrbitCameraMode(WorldspaceWidget* worldspaceWidget, const QIcon& icon, const QString& tooltip = "",
+                QWidget* parent = 0);
+            ~OrbitCameraMode();
+
+            virtual void activate(CSVWidget::SceneToolbar* toolbar);
+            virtual void deactivate(CSVWidget::SceneToolbar* toolbar);
+            virtual bool createContextMenu(QMenu* menu);
+
+        private:
+
+            WorldspaceWidget* mWorldspaceWidget;
+            QAction* mCenterOnSelection;
+            CSMPrefs::Shortcut* mCenterShortcut;
+
+        private slots:
+
+            void centerSelection();
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index d71446d0b..901dadc85 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -6,24 +6,24 @@
 #include <QMouseEvent>
 #include <QApplication>
 
-#include <osgGA/TrackballManipulator>
-
 #include <components/esm/loadland.hpp>
 
+#include "../../model/prefs/shortcut.hpp"
+
 #include "../../model/world/tablemimedata.hpp"
 #include "../../model/world/idtable.hpp"
 
-#include "../widget/scenetooltoggle.hpp"
+#include "../widget/scenetooltoggle2.hpp"
 #include "../widget/scenetoolmode.hpp"
 #include "../widget/scenetooltoggle2.hpp"
 
 #include "editmode.hpp"
 #include "mask.hpp"
+#include "cameracontroller.hpp"
 
 bool CSVRender::PagedWorldspaceWidget::adjustCells()
 {
     bool modified = false;
-    bool wasEmpty = mCells.empty();
 
     const CSMWorld::IdCollection<CSMWorld::Cell>& cells = mDocument.getData().getCells();
 
@@ -114,11 +114,6 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells()
         }
     }
 
-    /// \todo do not overwrite manipulator object
-    /// \todo move code to useViewHint function
-    if (modified && wasEmpty)
-        mView->setCameraManipulator(new osgGA::TrackballManipulator);
-
     return modified;
 }
 
@@ -150,74 +145,71 @@ void CSVRender::PagedWorldspaceWidget::addEditModeSelectorButtons (
         "terrain-move");
 }
 
-void CSVRender::PagedWorldspaceWidget::handleMouseClick (osg::ref_ptr<TagBase> tag, const std::string& button, bool shift)
+void CSVRender::PagedWorldspaceWidget::handleInteractionPress (const WorldspaceHitResult& hit, InteractionType type)
 {
-    if (tag && tag->getMask()==Mask_CellArrow)
+    if (hit.tag && hit.tag->getMask()==Mask_CellArrow)
     {
-        if (button=="p-edit" || button=="s-edit")
+        if (CellArrowTag *cellArrowTag = dynamic_cast<CSVRender::CellArrowTag *> (hit.tag.get()))
         {
-            if (CellArrowTag *cellArrowTag =
-                dynamic_cast<CSVRender::CellArrowTag *> (tag.get()))
-            {
-                CellArrow *arrow = cellArrowTag->getCellArrow();
+            CellArrow *arrow = cellArrowTag->getCellArrow();
 
-                CSMWorld::CellCoordinates coordinates = arrow->getCoordinates();
+            CSMWorld::CellCoordinates coordinates = arrow->getCoordinates();
 
-                CellArrow::Direction direction = arrow->getDirection();
+            CellArrow::Direction direction = arrow->getDirection();
 
-                int x = 0;
-                int y = 0;
+            int x = 0;
+            int y = 0;
 
-                switch (direction)
-                {
-                    case CellArrow::Direction_North: y = 1; break;
-                    case CellArrow::Direction_West: x = -1; break;
-                    case CellArrow::Direction_South: y = -1; break;
-                    case CellArrow::Direction_East: x = 1; break;
-                }
+            switch (direction)
+            {
+                case CellArrow::Direction_North: y = 1; break;
+                case CellArrow::Direction_West: x = -1; break;
+                case CellArrow::Direction_South: y = -1; break;
+                case CellArrow::Direction_East: x = 1; break;
+            }
 
-                bool modified = false;
+            bool modified = false;
 
-                if (shift)
-                {
-                    if (button=="p-edit")
-                        addCellSelection (x, y);
-                    else
-                        moveCellSelection (x, y);
+            if (type == InteractionType_PrimarySelect)
+            {
+                addCellSelection (x, y);
+                modified = true;
+            }
+            else if (type == InteractionType_SecondarySelect)
+            {
+                moveCellSelection (x, y);
+                modified = true;
+            }
+            else // Primary/SecondaryEdit
+            {
+                CSMWorld::CellCoordinates newCoordinates = coordinates.move (x, y);
 
+                if (mCells.find (newCoordinates)==mCells.end())
+                {
+                    addCellToScene (newCoordinates);
+                    mSelection.add (newCoordinates);
                     modified = true;
                 }
-                else
-                {
-                    CSMWorld::CellCoordinates newCoordinates = coordinates.move (x, y);
 
-                    if (mCells.find (newCoordinates)==mCells.end())
+                if (type == InteractionType_SecondaryEdit)
+                {
+                    if (mCells.find (coordinates)!=mCells.end())
                     {
-                        addCellToScene (newCoordinates);
-                        mSelection.add (newCoordinates);
+                        removeCellFromScene (coordinates);
+                        mSelection.remove (coordinates);
                         modified = true;
                     }
-
-                    if (button=="s-edit")
-                    {
-                        if (mCells.find (coordinates)!=mCells.end())
-                        {
-                            removeCellFromScene (coordinates);
-                            mSelection.remove (coordinates);
-                            modified = true;
-                        }
-                    }
                 }
+            }
 
-                if (modified)
-                    adjustCells();
+            if (modified)
+                adjustCells();
 
-                return;
-            }
+            return;
         }
     }
 
-    WorldspaceWidget::handleMouseClick (tag, button, shift);
+    WorldspaceWidget::handleInteractionPress (hit, type);
 }
 
 void CSVRender::PagedWorldspaceWidget::referenceableDataChanged (const QModelIndex& topLeft,
@@ -283,6 +275,82 @@ void CSVRender::PagedWorldspaceWidget::referenceAdded (const QModelIndex& parent
             flagAsModified();
 }
 
+void CSVRender::PagedWorldspaceWidget::pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    int rowStart = -1;
+    int rowEnd = -1;
+
+    if (topLeft.parent().isValid())
+    {
+        rowStart = topLeft.parent().row();
+        rowEnd = bottomRight.parent().row();
+    }
+    else
+    {
+        rowStart = topLeft.row();
+        rowEnd = bottomRight.row();
+    }
+
+    for (int row = rowStart; row <= rowEnd; ++row)
+    {
+        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+        CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
+
+        std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
+        if (searchResult != mCells.end())
+        {
+            searchResult->second->pathgridModified();
+            flagAsModified();
+        }
+    }
+}
+
+void CSVRender::PagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (!parent.isValid())
+    {
+        // Pathgrid going to be deleted
+        for (int row = start; row <= end; ++row)
+        {
+            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+            CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
+
+            std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
+            if (searchResult != mCells.end())
+            {
+                searchResult->second->pathgridRemoved();
+                flagAsModified();
+            }
+        }
+    }
+}
+
+void CSVRender::PagedWorldspaceWidget::pathgridAdded(const QModelIndex& parent, int start, int end)
+{
+   const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (!parent.isValid())
+    {
+        for (int row = start; row <= end; ++row)
+        {
+            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+            CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
+
+            std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
+            if (searchResult != mCells.end())
+            {
+                searchResult->second->pathgridModified();
+                flagAsModified();
+            }
+        }
+    }
+}
+
+
 std::string CSVRender::PagedWorldspaceWidget::getStartupInstruction()
 {
     osg::Vec3d eye, center, up;
@@ -309,10 +377,13 @@ void CSVRender::PagedWorldspaceWidget::addCellToScene (
     bool deleted = index==-1 ||
         cells.getRecord (index).mState==CSMWorld::RecordBase::State_Deleted;
 
-    Cell *cell = new Cell (mDocument.getData(), mRootNode, coordinates.getId (mWorldspace),
-        deleted);
+    std::auto_ptr<Cell> cell (
+        new Cell (mDocument.getData(), mRootNode, coordinates.getId (mWorldspace),
+        deleted));
+    EditMode *editMode = getEditMode();
+    cell->setSubMode (editMode->getSubMode(), editMode->getInteractionMask());
 
-    mCells.insert (std::make_pair (coordinates, cell));
+    mCells.insert (std::make_pair (coordinates, cell.release()));
 }
 
 void CSVRender::PagedWorldspaceWidget::removeCellFromScene (
@@ -365,6 +436,27 @@ void CSVRender::PagedWorldspaceWidget::moveCellSelection (int x, int y)
     mSelection = newSelection;
 }
 
+void CSVRender::PagedWorldspaceWidget::addCellToSceneFromCamera (int offsetX, int offsetY)
+{
+    const int CellSize = 8192;
+
+    osg::Vec3f eye, center, up;
+    getCamera()->getViewMatrixAsLookAt(eye, center, up);
+
+    int cellX = (int)std::floor(center.x() / CellSize) + offsetX;
+    int cellY = (int)std::floor(center.y() / CellSize) + offsetY;
+
+    CSMWorld::CellCoordinates cellCoordinates(cellX, cellY);
+
+    if (!mSelection.has(cellCoordinates))
+    {
+        addCellToScene(cellCoordinates);
+        mSelection.add(cellCoordinates);
+
+        adjustCells();
+    }
+}
+
 CSVRender::PagedWorldspaceWidget::PagedWorldspaceWidget (QWidget* parent, CSMDoc::Document& document)
 : WorldspaceWidget (document, parent), mDocument (document), mWorldspace ("std::default"),
   mControlElements(NULL), mDisplayCellCoord(true)
@@ -378,6 +470,22 @@ CSVRender::PagedWorldspaceWidget::PagedWorldspaceWidget (QWidget* parent, CSMDoc
         this, SLOT (cellRemoved (const QModelIndex&, int, int)));
     connect (cells, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
         this, SLOT (cellAdded (const QModelIndex&, int, int)));
+
+    // Shortcuts
+    CSMPrefs::Shortcut* loadCameraCellShortcut = new CSMPrefs::Shortcut("scene-load-cam-cell", this);
+    connect(loadCameraCellShortcut, SIGNAL(activated()), this, SLOT(loadCameraCell()));
+
+    CSMPrefs::Shortcut* loadCameraEastCellShortcut = new CSMPrefs::Shortcut("scene-load-cam-eastcell", this);
+    connect(loadCameraEastCellShortcut, SIGNAL(activated()), this, SLOT(loadEastCell()));
+
+    CSMPrefs::Shortcut* loadCameraNorthCellShortcut = new CSMPrefs::Shortcut("scene-load-cam-northcell", this);
+    connect(loadCameraNorthCellShortcut, SIGNAL(activated()), this, SLOT(loadNorthCell()));
+
+    CSMPrefs::Shortcut* loadCameraWestCellShortcut = new CSMPrefs::Shortcut("scene-load-cam-westcell", this);
+    connect(loadCameraWestCellShortcut, SIGNAL(activated()), this, SLOT(loadWestCell()));
+
+    CSMPrefs::Shortcut* loadCameraSouthCellShortcut = new CSMPrefs::Shortcut("scene-load-cam-southcell", this);
+    connect(loadCameraSouthCellShortcut, SIGNAL(activated()), this, SLOT(loadSouthCell()));
 }
 
 CSVRender::PagedWorldspaceWidget::~PagedWorldspaceWidget()
@@ -405,12 +513,15 @@ void CSVRender::PagedWorldspaceWidget::useViewHint (const std::string& hint)
             {
                 char ignore1; // : or ;
                 char ignore2; // #
+                // Current coordinate
                 int x, y;
 
+                // Loop through all the coordinates to add them to selection
                 while (stream >> ignore1 >> ignore2 >> x >> y)
                     selection.add (CSMWorld::CellCoordinates (x, y));
-
-                /// \todo adjust camera position
+                               
+                // Mark that camera needs setup
+                mCamPositionSet=false;
             }
         }
         else if (hint[0]=='r')
@@ -447,18 +558,18 @@ std::pair< int, int > CSVRender::PagedWorldspaceWidget::getCoordinatesFromId (co
 }
 
 bool CSVRender::PagedWorldspaceWidget::handleDrop (
-    const std::vector< CSMWorld::UniversalId >& data, DropType type)
+    const std::vector< CSMWorld::UniversalId >& universalIdData, DropType type)
 {
-    if (WorldspaceWidget::handleDrop (data, type))
+    if (WorldspaceWidget::handleDrop (universalIdData, type))
         return true;
 
     if (type!=Type_CellsExterior)
         return false;
 
     bool selectionChanged = false;
-    for (unsigned i = 0; i < data.size(); ++i)
+    for (unsigned i = 0; i < universalIdData.size(); ++i)
     {
-        std::pair<int, int> coordinates(getCoordinatesFromId(data[i].getId()));
+        std::pair<int, int> coordinates(getCoordinatesFromId(universalIdData[i].getId()));
         if (mSelection.add(CSMWorld::CellCoordinates(coordinates.first, coordinates.second)))
         {
             selectionChanged = true;
@@ -509,6 +620,15 @@ void CSVRender::PagedWorldspaceWidget::clearSelection (int elementMask)
     flagAsModified();
 }
 
+void CSVRender::PagedWorldspaceWidget::invertSelection (int elementMask)
+{
+    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter = mCells.begin();
+        iter!=mCells.end(); ++iter)
+        iter->second->setSelection (elementMask, Cell::Selection_Invert);
+
+    flagAsModified();
+}
+
 void CSVRender::PagedWorldspaceWidget::selectAll (int elementMask)
 {
     for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter = mCells.begin();
@@ -538,6 +658,21 @@ std::string CSVRender::PagedWorldspaceWidget::getCellId (const osg::Vec3f& point
     return cellCoordinates.getId (mWorldspace);
 }
 
+CSVRender::Cell* CSVRender::PagedWorldspaceWidget::getCell(const osg::Vec3d& point) const
+{
+    const int cellSize = 8192;
+
+    CSMWorld::CellCoordinates coords(
+        static_cast<int> (std::floor (point.x()/cellSize)),
+        static_cast<int> (std::floor (point.y()/cellSize)));
+
+    std::map<CSMWorld::CellCoordinates, Cell*>::const_iterator searchResult = mCells.find(coords);
+    if (searchResult != mCells.end())
+        return searchResult->second;
+    else
+        return 0;
+}
+
 std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::PagedWorldspaceWidget::getSelection (
     unsigned int elementMask) const
 {
@@ -555,16 +690,46 @@ std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::PagedWorldspaceWidget:
     return result;
 }
 
-CSVWidget::SceneToolToggle *CSVRender::PagedWorldspaceWidget::makeControlVisibilitySelector (
+std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::PagedWorldspaceWidget::getEdited (
+    unsigned int elementMask) const
+{
+    std::vector<osg::ref_ptr<CSVRender::TagBase> > result;
+
+    for (std::map<CSMWorld::CellCoordinates, Cell *>::const_iterator iter = mCells.begin();
+        iter!=mCells.end(); ++iter)
+    {
+        std::vector<osg::ref_ptr<CSVRender::TagBase> > cellResult =
+            iter->second->getEdited (elementMask);
+
+        result.insert (result.end(), cellResult.begin(), cellResult.end());
+    }
+
+    return result;
+}
+
+void CSVRender::PagedWorldspaceWidget::setSubMode (int subMode, unsigned int elementMask)
+{
+    for (std::map<CSMWorld::CellCoordinates, Cell *>::const_iterator iter = mCells.begin();
+        iter!=mCells.end(); ++iter)
+        iter->second->setSubMode (subMode, elementMask);
+}
+
+void CSVRender::PagedWorldspaceWidget::reset (unsigned int elementMask)
+{
+    for (std::map<CSMWorld::CellCoordinates, Cell *>::const_iterator iter = mCells.begin();
+        iter!=mCells.end(); ++iter)
+        iter->second->reset (elementMask);
+}
+
+CSVWidget::SceneToolToggle2 *CSVRender::PagedWorldspaceWidget::makeControlVisibilitySelector (
     CSVWidget::SceneToolbar *parent)
 {
-    mControlElements = new CSVWidget::SceneToolToggle (parent,
-        "Controls & Guides Visibility", ":placeholder");
+    mControlElements = new CSVWidget::SceneToolToggle2 (parent,
+        "Controls & Guides Visibility", ":scenetoolbar/scene-view-marker-c", ":scenetoolbar/scene-view-marker-");
 
-    mControlElements->addButton (":placeholder", Mask_CellMarker, ":placeholder",
-        "Cell marker");
-    mControlElements->addButton (":placeholder", Mask_CellArrow, ":placeholder", "Cell arrows");
-    mControlElements->addButton (":placeholder", Mask_CellBorder, ":placeholder", "Cell border");
+    mControlElements->addButton (1, Mask_CellMarker, "Cell Marker");
+    mControlElements->addButton (2, Mask_CellArrow, "Cell Arrows");
+    mControlElements->addButton (4, Mask_CellBorder, "Cell Border");
 
     mControlElements->setSelectionMask (0xffffffff);
 
@@ -596,3 +761,28 @@ void CSVRender::PagedWorldspaceWidget::cellAdded (const QModelIndex& index, int
     if (adjustCells())
         flagAsModified();
 }
+
+void CSVRender::PagedWorldspaceWidget::loadCameraCell()
+{
+    addCellToSceneFromCamera(0, 0);
+}
+
+void CSVRender::PagedWorldspaceWidget::loadEastCell()
+{
+    addCellToSceneFromCamera(1, 0);
+}
+
+void CSVRender::PagedWorldspaceWidget::loadNorthCell()
+{
+    addCellToSceneFromCamera(0, 1);
+}
+
+void CSVRender::PagedWorldspaceWidget::loadWestCell()
+{
+    addCellToSceneFromCamera(-1, 0);
+}
+
+void CSVRender::PagedWorldspaceWidget::loadSouthCell()
+{
+    addCellToSceneFromCamera(0, -1);
+}
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index 419a2a46a..0663d3424 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -11,6 +11,7 @@
 namespace CSVWidget
 {
    class SceneToolToggle;
+   class SceneToolToggle2;
 }
 
 namespace CSVRender
@@ -26,7 +27,7 @@ namespace CSVRender
             CSMWorld::CellSelection mSelection;
             std::map<CSMWorld::CellCoordinates, Cell *> mCells;
             std::string mWorldspace;
-            CSVWidget::SceneToolToggle *mControlElements;
+            CSVWidget::SceneToolToggle2 *mControlElements;
             bool mDisplayCellCoord;
 
         private:
@@ -51,6 +52,12 @@ namespace CSVRender
 
             virtual void referenceAdded (const QModelIndex& index, int start, int end);
 
+            virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+            virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+
+            virtual void pathgridAdded (const QModelIndex& parent, int start, int end);
+
             virtual std::string getStartupInstruction();
 
             /// \note Does not update the view or any cell marker
@@ -67,6 +74,8 @@ namespace CSVRender
             /// \note Does not update the view or any cell marker
             void moveCellSelection (int x, int y);
 
+            void addCellToSceneFromCamera (int offsetX, int offsetY);
+
         public:
 
             PagedWorldspaceWidget (QWidget *parent, CSMDoc::Document& document);
@@ -75,7 +84,8 @@ namespace CSVRender
             /// hint system.
 
             virtual ~PagedWorldspaceWidget();
-
+            
+            /// Decodes the the hint string to set of cell that are rendered.
             void useViewHint (const std::string& hint);
 
             void setCellSelection(const CSMWorld::CellSelection& selection);
@@ -90,7 +100,7 @@ namespace CSVRender
 
             /// \attention The created tool is not added to the toolbar (via addTool). Doing
             /// that is the responsibility of the calling function.
-            virtual CSVWidget::SceneToolToggle *makeControlVisibilitySelector (
+            virtual CSVWidget::SceneToolToggle2 *makeControlVisibilitySelector (
                 CSVWidget::SceneToolbar *parent);
 
             virtual unsigned int getVisibilityMask() const;
@@ -98,6 +108,9 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the clear operation
             virtual void clearSelection (int elementMask);
 
+            /// \param elementMask Elements to be affected by the select operation
+            virtual void invertSelection (int elementMask);
+
             /// \param elementMask Elements to be affected by the select operation
             virtual void selectAll (int elementMask);
 
@@ -109,16 +122,26 @@ namespace CSVRender
 
             virtual std::string getCellId (const osg::Vec3f& point) const;
 
+            virtual Cell* getCell(const osg::Vec3d& point) const;
+
             virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
                 const;
 
+            virtual std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask)
+                const;
+
+            virtual void setSubMode (int subMode, unsigned int elementMask);
+
+            /// Erase all overrides and restore the visual representation to its true state.
+            virtual void reset (unsigned int elementMask);
+
         protected:
 
             virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool);
 
             virtual void addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool);
 
-            virtual void handleMouseClick (osg::ref_ptr<TagBase> tag, const std::string& button, bool shift);
+            virtual void handleInteractionPress (const WorldspaceHitResult& hit, InteractionType type);
 
         signals:
 
@@ -132,6 +155,16 @@ namespace CSVRender
 
             virtual void cellAdded (const QModelIndex& index, int start, int end);
 
+            void loadCameraCell();
+
+            void loadEastCell();
+
+            void loadNorthCell();
+
+            void loadWestCell();
+
+            void loadSouthCell();
+
     };
 }
 
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
new file mode 100644
index 000000000..9eb2765d3
--- /dev/null
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -0,0 +1,680 @@
+#include "pathgrid.hpp"
+
+#include <algorithm>
+
+#include <osg/Array>
+#include <osg/Geode>
+#include <osg/Geometry>
+#include <osg/Group>
+#include <osg/PositionAttitudeTransform>
+#include <osg/Vec3>
+
+#include <components/sceneutil/pathgridutil.hpp>
+
+#include "../../model/world/cell.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/commandmacro.hpp"
+#include "../../model/world/data.hpp"
+#include "../../model/world/idtree.hpp"
+
+namespace CSVRender
+{
+    class PathgridNodeCallback : public osg::NodeCallback
+    {
+        public:
+
+            virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+            {
+                PathgridTag* tag = static_cast<PathgridTag*>(node->getUserData());
+                tag->getPathgrid()->update();
+            }
+    };
+
+    PathgridTag::PathgridTag(Pathgrid* pathgrid)
+        : TagBase(Mask_Pathgrid), mPathgrid(pathgrid)
+    {
+    }
+
+    Pathgrid* PathgridTag::getPathgrid() const
+    {
+        return mPathgrid;
+    }
+
+    QString PathgridTag::getToolTip(bool hideBasics) const
+    {
+        QString text("Pathgrid: ");
+        text += mPathgrid->getId().c_str();
+
+        return text;
+    }
+
+    Pathgrid::Pathgrid(CSMWorld::Data& data, osg::Group* parent, const std::string& pathgridId,
+        const CSMWorld::CellCoordinates& coordinates)
+        : mData(data)
+        , mPathgridCollection(mData.getPathgrids())
+        , mId(pathgridId)
+        , mCoords(coordinates)
+        , mInterior(false)
+        , mDragOrigin(0)
+        , mChangeGeometry(true)
+        , mRemoveGeometry(false)
+        , mUseOffset(true)
+        , mParent(parent)
+        , mPathgridGeometry(0)
+        , mDragGeometry(0)
+        , mTag(new PathgridTag(this))
+    {
+        const float CoordScalar = ESM::Land::REAL_SIZE;
+
+        mBaseNode = new osg::PositionAttitudeTransform ();
+        mBaseNode->setPosition(osg::Vec3f(mCoords.getX() * CoordScalar, mCoords.getY() * CoordScalar, 0.f));
+        mBaseNode->setUserData(mTag);
+        mBaseNode->setUpdateCallback(new PathgridNodeCallback());
+        mBaseNode->setNodeMask(Mask_Pathgrid);
+        mParent->addChild(mBaseNode);
+
+        mPathgridGeode = new osg::Geode();
+        mBaseNode->addChild(mPathgridGeode);
+
+        recreateGeometry();
+
+        int index = mData.getCells().searchId(mId);
+        if (index != -1)
+        {
+            const CSMWorld::Cell& cell = mData.getCells().getRecord(index).get();
+            mInterior = cell.mData.mFlags & ESM::Cell::Interior;
+        }
+    }
+
+    Pathgrid::~Pathgrid()
+    {
+        mParent->removeChild(mBaseNode);
+    }
+
+    const CSMWorld::CellCoordinates& Pathgrid::getCoordinates() const
+    {
+        return mCoords;
+    }
+
+    const std::string& Pathgrid::getId() const
+    {
+        return mId;
+    }
+
+    bool Pathgrid::isSelected() const
+    {
+        return !mSelected.empty();
+    }
+
+    const Pathgrid::NodeList& Pathgrid::getSelected() const
+    {
+        return mSelected;
+    }
+
+    void Pathgrid::selectAll()
+    {
+        mSelected.clear();
+
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            for (unsigned short i = 0; i < static_cast<unsigned short>(source->mPoints.size()); ++i)
+                mSelected.push_back(i);
+
+            createSelectedGeometry(*source);
+        }
+        else
+        {
+            removeSelectedGeometry();
+        }
+    }
+
+    void Pathgrid::toggleSelected(unsigned short node)
+    {
+        NodeList::iterator searchResult = std::find(mSelected.begin(), mSelected.end(), node);
+        if (searchResult != mSelected.end())
+        {
+            mSelected.erase(searchResult);
+        }
+        else
+        {
+            mSelected.push_back(node);
+        }
+
+        createSelectedGeometry();
+    }
+
+    void Pathgrid::invertSelected()
+    {
+        NodeList temp = NodeList(mSelected);
+        mSelected.clear();
+
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            for (unsigned short i = 0; i < static_cast<unsigned short>(source->mPoints.size()); ++i)
+            {
+                if (std::find(temp.begin(), temp.end(), i) == temp.end())
+                    mSelected.push_back(i);
+            }
+
+            createSelectedGeometry(*source);
+        }
+        else
+        {
+            removeSelectedGeometry();
+        }
+    }
+
+    void Pathgrid::clearSelected()
+    {
+        mSelected.clear();
+        removeSelectedGeometry();
+    }
+
+    void Pathgrid::moveSelected(const osg::Vec3d& offset)
+    {
+        mUseOffset = true;
+        mMoveOffset += offset;
+
+        recreateGeometry();
+    }
+
+    void Pathgrid::setDragOrigin(unsigned short node)
+    {
+        mDragOrigin = node;
+    }
+
+    void Pathgrid::setDragEndpoint(unsigned short node)
+    {
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            const CSMWorld::Pathgrid::Point& pointA = source->mPoints[mDragOrigin];
+            const CSMWorld::Pathgrid::Point& pointB = source->mPoints[node];
+
+            osg::Vec3f start = osg::Vec3f(pointA.mX, pointA.mY, pointA.mZ + SceneUtil::DiamondHalfHeight);
+            osg::Vec3f end = osg::Vec3f(pointB.mX, pointB.mY, pointB.mZ + SceneUtil::DiamondHalfHeight);
+
+            createDragGeometry(start, end, true);
+        }
+    }
+
+    void Pathgrid::setDragEndpoint(const osg::Vec3d& pos)
+    {
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            const CSMWorld::Pathgrid::Point& point = source->mPoints[mDragOrigin];
+
+            osg::Vec3f start = osg::Vec3f(point.mX, point.mY, point.mZ + SceneUtil::DiamondHalfHeight);
+            osg::Vec3f end = pos - mBaseNode->getPosition();
+            createDragGeometry(start, end, false);
+        }
+    }
+
+    void Pathgrid::resetIndicators()
+    {
+        mUseOffset = false;
+        mMoveOffset.set(0, 0, 0);
+
+        mPathgridGeode->removeDrawable(mDragGeometry);
+        mDragGeometry = 0;
+    }
+
+    void Pathgrid::applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos)
+    {
+        CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
+                CSMWorld::UniversalId::Type_Pathgrids));
+
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            osg::Vec3d localCoords = worldPos - mBaseNode->getPosition();
+
+            int posX = clampToCell(static_cast<int>(localCoords.x()));
+            int posY = clampToCell(static_cast<int>(localCoords.y()));
+            int posZ = clampToCell(static_cast<int>(localCoords.z()));
+
+            int recordIndex = mPathgridCollection.getIndex (mId);
+            int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
+
+            int posXColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridPosX);
+
+            int posYColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridPosY);
+
+            int posZColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridPosZ);
+
+            QModelIndex parent = model->index(recordIndex, parentColumn);
+            int row = static_cast<int>(source->mPoints.size());
+
+            // Add node to end of list
+            commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent), posX));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent), posY));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posZColumn, parent), posZ));
+        }
+        else
+        {
+            int index = mPathgridCollection.searchId(mId);
+            if (index == -1)
+            {
+                // Does not exist
+                commands.push(new CSMWorld::CreatePathgridCommand(*model, mId));
+            }
+            else
+            {
+                source = &mPathgridCollection.getRecord(index).get();
+
+                // Deleted, so revert and remove all data
+                commands.push(new CSMWorld::RevertCommand(*model, mId));
+
+                int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
+                for (int row = source->mPoints.size() - 1; row >= 0; --row)
+                {
+                    commands.push(new CSMWorld::DeleteNestedCommand(*model, mId, row, parentColumn));
+                }
+
+                parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
+                for (int row = source->mEdges.size() - 1; row >= 0; --row)
+                {
+                    commands.push(new CSMWorld::DeleteNestedCommand(*model, mId, row, parentColumn));
+                }
+            }
+        }
+    }
+
+    void Pathgrid::applyPosition(CSMWorld::CommandMacro& commands)
+    {
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            osg::Vec3d localCoords = mMoveOffset;
+
+            int offsetX = static_cast<int>(localCoords.x());
+            int offsetY = static_cast<int>(localCoords.y());
+            int offsetZ = static_cast<int>(localCoords.z());
+
+            QAbstractItemModel* model = mData.getTableModel(CSMWorld::UniversalId::Type_Pathgrids);
+
+            int recordIndex = mPathgridCollection.getIndex(mId);
+            int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
+
+            int posXColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridPosX);
+
+            int posYColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridPosY);
+
+            int posZColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridPosZ);
+
+            QModelIndex parent = model->index(recordIndex, parentColumn);
+
+            for (size_t i = 0; i < mSelected.size(); ++i)
+            {
+                const CSMWorld::Pathgrid::Point& point = source->mPoints[mSelected[i]];
+                int row = static_cast<int>(mSelected[i]);
+
+                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent),
+                    clampToCell(point.mX + offsetX)));
+
+                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent),
+                    clampToCell(point.mY + offsetY)));
+
+                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posZColumn, parent),
+                    clampToCell(point.mZ + offsetZ)));
+            }
+        }
+    }
+
+    void Pathgrid::applyEdge(CSMWorld::CommandMacro& commands, unsigned short node1, unsigned short node2)
+    {
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            addEdge(commands, *source, node1, node2);
+        }
+    }
+
+    void Pathgrid::applyEdges(CSMWorld::CommandMacro& commands, unsigned short node)
+    {
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            for (size_t i = 0; i < mSelected.size(); ++i)
+            {
+                addEdge(commands, *source, node, mSelected[i]);
+            }
+        }
+    }
+
+    void Pathgrid::applyRemoveNodes(CSMWorld::CommandMacro& commands)
+    {
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
+                CSMWorld::UniversalId::Type_Pathgrids));
+
+            // Want to remove nodes from end of list first
+            std::sort(mSelected.begin(), mSelected.end(), std::greater<int>());
+
+            int recordIndex = mPathgridCollection.getIndex(mId);
+            int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
+
+            for (std::vector<unsigned short>::iterator row = mSelected.begin(); row != mSelected.end(); ++row)
+            {
+                commands.push(new CSMWorld::DeleteNestedCommand(*model, mId, static_cast<int>(*row), parentColumn));
+            }
+
+            // Fix/remove edges
+            std::set<int, std::greater<int> > edgeRowsToRemove;
+
+            parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
+
+            int edge0Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridEdge0);
+
+            int edge1Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridEdge1);
+
+            QModelIndex parent = model->index(recordIndex, parentColumn);
+
+            for (size_t edge = 0; edge < source->mEdges.size(); ++edge)
+            {
+                int adjustment0 = 0;
+                int adjustment1 = 0;
+
+                // Determine necessary adjustment
+                for (std::vector<unsigned short>::iterator point = mSelected.begin(); point != mSelected.end(); ++point)
+                {
+                    if (source->mEdges[edge].mV0 == *point || source->mEdges[edge].mV1 == *point)
+                    {
+                        edgeRowsToRemove.insert(static_cast<int>(edge));
+
+                        adjustment0 = 0; // No need to adjust, its getting removed
+                        adjustment1 = 0;
+                        break;
+                    }
+
+                    if (source->mEdges[edge].mV0 > *point)
+                        --adjustment0;
+
+                    if (source->mEdges[edge].mV1 > *point)
+                        --adjustment1;
+                }
+
+                if (adjustment0 != 0)
+                {
+                    int adjustedEdge = source->mEdges[edge].mV0 + adjustment0;
+                    commands.push(new CSMWorld::ModifyCommand(*model, model->index(edge, edge0Column, parent),
+                        adjustedEdge));
+                }
+
+                if (adjustment1 != 0)
+                {
+                    int adjustedEdge = source->mEdges[edge].mV1 + adjustment1;
+                    commands.push(new CSMWorld::ModifyCommand(*model, model->index(edge, edge1Column, parent),
+                        adjustedEdge));
+                }
+            }
+
+            std::set<int, std::greater<int> >::iterator row;
+            for (row = edgeRowsToRemove.begin(); row != edgeRowsToRemove.end(); ++row)
+            {
+                commands.push(new CSMWorld::DeleteNestedCommand(*model, mId, *row, parentColumn));
+            }
+        }
+
+        clearSelected();
+    }
+
+    void Pathgrid::applyRemoveEdges(CSMWorld::CommandMacro& commands)
+    {
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            // Want to remove from end of row first
+            std::set<int, std::greater<int> > rowsToRemove;
+            for (size_t i = 0; i <= mSelected.size(); ++i)
+            {
+                for (size_t j = i + 1; j < mSelected.size(); ++j)
+                {
+                    int row = edgeExists(*source, mSelected[i], mSelected[j]);
+                    if (row != -1)
+                    {
+                        rowsToRemove.insert(row);
+                    }
+
+                    row = edgeExists(*source, mSelected[j], mSelected[i]);
+                    if (row != -1)
+                    {
+                        rowsToRemove.insert(row);
+                    }
+                }
+            }
+
+            CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
+                CSMWorld::UniversalId::Type_Pathgrids));
+
+            int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
+
+            std::set<int, std::greater<int> >::iterator row;
+            for (row = rowsToRemove.begin(); row != rowsToRemove.end(); ++row)
+            {
+                commands.push(new CSMWorld::DeleteNestedCommand(*model, mId, *row, parentColumn));
+            }
+        }
+    }
+
+    osg::ref_ptr<PathgridTag> Pathgrid::getTag() const
+    {
+        return mTag;
+    }
+
+    void Pathgrid::recreateGeometry()
+    {
+        mChangeGeometry = true;
+    }
+
+    void Pathgrid::removeGeometry()
+    {
+        mRemoveGeometry = true;
+    }
+
+    void Pathgrid::update()
+    {
+        if (mRemoveGeometry)
+        {
+            removePathgridGeometry();
+            removeSelectedGeometry();
+        }
+        else if (mChangeGeometry)
+        {
+            createGeometry();
+        }
+
+        mChangeGeometry = false;
+        mRemoveGeometry = false;
+    }
+
+    void Pathgrid::createGeometry()
+    {
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            CSMWorld::Pathgrid temp;
+            if (mUseOffset)
+            {
+                temp = *source;
+
+                for (NodeList::iterator it = mSelected.begin(); it != mSelected.end(); ++it)
+                {
+                    temp.mPoints[*it].mX += mMoveOffset.x();
+                    temp.mPoints[*it].mY += mMoveOffset.y();
+                    temp.mPoints[*it].mZ += mMoveOffset.z();
+                }
+
+                source = &temp;
+            }
+
+            removePathgridGeometry();
+            mPathgridGeometry = SceneUtil::createPathgridGeometry(*source);
+            mPathgridGeode->addDrawable(mPathgridGeometry);
+
+            createSelectedGeometry(*source);
+        }
+        else
+        {
+            removePathgridGeometry();
+            removeSelectedGeometry();
+        }
+    }
+
+    void Pathgrid::createSelectedGeometry()
+    {
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            createSelectedGeometry(*source);
+        }
+        else
+        {
+            removeSelectedGeometry();
+        }
+    }
+
+    void Pathgrid::createSelectedGeometry(const CSMWorld::Pathgrid& source)
+    {
+        removeSelectedGeometry();
+
+        mSelectedGeometry = SceneUtil::createPathgridSelectedWireframe(source, mSelected);
+        mPathgridGeode->addDrawable(mSelectedGeometry);
+    }
+
+    void Pathgrid::removePathgridGeometry()
+    {
+        if (mPathgridGeometry)
+        {
+            mPathgridGeode->removeDrawable(mPathgridGeometry);
+            mPathgridGeometry = 0;
+        }
+    }
+
+    void Pathgrid::removeSelectedGeometry()
+    {
+        if (mSelectedGeometry)
+        {
+            mPathgridGeode->removeDrawable(mSelectedGeometry);
+            mSelectedGeometry = 0;
+        }
+    }
+
+    void Pathgrid::createDragGeometry(const osg::Vec3f& start, const osg::Vec3f& end, bool valid)
+    {
+        if (mDragGeometry)
+            mPathgridGeode->removeDrawable(mDragGeometry);
+
+        mDragGeometry = new osg::Geometry();
+
+        osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(2);
+        osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(1);
+        osg::ref_ptr<osg::DrawElementsUShort> indices = new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, 2);
+
+        (*vertices)[0] = start;
+        (*vertices)[1] = end;
+
+        if (valid)
+        {
+            (*colors)[0] = osg::Vec4f(0.91f, 0.66f, 1.f, 1.f);
+        }
+        else
+        {
+            (*colors)[0] = osg::Vec4f(1.f, 0.f, 0.f, 1.f);
+        }
+
+        indices->setElement(0, 0);
+        indices->setElement(1, 1);
+
+        mDragGeometry->setVertexArray(vertices);
+        mDragGeometry->setColorArray(colors, osg::Array::BIND_OVERALL);
+        mDragGeometry->addPrimitiveSet(indices);
+        mDragGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+
+        mPathgridGeode->addDrawable(mDragGeometry);
+    }
+
+    const CSMWorld::Pathgrid* Pathgrid::getPathgridSource()
+    {
+        int index = mPathgridCollection.searchId(mId);
+        if (index != -1 && !mPathgridCollection.getRecord(index).isDeleted())
+        {
+            return &mPathgridCollection.getRecord(index).get();
+        }
+
+        return 0;
+    }
+
+    int Pathgrid::edgeExists(const CSMWorld::Pathgrid& source, unsigned short node1, unsigned short node2)
+    {
+        for (size_t i = 0; i < source.mEdges.size(); ++i)
+        {
+            if (source.mEdges[i].mV0 == node1 && source.mEdges[i].mV1 == node2)
+                return static_cast<int>(i);
+        }
+
+        return -1;
+    }
+
+    void Pathgrid::addEdge(CSMWorld::CommandMacro& commands, const CSMWorld::Pathgrid& source, unsigned short node1,
+        unsigned short node2)
+    {
+        CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
+            CSMWorld::UniversalId::Type_Pathgrids));
+
+        int recordIndex = mPathgridCollection.getIndex(mId);
+        int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
+
+        int edge0Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+            CSMWorld::Columns::ColumnId_PathgridEdge0);
+
+        int edge1Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+            CSMWorld::Columns::ColumnId_PathgridEdge1);
+
+        QModelIndex parent = model->index(recordIndex, parentColumn);
+        int row = static_cast<int>(source.mEdges.size());
+
+        if (edgeExists(source, node1, node2) == -1)
+        {
+            commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge0Column, parent), node1));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge1Column, parent), node2));
+            ++row;
+        }
+
+        if (edgeExists(source, node2, node1) == -1)
+        {
+            commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge0Column, parent), node2));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge1Column, parent), node1));
+        }
+    }
+
+    int Pathgrid::clampToCell(int v)
+    {
+        const int CellExtent = ESM::Land::REAL_SIZE;
+
+        if (mInterior)
+            return v;
+        else if (v > CellExtent)
+            return CellExtent;
+        else if (v < 0)
+            return 0;
+        else
+            return v;
+    }
+}
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
new file mode 100644
index 000000000..181a62b44
--- /dev/null
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -0,0 +1,137 @@
+#ifndef CSV_RENDER_PATHGRID_H
+#define CSV_RENDER_PATHGRID_H
+
+#include <vector>
+
+#include <QString>
+#include <osg/ref_ptr>
+#include <osg/Vec3d>
+
+#include "../../model/world/cellcoordinates.hpp"
+#include "../../model/world/idcollection.hpp"
+#include "../../model/world/subcellcollection.hpp"
+
+#include "tagbase.hpp"
+
+namespace osg
+{
+    class Geode;
+    class Geometry;
+    class Group;
+    class PositionAttitudeTransform;
+}
+
+namespace CSMWorld
+{
+    class CommandMacro;
+    class Data;
+    struct Pathgrid;
+}
+
+namespace CSVRender
+{
+    class Pathgrid;
+
+    class PathgridTag : public TagBase
+    {
+        public:
+
+            PathgridTag (Pathgrid* pathgrid);
+
+            Pathgrid* getPathgrid () const;
+
+            virtual QString getToolTip (bool hideBasics) const;
+
+        private:
+
+            Pathgrid* mPathgrid;
+    };
+
+    class Pathgrid
+    {
+        public:
+
+            typedef std::vector<unsigned short> NodeList;
+
+            Pathgrid(CSMWorld::Data& data, osg::Group* parent, const std::string& pathgridId,
+                const CSMWorld::CellCoordinates& coordinates);
+
+            ~Pathgrid();
+
+            const CSMWorld::CellCoordinates& getCoordinates() const;
+            const std::string& getId() const;
+
+            bool isSelected() const;
+            const NodeList& getSelected() const;
+            void selectAll();
+            void toggleSelected(unsigned short node); // Adds to end of vector
+            void invertSelected();
+            void clearSelected();
+
+            void moveSelected(const osg::Vec3d& offset);
+            void setDragOrigin(unsigned short node);
+            void setDragEndpoint(unsigned short node);
+            void setDragEndpoint(const osg::Vec3d& pos);
+
+            void resetIndicators();
+
+            void applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos);
+            void applyPosition(CSMWorld::CommandMacro& commands);
+            void applyEdge(CSMWorld::CommandMacro& commands, unsigned short node1, unsigned short node2);
+            void applyEdges(CSMWorld::CommandMacro& commands, unsigned short node);
+            void applyRemoveNodes(CSMWorld::CommandMacro& commands);
+            void applyRemoveEdges(CSMWorld::CommandMacro& commands);
+
+            osg::ref_ptr<PathgridTag> getTag() const;
+
+            void recreateGeometry();
+            void removeGeometry();
+
+            void update();
+
+        private:
+
+            CSMWorld::Data& mData;
+            CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& mPathgridCollection;
+            std::string mId;
+            CSMWorld::CellCoordinates mCoords;
+            bool mInterior;
+
+            NodeList mSelected;
+            osg::Vec3d mMoveOffset;
+            unsigned short mDragOrigin;
+
+            bool mChangeGeometry;
+            bool mRemoveGeometry;
+            bool mUseOffset;
+
+            osg::Group* mParent;
+            osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
+            osg::ref_ptr<osg::Geode> mPathgridGeode;
+            osg::ref_ptr<osg::Geometry> mPathgridGeometry;
+            osg::ref_ptr<osg::Geometry> mSelectedGeometry;
+            osg::ref_ptr<osg::Geometry> mDragGeometry;
+
+            osg::ref_ptr<PathgridTag> mTag;
+
+            void createGeometry();
+            void createSelectedGeometry();
+            void createSelectedGeometry(const CSMWorld::Pathgrid& source);
+            void removePathgridGeometry();
+            void removeSelectedGeometry();
+
+            void createDragGeometry(const osg::Vec3f& start, const osg::Vec3f& end, bool valid);
+
+            const CSMWorld::Pathgrid* getPathgridSource();
+
+            int edgeExists(const CSMWorld::Pathgrid& source, unsigned short node1, unsigned short node2);
+            void addEdge(CSMWorld::CommandMacro& commands, const CSMWorld::Pathgrid& source, unsigned short node1,
+                unsigned short node2);
+            void removeEdge(CSMWorld::CommandMacro& commands, const CSMWorld::Pathgrid& source, unsigned short node1,
+                unsigned short node2);
+
+            int clampToCell(int v);
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
new file mode 100644
index 000000000..228b2b5e7
--- /dev/null
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -0,0 +1,275 @@
+#include "pathgridmode.hpp"
+
+#include <QMenu>
+#include <QPoint>
+
+#include <components/sceneutil/pathgridutil.hpp>
+
+#include "../../model/prefs/state.hpp"
+
+#include "../../model/world/commands.hpp"
+#include "../../model/world/commandmacro.hpp"
+#include "../../model/world/idtable.hpp"
+#include "../../model/world/idtree.hpp"
+
+#include "../widget/scenetoolbar.hpp"
+
+#include "cell.hpp"
+#include "mask.hpp"
+#include "pathgrid.hpp"
+#include "pathgridselectionmode.hpp"
+#include "worldspacewidget.hpp"
+
+namespace CSVRender
+{
+    PathgridMode::PathgridMode(WorldspaceWidget* worldspaceWidget, QWidget* parent)
+        : EditMode(worldspaceWidget, QIcon(":placeholder"), Mask_Pathgrid | Mask_Terrain | Mask_Reference,
+            getTooltip(), parent)
+        , mDragMode(DragMode_None)
+        , mFromNode(0)
+        , mSelectionMode(0)
+    {
+    }
+
+    QString PathgridMode::getTooltip()
+    {
+        return QString(
+            "Pathgrid editing"
+            "<ul><li>Press {scene-edit-primary} to add a node to the cursor location</li>"
+            "<li>Press {scene-edit-secondary} to connect the selected nodes to the node beneath the cursor</li>"
+            "<li>Press {scene-edit-primary} and drag to move selected nodes</li>"
+            "<li>Press {scene-edit-secondary} and drag to connect one node to another</li>"
+            "</ul><p>Note: Only a single cell's pathgrid may be edited at a time");
+    }
+
+    void PathgridMode::activate(CSVWidget::SceneToolbar* toolbar)
+    {
+        if (!mSelectionMode)
+        {
+            mSelectionMode = new PathgridSelectionMode(toolbar, getWorldspaceWidget());
+        }
+
+        EditMode::activate(toolbar);
+        toolbar->addTool(mSelectionMode);
+    }
+
+    void PathgridMode::deactivate(CSVWidget::SceneToolbar* toolbar)
+    {
+        if (mSelectionMode)
+        {
+            toolbar->removeTool (mSelectionMode);
+            delete mSelectionMode;
+            mSelectionMode = 0;
+        }
+    }
+
+    void PathgridMode::primaryEditPressed(const WorldspaceHitResult& hitResult)
+    {
+        if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue() &&
+            dynamic_cast<PathgridTag*>(hitResult.tag.get()))
+        {
+            primarySelectPressed(hitResult);
+        }
+        else if (Cell* cell = getWorldspaceWidget().getCell (hitResult.worldPos))
+        {
+            // Add node
+            QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+            QString description = "Add node";
+
+            CSMWorld::CommandMacro macro(undoStack, description);
+            cell->getPathgrid()->applyPoint(macro, hitResult.worldPos);
+        }
+    }
+
+    void PathgridMode::secondaryEditPressed(const WorldspaceHitResult& hit)
+    {
+        if (hit.tag)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
+            {
+                if (tag->getPathgrid()->isSelected())
+                {
+                    unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+
+                    QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+                    QString description = "Connect node to selected nodes";
+
+                    CSMWorld::CommandMacro macro(undoStack, description);
+                    tag->getPathgrid()->applyEdges(macro, node);
+                }
+            }
+        }
+    }
+
+    void PathgridMode::primarySelectPressed(const WorldspaceHitResult& hit)
+    {
+        getWorldspaceWidget().clearSelection(Mask_Pathgrid);
+
+        if (hit.tag)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
+            {
+                mLastId = tag->getPathgrid()->getId();
+                unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+                tag->getPathgrid()->toggleSelected(node);
+            }
+        }
+    }
+
+    void PathgridMode::secondarySelectPressed(const WorldspaceHitResult& hit)
+    {
+        if (hit.tag)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
+            {
+                if (tag->getPathgrid()->getId() != mLastId)
+                {
+                    getWorldspaceWidget().clearSelection(Mask_Pathgrid);
+                    mLastId = tag->getPathgrid()->getId();
+                }
+
+                unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+                tag->getPathgrid()->toggleSelected(node);
+
+                return;
+            }
+        }
+
+        getWorldspaceWidget().clearSelection(Mask_Pathgrid);
+    }
+
+    bool PathgridMode::primaryEditStartDrag(const QPoint& pos)
+    {
+        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+
+        if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
+        {
+            WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+
+            if (dynamic_cast<PathgridTag*>(hit.tag.get()))
+            {
+                primarySelectPressed(hit);
+                selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+            }
+        }
+
+        if (!selection.empty())
+        {
+            mDragMode = DragMode_Move;
+            return true;
+        }
+
+        return false;
+    }
+
+    bool PathgridMode::secondaryEditStartDrag(const QPoint& pos)
+    {
+        WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+        if (hit.tag)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
+            {
+                mDragMode = DragMode_Edge;
+                mEdgeId = tag->getPathgrid()->getId();
+                mFromNode = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+
+                tag->getPathgrid()->setDragOrigin(mFromNode);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    void PathgridMode::drag(const QPoint& pos, int diffX, int diffY, double speedFactor)
+    {
+        if (mDragMode == DragMode_Move)
+        {
+            std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection(Mask_Pathgrid);
+
+            for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+            {
+                if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
+                {
+                    osg::Vec3d eye, center, up, offset;
+                    getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, center, up);
+
+                    offset = (up * diffY * speedFactor) + (((center - eye) ^ up) * diffX * speedFactor);
+
+                    tag->getPathgrid()->moveSelected(offset);
+                }
+            }
+        }
+        else if (mDragMode == DragMode_Edge)
+        {
+            WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+
+            Cell* cell = getWorldspaceWidget().getCell(hit.worldPos);
+            if (cell)
+            {
+                PathgridTag* tag = 0;
+                if (hit.tag && (tag = dynamic_cast<PathgridTag*>(hit.tag.get())) && tag->getPathgrid()->getId() == mEdgeId)
+                {
+                    unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+                    cell->getPathgrid()->setDragEndpoint(node);
+                }
+                else
+                {
+                    cell->getPathgrid()->setDragEndpoint(hit.worldPos);
+                }
+
+            }
+        }
+    }
+
+    void PathgridMode::dragCompleted(const QPoint& pos)
+    {
+        if (mDragMode == DragMode_Move)
+        {
+            std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+            for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+            {
+                if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
+                {
+                    QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+                    QString description = "Move pathgrid node(s)";
+
+                    CSMWorld::CommandMacro macro(undoStack, description);
+                    tag->getPathgrid()->applyPosition(macro);
+                }
+            }
+        }
+        else if (mDragMode == DragMode_Edge)
+        {
+            WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
+
+            if (hit.tag)
+            {
+                if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
+                {
+                    if (tag->getPathgrid()->getId() == mEdgeId)
+                    {
+                        unsigned short toNode = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+
+                        QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+                        QString description = "Add edge between nodes";
+
+                        CSMWorld::CommandMacro macro(undoStack, description);
+                        tag->getPathgrid()->applyEdge(macro, mFromNode, toNode);
+                    }
+                }
+            }
+
+            mEdgeId.clear();
+            mFromNode = 0;
+        }
+
+        mDragMode = DragMode_None;
+        getWorldspaceWidget().reset(Mask_Pathgrid);
+    }
+
+    void PathgridMode::dragAborted()
+    {
+        getWorldspaceWidget().reset(Mask_Pathgrid);
+    }
+}
diff --git a/apps/opencs/view/render/pathgridmode.hpp b/apps/opencs/view/render/pathgridmode.hpp
new file mode 100644
index 000000000..e34208f8c
--- /dev/null
+++ b/apps/opencs/view/render/pathgridmode.hpp
@@ -0,0 +1,63 @@
+#ifndef CSV_RENDER_PATHGRIDMODE_H
+#define CSV_RENDER_PATHGRIDMODE_H
+
+#include <string>
+
+#include "editmode.hpp"
+
+namespace CSVRender
+{
+    class PathgridSelectionMode;
+
+    class PathgridMode : public EditMode
+    {
+            Q_OBJECT
+
+        public:
+
+            PathgridMode(WorldspaceWidget* worldspace, QWidget* parent=0);
+
+            virtual void activate(CSVWidget::SceneToolbar* toolbar);
+
+            virtual void deactivate(CSVWidget::SceneToolbar* toolbar);
+
+            virtual void primaryEditPressed(const WorldspaceHitResult& hit);
+
+            virtual void secondaryEditPressed(const WorldspaceHitResult& hit);
+
+            virtual void primarySelectPressed(const WorldspaceHitResult& hit);
+
+            virtual void secondarySelectPressed(const WorldspaceHitResult& hit);
+
+            virtual bool primaryEditStartDrag (const QPoint& pos);
+
+            virtual bool secondaryEditStartDrag (const QPoint& pos);
+
+            virtual void drag (const QPoint& pos, int diffX, int diffY, double speedFactor);
+
+            virtual void dragCompleted(const QPoint& pos);
+
+            /// \note dragAborted will not be called, if the drag is aborted via changing
+            /// editing mode
+            virtual void dragAborted();
+
+        private:
+
+            enum DragMode
+            {
+                DragMode_None,
+                DragMode_Move,
+                DragMode_Edge
+            };
+
+            DragMode mDragMode;
+            std::string mLastId, mEdgeId;
+            unsigned short mFromNode;
+
+            PathgridSelectionMode* mSelectionMode;
+
+            QString getTooltip();
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/pathgridselectionmode.cpp b/apps/opencs/view/render/pathgridselectionmode.cpp
new file mode 100644
index 000000000..db41faf50
--- /dev/null
+++ b/apps/opencs/view/render/pathgridselectionmode.cpp
@@ -0,0 +1,71 @@
+#include "pathgridselectionmode.hpp"
+
+#include <QMenu>
+#include <QAction>
+
+#include "../../model/world/idtable.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/commandmacro.hpp"
+
+#include "worldspacewidget.hpp"
+#include "pathgrid.hpp"
+
+namespace CSVRender
+{
+    PathgridSelectionMode::PathgridSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget)
+        : SelectionMode(parent, worldspaceWidget, Mask_Pathgrid)
+    {
+        mRemoveSelectedNodes = new QAction("Remove selected nodes", this);
+        mRemoveSelectedEdges = new QAction("Remove edges between selected nodes", this);
+
+        connect(mRemoveSelectedNodes, SIGNAL(triggered()), this, SLOT(removeSelectedNodes()));
+        connect(mRemoveSelectedEdges, SIGNAL(triggered()), this, SLOT(removeSelectedEdges()));
+    }
+
+    bool PathgridSelectionMode::createContextMenu(QMenu* menu)
+    {
+        if (menu)
+        {
+            SelectionMode::createContextMenu(menu);
+
+            menu->addAction(mRemoveSelectedNodes);
+            menu->addAction(mRemoveSelectedEdges);
+        }
+
+        return true;
+    }
+
+    void PathgridSelectionMode::removeSelectedNodes()
+    {
+        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+
+        for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
+            {
+                QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+                QString description = "Remove selected nodes";
+
+                CSMWorld::CommandMacro macro(undoStack, description);
+                tag->getPathgrid()->applyRemoveNodes(macro);
+            }
+        }
+    }
+
+    void PathgridSelectionMode::removeSelectedEdges()
+    {
+        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+
+        for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
+            {
+                QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+                QString description = "Remove edges between selected nodes";
+
+                CSMWorld::CommandMacro macro(undoStack, description);
+                tag->getPathgrid()->applyRemoveEdges(macro);
+            }
+        }
+    }
+}
diff --git a/apps/opencs/view/render/pathgridselectionmode.hpp b/apps/opencs/view/render/pathgridselectionmode.hpp
new file mode 100644
index 000000000..e4cb1e044
--- /dev/null
+++ b/apps/opencs/view/render/pathgridselectionmode.hpp
@@ -0,0 +1,38 @@
+#ifndef CSV_RENDER_PATHGRID_SELECTION_MODE_H
+#define CSV_RENDER_PATHGRID_SELECTION_MODE_H
+
+#include "selectionmode.hpp"
+
+namespace CSVRender
+{
+    class PathgridSelectionMode : public SelectionMode
+    {
+            Q_OBJECT
+
+        public:
+
+            PathgridSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget);
+
+        protected:
+
+            /// Add context menu items to \a menu.
+            ///
+            /// \attention menu can be a 0-pointer
+            ///
+            /// \return Have there been any menu items to be added (if menu is 0 and there
+            /// items to be added, the function must return true anyway.
+            bool createContextMenu(QMenu* menu);
+
+        private:
+
+            QAction* mRemoveSelectedNodes;
+            QAction* mRemoveSelectedEdges;
+
+        private slots:
+
+            void removeSelectedNodes();
+            void removeSelectedEdges();
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/previewwidget.cpp b/apps/opencs/view/render/previewwidget.cpp
index a03b277d3..2f3510317 100644
--- a/apps/opencs/view/render/previewwidget.cpp
+++ b/apps/opencs/view/render/previewwidget.cpp
@@ -1,7 +1,5 @@
 #include "previewwidget.hpp"
 
-#include <osgGA/TrackballManipulator>
-
 #include "../../model/world/data.hpp"
 #include "../../model/world/idtable.hpp"
 
@@ -9,7 +7,7 @@ CSVRender::PreviewWidget::PreviewWidget (CSMWorld::Data& data,
     const std::string& id, bool referenceable, QWidget *parent)
 : SceneWidget (data.getResourceSystem(), parent), mData (data), mObject(data, mRootNode, id, referenceable)
 {
-    mView->setCameraManipulator(new osgGA::TrackballManipulator);
+    selectNavigationMode("orbit");
 
     QAbstractItemModel *referenceables =
         mData.getTableModel (CSMWorld::UniversalId::Type_Referenceables);
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index e5b9171e0..a072cd0aa 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -3,14 +3,15 @@
 #include <QEvent>
 #include <QResizeEvent>
 #include <QTimer>
-#include <QShortcut>
 #include <QLayout>
 
-#include <osgQt/GraphicsWindowQt>
+#include <extern/osgQt/GraphicsWindowQt>
 #include <osg/GraphicsContext>
 #include <osgViewer/CompositeViewer>
 #include <osgViewer/ViewerEventHandlers>
 #include <osg/LightModel>
+#include <osg/Material>
+#include <osg/Version>
 
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/resourcesystem.hpp>
@@ -18,8 +19,13 @@
 
 #include "../widget/scenetoolmode.hpp"
 
+#include "../../model/prefs/state.hpp"
+#include "../../model/prefs/shortcut.hpp"
+#include "../../model/prefs/shortcuteventhandler.hpp"
+
 #include "lighting.hpp"
 #include "mask.hpp"
+#include "cameracontroller.hpp"
 
 namespace CSVRender
 {
@@ -57,9 +63,6 @@ RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
     layout->addWidget(window->getGLWidget());
     setLayout(layout);
 
-    // Pass events through this widget first
-    window->getGLWidget()->installEventFilter(this);
-
     mView->getCamera()->setGraphicsContext(window);
     mView->getCamera()->setClearColor( osg::Vec4(0.2, 0.2, 0.6, 1.0) );
     mView->getCamera()->setViewport( new osg::Viewport(0, 0, traits->width, traits->height) );
@@ -72,10 +75,16 @@ RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
 
     mView->getCamera()->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
     mView->getCamera()->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
+    osg::ref_ptr<osg::Material> defaultMat (new osg::Material);
+    defaultMat->setColorMode(osg::Material::OFF);
+    defaultMat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+    defaultMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+    defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
+    mView->getCamera()->getOrCreateStateSet()->setAttribute(defaultMat);
 
     mView->setSceneData(mRootNode);
 
-    // Press S to reveal profiling stats
+    // Add ability to signal osg to show its statistics for debugging purposes
     mView->addEventHandler(new osgViewer::StatsHandler);
 
     mView->getCamera()->setCullMask(~(Mask_UpdateVisitor));
@@ -100,26 +109,21 @@ void RenderWidget::setVisibilityMask(int mask)
     mView->getCamera()->setCullMask(mask | Mask_ParticleSystem | Mask_Lighting);
 }
 
-bool RenderWidget::eventFilter(QObject* obj, QEvent* event)
+osg::Camera *RenderWidget::getCamera()
 {
-    // handle event in this widget, is there a better way to do this?
-    if (event->type() == QEvent::MouseButtonPress)
-        mousePressEvent(static_cast<QMouseEvent*>(event));
-    if (event->type() == QEvent::MouseButtonRelease)
-        mouseReleaseEvent(static_cast<QMouseEvent*>(event));
-    if (event->type() == QEvent::MouseMove)
-        mouseMoveEvent(static_cast<QMouseEvent*>(event));
-    if (event->type() == QEvent::KeyPress)
-        keyPressEvent(static_cast<QKeyEvent*>(event));
-    if (event->type() == QEvent::KeyRelease)
-        keyReleaseEvent(static_cast<QKeyEvent*>(event));
-    if (event->type() == QEvent::Wheel)
-        wheelEvent(static_cast<QWheelEvent *>(event));
-
-    // Always pass the event on to GLWidget, i.e. to OSG event queue
-    return QObject::eventFilter(obj, event);
+    return mView->getCamera();
 }
 
+void RenderWidget::toggleRenderStats()
+{
+    osgViewer::GraphicsWindow* window =
+        static_cast<osgViewer::GraphicsWindow*>(mView->getCamera()->getGraphicsContext());
+
+    window->getEventQueue()->keyPress(osgGA::GUIEventAdapter::KEY_S);
+    window->getEventQueue()->keyRelease(osgGA::GUIEventAdapter::KEY_S);
+}
+
+
 // --------------------------------------------------
 
 CompositeViewer::CompositeViewer()
@@ -134,6 +138,10 @@ CompositeViewer::CompositeViewer()
 
     setThreadingModel(threadingModel);
 
+#if OSG_VERSION_GREATER_OR_EQUAL(3,5,5)
+    setUseConfigureAffinity(false);
+#endif
+
     // disable the default setting of viewer.done() by pressing Escape.
     setKeyEventSetsDone(0);
 
@@ -153,19 +161,33 @@ CompositeViewer &CompositeViewer::get()
 
 void CompositeViewer::update()
 {
-    mSimulationTime += mFrameTimer.time_s();
+    double dt = mFrameTimer.time_s();
     mFrameTimer.setStartTick();
+
+    emit simulationUpdated(dt);
+
+    mSimulationTime += dt;
     frame(mSimulationTime);
 }
 
 // ---------------------------------------------------
 
-SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget *parent, Qt::WindowFlags f)
+SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget *parent, Qt::WindowFlags f,
+    bool retrieveInput)
     : RenderWidget(parent, f)
     , mResourceSystem(resourceSystem)
     , mLighting(NULL)
     , mHasDefaultAmbient(false)
+    , mPrevMouseX(0)
+    , mPrevMouseY(0)
+    , mCamPositionSet(false)
 {
+    mFreeCamControl = new FreeCameraController(this);
+    mOrbitCamControl = new OrbitCameraController(this);
+    mCurrentCamControl = mFreeCamControl;
+
+    mOrbitCamControl->setPickingMask(Mask_Reference | Mask_Terrain);
+
     // we handle lighting manually
     mView->setLightingMode(osgViewer::View::NO_LIGHT);
 
@@ -173,14 +195,33 @@ SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSys
 
     mResourceSystem->getSceneManager()->setParticleSystemMask(Mask_ParticleSystem);
 
-    /// \todo make shortcut configurable
-    QShortcut *focusToolbar = new QShortcut (Qt::Key_T, this, 0, 0, Qt::WidgetWithChildrenShortcut);
-    connect (focusToolbar, SIGNAL (activated()), this, SIGNAL (focusToolbarRequest()));
+    // Recieve mouse move event even if mouse button is not pressed
+    setMouseTracking(true);
+    setFocusPolicy(Qt::ClickFocus);
+
+    connect (&CSMPrefs::State::get(), SIGNAL (settingChanged (const CSMPrefs::Setting *)),
+        this, SLOT (settingChanged (const CSMPrefs::Setting *)));
+
+    // TODO update this outside of the constructor where virtual methods can be used
+    if (retrieveInput)
+    {
+        CSMPrefs::get()["3D Scene Input"].update();
+        CSMPrefs::get()["Tooltips"].update();
+    }
+
+    connect (&CompositeViewer::get(), SIGNAL (simulationUpdated(double)), this, SLOT (update(double)));
+
+    // Shortcuts
+    CSMPrefs::Shortcut* focusToolbarShortcut = new CSMPrefs::Shortcut("scene-focus-toolbar", this);
+    connect(focusToolbarShortcut, SIGNAL(activated()), this, SIGNAL(focusToolbarRequest()));
+
+    CSMPrefs::Shortcut* renderStatsShortcut = new CSMPrefs::Shortcut("scene-render-stats", this);
+    connect(renderStatsShortcut, SIGNAL(activated()), this, SLOT(toggleRenderStats()));
 }
 
 SceneWidget::~SceneWidget()
 {
-    // Since we're holding on to the scene templates past the existance of this graphics context, we'll need to manually release the created objects
+    // Since we're holding on to the scene templates past the existence of this graphics context, we'll need to manually release the created objects
     mResourceSystem->getSceneManager()->releaseGLObjects(mView->getCamera()->getGraphicsContext()->getState());
 }
 
@@ -255,4 +296,104 @@ void SceneWidget::setDefaultAmbient (const osg::Vec4f& colour)
     setAmbient(mLighting->getAmbientColour(&mDefaultAmbient));
 }
 
+void SceneWidget::mouseMoveEvent (QMouseEvent *event)
+{
+    mCurrentCamControl->handleMouseMoveEvent(event->x() - mPrevMouseX, event->y() - mPrevMouseY);
+
+    mPrevMouseX = event->x();
+    mPrevMouseY = event->y();
+}
+
+void SceneWidget::wheelEvent(QWheelEvent *event)
+{
+    mCurrentCamControl->handleMouseScrollEvent(event->delta());
+}
+
+void SceneWidget::update(double dt)
+{
+    if (mCamPositionSet)
+    {
+        mCurrentCamControl->update(dt);
+    }
+    else
+    {
+        mCurrentCamControl->setup(mRootNode, Mask_Reference | Mask_Terrain, CameraController::WorldUp);
+        mCamPositionSet = true;
+    }
+}
+
+void SceneWidget::settingChanged (const CSMPrefs::Setting *setting)
+{
+    if (*setting=="3D Scene Input/p-navi-free-sensitivity")
+    {
+        mFreeCamControl->setCameraSensitivity(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/p-navi-orbit-sensitivity")
+    {
+        mOrbitCamControl->setCameraSensitivity(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/p-navi-free-invert")
+    {
+        mFreeCamControl->setInverted(setting->isTrue());
+    }
+    else if (*setting=="3D Scene Input/p-navi-orbit-invert")
+    {
+        mOrbitCamControl->setInverted(setting->isTrue());
+    }
+    else if (*setting=="3D Scene Input/s-navi-sensitivity")
+    {
+        mFreeCamControl->setSecondaryMovementMultiplier(setting->toDouble());
+        mOrbitCamControl->setSecondaryMovementMultiplier(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/navi-wheel-factor")
+    {
+        mFreeCamControl->setWheelMovementMultiplier(setting->toDouble());
+        mOrbitCamControl->setWheelMovementMultiplier(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/navi-free-lin-speed")
+    {
+        mFreeCamControl->setLinearSpeed(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/navi-free-rot-speed")
+    {
+        mFreeCamControl->setRotationalSpeed(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/navi-free-speed-mult")
+    {
+        mFreeCamControl->setSpeedMultiplier(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/navi-orbit-rot-speed")
+    {
+        mOrbitCamControl->setOrbitSpeed(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/navi-orbit-speed-mult")
+    {
+        mOrbitCamControl->setOrbitSpeedMultiplier(setting->toDouble());
+    }
+}
+
+void SceneWidget::selectNavigationMode (const std::string& mode)
+{
+    if (mode=="1st")
+    {
+        mCurrentCamControl->setCamera(NULL);
+        mCurrentCamControl = mFreeCamControl;
+        mFreeCamControl->setCamera(getCamera());
+        mFreeCamControl->fixUpAxis(CameraController::WorldUp);
+    }
+    else if (mode=="free")
+    {
+        mCurrentCamControl->setCamera(NULL);
+        mCurrentCamControl = mFreeCamControl;
+        mFreeCamControl->setCamera(getCamera());
+        mFreeCamControl->unfixUpAxis();
+    }
+    else if (mode=="orbit")
+    {
+        mCurrentCamControl->setCamera(NULL);
+        mCurrentCamControl = mOrbitCamControl;
+        mOrbitCamControl->setCamera(getCamera());
+    }
+}
+
 }
diff --git a/apps/opencs/view/render/scenewidget.hpp b/apps/opencs/view/render/scenewidget.hpp
index 63da01a45..c5d9cdfce 100644
--- a/apps/opencs/view/render/scenewidget.hpp
+++ b/apps/opencs/view/render/scenewidget.hpp
@@ -1,17 +1,21 @@
 #ifndef OPENCS_VIEW_SCENEWIDGET_H
 #define OPENCS_VIEW_SCENEWIDGET_H
 
+#include <map>
+#include <memory>
+
 #include <QWidget>
 #include <QTimer>
 
+#include <osgViewer/View>
+#include <osgViewer/CompositeViewer>
+
 #include <boost/shared_ptr.hpp>
 
 #include "lightingday.hpp"
 #include "lightingnight.hpp"
 #include "lightingbright.hpp"
 
-#include <osgViewer/View>
-#include <osgViewer/CompositeViewer>
 
 namespace Resource
 {
@@ -21,6 +25,7 @@ namespace Resource
 namespace osg
 {
     class Group;
+    class Camera;
 }
 
 namespace CSVWidget
@@ -29,91 +34,128 @@ namespace CSVWidget
     class SceneToolbar;
 }
 
+namespace CSMPrefs
+{
+    class Setting;
+}
+
 namespace CSVRender
 {
+    class CameraController;
+    class FreeCameraController;
+    class OrbitCameraController;
     class Lighting;
 
     class RenderWidget : public QWidget
     {
-        Q_OBJECT
+            Q_OBJECT
+
+        public:
+            RenderWidget(QWidget* parent = 0, Qt::WindowFlags f = 0);
+            virtual ~RenderWidget();
 
-    public:
-        RenderWidget(QWidget* parent = 0, Qt::WindowFlags f = 0);
-        virtual ~RenderWidget();
+            /// Initiates a request to redraw the view
+            void flagAsModified();
 
-        void flagAsModified();
+            void setVisibilityMask(int mask);
 
-        void setVisibilityMask(int mask);
+            osg::Camera *getCamera();
 
-        bool eventFilter(QObject *, QEvent *);
+        protected:
 
-    protected:
+            osg::ref_ptr<osgViewer::View> mView;
+            osg::ref_ptr<osg::Group> mRootNode;
 
-        osg::ref_ptr<osgViewer::View> mView;
+            QTimer mTimer;
 
-        osg::Group* mRootNode;
+        protected slots:
 
-        QTimer mTimer;
+            void toggleRenderStats();
     };
 
-    // Extension of RenderWidget to support lighting mode selection & toolbar
+    /// Extension of RenderWidget to support lighting mode selection & toolbar
     class SceneWidget : public RenderWidget
     {
-        Q_OBJECT
-    public:
-        SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget* parent = 0, Qt::WindowFlags f = 0);
-        virtual ~SceneWidget();
+            Q_OBJECT
+        public:
+            SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget* parent = 0,
+                    Qt::WindowFlags f = 0, bool retrieveInput = true);
+            virtual ~SceneWidget();
 
-        CSVWidget::SceneToolMode *makeLightingSelector (CSVWidget::SceneToolbar *parent);
-        ///< \attention The created tool is not added to the toolbar (via addTool). Doing that
-        /// is the responsibility of the calling function.
+            CSVWidget::SceneToolMode *makeLightingSelector (CSVWidget::SceneToolbar *parent);
+            ///< \attention The created tool is not added to the toolbar (via addTool). Doing that
+            /// is the responsibility of the calling function.
 
-        void setDefaultAmbient (const osg::Vec4f& colour);
-        ///< \note The actual ambient colour may differ based on lighting settings.
+            void setDefaultAmbient (const osg::Vec4f& colour);
+            ///< \note The actual ambient colour may differ based on lighting settings.
 
-    protected:
-        void setLighting (Lighting *lighting);
-        ///< \attention The ownership of \a lighting is not transferred to *this.
+        protected:
+            void setLighting (Lighting *lighting);
+            ///< \attention The ownership of \a lighting is not transferred to *this.
 
-        void setAmbient(const osg::Vec4f& ambient);
+            void setAmbient(const osg::Vec4f& ambient);
 
-        boost::shared_ptr<Resource::ResourceSystem> mResourceSystem;
+            virtual void mouseMoveEvent (QMouseEvent *event);
+            virtual void wheelEvent (QWheelEvent *event);
 
-        Lighting* mLighting;
+            boost::shared_ptr<Resource::ResourceSystem> mResourceSystem;
 
-        osg::Vec4f mDefaultAmbient;
-        bool mHasDefaultAmbient;
-        LightingDay mLightingDay;
-        LightingNight mLightingNight;
-        LightingBright mLightingBright;
+            Lighting* mLighting;
 
-    private slots:
+            osg::Vec4f mDefaultAmbient;
+            bool mHasDefaultAmbient;
+            LightingDay mLightingDay;
+            LightingNight mLightingNight;
+            LightingBright mLightingBright;
 
-        void selectLightingMode (const std::string& mode);
+            int mPrevMouseX, mPrevMouseY;
+            
+            /// Tells update that camera isn't set
+            bool mCamPositionSet;
+
+            FreeCameraController* mFreeCamControl;
+            OrbitCameraController* mOrbitCamControl;
+            CameraController* mCurrentCamControl;
+
+        public slots:
+            void update(double dt);
+
+        protected slots:
+
+            virtual void settingChanged (const CSMPrefs::Setting *setting);
+
+            void selectNavigationMode (const std::string& mode);
+
+        private slots:
+
+            void selectLightingMode (const std::string& mode);
 
         signals:
 
-             void focusToolbarRequest();
+            void focusToolbarRequest();
     };
 
 
     // There are rendering glitches when using multiple Viewer instances, work around using CompositeViewer with multiple views
     class CompositeViewer : public QObject, public osgViewer::CompositeViewer
     {
-        Q_OBJECT
-    public:
-        CompositeViewer();
+            Q_OBJECT
+        public:
+            CompositeViewer();
 
-        static CompositeViewer& get();
+            static CompositeViewer& get();
 
-        QTimer mTimer;
+            QTimer mTimer;
 
-    private:
-        osg::Timer mFrameTimer;
-        double mSimulationTime;
+        private:
+            osg::Timer mFrameTimer;
+            double mSimulationTime;
 
-    public slots:
-        void update();
+        public slots:
+            void update();
+
+        signals:
+            void simulationUpdated(double dt);
     };
 
 }
diff --git a/apps/opencs/view/render/selectionmode.cpp b/apps/opencs/view/render/selectionmode.cpp
new file mode 100644
index 000000000..cf0967e47
--- /dev/null
+++ b/apps/opencs/view/render/selectionmode.cpp
@@ -0,0 +1,83 @@
+#include "selectionmode.hpp"
+
+#include <QMenu>
+#include <QAction>
+
+#include "worldspacewidget.hpp"
+
+namespace CSVRender
+{
+    SelectionMode::SelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget,
+        unsigned int interactionMask)
+        : SceneToolMode(parent, "Selection mode")
+        , mWorldspaceWidget(worldspaceWidget)
+        , mInteractionMask(interactionMask)
+    {
+        addButton(":placeholder", "cube-centre",
+            "Centred cube"
+            "<ul><li>Drag with {scene-select-primary} (make instances the selection) or {scene-select-secondary} "
+                "(invert selection state) from the centre of the selection cube outwards</li>"
+            "<li>The selection cube is aligned to the word space axis</li>"
+            "<li>If context selection mode is enabled, a drag with {scene-edit-primary} or {scene-edit-secondary} not "
+                "starting on an instance will have the same effect</li>"
+            "</ul>"
+            "<font color=Red>Not implemented yet</font color>");
+        addButton(":placeholder", "cube-corner",
+            "Cube corner to corner"
+            "<ul><li>Drag with {scene-select-primary} (make instances the selection) or {scene-select-secondary} "
+                "(invert selection state) from one corner of the selection cube to the opposite corner</li>"
+            "<li>The selection cube is aligned to the word space axis</li>"
+            "<li>If context selection mode is enabled, a drag with {scene-edit-primary} or {scene-edit-secondary} not "
+                "starting on an instance will have the same effect</li>"
+            "</ul>"
+            "<font color=Red>Not implemented yet</font color>");
+        addButton(":placeholder", "sphere",
+            "Centred sphere"
+            "<ul><li>Drag with {scene-select-primary} (make instances the selection) or {scene-select-secondary} "
+                "(invert selection state) from the centre of the selection sphere outwards</li>"
+            "<li>If context selection mode is enabled, a drag with {scene-edit-primary} or {scene-edit-secondary} not "
+                "starting on an instance will have the same effect</li>"
+            "</ul>"
+            "<font color=Red>Not implemented yet</font color>");
+
+        mSelectAll = new QAction("Select all", this);
+        mDeselectAll = new QAction("Clear selection", this);
+        mInvertSelection = new QAction("Invert selection", this);
+
+        connect(mSelectAll, SIGNAL(triggered()), this, SLOT(selectAll()));
+        connect(mDeselectAll, SIGNAL(triggered()), this, SLOT(clearSelection()));
+        connect(mInvertSelection, SIGNAL(triggered()), this, SLOT(invertSelection()));
+    }
+
+    WorldspaceWidget& SelectionMode::getWorldspaceWidget()
+    {
+        return mWorldspaceWidget;
+    }
+
+    bool SelectionMode::createContextMenu (QMenu* menu)
+    {
+        if (menu)
+        {
+            menu->addAction(mSelectAll);
+            menu->addAction(mDeselectAll);
+            menu->addAction(mInvertSelection);
+        }
+
+        return true;
+    }
+
+    void SelectionMode::selectAll()
+    {
+        getWorldspaceWidget().selectAll(mInteractionMask);
+    }
+
+    void SelectionMode::clearSelection()
+    {
+        getWorldspaceWidget().clearSelection(mInteractionMask);
+    }
+
+    void SelectionMode::invertSelection()
+    {
+        getWorldspaceWidget().invertSelection(mInteractionMask);
+    }
+}
diff --git a/apps/opencs/view/render/selectionmode.hpp b/apps/opencs/view/render/selectionmode.hpp
new file mode 100644
index 000000000..f28888bfd
--- /dev/null
+++ b/apps/opencs/view/render/selectionmode.hpp
@@ -0,0 +1,51 @@
+#ifndef CSV_RENDER_SELECTION_MODE_H
+#define CSV_RENDER_SELECTION_MODE_H
+
+#include "../widget/scenetoolmode.hpp"
+
+#include "mask.hpp"
+
+class QAction;
+
+namespace CSVRender
+{
+    class WorldspaceWidget;
+
+    class SelectionMode : public CSVWidget::SceneToolMode
+    {
+            Q_OBJECT
+
+        public:
+
+            SelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget,
+                unsigned int interactionMask);
+
+        protected:
+
+            WorldspaceWidget& getWorldspaceWidget();
+
+            /// Add context menu items to \a menu.
+            ///
+            /// \attention menu can be a 0-pointer
+            ///
+            /// \return Have there been any menu items to be added (if menu is 0 and there
+            /// items to be added, the function must return true anyway.
+            virtual bool createContextMenu (QMenu* menu);
+
+        private:
+
+            WorldspaceWidget& mWorldspaceWidget;
+            unsigned int mInteractionMask;
+            QAction* mSelectAll;
+            QAction* mDeselectAll;
+            QAction* mInvertSelection;
+
+        protected slots:
+
+            virtual void selectAll();
+            virtual void clearSelection();
+            virtual void invertSelection();
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 8d65c3694..03a97bf1a 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -2,8 +2,6 @@
 
 #include <sstream>
 
-#include <osgGA/TrackballManipulator>
-
 #include <QEvent>
 
 #include <components/sceneutil/util.hpp>
@@ -34,7 +32,7 @@ void CSVRender::UnpagedWorldspaceWidget::update()
 }
 
 CSVRender::UnpagedWorldspaceWidget::UnpagedWorldspaceWidget (const std::string& cellId, CSMDoc::Document& document, QWidget* parent)
-: WorldspaceWidget (document, parent), mCellId (cellId)
+: WorldspaceWidget (document, parent), mDocument(document), mCellId (cellId)
 {
     mCellsModel = &dynamic_cast<CSMWorld::IdTable&> (
         *document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
@@ -50,8 +48,6 @@ CSVRender::UnpagedWorldspaceWidget::UnpagedWorldspaceWidget (const std::string&
     update();
 
     mCell.reset (new Cell (document.getData(), mRootNode, mCellId));
-
-    mView->setCameraManipulator(new osgGA::TrackballManipulator);
 }
 
 void CSVRender::UnpagedWorldspaceWidget::cellDataChanged (const QModelIndex& topLeft,
@@ -84,20 +80,20 @@ void CSVRender::UnpagedWorldspaceWidget::cellRowsAboutToBeRemoved (const QModelI
         emit closeRequest();
 }
 
-bool CSVRender::UnpagedWorldspaceWidget::handleDrop (const std::vector<CSMWorld::UniversalId>& data, DropType type)
+bool CSVRender::UnpagedWorldspaceWidget::handleDrop (const std::vector<CSMWorld::UniversalId>& universalIdData, DropType type)
 {
-    if (WorldspaceWidget::handleDrop (data, type))
+    if (WorldspaceWidget::handleDrop (universalIdData, type))
         return true;
 
     if (type!=Type_CellsInterior)
         return false;
 
-    mCellId = data.begin()->getId();
+    mCellId = universalIdData.begin()->getId();
 
     mCell.reset (new Cell (getDocument().getData(), mRootNode, mCellId));
 
     update();
-    emit cellChanged(*data.begin());
+    emit cellChanged(*universalIdData.begin());
 
     return true;
 }
@@ -108,6 +104,12 @@ void CSVRender::UnpagedWorldspaceWidget::clearSelection (int elementMask)
     flagAsModified();
 }
 
+void CSVRender::UnpagedWorldspaceWidget::invertSelection (int elementMask)
+{
+    mCell->setSelection (elementMask, Cell::Selection_Invert);
+    flagAsModified();
+}
+
 void CSVRender::UnpagedWorldspaceWidget::selectAll (int elementMask)
 {
     mCell->setSelection (elementMask, Cell::Selection_All);
@@ -125,12 +127,33 @@ std::string CSVRender::UnpagedWorldspaceWidget::getCellId (const osg::Vec3f& poi
     return mCellId;
 }
 
+CSVRender::Cell* CSVRender::UnpagedWorldspaceWidget::getCell(const osg::Vec3d& point) const
+{
+    return mCell.get();
+}
+
 std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::UnpagedWorldspaceWidget::getSelection (
     unsigned int elementMask) const
 {
     return mCell->getSelection (elementMask);
 }
 
+std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::UnpagedWorldspaceWidget::getEdited (
+    unsigned int elementMask) const
+{
+    return mCell->getEdited (elementMask);
+}
+
+void  CSVRender::UnpagedWorldspaceWidget::setSubMode (int subMode, unsigned int elementMask)
+{
+    mCell->setSubMode (subMode, elementMask);
+}
+
+void CSVRender::UnpagedWorldspaceWidget::reset (unsigned int elementMask)
+{
+    mCell->reset (elementMask);
+}
+
 void CSVRender::UnpagedWorldspaceWidget::referenceableDataChanged (const QModelIndex& topLeft,
     const QModelIndex& bottomRight)
 {
@@ -185,6 +208,75 @@ void CSVRender::UnpagedWorldspaceWidget::referenceAdded (const QModelIndex& pare
             flagAsModified();
 }
 
+void CSVRender::UnpagedWorldspaceWidget::pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    int rowStart = -1;
+    int rowEnd = -1;
+
+    if (topLeft.parent().isValid())
+    {
+        rowStart = topLeft.parent().row();
+        rowEnd = bottomRight.parent().row();
+    }
+    else
+    {
+        rowStart = topLeft.row();
+        rowEnd = bottomRight.row();
+    }
+
+    for (int row = rowStart; row <= rowEnd; ++row)
+    {
+        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+        if (mCellId == pathgrid.mId)
+        {
+            mCell->pathgridModified();
+            flagAsModified();
+            return;
+        }
+    }
+}
+
+void CSVRender::UnpagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (!parent.isValid())
+    {
+        // Pathgrid going to be deleted
+        for (int row = start; row <= end; ++row)
+        {
+            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+            if (mCellId == pathgrid.mId)
+            {
+                mCell->pathgridRemoved();
+                flagAsModified();
+                return;
+            }
+        }
+    }
+}
+
+void CSVRender::UnpagedWorldspaceWidget::pathgridAdded (const QModelIndex& parent, int start, int end)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (!parent.isValid())
+    {
+        for (int row = start; row <= end; ++row)
+        {
+            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+            if (mCellId == pathgrid.mId)
+            {
+                mCell->pathgridModified();
+                flagAsModified();
+                return;
+            }
+        }
+    }
+}
+
 void CSVRender::UnpagedWorldspaceWidget::addVisibilitySelectorButtons (
     CSVWidget::SceneToolToggle2 *tool)
 {
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index a4c517948..57e8d1a19 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -25,6 +25,7 @@ namespace CSVRender
     {
             Q_OBJECT
 
+            CSMDoc::Document& mDocument;
             std::string mCellId;
             CSMWorld::IdTable *mCellsModel;
             CSMWorld::IdTable *mReferenceablesModel;
@@ -46,6 +47,9 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the clear operation
             virtual void clearSelection (int elementMask);
 
+            /// \param elementMask Elements to be affected by the select operation
+            virtual void invertSelection (int elementMask);
+
             /// \param elementMask Elements to be affected by the select operation
             virtual void selectAll (int elementMask);
 
@@ -57,9 +61,19 @@ namespace CSVRender
 
             virtual std::string getCellId (const osg::Vec3f& point) const;
 
+            virtual Cell* getCell(const osg::Vec3d& point) const;
+
             virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
                 const;
 
+            virtual std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask)
+                const;
+
+            virtual void setSubMode (int subMode, unsigned int elementMask);
+
+            /// Erase all overrides and restore the visual representation to its true state.
+            virtual void reset (unsigned int elementMask);
+
         private:
 
             virtual void referenceableDataChanged (const QModelIndex& topLeft,
@@ -75,6 +89,13 @@ namespace CSVRender
 
             virtual void referenceAdded (const QModelIndex& index, int start, int end);
 
+            virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+            virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+
+            virtual void pathgridAdded (const QModelIndex& parent, int start, int end);
+
+
             virtual std::string getStartupInstruction();
 
         protected:
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 6ba6e9543..325fa5f6d 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -1,7 +1,6 @@
 #include "worldspacewidget.hpp"
 
 #include <algorithm>
-#include <iostream>
 
 #include <QEvent>
 #include <QDragEnterEvent>
@@ -12,30 +11,46 @@
 #include <QApplication>
 #include <QToolTip>
 
-#include <osgGA/TrackballManipulator>
-#include <osgGA/FirstPersonManipulator>
-
 #include <osgUtil/LineSegmentIntersector>
 
 #include "../../model/world/universalid.hpp"
 #include "../../model/world/idtable.hpp"
 
+#include "../../model/prefs/shortcut.hpp"
+#include "../../model/prefs/shortcuteventhandler.hpp"
 #include "../../model/prefs/state.hpp"
 
+#include "../render/orbitcameramode.hpp"
+
 #include "../widget/scenetoolmode.hpp"
 #include "../widget/scenetooltoggle2.hpp"
 #include "../widget/scenetoolrun.hpp"
 
 #include "object.hpp"
 #include "mask.hpp"
-#include "editmode.hpp"
 #include "instancemode.hpp"
+#include "pathgridmode.hpp"
+#include "cameracontroller.hpp"
 
 CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)
-: SceneWidget (document.getData().getResourceSystem(), parent), mSceneElements(0), mRun(0), mDocument(document),
-  mInteractionMask (0), mEditMode (0), mLocked (false), mDragging (false), mDragX(0), mDragY(0), mDragFactor(0),
-  mDragWheelFactor(0), mDragShiftFactor(0),
-  mToolTipPos (-1, -1), mShowToolTips(false), mToolTipDelay(0)
+    : SceneWidget (document.getData().getResourceSystem(), parent, 0, false)
+    , mSceneElements(0)
+    , mRun(0)
+    , mDocument(document)
+    , mInteractionMask (0)
+    , mEditMode (0)
+    , mLocked (false)
+    , mDragMode(InteractionType_None)
+    , mDragging (false)
+    , mDragX(0)
+    , mDragY(0)
+    , mSpeedMode(false)
+    , mDragFactor(0)
+    , mDragWheelFactor(0)
+    , mDragShiftFactor(0)
+    , mToolTipPos (-1, -1)
+    , mShowToolTips(false)
+    , mToolTipDelay(0)
 {
     setAcceptDrops(true);
 
@@ -59,6 +74,15 @@ CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidg
     connect (references, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
         this, SLOT (referenceAdded (const QModelIndex&, int, int)));
 
+    QAbstractItemModel *pathgrids = document.getData().getTableModel (CSMWorld::UniversalId::Type_Pathgrids);
+
+    connect (pathgrids, SIGNAL (dataChanged (const QModelIndex&, const QModelIndex&)),
+        this, SLOT (pathgridDataChanged (const QModelIndex&, const QModelIndex&)));
+    connect (pathgrids, SIGNAL (rowsAboutToBeRemoved (const QModelIndex&, int, int)),
+        this, SLOT (pathgridAboutToBeRemoved (const QModelIndex&, int, int)));
+    connect (pathgrids, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
+        this, SLOT (pathgridAdded (const QModelIndex&, int, int)));
+
     QAbstractItemModel *debugProfiles =
         document.getData().getTableModel (CSMWorld::UniversalId::Type_DebugProfiles);
 
@@ -67,13 +91,29 @@ CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidg
     connect (debugProfiles, SIGNAL (rowsAboutToBeRemoved (const QModelIndex&, int, int)),
         this, SLOT (debugProfileAboutToBeRemoved (const QModelIndex&, int, int)));
 
-    connect (&CSMPrefs::State::get(), SIGNAL (settingChanged (const CSMPrefs::Setting *)),
-        this, SLOT (settingChanged (const CSMPrefs::Setting *)));
+    mToolTipDelayTimer.setSingleShot (true);
+    connect (&mToolTipDelayTimer, SIGNAL (timeout()), this, SLOT (showToolTip()));
+
     CSMPrefs::get()["3D Scene Input"].update();
     CSMPrefs::get()["Tooltips"].update();
 
-    mToolTipDelayTimer.setSingleShot (true);
-    connect (&mToolTipDelayTimer, SIGNAL (timeout()), this, SLOT (showToolTip()));
+    // Shortcuts
+    CSMPrefs::Shortcut* primaryEditShortcut = new CSMPrefs::Shortcut("scene-edit-primary", "scene-speed-modifier",
+            CSMPrefs::Shortcut::SM_Detach, this);
+    connect(primaryEditShortcut, SIGNAL(activated(bool)), this, SLOT(primaryEdit(bool)));
+    connect(primaryEditShortcut, SIGNAL(secondary(bool)), this, SLOT(speedMode(bool)));
+
+    CSMPrefs::Shortcut* secondaryEditShortcut = new CSMPrefs::Shortcut("scene-edit-secondary", this);
+    connect(secondaryEditShortcut, SIGNAL(activated(bool)), this, SLOT(secondaryEdit(bool)));
+
+    CSMPrefs::Shortcut* primarySelectShortcut = new CSMPrefs::Shortcut("scene-select-primary", this);
+    connect(primarySelectShortcut, SIGNAL(activated(bool)), this, SLOT(primarySelect(bool)));
+
+    CSMPrefs::Shortcut* secondarySelectShortcut = new CSMPrefs::Shortcut("scene-select-secondary", this);
+    connect(secondarySelectShortcut, SIGNAL(activated(bool)), this, SLOT(secondarySelect(bool)));
+
+    CSMPrefs::Shortcut* abortShortcut = new CSMPrefs::Shortcut("scene-edit-abort", this);
+    connect(abortShortcut, SIGNAL(activated()), this, SLOT(abortDrag()));
 }
 
 CSVRender::WorldspaceWidget::~WorldspaceWidget ()
@@ -82,9 +122,6 @@ CSVRender::WorldspaceWidget::~WorldspaceWidget ()
 
 void CSVRender::WorldspaceWidget::settingChanged (const CSMPrefs::Setting *setting)
 {
-    if (storeMappingSetting (setting))
-        return;
-
     if (*setting=="3D Scene Input/drag-factor")
         mDragFactor = setting->toDouble();
     else if (*setting=="3D Scene Input/drag-wheel-factor")
@@ -95,23 +132,29 @@ void CSVRender::WorldspaceWidget::settingChanged (const CSMPrefs::Setting *setti
         mToolTipDelay = setting->toInt();
     else if (*setting=="Tooltips/scene")
         mShowToolTips = setting->isTrue();
+    else
+        SceneWidget::settingChanged(setting);
 }
 
-void CSVRender::WorldspaceWidget::selectNavigationMode (const std::string& mode)
-{
-    if (mode=="1st")
-        mView->setCameraManipulator(new osgGA::FirstPersonManipulator);
-    else if (mode=="free")
-        mView->setCameraManipulator(new osgGA::FirstPersonManipulator);
-    else if (mode=="orbit")
-        mView->setCameraManipulator(new osgGA::OrbitManipulator);
-}
 
 void CSVRender::WorldspaceWidget::useViewHint (const std::string& hint) {}
 
 void CSVRender::WorldspaceWidget::selectDefaultNavigationMode()
 {
-    mView->setCameraManipulator(new osgGA::FirstPersonManipulator);
+    selectNavigationMode("1st");
+}
+
+void CSVRender::WorldspaceWidget::centerOrbitCameraOnSelection()
+{
+    std::vector<osg::ref_ptr<TagBase> > selection = getSelection(~0);
+
+    for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it!=selection.end(); ++it)
+    {
+        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag*> (it->get()))
+        {
+            mOrbitCamControl->setCenter(objectTag->mObject->getPosition().asVec3());
+        }
+    }
 }
 
 CSVWidget::SceneToolMode *CSVRender::WorldspaceWidget::makeNavigationSelector (
@@ -123,30 +166,34 @@ CSVWidget::SceneToolMode *CSVRender::WorldspaceWidget::makeNavigationSelector (
     /// \todo consider user-defined button-mapping
     tool->addButton (":scenetoolbar/1st-person", "1st",
         "First Person"
-        "<ul><li>Mouse-Look while holding the left button</li>"
-        "<li>WASD movement keys</li>"
+        "<ul><li>Camera is held upright</li>"
+        "<li>Mouse-Look while holding {scene-navi-primary}</li>"
+        "<li>Movement keys: {free-forward}(forward), {free-left}(left), {free-backward}(back), {free-right}(right)</li>"
+        "<li>Strafing (also vertically) by holding {scene-navi-secondary}</li>"
         "<li>Mouse wheel moves the camera forward/backward</li>"
-        "<li>Strafing (also vertically) by holding the left mouse button and control</li>"
-        "<li>Camera is held upright</li>"
-        "<li>Hold shift to speed up movement</li>"
+        "<li>Hold {scene-speed-modifier} to speed up movement</li>"
         "</ul>");
     tool->addButton (":scenetoolbar/free-camera", "free",
         "Free Camera"
-        "<ul><li>Mouse-Look while holding the left button</li>"
-        "<li>Strafing (also vertically) via WASD or by holding the left mouse button and control</li>"
+        "<ul><li>Mouse-Look while holding {scene-navi-primary}</li>"
+        "<li>Movement keys: {free-forward}(forward), {free-left}(left), {free-backward}(back), {free-right}(right)</li>"
+        "<li>Roll camera with {free-roll-left} and {free-roll-right} keys</li>"
+        "<li>Strafing (also vertically) by holding {scene-navi-secondary}</li>"
         "<li>Mouse wheel moves the camera forward/backward</li>"
-        "<li>Roll camera with Q and E keys</li>"
-        "<li>Hold shift to speed up movement</li>"
-        "</ul>");
-    tool->addButton (":scenetoolbar/orbiting-camera", "orbit",
-        "Orbiting Camera"
-        "<ul><li>Always facing the centre point</li>"
-        "<li>Rotate around the centre point via WASD or by moving the mouse while holding the left button</li>"
-        "<li>Mouse wheel moves camera away or towards centre point but can not pass through it</li>"
-        "<li>Roll camera with Q and E keys</li>"
-        "<li>Strafing (also vertically) by holding the left mouse button and control (includes relocation of the centre point)</li>"
-        "<li>Hold shift to speed up movement</li>"
+        "<li>Hold {free-forward:mod} to speed up movement</li>"
         "</ul>");
+    tool->addButton(
+        new CSVRender::OrbitCameraMode(this, QIcon(":scenetoolbar/orbiting-camera"),
+            "Orbiting Camera"
+            "<ul><li>Always facing the centre point</li>"
+            "<li>Rotate around the centre point via {orbit-up}, {orbit-left}, {orbit-down}, {orbit-right} or by moving "
+                "the mouse while holding {scene-navi-primary}</li>"
+            "<li>Roll camera with {orbit-roll-left} and {orbit-roll-right} keys</li>"
+            "<li>Strafing (also vertically) by holding {scene-navi-secondary} (includes relocation of the centre point)</li>"
+            "<li>Mouse wheel moves camera away or towards centre point but can not pass through it</li>"
+            "<li>Hold {scene-speed-modifier} to speed up movement</li>"
+            "</ul>", tool),
+        "orbit");
 
     connect (tool, SIGNAL (modeChanged (const std::string&)),
         this, SLOT (selectNavigationMode (const std::string&)));
@@ -256,15 +303,15 @@ CSVRender::WorldspaceWidget::dropRequirments
     return ignored;
 }
 
-bool CSVRender::WorldspaceWidget::handleDrop (const std::vector<CSMWorld::UniversalId>& data,
+bool CSVRender::WorldspaceWidget::handleDrop (const std::vector<CSMWorld::UniversalId>& universalIdData,
     DropType type)
 {
     if (type==Type_DebugProfile)
     {
         if (mRun)
         {
-            for (std::vector<CSMWorld::UniversalId>::const_iterator iter (data.begin());
-                iter!=data.end(); ++iter)
+            for (std::vector<CSMWorld::UniversalId>::const_iterator iter (universalIdData.begin());
+                iter!=universalIdData.end(); ++iter)
                 mRun->addProfile (iter->getId());
         }
 
@@ -306,9 +353,7 @@ void CSVRender::WorldspaceWidget::addEditModeSelectorButtons (CSVWidget::SceneTo
 {
     /// \todo replace EditMode with suitable subclasses
     tool->addButton (new InstanceMode (this, tool), "object");
-    tool->addButton (
-        new EditMode (this, QIcon (":placeholder"), Mask_Pathgrid, "Pathgrid editing"),
-        "pathgrid");
+    tool->addButton (new PathgridMode (this, tool), "pathgrid");
 }
 
 CSMDoc::Document& CSVRender::WorldspaceWidget::getDocument()
@@ -316,52 +361,92 @@ CSMDoc::Document& CSVRender::WorldspaceWidget::getDocument()
     return mDocument;
 }
 
-osg::Vec3f CSVRender::WorldspaceWidget::getIntersectionPoint (const QPoint& localPos,
-    unsigned int interactionMask, bool ignoreHidden) const
+CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPoint& localPos,
+    unsigned int interactionMask) const
 {
     // (0,0) is considered the lower left corner of an OpenGL window
     int x = localPos.x();
     int y = height() - localPos.y();
 
-    osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (
-        new osgUtil::LineSegmentIntersector (osgUtil::Intersector::WINDOW, x, y));
+    // Convert from screen space to world space
+    osg::Matrixd wpvMat;
+    wpvMat.preMult (mView->getCamera()->getViewport()->computeWindowMatrix());
+    wpvMat.preMult (mView->getCamera()->getProjectionMatrix());
+    wpvMat.preMult (mView->getCamera()->getViewMatrix());
+    wpvMat = osg::Matrixd::inverse (wpvMat);
 
-    intersector->setIntersectionLimit (osgUtil::LineSegmentIntersector::NO_LIMIT);
-    osgUtil::IntersectionVisitor visitor (intersector);
+    osg::Vec3d start = wpvMat.preMult (osg::Vec3d(x, y, 0));
+    osg::Vec3d end = wpvMat.preMult (osg::Vec3d(x, y, 1));
+    osg::Vec3d direction = end - start;
 
-    unsigned int mask = interactionMask;
+    // Get intersection
+    osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(
+        osgUtil::Intersector::MODEL, start, end));
 
-    if (ignoreHidden)
-        mask &= getVisibilityMask();
+    intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
+    osgUtil::IntersectionVisitor visitor(intersector);
 
-    visitor.setTraversalMask (mask);
+    visitor.setTraversalMask(interactionMask);
 
-    mView->getCamera()->accept (visitor);
+    mView->getCamera()->accept(visitor);
 
-    for (osgUtil::LineSegmentIntersector::Intersections::iterator iter = intersector->getIntersections().begin();
-         iter!=intersector->getIntersections().end(); ++iter)
+    // Get relevant data
+    for (osgUtil::LineSegmentIntersector::Intersections::iterator it = intersector->getIntersections().begin();
+         it != intersector->getIntersections().end(); ++it)
     {
+        osgUtil::LineSegmentIntersector::Intersection intersection = *it;
+
         // reject back-facing polygons
-        osg::Vec3f normal = osg::Matrix::transform3x3 (
-            iter->getWorldIntersectNormal(), mView->getCamera()->getViewMatrix());
+        if (direction * intersection.getWorldIntersectNormal() > 0)
+        {
+            continue;
+        }
+
+        for (std::vector<osg::Node*>::iterator nodeIter = intersection.nodePath.begin(); nodeIter != intersection.nodePath.end(); ++nodeIter)
+        {
+            osg::Node* node = *nodeIter;
+            if (osg::ref_ptr<CSVRender::TagBase> tag = dynamic_cast<CSVRender::TagBase *>(node->getUserData()))
+            {
+                WorldspaceHitResult hit = { true, tag, 0, 0, 0, intersection.getWorldIntersectPoint() };
+                if (intersection.indexList.size() >= 3)
+                {
+                    hit.index0 = intersection.indexList[0];
+                    hit.index1 = intersection.indexList[1];
+                    hit.index2 = intersection.indexList[2];
+                }
+                return hit;
+            }
+        }
 
-        if (normal.z()>=0)
-            return iter->getWorldIntersectPoint();
+        // Something untagged, probably terrain
+        WorldspaceHitResult hit = { true, 0, 0, 0, 0, intersection.getWorldIntersectPoint() };
+        if (intersection.indexList.size() >= 3)
+        {
+            hit.index0 = intersection.indexList[0];
+            hit.index1 = intersection.indexList[1];
+            hit.index2 = intersection.indexList[2];
+        }
+        return hit;
     }
 
-    osg::Matrixd matrix;
-    matrix.preMult (mView->getCamera()->getViewport()->computeWindowMatrix());
-    matrix.preMult (mView->getCamera()->getProjectionMatrix());
-    matrix.preMult (mView->getCamera()->getViewMatrix());
-    matrix = osg::Matrixd::inverse (matrix);
+    // Default placement
+    direction.normalize();
+    direction *= CSMPrefs::get()["Scene Drops"]["distance"].toInt();
 
-    osg::Vec3d start = matrix.preMult (intersector->getStart());
-    osg::Vec3d end = matrix.preMult (intersector->getEnd());
+    WorldspaceHitResult hit = { false, 0, 0, 0, 0, start + direction };
+    return hit;
+}
 
-    osg::Vec3d direction = end-start;
-    direction.normalize();
+void CSVRender::WorldspaceWidget::abortDrag()
+{
+    if (mDragging)
+    {
+        EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
 
-    return start + direction * CSMPrefs::get()["Scene Drops"]["distance"].toInt();
+        editMode.dragAborted();
+        mDragging = false;
+        mDragMode = InteractionType_None;
+    }
 }
 
 void CSVRender::WorldspaceWidget::dragEnterEvent (QDragEnterEvent* event)
@@ -404,100 +489,6 @@ void CSVRender::WorldspaceWidget::dragMoveEvent(QDragMoveEvent *event)
     }
 }
 
-bool CSVRender::WorldspaceWidget::storeMappingSetting (const CSMPrefs::Setting *setting)
-{
-    if (setting->getParent()->getKey()!="3D Scene Input")
-        return false;
-
-    static const char * const sMappingSettings[] =
-    {
-        "p-navi", "s-navi",
-        "p-edit", "s-edit",
-        "p-select", "s-select",
-        0
-    };
-
-    for (int i=0; sMappingSettings[i]; ++i)
-        if (setting->getKey()==sMappingSettings[i])
-        {
-            QString value = QString::fromUtf8 (setting->toString().c_str());
-
-            Qt::MouseButton button = Qt::NoButton;
-
-            if (value.endsWith ("Left Mouse-Button"))
-                button = Qt::LeftButton;
-            else if (value.endsWith ("Right Mouse-Button"))
-                button = Qt::RightButton;
-            else if (value.endsWith ("Middle Mouse-Button"))
-                button = Qt::MiddleButton;
-            else
-                return false;
-
-            bool ctrl = value.startsWith ("Ctrl-");
-
-            mButtonMapping[std::make_pair (button, ctrl)] = sMappingSettings[i];
-            return true;
-        }
-
-    return false;
-}
-
-osg::ref_ptr<CSVRender::TagBase> CSVRender::WorldspaceWidget::mousePick (const QPoint& localPos)
-{
-    // (0,0) is considered the lower left corner of an OpenGL window
-    int x = localPos.x();
-    int y = height() - localPos.y();
-
-    osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(osgUtil::Intersector::WINDOW, x, y));
-
-    intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
-    osgUtil::IntersectionVisitor visitor(intersector);
-
-    visitor.setTraversalMask(getInteractionMask());
-
-    mView->getCamera()->accept(visitor);
-
-    for (osgUtil::LineSegmentIntersector::Intersections::iterator it = intersector->getIntersections().begin();
-         it != intersector->getIntersections().end(); ++it)
-    {
-        osgUtil::LineSegmentIntersector::Intersection intersection = *it;
-
-        // reject back-facing polygons
-        osg::Vec3f normal = intersection.getWorldIntersectNormal();
-        normal = osg::Matrix::transform3x3(normal, mView->getCamera()->getViewMatrix());
-        if (normal.z() < 0)
-            continue;
-
-        for (std::vector<osg::Node*>::iterator it = intersection.nodePath.begin(); it != intersection.nodePath.end(); ++it)
-        {
-            osg::Node* node = *it;
-            if (osg::ref_ptr<CSVRender::TagBase> tag = dynamic_cast<CSVRender::TagBase *>(node->getUserData()))
-                return tag;
-        }
-
-// ignoring terrain for now
-        // must be terrain, report coordinates
-//        std::cout << "Terrain hit at " << intersection.getWorldIntersectPoint().x() << " " << intersection.getWorldIntersectPoint().y() << std::endl;
-//        return;
-    }
-
-    return osg::ref_ptr<CSVRender::TagBase>();
-}
-
-std::string CSVRender::WorldspaceWidget::mapButton (QMouseEvent *event)
-{
-    std::pair<Qt::MouseButton, bool> phyiscal (
-        event->button(), event->modifiers() & Qt::ControlModifier);
-
-    std::map<std::pair<Qt::MouseButton, bool>, std::string>::const_iterator iter =
-        mButtonMapping.find (phyiscal);
-
-    if (iter!=mButtonMapping.end())
-        return iter->second;
-
-    return "";
-}
-
 void CSVRender::WorldspaceWidget::dropEvent (QDropEvent* event)
 {
     const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData());
@@ -573,6 +564,7 @@ void CSVRender::WorldspaceWidget::editModeChanged (const std::string& id)
 {
     dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent()).setEditLock (mLocked);
     mDragging = false;
+    mDragMode = InteractionType_None;
 }
 
 void CSVRender::WorldspaceWidget::showToolTip()
@@ -581,10 +573,11 @@ void CSVRender::WorldspaceWidget::showToolTip()
     {
         QPoint pos = QCursor::pos();
 
-        if (osg::ref_ptr<TagBase> tag = mousePick (mapFromGlobal (pos)))
+        WorldspaceHitResult hit = mousePick (mapFromGlobal (pos), getInteractionMask());
+        if (hit.tag)
         {
             bool hideBasics = CSMPrefs::get()["Tooltips"]["scene-hide-basic"].isTrue();
-            QToolTip::showText (pos, tag->getToolTip (hideBasics), this);
+            QToolTip::showText (pos, hit.tag->getToolTip (hideBasics), this);
         }
     }
 }
@@ -602,50 +595,7 @@ void CSVRender::WorldspaceWidget::updateOverlay()
 
 void CSVRender::WorldspaceWidget::mouseMoveEvent (QMouseEvent *event)
 {
-    if (!mDragging)
-    {
-        if (mDragMode.empty())
-        {
-            if (event->globalPos()!=mToolTipPos)
-            {
-                mToolTipPos = event->globalPos();
-
-                if (mShowToolTips)
-                    mToolTipDelayTimer.start (mToolTipDelay);
-            }
-        }
-        else if (mDragMode=="p-navi" || mDragMode=="s-navi")
-        {
-
-        }
-        else if (mDragMode=="p-edit" || mDragMode=="s-edit" || mDragMode=="p-select" || mDragMode=="s-select")
-        {
-            osg::ref_ptr<TagBase> tag = mousePick (event->pos());
-
-            EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
-
-            if (mDragMode=="p-edit")
-                mDragging = editMode.primaryEditStartDrag (tag);
-            else if (mDragMode=="s-edit")
-                mDragging = editMode.secondaryEditStartDrag (tag);
-            else if (mDragMode=="p-select")
-                mDragging = editMode.primarySelectStartDrag (tag);
-            else if (mDragMode=="s-select")
-                mDragging = editMode.secondarySelectStartDrag (tag);
-
-            if (mDragging)
-            {
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-                mDragX = event->localPos().x();
-                mDragY = height() - event->localPos().y();
-#else
-                mDragX = event->posF().x();
-                mDragY = height() - event->posF().y();
-#endif
-            }
-        }
-    }
-    else
+    if (mDragging)
     {
         int diffX = event->x() - mDragX;
         int diffY = (height() - event->y()) - mDragY;
@@ -655,65 +605,51 @@ void CSVRender::WorldspaceWidget::mouseMoveEvent (QMouseEvent *event)
 
         double factor = mDragFactor;
 
-        if (event->modifiers() & Qt::ShiftModifier)
+        if (mSpeedMode)
             factor *= mDragShiftFactor;
 
         EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
 
-        editMode.drag (diffX, diffY, factor);
+        editMode.drag (event->pos(), diffX, diffY, factor);
     }
-}
-
-void CSVRender::WorldspaceWidget::mousePressEvent (QMouseEvent *event)
-{
-    std::string button = mapButton (event);
-
-    if (!mDragging)
-        mDragMode = button;
-}
-
-void CSVRender::WorldspaceWidget::mouseReleaseEvent (QMouseEvent *event)
-{
-    std::string button = mapButton (event);
-
-    if (mDragging)
+    else if (mDragMode != InteractionType_None)
     {
-        if (mDragMode=="p-navi" || mDragMode=="s-navi")
-        {
+        EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
 
-        }
-        else if (mDragMode=="p-edit" || mDragMode=="s-edit" ||
-            mDragMode=="p-select" || mDragMode=="s-select")
-        {
-            EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
+        if (mDragMode == InteractionType_PrimaryEdit)
+            mDragging = editMode.primaryEditStartDrag (event->pos());
+        else if (mDragMode == InteractionType_SecondaryEdit)
+            mDragging = editMode.secondaryEditStartDrag (event->pos());
+        else if (mDragMode == InteractionType_PrimarySelect)
+            mDragging = editMode.primarySelectStartDrag (event->pos());
+        else if (mDragMode == InteractionType_SecondarySelect)
+            mDragging = editMode.secondarySelectStartDrag (event->pos());
 
-            editMode.dragCompleted();
-            mDragging = false;
+        if (mDragging)
+        {
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+            mDragX = event->localPos().x();
+            mDragY = height() - event->localPos().y();
+#else
+            mDragX = event->posF().x();
+            mDragY = height() - event->posF().y();
+#endif
         }
     }
     else
     {
-        if (button=="p-navi" || button=="s-navi")
-        {
-
-        }
-        else if (button=="p-edit" || button=="s-edit" ||
-            button=="p-select" || button=="s-select")
+        if (event->globalPos()!=mToolTipPos)
         {
-            osg::ref_ptr<TagBase> tag = mousePick (event->pos());
+            mToolTipPos = event->globalPos();
 
-            handleMouseClick (tag, button, event->modifiers() & Qt::ShiftModifier);
+            if (mShowToolTips)
+            {
+                QToolTip::hideText();
+                mToolTipDelayTimer.start (mToolTipDelay);
+            }
         }
-    }
-
-    mDragMode.clear();
-}
 
-void CSVRender::WorldspaceWidget::mouseDoubleClickEvent (QMouseEvent *event)
-{
-    if(event->button() == Qt::RightButton)
-    {
-        //mMouse->mouseDoubleClickEvent(event);
+        SceneWidget::mouseMoveEvent(event);
     }
 }
 
@@ -723,41 +659,82 @@ void CSVRender::WorldspaceWidget::wheelEvent (QWheelEvent *event)
     {
         double factor = mDragWheelFactor;
 
-        if (event->modifiers() & Qt::ShiftModifier)
+        if (mSpeedMode)
             factor *= mDragShiftFactor;
 
         EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
 
         editMode.dragWheel (event->delta(), factor);
     }
+    else
+        SceneWidget::wheelEvent(event);
+}
+
+void CSVRender::WorldspaceWidget::handleInteractionPress (const WorldspaceHitResult& hit, InteractionType type)
+{
+    EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
+
+    if (type == InteractionType_PrimaryEdit)
+        editMode.primaryEditPressed (hit);
+    else if (type == InteractionType_SecondaryEdit)
+        editMode.secondaryEditPressed (hit);
+    else if (type == InteractionType_PrimarySelect)
+        editMode.primarySelectPressed (hit);
+    else if (type == InteractionType_SecondarySelect)
+        editMode.secondarySelectPressed (hit);
+}
+
+CSVRender::EditMode *CSVRender::WorldspaceWidget::getEditMode()
+{
+    return dynamic_cast<CSVRender::EditMode *> (mEditMode->getCurrent());
+}
+
+void CSVRender::WorldspaceWidget::primaryEdit(bool activate)
+{
+    handleInteraction(InteractionType_PrimaryEdit, activate);
+}
+
+void CSVRender::WorldspaceWidget::secondaryEdit(bool activate)
+{
+    handleInteraction(InteractionType_SecondaryEdit, activate);
 }
 
-void CSVRender::WorldspaceWidget::keyPressEvent (QKeyEvent *event)
+void CSVRender::WorldspaceWidget::primarySelect(bool activate)
 {
-    if(event->key() == Qt::Key_Escape)
+    handleInteraction(InteractionType_PrimarySelect, activate);
+}
+
+void CSVRender::WorldspaceWidget::secondarySelect(bool activate)
+{
+    handleInteraction(InteractionType_SecondarySelect, activate);
+}
+
+void CSVRender::WorldspaceWidget::speedMode(bool activate)
+{
+    mSpeedMode = activate;
+}
+
+void CSVRender::WorldspaceWidget::handleInteraction(InteractionType type, bool activate)
+{
+    if (activate)
+    {
+        if (!mDragging)
+            mDragMode = type;
+    }
+    else
     {
+        mDragMode = InteractionType_None;
+
         if (mDragging)
         {
-            EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
-
-            editMode.dragAborted();
+            EditMode* editMode = getEditMode();
+            editMode->dragCompleted(mapFromGlobal(QCursor::pos()));
             mDragging = false;
         }
+        else
+        {
+            WorldspaceHitResult hit = mousePick(mapFromGlobal(QCursor::pos()), getInteractionMask());
+            handleInteractionPress(hit, type);
+        }
     }
-    else
-        RenderWidget::keyPressEvent(event);
-}
-
-void CSVRender::WorldspaceWidget::handleMouseClick (osg::ref_ptr<TagBase> tag, const std::string& button, bool shift)
-{
-    EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
-
-    if (button=="p-edit")
-        editMode.primaryEditPressed (tag);
-    else if (button=="s-edit")
-        editMode.secondaryEditPressed (tag);
-    else if (button=="p-select")
-        editMode.primarySelectPressed (tag);
-    else if (button=="s-select")
-        editMode.secondarySelectPressed (tag);
 }
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index ac6426b42..b30d7de8a 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -1,11 +1,10 @@
 #ifndef OPENCS_VIEW_WORLDSPACEWIDGET_H
 #define OPENCS_VIEW_WORLDSPACEWIDGET_H
 
-#include <map>
-
 #include <boost/shared_ptr.hpp>
 
 #include <QTimer>
+#include <osg/Vec3>
 
 #include "../../model/doc/document.hpp"
 #include "../../model/world/tablemimedata.hpp"
@@ -34,7 +33,17 @@ namespace CSVWidget
 namespace CSVRender
 {
     class TagBase;
+    class Cell;
     class CellArrow;
+    class EditMode;
+
+    struct WorldspaceHitResult
+    {
+        bool hit;
+        osg::ref_ptr<TagBase> tag;
+        unsigned int index0, index1, index2; // indices of mesh vertices
+        osg::Vec3d worldPos;
+    };
 
     class WorldspaceWidget : public SceneWidget
     {
@@ -44,13 +53,13 @@ namespace CSVRender
             CSVWidget::SceneToolRun *mRun;
             CSMDoc::Document& mDocument;
             unsigned int mInteractionMask;
-            std::map<std::pair<Qt::MouseButton, bool>, std::string> mButtonMapping;
             CSVWidget::SceneToolMode *mEditMode;
             bool mLocked;
-            std::string mDragMode;
+            int mDragMode;
             bool mDragging;
             int mDragX;
             int mDragY;
+            bool mSpeedMode;
             double mDragFactor;
             double mDragWheelFactor;
             double mDragShiftFactor;
@@ -77,6 +86,15 @@ namespace CSVRender
                 ignored //either mixed cells, or not cells
             };
 
+            enum InteractionType
+            {
+                InteractionType_PrimaryEdit,
+                InteractionType_PrimarySelect,
+                InteractionType_SecondaryEdit,
+                InteractionType_SecondarySelect,
+                InteractionType_None
+            };
+
             WorldspaceWidget (CSMDoc::Document& document, QWidget *parent = 0);
             ~WorldspaceWidget ();
 
@@ -99,6 +117,8 @@ namespace CSVRender
 
             void selectDefaultNavigationMode();
 
+            void centerOrbitCameraOnSelection();
+
             static DropType getDropType(const std::vector<CSMWorld::UniversalId>& data);
 
             virtual dropRequirments getDropRequirements(DropType type) const;
@@ -127,6 +147,9 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the clear operation
             virtual void clearSelection (int elementMask) = 0;
 
+            /// \param elementMask Elements to be affected by the select operation
+            virtual void invertSelection (int elementMask) = 0;
+
             /// \param elementMask Elements to be affected by the select operation
             virtual void selectAll (int elementMask) = 0;
 
@@ -136,22 +159,28 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the select operation
             virtual void selectAllWithSameParentId (int elementMask) = 0;
 
-            /// Return the next intersection point with scene elements matched by
+            /// Return the next intersection with scene elements matched by
             /// \a interactionMask based on \a localPos and the camera vector.
-            /// If there is no such point, instead a point "in front" of \a localPos will be
+            /// If there is no such intersection, instead a point "in front" of \a localPos will be
             /// returned.
-            ///
-            /// \param ignoreHidden ignore elements specified in interactionMask that are
-            /// flagged as not visible.
-            osg::Vec3f getIntersectionPoint (const QPoint& localPos,
-                unsigned int interactionMask = Mask_Reference | Mask_Terrain,
-                bool ignoreHidden = false) const;
+            WorldspaceHitResult mousePick (const QPoint& localPos, unsigned int interactionMask) const;
 
             virtual std::string getCellId (const osg::Vec3f& point) const = 0;
 
+            /// \note Returns the cell if it exists, otherwise a null pointer
+            virtual Cell* getCell(const osg::Vec3d& point) const = 0;
+
             virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
                 const = 0;
 
+            virtual std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask)
+                const = 0;
+
+            virtual void setSubMode (int subMode, unsigned int elementMask) = 0;
+
+            /// Erase all overrides and restore the visual representation to its true state.
+            virtual void reset (unsigned int elementMask) = 0;
+
         protected:
 
             /// Visual elements in a scene
@@ -172,14 +201,15 @@ namespace CSVRender
             virtual void updateOverlay();
 
             virtual void mouseMoveEvent (QMouseEvent *event);
-            virtual void mousePressEvent (QMouseEvent *event);
-            virtual void mouseReleaseEvent (QMouseEvent *event);
-            virtual void mouseDoubleClickEvent (QMouseEvent *event);
             virtual void wheelEvent (QWheelEvent *event);
-            virtual void keyPressEvent (QKeyEvent *event);
 
-            virtual void handleMouseClick (osg::ref_ptr<TagBase> tag, const std::string& button,
-                bool shift);
+            virtual void handleInteractionPress (const WorldspaceHitResult& hit, InteractionType type);
+
+            virtual void settingChanged (const CSMPrefs::Setting *setting);
+
+            EditMode *getEditMode();
+
+            bool getSpeedMode();
 
         private:
 
@@ -189,21 +219,20 @@ namespace CSVRender
 
             void dragMoveEvent(QDragMoveEvent *event);
 
-            /// \return Is \a key a button mapping setting? (ignored otherwise)
-            bool storeMappingSetting (const CSMPrefs::Setting *setting);
+            virtual std::string getStartupInstruction() = 0;
 
-            osg::ref_ptr<TagBase> mousePick (const QPoint& localPos);
+            void handleInteraction(InteractionType type, bool activate);
 
-            std::string mapButton (QMouseEvent *event);
+        public slots:
 
-            virtual std::string getStartupInstruction() = 0;
+            /// \note Drags will be automatically aborted when the aborting is triggered
+            /// (either explicitly or implicitly) from within this class. This function only
+            /// needs to be called, when the drag abort is triggered externally (e.g. from
+            /// an edit mode).
+            void abortDrag();
 
         private slots:
 
-            void settingChanged (const CSMPrefs::Setting *setting);
-
-            void selectNavigationMode (const std::string& mode);
-
             virtual void referenceableDataChanged (const QModelIndex& topLeft,
                 const QModelIndex& bottomRight) = 0;
 
@@ -217,6 +246,13 @@ namespace CSVRender
 
             virtual void referenceAdded (const QModelIndex& index, int start, int end) = 0;
 
+            virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight) = 0;
+
+            virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end) = 0;
+
+            virtual void pathgridAdded (const QModelIndex& parent, int start, int end) = 0;
+
+
             virtual void runRequest (const std::string& profile);
 
             void debugProfileDataChanged (const QModelIndex& topLeft,
@@ -228,6 +264,16 @@ namespace CSVRender
 
             void showToolTip();
 
+            void primaryEdit(bool activate);
+
+            void secondaryEdit(bool activate);
+
+            void primarySelect(bool activate);
+
+            void secondarySelect(bool activate);
+
+            void speedMode(bool activate);
+
         protected slots:
 
             void elementSelectionChanged();
diff --git a/apps/opencs/view/tools/reporttable.cpp b/apps/opencs/view/tools/reporttable.cpp
index bfc002933..4d1456cd9 100644
--- a/apps/opencs/view/tools/reporttable.cpp
+++ b/apps/opencs/view/tools/reporttable.cpp
@@ -15,6 +15,7 @@
 #include "../../model/tools/reportmodel.hpp"
 
 #include "../../model/prefs/state.hpp"
+#include "../../model/prefs/shortcut.hpp"
 
 #include "../../view/world/idtypedelegate.hpp"
 
@@ -156,6 +157,7 @@ CSVTools::ReportTable::ReportTable (CSMDoc::Document& document,
 
     mProxyModel = new QSortFilterProxyModel (this);
     mProxyModel->setSourceModel (mModel);
+    mProxyModel->setSortRole(Qt::UserRole);
 
     setModel (mProxyModel);
     setColumnHidden (2, true);
@@ -171,14 +173,20 @@ CSVTools::ReportTable::ReportTable (CSMDoc::Document& document,
     mShowAction = new QAction (tr ("Show"), this);
     connect (mShowAction, SIGNAL (triggered()), this, SLOT (showSelection()));
     addAction (mShowAction);
+    CSMPrefs::Shortcut* showShortcut = new CSMPrefs::Shortcut("reporttable-show", this);
+    showShortcut->associateAction(mShowAction);
 
     mRemoveAction = new QAction (tr ("Remove from list"), this);
     connect (mRemoveAction, SIGNAL (triggered()), this, SLOT (removeSelection()));
     addAction (mRemoveAction);
+    CSMPrefs::Shortcut* removeShortcut = new CSMPrefs::Shortcut("reporttable-remove", this);
+    removeShortcut->associateAction(mRemoveAction);
 
     mReplaceAction = new QAction (tr ("Replace"), this);
     connect (mReplaceAction, SIGNAL (triggered()), this, SIGNAL (replaceRequest()));
     addAction (mReplaceAction);
+    CSMPrefs::Shortcut* replaceShortcut = new CSMPrefs::Shortcut("reporttable-replace", this);
+    replaceShortcut->associateAction(mReplaceAction);
 
     if (mRefreshState)
     {
@@ -186,6 +194,8 @@ CSVTools::ReportTable::ReportTable (CSMDoc::Document& document,
         mRefreshAction->setEnabled (!(mDocument.getState() & mRefreshState));
         connect (mRefreshAction, SIGNAL (triggered()), this, SIGNAL (refreshRequest()));
         addAction (mRefreshAction);
+        CSMPrefs::Shortcut* refreshShortcut = new CSMPrefs::Shortcut("reporttable-refresh", this);
+        refreshShortcut->associateAction(mRefreshAction);
     }
 
     mDoubleClickActions.insert (std::make_pair (Qt::NoModifier, Action_Edit));
diff --git a/apps/opencs/view/widget/pushbutton.cpp b/apps/opencs/view/widget/pushbutton.cpp
index 424aaf68a..c4e6a4144 100644
--- a/apps/opencs/view/widget/pushbutton.cpp
+++ b/apps/opencs/view/widget/pushbutton.cpp
@@ -3,9 +3,17 @@
 #include <QMouseEvent>
 #include <QKeyEvent>
 
+#include "../../model/prefs/state.hpp"
+#include "../../model/prefs/shortcutmanager.hpp"
+
+void CSVWidget::PushButton::processShortcuts()
+{
+    mProcessedToolTip = CSMPrefs::State::get().getShortcutManager().processToolTip(mToolTip);
+}
+
 void CSVWidget::PushButton::setExtendedToolTip()
 {
-    QString tooltip = mToolTip;
+    QString tooltip = mProcessedToolTip;
 
     if (tooltip.isEmpty())
         tooltip = "(Tool tip not implemented yet)";
@@ -77,13 +85,18 @@ CSVWidget::PushButton::PushButton (const QIcon& icon, Type type, const QString&
         connect (this, SIGNAL (toggled (bool)), this, SLOT (checkedStateChanged (bool)));
     }
     setCheckable (type==Type_Mode || type==Type_Toggle);
+    processShortcuts();
     setExtendedToolTip();
+
+    connect (&CSMPrefs::State::get(), SIGNAL (settingChanged (const CSMPrefs::Setting *)),
+        this, SLOT (settingChanged (const CSMPrefs::Setting *)));
 }
 
 CSVWidget::PushButton::PushButton (Type type, const QString& tooltip, QWidget *parent)
 : QPushButton (parent), mKeepOpen (false), mType (type), mToolTip (tooltip)
 {
     setCheckable (type==Type_Mode || type==Type_Toggle);
+    processShortcuts();
     setExtendedToolTip();
 }
 
@@ -94,7 +107,7 @@ bool CSVWidget::PushButton::hasKeepOpen() const
 
 QString CSVWidget::PushButton::getBaseToolTip() const
 {
-    return mToolTip;
+    return mProcessedToolTip;
 }
 
 CSVWidget::PushButton::Type CSVWidget::PushButton::getType() const
@@ -106,3 +119,12 @@ void CSVWidget::PushButton::checkedStateChanged (bool checked)
 {
     setExtendedToolTip();
 }
+
+void CSVWidget::PushButton::settingChanged (const CSMPrefs::Setting *setting)
+{
+    if (setting->getParent()->getKey() == "Key Bindings")
+    {
+        processShortcuts();
+        setExtendedToolTip();
+    }
+}
diff --git a/apps/opencs/view/widget/pushbutton.hpp b/apps/opencs/view/widget/pushbutton.hpp
index 09cf22757..bdbdc9c4d 100644
--- a/apps/opencs/view/widget/pushbutton.hpp
+++ b/apps/opencs/view/widget/pushbutton.hpp
@@ -3,6 +3,11 @@
 
 #include <QPushButton>
 
+namespace CSMPrefs
+{
+    class Setting;
+}
+
 namespace CSVWidget
 {
     class PushButton : public QPushButton
@@ -24,9 +29,11 @@ namespace CSVWidget
             bool mKeepOpen;
             Type mType;
             QString mToolTip;
+            QString mProcessedToolTip;
 
         private:
 
+            void processShortcuts();
             void setExtendedToolTip();
 
         protected:
@@ -57,6 +64,7 @@ namespace CSVWidget
         private slots:
 
             void checkedStateChanged (bool checked);
+            void settingChanged (const CSMPrefs::Setting *setting);
     };
 }
 
diff --git a/apps/opencs/view/widget/scenetoolbar.cpp b/apps/opencs/view/widget/scenetoolbar.cpp
index b2e988dc9..a2458397f 100644
--- a/apps/opencs/view/widget/scenetoolbar.cpp
+++ b/apps/opencs/view/widget/scenetoolbar.cpp
@@ -1,7 +1,8 @@
 #include "scenetoolbar.hpp"
 
 #include <QVBoxLayout>
-#include <QShortcut>
+
+#include "../../model/prefs/shortcut.hpp"
 
 #include "scenetool.hpp"
 
@@ -25,9 +26,8 @@ CSVWidget::SceneToolbar::SceneToolbar (int buttonSize, QWidget *parent)
 
     setLayout (mLayout);
 
-    /// \todo make shortcut configurable
-    QShortcut *focusScene = new QShortcut (Qt::Key_T, this, 0, 0, Qt::WidgetWithChildrenShortcut);
-    connect (focusScene, SIGNAL (activated()), this, SIGNAL (focusSceneRequest()));
+    CSMPrefs::Shortcut* focusSceneShortcut = new CSMPrefs::Shortcut("scene-focus-toolbar", this);
+    connect(focusSceneShortcut, SIGNAL(activated()), this, SIGNAL(focusSceneRequest()));
 }
 
 void CSVWidget::SceneToolbar::addTool (SceneTool *tool, SceneTool *insertPoint)
diff --git a/apps/opencs/view/widget/scenetoolmode.cpp b/apps/opencs/view/widget/scenetoolmode.cpp
index 125f4ac79..7b2ff64db 100644
--- a/apps/opencs/view/widget/scenetoolmode.cpp
+++ b/apps/opencs/view/widget/scenetoolmode.cpp
@@ -5,6 +5,7 @@
 #include <QSignalMapper>
 #include <QMenu>
 #include <QContextMenuEvent>
+#include <QEvent>
 
 #include "scenetoolbar.hpp"
 #include "modebutton.hpp"
@@ -38,6 +39,27 @@ void CSVWidget::SceneToolMode::adjustToolTip (const ModeButton *activeMode)
     setToolTip (toolTip);
 }
 
+void CSVWidget::SceneToolMode::setButton (std::map<ModeButton *, std::string>::iterator iter)
+{
+    for (std::map<ModeButton *, std::string>::const_iterator iter2 = mButtons.begin();
+        iter2!=mButtons.end(); ++iter2)
+        iter2->first->setChecked (iter2==iter);
+
+    setIcon (iter->first->icon());
+    adjustToolTip (iter->first);
+
+    if (mCurrent!=iter->first)
+    {
+        if (mCurrent)
+            mCurrent->deactivate (mToolbar);
+
+        mCurrent = iter->first;
+        mCurrent->activate (mToolbar);
+    }
+
+    emit modeChanged (iter->second);
+}
+
 CSVWidget::SceneToolMode::SceneToolMode (SceneToolbar *parent, const QString& toolTip)
 : SceneTool (parent), mButtonSize (parent->getButtonSize()), mIconSize (parent->getIconSize()),
   mToolTip (toolTip), mFirst (0), mCurrent (0), mToolbar (parent)
@@ -96,9 +118,35 @@ CSVWidget::ModeButton *CSVWidget::SceneToolMode::getCurrent()
     return mCurrent;
 }
 
+std::string CSVWidget::SceneToolMode::getCurrentId() const
+{
+    return mButtons.find (mCurrent)->second;
+}
+
+void CSVWidget::SceneToolMode::setButton (const std::string& id)
+{
+    for (std::map<ModeButton *, std::string>::iterator iter = mButtons.begin();
+        iter!=mButtons.end(); ++iter)
+        if (iter->second==id)
+        {
+            setButton (iter);
+            break;
+        }
+}
+
+bool CSVWidget::SceneToolMode::event(QEvent* event)
+{
+    if (event->type() == QEvent::ToolTip)
+    {
+        adjustToolTip(mCurrent);
+    }
+
+    return SceneTool::event(event);
+}
+
 void CSVWidget::SceneToolMode::selected()
 {
-    std::map<ModeButton *, std::string>::const_iterator iter =
+    std::map<ModeButton *, std::string>::iterator iter =
         mButtons.find (dynamic_cast<ModeButton *> (sender()));
 
     if (iter!=mButtons.end())
@@ -106,22 +154,6 @@ void CSVWidget::SceneToolMode::selected()
         if (!iter->first->hasKeepOpen())
             mPanel->hide();
 
-        for (std::map<ModeButton *, std::string>::const_iterator iter2 = mButtons.begin();
-            iter2!=mButtons.end(); ++iter2)
-            iter2->first->setChecked (iter2==iter);
-
-        setIcon (iter->first->icon());
-        adjustToolTip (iter->first);
-
-        if (mCurrent!=iter->first)
-        {
-            if (mCurrent)
-                mCurrent->deactivate (mToolbar);
-
-            mCurrent = iter->first;
-            mCurrent->activate (mToolbar);
-        }
-
-        emit modeChanged (iter->second);
+        setButton (iter);
     }
 }
diff --git a/apps/opencs/view/widget/scenetoolmode.hpp b/apps/opencs/view/widget/scenetoolmode.hpp
index 3aa8e6799..90f1dc419 100644
--- a/apps/opencs/view/widget/scenetoolmode.hpp
+++ b/apps/opencs/view/widget/scenetoolmode.hpp
@@ -7,6 +7,7 @@
 
 class QHBoxLayout;
 class QMenu;
+class QEvent;
 
 namespace CSVWidget
 {
@@ -41,6 +42,12 @@ namespace CSVWidget
             /// items to be added, the function must return true anyway.
             virtual bool createContextMenu (QMenu *menu);
 
+            void setButton (std::map<ModeButton *, std::string>::iterator iter);
+
+        protected:
+
+            bool event(QEvent* event);
+
         public:
 
             SceneToolMode (SceneToolbar *parent, const QString& toolTip);
@@ -56,6 +63,12 @@ namespace CSVWidget
             /// Will return a 0-pointer only if the mode does not have any buttons yet.
             ModeButton *getCurrent();
 
+            /// Must not be called if there aren't any buttons yet.
+            std::string getCurrentId() const;
+
+            /// Manually change the current mode
+            void setButton (const std::string& id);
+
         signals:
 
             void modeChanged (const std::string& id);
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 0a79aac2b..87d5b3d7f 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -578,35 +578,31 @@ void CSVWorld::EditWidget::remake(int row)
                         fixedRows = true;
                 }
 
-                NestedTable* table =
-                    new NestedTable(mDocument, id, mNestedModels.back(), this, editable, fixedRows);
-                table->resizeColumnsToContents();
-                if (!editable)
+                // Create and display nested table only if it's editable.
+                if (editable)
                 {
-                    table->setEditTriggers(QAbstractItemView::NoEditTriggers);
-                    table->setEnabled(false);
-                }
-
-                int rows = mTable->rowCount(mTable->index(row, i));
-                int rowHeight = (rows == 0) ? table->horizontalHeader()->height() : table->rowHeight(0);
-                int tableMaxHeight = (5 * rowHeight)
-                    + table->horizontalHeader()->height() + 2 * table->frameWidth();
-                table->setMinimumHeight(tableMaxHeight);
-
-                QLabel* label =
-                    new QLabel (mTable->headerData (i, Qt::Horizontal, Qt::DisplayRole).toString(), mMainWidget);
-
-                label->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
-                if(!editable)
-                    label->setEnabled(false);
+                    NestedTable* table =
+                        new NestedTable(mDocument, id, mNestedModels.back(), this, editable, fixedRows);
+                    table->resizeColumnsToContents();
+
+                    int rows = mTable->rowCount(mTable->index(row, i));
+                    int rowHeight = (rows == 0) ? table->horizontalHeader()->height() : table->rowHeight(0);
+                    int headerHeight = table->horizontalHeader()->height();
+                    int tableMaxHeight = (5 * rowHeight) + headerHeight + (2 * table->frameWidth());
+                    table->setMinimumHeight(tableMaxHeight);
+
+                    QString headerText = mTable->headerData (i, Qt::Horizontal, Qt::DisplayRole).toString();
+                    QLabel* label = new QLabel (headerText, mMainWidget);
+                    label->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
 
-                tablesLayout->addWidget(label);
-                tablesLayout->addWidget(table);
+                    tablesLayout->addWidget(label);
+                    tablesLayout->addWidget(table);
 
-                connect(table,
-                        SIGNAL(editRequest(const CSMWorld::UniversalId &, const std::string &)),
-                        this,
-                        SIGNAL(editIdRequest(const CSMWorld::UniversalId &, const std::string &)));
+                    connect(table,
+                            SIGNAL(editRequest(const CSMWorld::UniversalId &, const std::string &)),
+                            this,
+                            SIGNAL(editIdRequest(const CSMWorld::UniversalId &, const std::string &)));
+                }
             }
             else if (!(flags & CSMWorld::ColumnBase::Flag_Dialogue_List))
             {
@@ -662,8 +658,7 @@ void CSVWorld::EditWidget::remake(int row)
                     int displayRole = tree->nestedHeaderData (i, col,
                             Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt();
 
-                    CSMWorld::ColumnBase::Display display =
-                        static_cast<CSMWorld::ColumnBase::Display> (displayRole);
+                    display = static_cast<CSMWorld::ColumnBase::Display> (displayRole);
 
                    mNestedTableDispatcher->makeDelegate (display);
 
diff --git a/apps/opencs/view/world/dragrecordtable.cpp b/apps/opencs/view/world/dragrecordtable.cpp
index a5f933283..6d980e171 100644
--- a/apps/opencs/view/world/dragrecordtable.cpp
+++ b/apps/opencs/view/world/dragrecordtable.cpp
@@ -67,8 +67,8 @@ void CSVWorld::DragRecordTable::dropEvent(QDropEvent *event)
     CSMWorld::ColumnBase::Display display = getIndexDisplayType(index);
     if (CSVWorld::DragDropUtils::canAcceptData(*event, display))
     {
-        const CSMWorld::TableMimeData *data = CSVWorld::DragDropUtils::getTableMimeData(*event);
-        if (data->fromDocument(mDocument))
+        const CSMWorld::TableMimeData *tableMimeData = CSVWorld::DragDropUtils::getTableMimeData(*event);
+        if (tableMimeData->fromDocument(mDocument))
         {
             CSMWorld::UniversalId id = CSVWorld::DragDropUtils::getAcceptedData(*event, display);
             QVariant newIndexData = QString::fromUtf8(id.getId().c_str());
diff --git a/apps/opencs/view/world/genericcreator.cpp b/apps/opencs/view/world/genericcreator.cpp
index df7739941..dd2bd82df 100644
--- a/apps/opencs/view/world/genericcreator.cpp
+++ b/apps/opencs/view/world/genericcreator.cpp
@@ -40,6 +40,10 @@ void CSVWorld::GenericCreator::insertAtBeginning (QWidget *widget, bool stretche
 void CSVWorld::GenericCreator::insertBeforeButtons (QWidget *widget, bool stretched)
 {
     mLayout->insertWidget (mLayout->count()-2, widget, stretched ? 1 : 0);
+
+    // Reset tab order relative to buttons.
+    setTabOrder(widget, mCreate);
+    setTabOrder(mCreate, mCancel);
 }
 
 std::string CSVWorld::GenericCreator::getId() const
@@ -161,15 +165,16 @@ CSVWorld::GenericCreator::GenericCreator (CSMWorld::Data& data, QUndoStack& undo
     mCreate = new QPushButton ("Create");
     mLayout->addWidget (mCreate);
 
-    QPushButton *cancelButton = new QPushButton ("Cancel");
-    mLayout->addWidget (cancelButton);
+    mCancel = new QPushButton("Cancel");
+    mLayout->addWidget(mCancel);
 
     setLayout (mLayout);
 
-    connect (cancelButton, SIGNAL (clicked (bool)), this, SIGNAL (done()));
+    connect (mCancel, SIGNAL (clicked (bool)), this, SIGNAL (done()));
     connect (mCreate, SIGNAL (clicked (bool)), this, SLOT (create()));
 
     connect (mId, SIGNAL (textChanged (const QString&)), this, SLOT (textChanged (const QString&)));
+    connect (mId, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed()));
 
     connect (&mData, SIGNAL (idListChanged()), this, SLOT (dataIdListChanged()));
 }
@@ -205,6 +210,14 @@ void CSVWorld::GenericCreator::textChanged (const QString& text)
     update();
 }
 
+void CSVWorld::GenericCreator::inputReturnPressed()
+{
+    if (mCreate->isEnabled())
+    {
+        create();
+    }
+}
+
 void CSVWorld::GenericCreator::create()
 {
     if (!mLocked)
diff --git a/apps/opencs/view/world/genericcreator.hpp b/apps/opencs/view/world/genericcreator.hpp
index f63c45109..f3fc82ec1 100644
--- a/apps/opencs/view/world/genericcreator.hpp
+++ b/apps/opencs/view/world/genericcreator.hpp
@@ -33,6 +33,7 @@ namespace CSVWorld
             QUndoStack& mUndoStack;
             CSMWorld::UniversalId mListId;
             QPushButton *mCreate;
+            QPushButton *mCancel;
             QLineEdit *mId;
             std::string mErrors;
             QHBoxLayout *mLayout;
@@ -56,6 +57,9 @@ namespace CSVWorld
 
             void insertAtBeginning (QWidget *widget, bool stretched);
 
+            /// \brief Insert given widget before Create and Cancel buttons.
+            /// \param widget Widget to add to layout.
+            /// \param stretched Whether widget should be streched or not.
             void insertBeforeButtons (QWidget *widget, bool stretched);
 
             virtual std::string getId() const;
@@ -112,6 +116,9 @@ namespace CSVWorld
 
             void textChanged (const QString& text);
 
+            /// \brief Create record if able to after Return key is pressed on input.
+            void inputReturnPressed();
+
             void create();
 
             void scopeChanged (int index);
diff --git a/apps/opencs/view/world/globalcreator.cpp b/apps/opencs/view/world/globalcreator.cpp
new file mode 100644
index 000000000..c7b140e15
--- /dev/null
+++ b/apps/opencs/view/world/globalcreator.cpp
@@ -0,0 +1,26 @@
+#include "globalcreator.hpp"
+
+#include <components/esm/variant.hpp>
+
+#include "../../model/world/data.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/columns.hpp"
+#include "../../model/world/idtable.hpp"
+
+namespace CSVWorld
+{
+    void GlobalCreator::configureCreateCommand (CSMWorld::CreateCommand& command) const
+    {
+        CSMWorld::IdTable* table = static_cast<CSMWorld::IdTable*>(getData().getTableModel(getCollectionId()));
+
+        int index = table->findColumnIndex(CSMWorld::Columns::ColumnId_ValueType);
+        int type = (int)ESM::VT_Float;
+
+        command.addValue(index, type);
+    }
+
+    GlobalCreator::GlobalCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id)
+        : GenericCreator (data, undoStack, id, true)
+    {
+    }
+}
diff --git a/apps/opencs/view/world/globalcreator.hpp b/apps/opencs/view/world/globalcreator.hpp
new file mode 100644
index 000000000..8c6cc628c
--- /dev/null
+++ b/apps/opencs/view/world/globalcreator.hpp
@@ -0,0 +1,22 @@
+#ifndef CSV_WORLD_GLOBALCREATOR_H
+#define CSV_WORLD_GLOBALCREATOR_H
+
+#include "genericcreator.hpp"
+
+namespace CSVWorld
+{
+    class GlobalCreator : public GenericCreator
+    {
+            Q_OBJECT
+
+        public:
+
+            GlobalCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id);
+
+        protected:
+
+            virtual void configureCreateCommand(CSMWorld::CreateCommand& command) const;
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/world/idcompletiondelegate.cpp b/apps/opencs/view/world/idcompletiondelegate.cpp
index 970490828..7f0f4ae46 100644
--- a/apps/opencs/view/world/idcompletiondelegate.cpp
+++ b/apps/opencs/view/world/idcompletiondelegate.cpp
@@ -1,6 +1,7 @@
 #include "idcompletiondelegate.hpp"
 
 #include "../../model/world/idcompletionmanager.hpp"
+#include "../../model/world/infoselectwrapper.hpp"
 
 #include "../widget/droplineedit.hpp"
 
@@ -27,6 +28,56 @@ QWidget *CSVWorld::IdCompletionDelegate::createEditor(QWidget *parent,
         return NULL;
     }
 
+    // The completer for InfoCondVar needs to return a completer based on the first column
+    if (display == CSMWorld::ColumnBase::Display_InfoCondVar)
+    {
+        QModelIndex sibling = index.sibling(index.row(), 0);
+        int conditionFunction = sibling.model()->data(sibling, Qt::EditRole).toInt();
+
+        switch (conditionFunction)
+        {
+            case CSMWorld::ConstInfoSelectWrapper::Function_Global:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_GlobalVariable);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_Journal:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Journal);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_Item:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Referenceable);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_Dead:
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotId:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Referenceable);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotFaction:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Faction);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotClass:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Class);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotRace:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Race);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotCell:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Cell);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_Local:
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotLocal:
+            {
+                return new CSVWidget::DropLineEdit(display, parent);
+            }
+            default: return 0; // The rest of them can't be edited anyway
+        }
+    }
+
     CSMWorld::IdCompletionManager &completionManager = getDocument().getIdCompletionManager();
     CSVWidget::DropLineEdit *editor = new CSVWidget::DropLineEdit(display, parent);
     editor->setCompleter(completionManager.getCompleter(display).get());
diff --git a/apps/opencs/view/world/infocreator.cpp b/apps/opencs/view/world/infocreator.cpp
index 1139afd69..243b7d879 100644
--- a/apps/opencs/view/world/infocreator.cpp
+++ b/apps/opencs/view/world/infocreator.cpp
@@ -60,6 +60,7 @@ CSVWorld::InfoCreator::InfoCreator (CSMWorld::Data& data, QUndoStack& undoStack,
     setManualEditing (false);
 
     connect (mTopic, SIGNAL (textChanged (const QString&)), this, SLOT (topicChanged()));
+    connect (mTopic, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed()));
 }
 
 void CSVWorld::InfoCreator::cloneMode (const std::string& originId,
@@ -110,7 +111,7 @@ void CSVWorld::InfoCreator::topicChanged()
     update();
 }
 
-CSVWorld::Creator *CSVWorld::InfoCreatorFactory::makeCreator(CSMDoc::Document& document, 
+CSVWorld::Creator *CSVWorld::InfoCreatorFactory::makeCreator(CSMDoc::Document& document,
                                                              const CSMWorld::UniversalId& id) const
 {
     return new InfoCreator(document.getData(),
diff --git a/apps/opencs/view/world/nestedtable.cpp b/apps/opencs/view/world/nestedtable.cpp
index 23d566439..02bd93920 100644
--- a/apps/opencs/view/world/nestedtable.cpp
+++ b/apps/opencs/view/world/nestedtable.cpp
@@ -5,10 +5,13 @@
 #include <QMenu>
 #include <QDebug>
 
+#include "../../model/prefs/shortcut.hpp"
+
 #include "../../model/world/nestedtableproxymodel.hpp"
 #include "../../model/world/universalid.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/commanddispatcher.hpp"
+#include "../../model/world/commandmacro.hpp"
 
 #include "tableeditidaction.hpp"
 #include "util.hpp"
@@ -59,14 +62,16 @@ CSVWorld::NestedTable::NestedTable(CSMDoc::Document& document,
         if (!fixedRows)
         {
             mAddNewRowAction = new QAction (tr ("Add new row"), this);
-
             connect(mAddNewRowAction, SIGNAL(triggered()),
                     this, SLOT(addNewRowActionTriggered()));
+            CSMPrefs::Shortcut* addRowShortcut = new CSMPrefs::Shortcut("table-add", this);
+            addRowShortcut->associateAction(mAddNewRowAction);
 
-            mRemoveRowAction = new QAction (tr ("Remove row"), this);
-
+            mRemoveRowAction = new QAction (tr ("Remove rows"), this);
             connect(mRemoveRowAction, SIGNAL(triggered()),
                     this, SLOT(removeRowActionTriggered()));
+            CSMPrefs::Shortcut* removeRowShortcut = new CSMPrefs::Shortcut("table-remove", this);
+            removeRowShortcut->associateAction(mRemoveRowAction);
         }
 
         mEditIdAction = new TableEditIdAction(*this, this);
@@ -100,10 +105,8 @@ void CSVWorld::NestedTable::contextMenuEvent (QContextMenuEvent *event)
 
     if (mAddNewRowAction && mRemoveRowAction)
     {
-        if (selectionModel()->selectedRows().size() == 1)
-            menu.addAction(mRemoveRowAction);
-
         menu.addAction(mAddNewRowAction);
+        menu.addAction(mRemoveRowAction);
     }
 
     menu.exec (event->globalPos());
@@ -111,17 +114,27 @@ void CSVWorld::NestedTable::contextMenuEvent (QContextMenuEvent *event)
 
 void CSVWorld::NestedTable::removeRowActionTriggered()
 {
-    mDocument.getUndoStack().push(new CSMWorld::DeleteNestedCommand(*(mModel->model()),
-                                                                    mModel->getParentId(),
-                                                                    selectionModel()->selectedRows().begin()->row(),
-                                                                    mModel->getParentColumn()));
+    CSMWorld::CommandMacro macro(mDocument.getUndoStack(),
+        selectionModel()->selectedRows().size() > 1 ? tr("Remove rows") : "");
+
+    // Remove rows in reverse order
+    for (int i = selectionModel()->selectedRows().size() - 1; i >= 0; --i)
+    {
+        macro.push(new CSMWorld::DeleteNestedCommand(*(mModel->model()), mModel->getParentId(),
+            selectionModel()->selectedRows()[i].row(), mModel->getParentColumn()));
+    }
 }
 
 void CSVWorld::NestedTable::addNewRowActionTriggered()
 {
+    int row = 0;
+
+    if (!selectionModel()->selectedRows().empty())
+        row = selectionModel()->selectedRows().back().row() + 1;
+
     mDocument.getUndoStack().push(new CSMWorld::AddNestedCommand(*(mModel->model()),
                                                                  mModel->getParentId(),
-                                                                 selectionModel()->selectedRows().size(),
+                                                                 row,
                                                                  mModel->getParentColumn()));
 }
 
diff --git a/apps/opencs/view/world/pathgridcreator.cpp b/apps/opencs/view/world/pathgridcreator.cpp
new file mode 100644
index 000000000..a305b1249
--- /dev/null
+++ b/apps/opencs/view/world/pathgridcreator.cpp
@@ -0,0 +1,29 @@
+#include "pathgridcreator.hpp"
+
+#include "../../model/world/data.hpp"
+
+CSVWorld::PathgridCreator::PathgridCreator(
+    CSMWorld::Data& data,
+    QUndoStack& undoStack,
+    const CSMWorld::UniversalId& id,
+    bool relaxedIdRules
+) : GenericCreator(data, undoStack, id, relaxedIdRules)
+{}
+
+std::string CSVWorld::PathgridCreator::getErrors() const
+{
+    std::string pathgridId = getId();
+
+    // Check user input for any errors.
+    std::string errors;
+    if (pathgridId.empty())
+    {
+        errors = "No Pathgrid ID entered";
+    }
+    else if (getData().getPathgrids().searchId(pathgridId) > -1)
+    {
+        errors = "Pathgrid with this ID already exists";
+    }
+
+    return errors;
+}
diff --git a/apps/opencs/view/world/pathgridcreator.hpp b/apps/opencs/view/world/pathgridcreator.hpp
new file mode 100644
index 000000000..10f64a0a7
--- /dev/null
+++ b/apps/opencs/view/world/pathgridcreator.hpp
@@ -0,0 +1,26 @@
+#ifndef PATHGRIDCREATOR_HPP
+#define PATHGRIDCREATOR_HPP
+
+#include "genericcreator.hpp"
+
+namespace CSVWorld
+{
+    /// \brief Record creator for pathgrids.
+    class PathgridCreator : public GenericCreator
+    {
+        Q_OBJECT
+
+        public:
+
+            PathgridCreator(
+                CSMWorld::Data& data,
+                QUndoStack& undoStack,
+                const CSMWorld::UniversalId& id,
+                bool relaxedIdRules = false);
+
+            /// \return Error description for current user input.
+            virtual std::string getErrors() const;
+    };
+}
+
+#endif // PATHGRIDCREATOR_HPP
diff --git a/apps/opencs/view/world/referenceablecreator.cpp b/apps/opencs/view/world/referenceablecreator.cpp
index 1357ca46f..836e8ac7d 100644
--- a/apps/opencs/view/world/referenceablecreator.cpp
+++ b/apps/opencs/view/world/referenceablecreator.cpp
@@ -26,10 +26,10 @@ CSVWorld::ReferenceableCreator::ReferenceableCreator (CSMWorld::Data& data, QUnd
     for (std::vector<CSMWorld::UniversalId::Type>::const_iterator iter (types.begin());
          iter!=types.end(); ++iter)
     {
-        CSMWorld::UniversalId id (*iter, "");
+        CSMWorld::UniversalId id2 (*iter, "");
 
-        mType->addItem (QIcon (id.getIcon().c_str()), id.getTypeName().c_str(),
-            static_cast<int> (id.getType()));
+        mType->addItem (QIcon (id2.getIcon().c_str()), id2.getTypeName().c_str(),
+            static_cast<int> (id2.getType()));
     }
 
     insertBeforeButtons (mType, false);
diff --git a/apps/opencs/view/world/referencecreator.cpp b/apps/opencs/view/world/referencecreator.cpp
index 73ca62e02..cc7ae545a 100644
--- a/apps/opencs/view/world/referencecreator.cpp
+++ b/apps/opencs/view/world/referencecreator.cpp
@@ -9,6 +9,7 @@
 #include "../../model/world/columns.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/idcompletionmanager.hpp"
+#include "../../model/world/commandmacro.hpp"
 
 #include "../widget/droplineedit.hpp"
 
@@ -25,52 +26,6 @@ void CSVWorld::ReferenceCreator::configureCreateCommand (CSMWorld::CreateCommand
         findColumnIndex (CSMWorld::Columns::ColumnId_Cell);
 
     command.addValue (cellIdColumn, mCell->text());
-
-    // Set RefNum
-    int refNumColumn = dynamic_cast<CSMWorld::IdTable&> (
-        *getData().getTableModel (CSMWorld::UniversalId::Type_References)).
-        findColumnIndex (CSMWorld::Columns::ColumnId_RefNum);
-
-    command.addValue (refNumColumn, getRefNumCount());
-}
-
-void CSVWorld::ReferenceCreator::pushCommand (std::auto_ptr<CSMWorld::CreateCommand> command,
-    const std::string& id)
-{
-    // get the old count
-    std::string cellId = mCell->text().toUtf8().constData();
-
-    CSMWorld::IdTable& cellTable = dynamic_cast<CSMWorld::IdTable&> (
-        *getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
-
-    int countColumn = cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_RefNumCounter);
-
-    QModelIndex countIndex = cellTable.getModelIndex (cellId, countColumn);
-
-    int count = cellTable.data (countIndex).toInt();
-
-    // command for incrementing counter
-    std::auto_ptr<CSMWorld::ModifyCommand> increment (new CSMWorld::ModifyCommand
-        (cellTable, countIndex, count+1));
-
-    getUndoStack().beginMacro (command->text());
-    GenericCreator::pushCommand (command, id);
-    getUndoStack().push (increment.release());
-    getUndoStack().endMacro();
-}
-
-int CSVWorld::ReferenceCreator::getRefNumCount() const
-{
-    std::string cellId = mCell->text().toUtf8().constData();
-
-    CSMWorld::IdTable& cellTable = dynamic_cast<CSMWorld::IdTable&> (
-        *getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
-
-    int countColumn = cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_RefNumCounter);
-
-    QModelIndex countIndex = cellTable.getModelIndex (cellId, countColumn);
-
-    return cellTable.data (countIndex).toInt();
 }
 
 CSVWorld::ReferenceCreator::ReferenceCreator (CSMWorld::Data& data, QUndoStack& undoStack,
@@ -87,6 +42,7 @@ CSVWorld::ReferenceCreator::ReferenceCreator (CSMWorld::Data& data, QUndoStack&
     setManualEditing (false);
 
     connect (mCell, SIGNAL (textChanged (const QString&)), this, SLOT (cellChanged()));
+    connect (mCell, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed()));
 }
 
 void CSVWorld::ReferenceCreator::reset()
@@ -147,11 +103,11 @@ void CSVWorld::ReferenceCreator::cloneMode(const std::string& originId,
     cellChanged(); //otherwise ok button will remain disabled
 }
 
-CSVWorld::Creator *CSVWorld::ReferenceCreatorFactory::makeCreator (CSMDoc::Document& document, 
+CSVWorld::Creator *CSVWorld::ReferenceCreatorFactory::makeCreator (CSMDoc::Document& document,
                                                                    const CSMWorld::UniversalId& id) const
 {
-    return new ReferenceCreator(document.getData(), 
-                                document.getUndoStack(), 
+    return new ReferenceCreator(document.getData(),
+                                document.getUndoStack(),
                                 id,
                                 document.getIdCompletionManager());
 }
diff --git a/apps/opencs/view/world/referencecreator.hpp b/apps/opencs/view/world/referencecreator.hpp
index c230d0126..31010fa24 100644
--- a/apps/opencs/view/world/referencecreator.hpp
+++ b/apps/opencs/view/world/referencecreator.hpp
@@ -29,11 +29,6 @@ namespace CSVWorld
 
             virtual void configureCreateCommand (CSMWorld::CreateCommand& command) const;
 
-            virtual void pushCommand (std::auto_ptr<CSMWorld::CreateCommand> command,
-                const std::string& id);
-
-            int getRefNumCount() const;
-
         public:
 
             ReferenceCreator (CSMWorld::Data& data, QUndoStack& undoStack,
@@ -50,7 +45,7 @@ namespace CSVWorld
 
             /// Focus main input widget
             virtual void focus();
- 
+
         private slots:
 
             void cellChanged();
diff --git a/apps/opencs/view/world/regionmap.cpp b/apps/opencs/view/world/regionmap.cpp
index 49764bd17..31e5d94ca 100644
--- a/apps/opencs/view/world/regionmap.cpp
+++ b/apps/opencs/view/world/regionmap.cpp
@@ -17,6 +17,7 @@
 #include "../../model/world/commands.hpp"
 #include "../../model/world/columns.hpp"
 #include "../../model/world/tablemimedata.hpp"
+#include "../../model/world/commandmacro.hpp"
 
 void CSVWorld::RegionMap::contextMenuEvent (QContextMenuEvent *event)
 {
@@ -159,8 +160,7 @@ void CSVWorld::RegionMap::setRegion (const std::string& regionId)
 
     QString regionId2 = QString::fromUtf8 (regionId.c_str());
 
-    if (selected.size()>1)
-        mDocument.getUndoStack().beginMacro (tr ("Set Region"));
+    CSMWorld::CommandMacro macro (mDocument.getUndoStack(), selected.size()>1 ? tr ("Set Region") : "");
 
     for (QModelIndexList::const_iterator iter (selected.begin()); iter!=selected.end(); ++iter)
     {
@@ -170,12 +170,8 @@ void CSVWorld::RegionMap::setRegion (const std::string& regionId)
         QModelIndex index = cellsModel->getModelIndex (cellId,
             cellsModel->findColumnIndex (CSMWorld::Columns::ColumnId_Region));
 
-        mDocument.getUndoStack().push (
-            new CSMWorld::ModifyCommand (*cellsModel, index, regionId2));
+        macro.push (new CSMWorld::ModifyCommand (*cellsModel, index, regionId2));
     }
-
-    if (selected.size()>1)
-        mDocument.getUndoStack().endMacro();
 }
 
 CSVWorld::RegionMap::RegionMap (const CSMWorld::UniversalId& universalId,
@@ -258,19 +254,15 @@ void CSVWorld::RegionMap::createCells()
     CSMWorld::IdTable *cellsModel = &dynamic_cast<CSMWorld::IdTable&> (*
         mDocument.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
 
-    if (selected.size()>1)
-        mDocument.getUndoStack().beginMacro (tr ("Create cells"));
+    CSMWorld::CommandMacro macro (mDocument.getUndoStack(), selected.size()>1 ? tr ("Create cells"): "");
 
     for (QModelIndexList::const_iterator iter (selected.begin()); iter!=selected.end(); ++iter)
     {
         std::string cellId = model()->data (*iter, CSMWorld::RegionMap::Role_CellId).
             toString().toUtf8().constData();
 
-        mDocument.getUndoStack().push (new CSMWorld::CreateCommand (*cellsModel, cellId));
+        macro.push (new CSMWorld::CreateCommand (*cellsModel, cellId));
     }
-
-    if (selected.size()>1)
-        mDocument.getUndoStack().endMacro();
 }
 
 void CSVWorld::RegionMap::setRegion()
@@ -311,7 +303,7 @@ void CSVWorld::RegionMap::view()
         hint << cellId;
     }
 
-    emit editRequest (CSMWorld::UniversalId (CSMWorld::UniversalId::Type_Scene, "sys::default"),
+    emit editRequest (CSMWorld::UniversalId (CSMWorld::UniversalId::Type_Scene, ESM::CellId::sDefaultWorldspace),
         hint.str());
 }
 
diff --git a/apps/opencs/view/world/regionmap.hpp b/apps/opencs/view/world/regionmap.hpp
index 0097a16dc..ba773224f 100644
--- a/apps/opencs/view/world/regionmap.hpp
+++ b/apps/opencs/view/world/regionmap.hpp
@@ -45,8 +45,8 @@ namespace CSVWorld
             ///< \note Non-existent cells are not listed.
 
             QModelIndexList getSelectedCells (bool existent = true, bool nonExistent = false) const;
-            ///< \param existant Include existant cells.
-            /// \param nonExistant Include non-existant cells.
+            ///< \param existent Include existent cells.
+            /// \param nonExistent Include non-existent cells.
 
             QModelIndexList getMissingRegionCells() const;
             ///< Unselected cells within all regions that have at least one selected cell.
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index 7014b1486..b14d708da 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -38,7 +38,7 @@ CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::D
     CSVRender::WorldspaceWidget* worldspaceWidget = NULL;
     widgetType whatWidget;
 
-    if (id.getId()=="sys::default")
+    if (id.getId()==ESM::CellId::sDefaultWorldspace)
     {
         whatWidget = widget_Paged;
 
@@ -112,7 +112,7 @@ CSVWidget::SceneToolbar* CSVWorld::SceneSubView::makeToolbar (CSVRender::Worldsp
 
     if (type==widget_Paged)
     {
-        CSVWidget::SceneToolToggle *controlVisibilityTool =
+        CSVWidget::SceneToolToggle2 *controlVisibilityTool =
             dynamic_cast<CSVRender::PagedWorldspaceWidget&> (*widget).
             makeControlVisibilitySelector (toolbar);
 
@@ -160,7 +160,7 @@ void CSVWorld::SceneSubView::cellSelectionChanged (const CSMWorld::UniversalId&
 
 void CSVWorld::SceneSubView::cellSelectionChanged (const CSMWorld::CellSelection& selection)
 {
-    setUniversalId(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Scene, "sys::default"));
+    setUniversalId(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Scene, ESM::CellId::sDefaultWorldspace));
     int size = selection.getSize();
 
     std::ostringstream stream;
@@ -187,18 +187,18 @@ void CSVWorld::SceneSubView::cellSelectionChanged (const CSMWorld::CellSelection
     emit updateTitle();
 }
 
-void CSVWorld::SceneSubView::handleDrop (const std::vector< CSMWorld::UniversalId >& data)
+void CSVWorld::SceneSubView::handleDrop (const std::vector< CSMWorld::UniversalId >& universalIdData)
 {
     CSVRender::PagedWorldspaceWidget* pagedNewWidget = NULL;
     CSVRender::UnpagedWorldspaceWidget* unPagedNewWidget = NULL;
     CSVWidget::SceneToolbar* toolbar = NULL;
 
-    CSVRender::WorldspaceWidget::DropType type = CSVRender::WorldspaceWidget::getDropType (data);
+    CSVRender::WorldspaceWidget::DropType type = CSVRender::WorldspaceWidget::getDropType (universalIdData);
 
     switch (mScene->getDropRequirements (type))
     {
         case CSVRender::WorldspaceWidget::canHandle:
-            mScene->handleDrop (data, type);
+            mScene->handleDrop (universalIdData, type);
             break;
 
         case CSVRender::WorldspaceWidget::needPaged:
@@ -206,15 +206,15 @@ void CSVWorld::SceneSubView::handleDrop (const std::vector< CSMWorld::UniversalI
             toolbar = makeToolbar(pagedNewWidget, widget_Paged);
             makeConnections(pagedNewWidget);
             replaceToolbarAndWorldspace(pagedNewWidget, toolbar);
-            mScene->handleDrop (data, type);
+            mScene->handleDrop (universalIdData, type);
             break;
 
         case CSVRender::WorldspaceWidget::needUnpaged:
-            unPagedNewWidget = new CSVRender::UnpagedWorldspaceWidget(data.begin()->getId(), mDocument, this);
+            unPagedNewWidget = new CSVRender::UnpagedWorldspaceWidget(universalIdData.begin()->getId(), mDocument, this);
             toolbar = makeToolbar(unPagedNewWidget, widget_Unpaged);
             makeConnections(unPagedNewWidget);
             replaceToolbarAndWorldspace(unPagedNewWidget, toolbar);
-            cellSelectionChanged(*(data.begin()));
+            cellSelectionChanged(*(universalIdData.begin()));
             break;
 
         case CSVRender::WorldspaceWidget::ignored:
diff --git a/apps/opencs/view/world/scriptedit.cpp b/apps/opencs/view/world/scriptedit.cpp
index d0146445a..6f27d5656 100644
--- a/apps/opencs/view/world/scriptedit.cpp
+++ b/apps/opencs/view/world/scriptedit.cpp
@@ -48,11 +48,12 @@ CSVWorld::ScriptEdit::ScriptEdit(
     mLineNumberArea(0),
     mDefaultFont(font()),
     mMonoFont(QFont("Monospace")),
+    mTabCharCount(4),
     mDocument(document),
     mWhiteListQoutes("^[a-z|_]{1}[a-z|0-9|_]{0,}$", Qt::CaseInsensitive)
 {
     wrapLines(false);
-    setTabStopWidth (4);
+    setTabWidth();
     setUndoRedoEnabled (false); // we use OpenCS-wide undo/redo instead
 
     mAllowedTypes <<CSMWorld::UniversalId::Type_Journal
@@ -120,14 +121,6 @@ void CSVWorld::ScriptEdit::showLineNum(bool show)
     }
 }
 
-void CSVWorld::ScriptEdit::setMonoFont(bool show)
-{
-    if(show)
-        setFont(mMonoFont);
-    else
-        setFont(mDefaultFont);
-}
-
 bool CSVWorld::ScriptEdit::isChangeLocked() const
 {
     return mChangeLocked!=0;
@@ -194,6 +187,12 @@ bool CSVWorld::ScriptEdit::stringNeedsQuote (const std::string& id) const
     return !(string.contains(mWhiteListQoutes));
 }
 
+void CSVWorld::ScriptEdit::setTabWidth()
+{
+    // Set tab width to specified number of characters using current font.
+    setTabStopWidth(mTabCharCount * fontMetrics().width(' '));
+}
+
 void CSVWorld::ScriptEdit::wrapLines(bool wrap)
 {
     if (wrap)
@@ -216,6 +215,7 @@ void CSVWorld::ScriptEdit::settingChanged(const CSMPrefs::Setting *setting)
     else if (*setting == "Scripts/mono-font")
     {
         setFont(setting->isTrue() ? mMonoFont : mDefaultFont);
+        setTabWidth();
     }
     else if (*setting == "Scripts/show-linenum")
     {
@@ -225,6 +225,11 @@ void CSVWorld::ScriptEdit::settingChanged(const CSMPrefs::Setting *setting)
     {
         wrapLines(setting->isTrue());
     }
+    else if (*setting == "Scripts/tab-width")
+    {
+        mTabCharCount = setting->toInt();
+        setTabWidth();
+    }
 }
 
 void CSVWorld::ScriptEdit::idListChanged()
diff --git a/apps/opencs/view/world/scriptedit.hpp b/apps/opencs/view/world/scriptedit.hpp
index 1f03f050a..4977ed8e0 100644
--- a/apps/opencs/view/world/scriptedit.hpp
+++ b/apps/opencs/view/world/scriptedit.hpp
@@ -53,6 +53,7 @@ namespace CSVWorld
             LineNumberArea *mLineNumberArea;
             QFont mDefaultFont;
             QFont mMonoFont;
+            int mTabCharCount;
 
         protected:
 
@@ -71,7 +72,6 @@ namespace CSVWorld
             void lineNumberAreaPaintEvent(QPaintEvent *event);
             int lineNumberAreaWidth();
             void showLineNum(bool show);
-            void setMonoFont(bool show);
 
         protected:
 
@@ -91,6 +91,9 @@ namespace CSVWorld
 
             bool stringNeedsQuote(const std::string& id) const;
 
+            /// \brief Set tab width for script editor.
+            void setTabWidth();
+
             /// \brief Turn line wrapping in script editor on or off.
             /// \param wrap Whether or not to wrap lines.
             void wrapLines(bool wrap);
diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index ee0acb560..c9b8127f6 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -324,7 +324,9 @@ void CSVWorld::ScriptSubView::switchToRow (int row)
     std::string id = mModel->data (mModel->index (row, idColumn)).toString().toUtf8().constData();
     setUniversalId (CSMWorld::UniversalId (CSMWorld::UniversalId::Type_Script, id));
 
-    mEditor->setPlainText (mModel->data (mModel->index (row, mColumn)).toString());
+    bool oldSignalsState =  mEditor->blockSignals( true );
+    mEditor->setPlainText( mModel->data(mModel->index(row, mColumn)).toString() );
+    mEditor->blockSignals( oldSignalsState );
 
     std::vector<std::string> selection (1, id);
     mCommandDispatcher.setSelection (selection);
diff --git a/apps/opencs/view/world/startscriptcreator.cpp b/apps/opencs/view/world/startscriptcreator.cpp
index 7495da035..891199027 100644
--- a/apps/opencs/view/world/startscriptcreator.cpp
+++ b/apps/opencs/view/world/startscriptcreator.cpp
@@ -24,15 +24,6 @@ CSMWorld::IdTable& CSVWorld::StartScriptCreator::getStartScriptsTable() const
     );
 }
 
-void CSVWorld::StartScriptCreator::configureCreateCommand(CSMWorld::CreateCommand& command) const
-{
-    CSMWorld::IdTable& table = getStartScriptsTable();
-    int column = table.findColumnIndex(CSMWorld::Columns::ColumnId_Id);
-
-    // Set script ID to be added to start scripts table.
-    command.addValue(column, mScript->text());
-}
-
 CSVWorld::StartScriptCreator::StartScriptCreator(
     CSMWorld::Data &data,
     QUndoStack &undoStack,
@@ -53,6 +44,7 @@ CSVWorld::StartScriptCreator::StartScriptCreator(
     insertBeforeButtons(mScript, true);
 
     connect(mScript, SIGNAL (textChanged(const QString&)), this, SLOT (scriptChanged()));
+    connect(mScript, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed()));
 }
 
 void CSVWorld::StartScriptCreator::cloneMode(
diff --git a/apps/opencs/view/world/startscriptcreator.hpp b/apps/opencs/view/world/startscriptcreator.hpp
index 473e2fd5f..72eb67bcc 100644
--- a/apps/opencs/view/world/startscriptcreator.hpp
+++ b/apps/opencs/view/world/startscriptcreator.hpp
@@ -31,10 +31,6 @@ namespace CSVWorld
             /// \return reference to table containing start scripts.
             CSMWorld::IdTable& getStartScriptsTable() const;
 
-            /// \brief Add user input to command for creating start script.
-            /// \param command Creation command to configure.
-            virtual void configureCreateCommand(CSMWorld::CreateCommand& command) const;
-
         public:
 
             StartScriptCreator(
diff --git a/apps/opencs/view/world/subviews.cpp b/apps/opencs/view/world/subviews.cpp
index 650f344ed..32661ed93 100644
--- a/apps/opencs/view/world/subviews.cpp
+++ b/apps/opencs/view/world/subviews.cpp
@@ -7,6 +7,7 @@
 #include "scriptsubview.hpp"
 #include "regionmapsubview.hpp"
 #include "genericcreator.hpp"
+#include "globalcreator.hpp"
 #include "cellcreator.hpp"
 #include "referenceablecreator.hpp"
 #include "referencecreator.hpp"
@@ -14,6 +15,7 @@
 #include "scenesubview.hpp"
 #include "dialoguecreator.hpp"
 #include "infocreator.hpp"
+#include "pathgridcreator.hpp"
 #include "previewsubview.hpp"
 
 void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
@@ -31,7 +33,6 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
 
     static const CSMWorld::UniversalId::Type sTableTypes[] =
     {
-        CSMWorld::UniversalId::Type_Globals,
         CSMWorld::UniversalId::Type_Classes,
         CSMWorld::UniversalId::Type_Factions,
         CSMWorld::UniversalId::Type_Races,
@@ -42,7 +43,6 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         CSMWorld::UniversalId::Type_Enchantments,
         CSMWorld::UniversalId::Type_BodyParts,
         CSMWorld::UniversalId::Type_SoundGens,
-        CSMWorld::UniversalId::Type_Pathgrids,
 
         CSMWorld::UniversalId::Type_None // end marker
     };
@@ -75,6 +75,12 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
     manager.add (CSMWorld::UniversalId::Type_JournalInfos,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, InfoCreatorFactory>);
 
+    manager.add (CSMWorld::UniversalId::Type_Pathgrids,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<PathgridCreator> >);
+
+    manager.add (CSMWorld::UniversalId::Type_Globals,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<GlobalCreator> >);
+
     // Subviews for resources tables
     manager.add (CSMWorld::UniversalId::Type_Meshes,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
@@ -125,7 +131,6 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         CSMWorld::UniversalId::Type_Enchantment,
         CSMWorld::UniversalId::Type_BodyPart,
         CSMWorld::UniversalId::Type_SoundGen,
-        CSMWorld::UniversalId::Type_Pathgrid,
 
         CSMWorld::UniversalId::Type_None // end marker
     };
@@ -168,6 +173,9 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
     manager.add (CSMWorld::UniversalId::Type_Journal,
         new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, JournalCreatorFactory> (false));
 
+    manager.add (CSMWorld::UniversalId::Type_Pathgrid,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<PathgridCreator> > (false));
+
     manager.add (CSMWorld::UniversalId::Type_DebugProfile,
         new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator, CSMWorld::Scope_Project | CSMWorld::Scope_Session> > (false));
 
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 45e50dba7..07db5b477 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -21,6 +21,7 @@
 #include "../../model/world/commanddispatcher.hpp"
 
 #include "../../model/prefs/state.hpp"
+#include "../../model/prefs/shortcut.hpp"
 
 #include "tableeditidaction.hpp"
 #include "util.hpp"
@@ -283,49 +284,72 @@ CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
     mEditAction = new QAction (tr ("Edit Record"), this);
     connect (mEditAction, SIGNAL (triggered()), this, SLOT (editRecord()));
     addAction (mEditAction);
+    CSMPrefs::Shortcut* editShortcut = new CSMPrefs::Shortcut("table-edit", this);
+    editShortcut->associateAction(mEditAction);
 
     if (createAndDelete)
     {
         mCreateAction = new QAction (tr ("Add Record"), this);
         connect (mCreateAction, SIGNAL (triggered()), this, SIGNAL (createRequest()));
         addAction (mCreateAction);
+        CSMPrefs::Shortcut* createShortcut = new CSMPrefs::Shortcut("table-add", this);
+        createShortcut->associateAction(mCreateAction);
 
         mCloneAction = new QAction (tr ("Clone Record"), this);
         connect(mCloneAction, SIGNAL (triggered()), this, SLOT (cloneRecord()));
         addAction(mCloneAction);
+        CSMPrefs::Shortcut* cloneShortcut = new CSMPrefs::Shortcut("table-clone", this);
+        cloneShortcut->associateAction(mCloneAction);
     }
 
     mRevertAction = new QAction (tr ("Revert Record"), this);
     connect (mRevertAction, SIGNAL (triggered()), mDispatcher, SLOT (executeRevert()));
     addAction (mRevertAction);
+    CSMPrefs::Shortcut* revertShortcut = new CSMPrefs::Shortcut("table-revert", this);
+    revertShortcut->associateAction(mRevertAction);
 
     mDeleteAction = new QAction (tr ("Delete Record"), this);
     connect (mDeleteAction, SIGNAL (triggered()), mDispatcher, SLOT (executeDelete()));
     addAction (mDeleteAction);
+    CSMPrefs::Shortcut* deleteShortcut = new CSMPrefs::Shortcut("table-remove", this);
+    deleteShortcut->associateAction(mDeleteAction);
+
 
     mMoveUpAction = new QAction (tr ("Move Up"), this);
     connect (mMoveUpAction, SIGNAL (triggered()), this, SLOT (moveUpRecord()));
     addAction (mMoveUpAction);
+    CSMPrefs::Shortcut* moveUpShortcut = new CSMPrefs::Shortcut("table-moveup", this);
+    moveUpShortcut->associateAction(mMoveUpAction);
 
     mMoveDownAction = new QAction (tr ("Move Down"), this);
     connect (mMoveDownAction, SIGNAL (triggered()), this, SLOT (moveDownRecord()));
     addAction (mMoveDownAction);
+    CSMPrefs::Shortcut* moveDownShortcut = new CSMPrefs::Shortcut("table-movedown", this);
+    moveDownShortcut->associateAction(mMoveDownAction);
 
     mViewAction = new QAction (tr ("View"), this);
     connect (mViewAction, SIGNAL (triggered()), this, SLOT (viewRecord()));
     addAction (mViewAction);
+    CSMPrefs::Shortcut* viewShortcut = new CSMPrefs::Shortcut("table-view", this);
+    viewShortcut->associateAction(mViewAction);
 
     mPreviewAction = new QAction (tr ("Preview"), this);
     connect (mPreviewAction, SIGNAL (triggered()), this, SLOT (previewRecord()));
     addAction (mPreviewAction);
+    CSMPrefs::Shortcut* previewShortcut = new CSMPrefs::Shortcut("table-preview", this);
+    previewShortcut->associateAction(mPreviewAction);
 
     mExtendedDeleteAction = new QAction (tr ("Extended Delete Record"), this);
     connect (mExtendedDeleteAction, SIGNAL (triggered()), this, SLOT (executeExtendedDelete()));
     addAction (mExtendedDeleteAction);
+    CSMPrefs::Shortcut* extendedDeleteShortcut = new CSMPrefs::Shortcut("table-extendeddelete", this);
+    extendedDeleteShortcut->associateAction(mExtendedDeleteAction);
 
     mExtendedRevertAction = new QAction (tr ("Extended Revert Record"), this);
     connect (mExtendedRevertAction, SIGNAL (triggered()), this, SLOT (executeExtendedRevert()));
     addAction (mExtendedRevertAction);
+    CSMPrefs::Shortcut* extendedRevertShortcut = new CSMPrefs::Shortcut("table-extendedrevert", this);
+    extendedRevertShortcut->associateAction(mExtendedRevertAction);
 
     mEditIdAction = new TableEditIdAction (*this, this);
     connect (mEditIdAction, SIGNAL (triggered()), this, SLOT (editCell()));
diff --git a/apps/opencs/view/world/tablesubview.cpp b/apps/opencs/view/world/tablesubview.cpp
index 1b25e1c08..fcf66ed81 100644
--- a/apps/opencs/view/world/tablesubview.cpp
+++ b/apps/opencs/view/world/tablesubview.cpp
@@ -148,14 +148,14 @@ bool CSVWorld::TableSubView::eventFilter (QObject* object, QEvent* event)
     {
         if (QDropEvent* drop = dynamic_cast<QDropEvent*>(event))
         {
-            const CSMWorld::TableMimeData* data = dynamic_cast<const CSMWorld::TableMimeData*>(drop->mimeData());
-            if (!data) // May happen when non-records (e.g. plain text) are dragged and dropped
+            const CSMWorld::TableMimeData* tableMimeData = dynamic_cast<const CSMWorld::TableMimeData*>(drop->mimeData());
+            if (!tableMimeData) // May happen when non-records (e.g. plain text) are dragged and dropped
                 return false;
 
-            bool handled = data->holdsType(CSMWorld::UniversalId::Type_Filter);
+            bool handled = tableMimeData->holdsType(CSMWorld::UniversalId::Type_Filter);
             if (handled)
             {
-                mFilterBox->setRecordFilter(data->returnMatching(CSMWorld::UniversalId::Type_Filter).getId());
+                mFilterBox->setRecordFilter(tableMimeData->returnMatching(CSMWorld::UniversalId::Type_Filter).getId());
             }
             return handled;
         }
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index b0431f71a..e44606652 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -212,6 +212,13 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
             return sb;
         }
 
+        case CSMWorld::ColumnBase::Display_UnsignedInteger8:
+        {
+            DialogueSpinBox *sb = new DialogueSpinBox(parent);
+            sb->setRange(0, UCHAR_MAX);
+            return sb;
+        }
+
         case CSMWorld::ColumnBase::Display_Var:
 
             return new QLineEdit(parent);
diff --git a/apps/opencs/view/world/vartypedelegate.cpp b/apps/opencs/view/world/vartypedelegate.cpp
index a63e6028c..8aa43d15b 100644
--- a/apps/opencs/view/world/vartypedelegate.cpp
+++ b/apps/opencs/view/world/vartypedelegate.cpp
@@ -4,6 +4,7 @@
 
 #include "../../model/world/commands.hpp"
 #include "../../model/world/columns.hpp"
+#include "../../model/world/commandmacro.hpp"
 
 void CSVWorld::VarTypeDelegate::addCommands (QAbstractItemModel *model, const QModelIndex& index, int type)
     const
@@ -36,13 +37,10 @@ void CSVWorld::VarTypeDelegate::addCommands (QAbstractItemModel *model, const QM
         default: break; // ignore the rest
     }
 
-    getUndoStack().beginMacro (
-        "Modify " + model->headerData (index.column(), Qt::Horizontal, Qt::DisplayRole).toString());
+    CSMWorld::CommandMacro macro (getUndoStack(), "Modify " + model->headerData (index.column(), Qt::Horizontal, Qt::DisplayRole).toString());
 
-    getUndoStack().push (new CSMWorld::ModifyCommand (*model, index, type));
-    getUndoStack().push (new CSMWorld::ModifyCommand (*model, next, value));
-
-    getUndoStack().endMacro();
+    macro.push (new CSMWorld::ModifyCommand (*model, index, type));
+    macro.push (new CSMWorld::ModifyCommand (*model, next, value));
 }
 
 CSVWorld::VarTypeDelegate::VarTypeDelegate (const std::vector<std::pair<int, QString> >& values,
diff --git a/apps/openmw-mp/CMakeLists.txt b/apps/openmw-mp/CMakeLists.txt
new file mode 100644
index 000000000..abb770efb
--- /dev/null
+++ b/apps/openmw-mp/CMakeLists.txt
@@ -0,0 +1,142 @@
+project(tes3mp-server)
+
+option(BUILD_WITH_PAWN "Enable Pawn language" OFF)
+option(ENABLE_BREAKPAD "Enable Google Breakpad for Crash reporting" OFF)
+
+if(ENABLE_BREAKPAD)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_BREAKPAD")
+    if (UNIX)
+        set(Breakpad_Headers "${CMAKE_SOURCE_DIR}/extern/breakpad/src/client/linux")
+        set(Breakpad_Library "${CMAKE_SOURCE_DIR}/extern/breakpad/src/client/linux/libbreakpad_client.a")
+    elseif(WIN32)
+        set(Breakpad_Headers "${CMAKE_SOURCE_DIR}/extern/breakpad/src/client/windows")
+        set(Breakpad_Library "-lbreakpad_client")
+    endif (UNIX)
+    include_directories(${CMAKE_SOURCE_DIR}/extern/breakpad/src ${Breakpad_Headers})
+endif(ENABLE_BREAKPAD)
+
+if(BUILD_WITH_PAWN)
+
+    add_subdirectory(amx)
+
+    #set(Pawn_ROOT ${CMAKE_SOURCE_DIR}/external/pawn/)
+    set(Pawn_INCLUDES ${Pawn_ROOT}/include)
+    set(Pawn_LIBRARY ${Pawn_ROOT}/lib/libamx.a)
+    set(PawnScript_Sources
+            Script/LangPawn/LangPAWN.cpp
+            Script/LangPawn/PawnFunc.cpp)
+    set(PawnScript_Headers ${Pawn_INCLUDES}
+            Script/LangPawn/LangPAWN.hpp
+            )
+
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_PAWN -DPAWN_CELL_SIZE=64")
+    #include_directories(${Pawn_INCLUDES})
+    include_directories("./amx/linux")
+endif(BUILD_WITH_PAWN)
+
+option(BUILD_WITH_LUA "Enable Terra/Lua language" ON)
+option(FORCE_LUA "Use Lua instead Terra" OFF)
+if(BUILD_WITH_LUA)
+    #set(Terra_ROOT ${CMAKE_SOURCE_DIR}/external/terra/)
+    if(WIN32 OR FORCE_LUA)
+        find_package(Lua51 REQUIRED)
+        MESSAGE(STATUS "Found LUA_LIBRARY: ${LUA_LIBRARY}")
+        MESSAGE(STATUS "Found LUA_INCLUDE_DIR: ${LUA_INCLUDE_DIR}")
+    else()
+        find_package(Terra REQUIRED)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_TERRA")
+    endif()
+    set(LuaScript_Sources
+            Script/LangLua/LangLua.cpp
+            Script/LangLua/LuaFunc.cpp)
+    set(LuaScript_Headers ${Terra_INCLUDES} ${LUA_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/extern/LuaBridge ${CMAKE_SOURCE_DIR}/extern/LuaBridge/detail
+            Script/LangLua/LangLua.hpp)
+
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_LUA")
+    include_directories(${Terra_INCLUDES} ${LUA_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/extern/LuaBridge)
+endif(BUILD_WITH_LUA)
+
+set(NativeScript_Sources
+        Script/LangNative/LangNative.cpp
+        )
+set(NativeScript_Headers
+        Script/LangNative/LangNative.hpp
+        )
+
+# local files
+set(SERVER
+    main.cpp
+    Player.cpp
+    Networking.cpp
+    Utils.cpp
+    MasterClient.cpp
+    Cell.cpp
+    Script/Script.cpp Script/ScriptFunction.cpp
+    Script/ScriptFunctions.cpp
+
+    Script/Functions/CharClass.cpp Script/Functions/Chat.cpp Script/Functions/GUI.cpp
+    Script/Functions/Items.cpp Script/Functions/Quests.cpp Script/Functions/Stats.cpp
+    Script/Functions/Spells.cpp Script/Functions/Timer.cpp Script/Functions/Positions.cpp
+    Script/Functions/Cells.cpp Script/Functions/World.cpp
+
+    Script/API/TimerAPI.cpp Script/API/PublicFnAPI.cpp
+        ${PawnScript_Sources}
+        ${LuaScript_Sources}
+        ${NativeScript_Sources}
+
+)
+
+set(SERVER_HEADER
+        Script/Types.hpp Script/Script.hpp Script/SystemInterface.hpp
+        Script/ScriptFunction.hpp Script/Platform.hpp Script/Language.hpp
+        Script/ScriptFunctions.hpp Script/API/TimerAPI.hpp Script/API/PublicFnAPI.hpp
+        ${PawnScript_Headers}
+        ${LuaScript_Headers}
+        ${NativeScript_Headers}
+)
+source_group(tes3mp-server FILES ${SERVER} ${SERVER_HEADER})
+
+include_directories("./")
+
+# Main executable
+
+add_executable(tes3mp-server
+${SERVER_FILES}
+${SERVER} ${SERVER_HEADER}
+${APPLE_BUNDLE_RESOURCES}
+)
+add_definitions(-std=gnu++14 -Wno-ignored-qualifiers)
+
+target_link_libraries(tes3mp-server
+    #${Boost_SYSTEM_LIBRARY}
+    #${Boost_THREAD_LIBRARY}
+    #${Boost_FILESYSTEM_LIBRARY}
+    #${Boost_PROGRAM_OPTIONS_LIBRARY}
+    ${RakNet_LIBRARY}
+    components
+    ${Terra_LIBRARY}
+    ${LUA_LIBRARIES}
+    ${Pawn_LIBRARY}
+    ${Breakpad_Library}
+)
+
+if (UNIX)
+    target_link_libraries(tes3mp-server dl)
+    # Fix for not visible pthreads functions for linker with glibc 2.15
+    if(NOT APPLE)
+        target_link_libraries(tes3mp-server ${CMAKE_THREAD_LIBS_INIT})
+    endif(NOT APPLE)
+endif(UNIX)
+
+if (BUILD_WITH_CODE_COVERAGE)
+  add_definitions (--coverage)
+  target_link_libraries(tes3mp-server gcov)
+endif()
+
+if (MSVC)
+    # Debug version needs increased number of sections beyond 2^16
+    if (CMAKE_CL_64)
+        set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
+    endif (CMAKE_CL_64)
+    add_definitions("-D_USE_MATH_DEFINES")
+endif (MSVC)
diff --git a/apps/openmw-mp/Cell.cpp b/apps/openmw-mp/Cell.cpp
new file mode 100644
index 000000000..b3176d9ea
--- /dev/null
+++ b/apps/openmw-mp/Cell.cpp
@@ -0,0 +1,231 @@
+//
+// Created by koncord on 18.02.17.
+//
+
+#include "Cell.hpp"
+
+#include <iostream>
+#include "Player.hpp"
+
+using namespace std;
+
+void Cell::addPlayer(Player *player)
+{
+    auto it = find(player->cells.begin(), player->cells.end(), this);
+    if (it == player->cells.end())
+        player->cells.push_back(this);
+    players.push_back(player);
+}
+
+void Cell::removePlayer(Player *player)
+{
+    for (Iterator it = begin(); it != end(); it++)
+    {
+        if (*it == player)
+        {
+            auto it2 = find(player->cells.begin(), player->cells.end(), this);
+            if (it2 != player->cells.end())
+                player->cells.erase(it2);
+            players.erase(it);
+            return;
+        }
+    }
+}
+
+Cell::TPlayers Cell::getPlayers() const
+{
+    return players;
+}
+
+void Cell::sendToLoaded(mwmp::WorldPacket *worldPacket, mwmp::BaseEvent *baseEvent) const
+{
+    if (players.empty())
+        return;
+
+    std::list <Player*> plList;
+
+    for (auto pl : players)
+        plList.push_back(pl);
+
+    plList.sort();
+    plList.unique();
+
+    for (auto pl : plList)
+    {
+        if (pl->guid == baseEvent->guid) continue;
+        worldPacket->Send(baseEvent, pl->guid);
+    }
+}
+
+std::string Cell::getDescription() const
+{
+    return cell.getDescription();
+}
+
+CellController::CellController()
+{
+
+}
+
+CellController::~CellController()
+{
+    for(auto cell : cells)
+    {
+        delete cell;
+    }
+}
+
+CellController *CellController::sThis = nullptr;
+
+void CellController::create()
+{
+    assert(!sThis);
+    sThis = new CellController;
+}
+
+void CellController::destroy()
+{
+    assert(sThis);
+    delete sThis;
+    sThis = nullptr;
+}
+
+CellController *CellController::get()
+{
+    assert(sThis);
+    return sThis;
+}
+
+Cell *CellController::getCell(ESM::Cell *esmCell)
+{
+    if (esmCell->isExterior())
+        return getCellByXY(esmCell->mData.mX, esmCell->mData.mY);
+    else
+        return getCellByName(esmCell->mName);
+}
+
+
+Cell *CellController::getCellByXY(int x, int y)
+{
+    auto it = find_if(cells.begin(), cells.end(), [x, y](const Cell *c) {
+        return c->cell.mData.mX == x && c->cell.mData.mY == y;
+    });
+    if (it == cells.end())
+        return nullptr;
+    return *it;
+}
+
+Cell *CellController::getCellByName(std::string cellName)
+{
+    auto it = find_if(cells.begin(), cells.end(), [cellName](const Cell *c) {
+        return c->cell.mName == cellName;
+    });
+    if (it == cells.end())
+        return nullptr;
+    return *it;
+}
+
+Cell *CellController::addCell(ESM::Cell cellData)
+{
+    LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Loaded cells: %d", cells.size());
+    auto it = find_if(cells.begin(), cells.end(), [cellData](const Cell *c) {
+        //return c->cell.sRecordId == cellData.sRecordId; // Currently we cannot compare because plugin lists can be loaded in different order
+        return c->cell.isExterior() ? (c->cell.mData.mX == cellData.mData.mX && c->cell.mData.mY == cellData.mData.mY) :
+               (c->cell.mName == cellData.mName);
+    });
+    Cell *cell;
+    if (it == cells.end())
+    {
+        cell = new Cell(cellData);
+        cells.push_back(cell);
+    }
+    else
+        cell = *it;
+    return cell;
+
+
+}
+
+void CellController::removeCell(Cell *cell)
+{
+    if (cell == nullptr)
+        return;
+    for (auto it = cells.begin(); it != cells.end();)
+    {
+        if (*it != nullptr && *it == cell)
+        {
+            delete *it;
+            it = cells.erase(it);
+        }
+        else
+            ++it;
+    }
+}
+
+void CellController::removePlayer(Cell *cell, Player *player)
+{
+    cell->removePlayer(player);
+
+    if (cell->players.empty())
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Deleting empty cell from memory: %s", player->npc.mName.c_str(),
+                           player->getId(), cell->cell.getDescription().c_str());
+        auto it = find(cells.begin(), cells.end(), cell);
+        delete *it;
+        cells.erase(it);
+    }
+}
+
+void CellController::deletePlayer(Player *player)
+{
+
+    for_each(player->getCells()->begin(), player->getCells()->end(), [&player](Cell *cell) {
+        for (auto it = cell->begin(); it != cell->end(); ++it)
+        {
+            if (*it == player)
+            {
+                cell->players.erase(it);
+                break;
+            }
+        }
+    });
+}
+
+void CellController::update(Player *player)
+{
+    for (auto cell : player->cellStateChanges.cellStates)
+    {
+        if (cell.type == mwmp::CellState::LOAD)
+        {
+            Cell *c = addCell(cell.cell);
+            c->addPlayer(player);
+        }
+        else
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Player %s (%d) unloaded cell: %s", player->npc.mName.c_str(), player->getId(), cell.cell.getDescription().c_str());
+            Cell *c;
+            if (!cell.cell.isExterior())
+                c = getCellByName(cell.cell.mName);
+            else
+                c = getCellByXY(cell.cell.getGridX(), cell.cell.getGridY());
+
+            if (c != nullptr)
+                removePlayer(c, player);
+        }
+    }
+}
+
+Cell::Cell(ESM::Cell cell): cell(cell)
+{
+
+}
+
+Cell::Iterator Cell::begin() const
+{
+    return players.begin();
+}
+
+Cell::Iterator Cell::end() const
+{
+    return players.end();
+}
diff --git a/apps/openmw-mp/Cell.hpp b/apps/openmw-mp/Cell.hpp
new file mode 100644
index 000000000..26eb26bc6
--- /dev/null
+++ b/apps/openmw-mp/Cell.hpp
@@ -0,0 +1,76 @@
+//
+// Created by koncord on 18.02.17.
+//
+
+#ifndef OPENMW_CELL_HPP
+#define OPENMW_CELL_HPP
+
+#include <deque>
+#include <string>
+#include <components/esm/records.hpp>
+#include <components/openmw-mp/Base/BaseEvent.hpp>
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+class Player;
+class Cell;
+
+
+class CellController
+{
+private:
+    CellController();
+    ~CellController();
+
+    CellController(CellController&); // not used
+public:
+    static void create();
+    static void destroy();
+    static CellController *get();
+public:
+    typedef std::deque<Cell*> TContainer;
+    typedef TContainer::iterator TIter;
+
+    Cell * addCell(ESM::Cell cell);
+    void removeCell(Cell *);
+
+    void removePlayer(Cell *cell, Player *player);
+    void deletePlayer(Player *player);
+
+    Cell *getCell(ESM::Cell *esmCell);
+    Cell *getCellByXY(int x, int y);
+    Cell *getCellByName(std::string cellName);
+
+    void update(Player *player);
+
+private:
+    static CellController *sThis;
+    TContainer cells;
+};
+
+class Cell
+{
+    friend class CellController;
+public:
+    Cell(ESM::Cell cell);
+    typedef std::deque<Player*> TPlayers;
+    typedef TPlayers::const_iterator Iterator;
+
+    Iterator begin() const;
+    Iterator end() const;
+
+    void addPlayer(Player *player);
+    void removePlayer(Player *player);
+
+    TPlayers getPlayers() const;
+    void sendToLoaded(mwmp::WorldPacket *worldPacket, mwmp::BaseEvent *baseEvent) const;
+
+    std::string getDescription() const;
+
+
+private:
+    TPlayers players;
+    ESM::Cell cell;
+};
+
+
+#endif //OPENMW_CELL_HPP
diff --git a/apps/openmw-mp/MasterClient.cpp b/apps/openmw-mp/MasterClient.cpp
new file mode 100644
index 000000000..72a50af84
--- /dev/null
+++ b/apps/openmw-mp/MasterClient.cpp
@@ -0,0 +1,197 @@
+//
+// Created by koncord on 14.08.16.
+//
+
+#include <RakSleep.h>
+#include <Getche.h>
+#include <sstream>
+#include <iostream>
+#include <thread>
+#include <RakPeerInterface.h>
+#include "MasterClient.hpp"
+#include <components/openmw-mp/Log.hpp>
+#include <components/openmw-mp/Version.hpp>
+#include "Networking.hpp"
+
+using namespace std;
+
+bool MasterClient::sRun = false;
+
+MasterClient::MasterClient(std::string queryAddr, unsigned short queryPort, std::string serverAddr,
+                           unsigned short serverPort) : queryAddr(queryAddr), queryPort(queryPort),
+                                                        serverAddr(serverAddr), serverPort(serverPort)
+{
+    players = 0;
+    maxPlayers = 0;
+    hostname = "";
+    modname = "";
+    timeout = 1000; // every 1 seconds
+}
+
+void MasterClient::SetPlayers(unsigned pl)
+{
+    mutexData.lock();
+    players = pl;
+    mutexData.unlock();
+}
+
+void MasterClient::SetMaxPlayers(unsigned pl)
+{
+    mutexData.lock();
+    maxPlayers = pl;
+    mutexData.unlock();
+}
+
+void MasterClient::SetHostname(std::string hostname)
+{
+    mutexData.lock();
+    this->hostname = hostname.substr(0, 200);
+    mutexData.unlock();
+}
+
+void MasterClient::SetModname(std::string modname)
+{
+    mutexData.lock();
+    this->modname = modname.substr(0, 200);
+    mutexData.unlock();
+}
+
+RakNet::RakString
+MasterClient::Send(std::string hostname, std::string modname, unsigned maxPlayers, bool update, unsigned players)
+{
+    /*static unsigned short oldServerPort, oldQueryPort;
+    static string oldMotd;
+    static unsigned oldPlayers, oldMaxPlayers;*/
+    std::stringstream sstr;
+    mutexData.lock();
+    sstr << "{";
+    sstr << "\"port\": " << serverPort << ", ";
+    sstr << "\"query_port\": " << queryPort << ", ";
+    sstr << "\"hostname\": \"" << hostname.c_str() << "\", ";
+    sstr << "\"modname\": \"" << modname.c_str() << "\", ";
+    sstr << "\"players\": " << players << ", ";
+    sstr << "\"max_players\": " << maxPlayers << ", ";
+    sstr << "\"version\": \"" << TES3MP_VERSION << "\", ";
+    sstr << "\"passw\": " << (mwmp::Networking::get().isPassworded() ? "true" : "false");
+    sstr << "}";
+    mutexData.unlock();
+
+    std::string contentType = "application/json";
+    RakNet::RakString createRequest;
+
+    if (update)
+        createRequest = RakNet::RakString::FormatForPUT(
+                string("/api/servers/" + serverAddr + ":" + to_string(serverPort)).c_str(), contentType.c_str(),
+                sstr.str().c_str());
+    else
+        createRequest = RakNet::RakString::FormatForPOST("/api/servers", contentType.c_str(),
+                                                         sstr.str().c_str());
+
+    httpConnection->TransmitRequest(createRequest.C_String(), queryAddr.c_str(), queryPort);
+
+    RakNet::Packet *packet;
+    RakNet::SystemAddress sa;
+
+    RakNet::RakString transmitted, hostTransmitted;
+    RakNet::RakString response;
+    RakNet::SystemAddress hostReceived;
+    int contentOffset;
+
+    while (true)
+    {
+
+        // This is kind of crappy, but for TCP plugins, always do HasCompletedConnectionAttempt,
+        // then Receive(), then HasFailedConnectionAttempt(),HasLostConnection()
+        sa = tcpInterface.HasCompletedConnectionAttempt();
+        if (sa != RakNet::UNASSIGNED_SYSTEM_ADDRESS)
+            LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Connected to master server: %s", sa.ToString());
+
+        sa = tcpInterface.HasFailedConnectionAttempt();
+        if (sa != RakNet::UNASSIGNED_SYSTEM_ADDRESS)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Failed to connect to master server: %s", sa.ToString());
+            return "FAIL_CONNECT";
+        }
+        sa = tcpInterface.HasLostConnection();
+        if (sa != RakNet::UNASSIGNED_SYSTEM_ADDRESS)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Lost connection to master server: %s", sa.ToString());
+            return "LOST_CONNECTION";
+        }
+
+        for (packet = tcpInterface.Receive(); packet; tcpInterface.DeallocatePacket(
+                packet), packet = tcpInterface.Receive());
+
+        if (httpConnection->GetResponse(transmitted, hostTransmitted, response, hostReceived, contentOffset))
+        {
+            if (contentOffset < 0)
+                return "NO_CONTENT"; // no content
+            tcpInterface.CloseConnection(sa);
+            return (response.C_String() + contentOffset);
+        }
+        RakSleep(30);
+    }
+
+}
+
+void MasterClient::Update()
+{
+    assert(!sRun);
+
+    httpConnection = RakNet::HTTPConnection2::GetInstance();
+    tcpInterface.Start(0, 64);
+    tcpInterface.AttachPlugin(httpConnection);
+
+    RakNet::RakString response = Send(hostname, modname, maxPlayers, false, players);
+    bool update = true;
+    sRun = true;
+    while (sRun)
+    {
+        if (response == "Created")
+            LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Server registered on the master server.");
+        else if (response == "Accepted")
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Sent info update to master server.");
+        else if (response == "bad request")
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Update rate is too low, and the master server has deleted information about"
+                    " the server. Trying low rate...");
+            if ((timeout - step_rate) >= step_rate)
+                SetUpdateRate(timeout - step_rate);
+            update = false;
+        }
+        else
+        {
+            /*cout << "Error: \""<< response << "\"" << endl;
+            cout << response.GetLength() << endl;*/
+        }
+
+        RakSleep(timeout);
+
+        players = Players::getPlayers()->size();
+        response = Send(hostname, modname, maxPlayers, update, players);
+        update = true;
+    }
+}
+
+void MasterClient::Start()
+{
+    thrQuery = thread(&MasterClient::Update, this);
+}
+
+void MasterClient::Stop()
+{
+    if (!sRun)
+        return;
+    sRun = false;
+    if (thrQuery.joinable())
+        thrQuery.join();
+}
+
+void MasterClient::SetUpdateRate(unsigned int rate)
+{
+    if (timeout < min_rate)
+        timeout = min_rate;
+    else if (timeout > max_rate)
+        timeout = max_rate;
+    timeout = rate;
+}
diff --git a/apps/openmw-mp/MasterClient.hpp b/apps/openmw-mp/MasterClient.hpp
new file mode 100644
index 000000000..c34c8b9e1
--- /dev/null
+++ b/apps/openmw-mp/MasterClient.hpp
@@ -0,0 +1,52 @@
+//
+// Created by koncord on 14.08.16.
+//
+
+#ifndef OPENMW_MASTERCLIENT_HPP
+#define OPENMW_MASTERCLIENT_HPP
+
+#include <string>
+#include <HTTPConnection2.h>
+#include <TCPInterface.h>
+#include <mutex>
+#include <thread>
+
+class MasterClient
+{
+public:
+    static const unsigned int step_rate = 1000;
+    static const unsigned int min_rate = 1000;
+    static const unsigned int max_rate = 30000;
+public:
+    MasterClient(std::string queryAddr, unsigned short queryPort, std::string serverAddr, unsigned short serverPort);
+    void SetPlayers(unsigned pl);
+    void SetMaxPlayers(unsigned pl);
+    void SetHostname(std::string hostname);
+    void SetModname(std::string hostname);
+    void Update();
+    void Start();
+    void Stop();
+    void SetUpdateRate(unsigned int rate);
+
+private:
+    RakNet::RakString
+    Send(std::string hostname, std::string modname, unsigned maxPlayers, bool update, unsigned players);
+private:
+    std::string queryAddr;
+    unsigned short queryPort;
+    std::string serverAddr;
+    unsigned short serverPort;
+    std::string hostname;
+    std::string modname;
+    unsigned players, maxPlayers;
+    RakNet::HTTPConnection2 *httpConnection;
+    RakNet::TCPInterface tcpInterface;
+    unsigned int timeout;
+    static bool sRun;
+    std::mutex mutexData;
+    std::thread thrQuery;
+
+};
+
+
+#endif //OPENMW_MASTERCLIENT_HPP
diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp
new file mode 100644
index 000000000..54c737d62
--- /dev/null
+++ b/apps/openmw-mp/Networking.cpp
@@ -0,0 +1,936 @@
+//
+// Created by koncord on 12.01.16.
+//
+
+#include "Player.hpp"
+#include <RakPeer.h>
+#include <Kbhit.h>
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <components/openmw-mp/Log.hpp>
+#include <iostream>
+#include <Script/Script.hpp>
+#include <Script/API/TimerAPI.hpp>
+#include <chrono>
+#include <thread>
+
+#include "Networking.hpp"
+#include "MasterClient.hpp"
+#include "Cell.hpp"
+#include <components/openmw-mp/Version.hpp>
+
+using namespace mwmp;
+using namespace std;
+
+Networking *Networking::sThis = 0;
+
+Networking::Networking(RakNet::RakPeerInterface *peer)
+{
+    sThis = this;
+    this->peer = peer;
+    players = Players::getPlayers();
+
+    CellController::create();
+
+    playerController = new PlayerPacketController(peer);
+    worldController = new WorldPacketController(peer);
+
+    // Set send stream
+    playerController->SetStream(0, &bsOut);
+    worldController->SetStream(0, &bsOut);
+
+    running = true;
+    exitCode = 0;
+
+    Script::Call<Script::CallbackIdentity("OnServerInit")>();
+
+    serverPassword = TES3MP_DEFAULT_PASSW;
+}
+
+Networking::~Networking()
+{
+    Script::Call<Script::CallbackIdentity("OnServerExit")>(false);
+
+    CellController::destroy();
+
+    sThis = 0;
+    delete playerController;
+    delete worldController;
+    LOG_QUIT();
+}
+
+void Networking::setServerPassword(std::string passw) noexcept
+{
+    serverPassword = passw.empty() ? TES3MP_DEFAULT_PASSW : passw;
+}
+
+bool Networking::isPassworded() const
+{
+    return serverPassword != TES3MP_DEFAULT_PASSW;
+}
+
+void Networking::processPlayerPacket(RakNet::Packet *packet)
+{
+    Player *player = Players::getPlayer(packet->guid);
+
+    PlayerPacket *myPacket = playerController->GetPacket(packet->data[0]);
+
+    if (packet->data[0] == ID_HANDSHAKE)
+    {
+
+        myPacket->Read(player);
+
+        if (player->isHandshaked())
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Wrong handshake with player %d, name: %s",
+                player->getId(),
+                player->npc.mName.c_str());
+            kickPlayer(player->guid);
+            return;
+        }
+
+        if (player->passw != serverPassword)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Wrong server password for player %d, name: %s (pass: %s)",
+                player->getId(),
+                player->npc.mName.c_str(),
+                player->passw.c_str());
+            kickPlayer(player->guid);
+            return;
+        }
+        player->setHandshake();
+        return;
+    }
+
+    if (!player->isHandshaked())
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Have not completed handshake with player %d",
+            player->getId());
+        //KickPlayer(player->guid);
+        return;
+    }
+
+    if (packet->data[0] == ID_LOADED)
+    {
+        player->setLoadState(Player::LOADED);
+
+        static constexpr unsigned int ident = Script::CallbackIdentity("OnPlayerConnect");
+        Script::CallBackReturn<ident> result = true;
+        Script::Call<ident>(result, Players::getPlayer(packet->guid)->getId());
+
+        if (!result)
+        {
+            playerController->GetPacket(ID_USER_DISCONNECTED)->Send(Players::getPlayer(packet->guid), false);
+            Players::deletePlayer(packet->guid);
+            return;
+        }
+    }
+    else if (packet->data[0] == ID_PLAYER_BASEINFO)
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_PLAYER_BASEINFO about %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(player);
+        myPacket->Send(player, true);
+    }
+
+    if (player->getLoadState() == Player::NOTLOADED)
+        return;
+    else if (player->getLoadState() == Player::LOADED)
+    {
+        player->setLoadState(Player::POSTLOADED);
+        newPlayer(packet->guid);
+        return;
+    }
+
+    switch (packet->data[0])
+    {
+        case ID_PLAYER_BASEINFO:
+        {
+        /*LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_PLAYER_BASEINFO about %s",
+        player->npc.mName.c_str());
+
+        myPacket->Read(player);
+        myPacket->Send(player, true);*/
+
+        break;
+        }
+    case ID_PLAYER_POS:
+    {
+        //DEBUG_PRINTF("ID_PLAYER_POS \n");
+
+        if (!player->creatureStats.mDead)
+        {
+            myPacket->Read(player);
+            //myPacket->Send(player, true); //send to other clients
+
+            player->sendToLoaded(myPacket);
+
+        }
+
+        break;
+    }
+    case ID_PLAYER_CELL_CHANGE:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_PLAYER_CELL_CHANGE from %s",
+            player->npc.mName.c_str());
+
+        if (!player->creatureStats.mDead)
+        {
+            myPacket->Read(player);
+
+            LOG_APPEND(Log::LOG_INFO, "- Moved to %s",
+                player->cell.getDescription().c_str());
+
+            player->forEachLoaded([this](Player *pl, Player *other) {
+
+                LOG_APPEND(Log::LOG_INFO, "- Started information exchange with %s",
+                    other->npc.mName.c_str());
+
+                playerController->GetPacket(ID_PLAYER_DYNAMICSTATS)->Send(other, pl->guid);
+                playerController->GetPacket(ID_PLAYER_ATTRIBUTE)->Send(other, pl->guid);
+                playerController->GetPacket(ID_PLAYER_POS)->Send(other, pl->guid);
+                playerController->GetPacket(ID_PLAYER_SKILL)->Send(other, pl->guid);
+                playerController->GetPacket(ID_PLAYER_EQUIPMENT)->Send(other, pl->guid);
+                playerController->GetPacket(ID_PLAYER_DRAWSTATE)->Send(other, pl->guid);
+
+                playerController->GetPacket(ID_PLAYER_DYNAMICSTATS)->Send(pl, other->guid);
+                playerController->GetPacket(ID_PLAYER_ATTRIBUTE)->Send(pl, other->guid);
+                playerController->GetPacket(ID_PLAYER_SKILL)->Send(pl, other->guid);
+                playerController->GetPacket(ID_PLAYER_EQUIPMENT)->Send(pl, other->guid);
+                playerController->GetPacket(ID_PLAYER_DRAWSTATE)->Send(pl, other->guid);
+                
+                LOG_APPEND(Log::LOG_INFO, "- Finished information exchange with %s",
+                    other->npc.mName.c_str());
+            });
+
+            playerController->GetPacket(ID_PLAYER_POS)->Send(player);
+            myPacket->Send(player, true); //send to other clients
+
+            Script::Call<Script::CallbackIdentity("OnPlayerCellChange")>(player->getId());
+
+            LOG_APPEND(Log::LOG_INFO, "- Finished processing ID_PLAYER_CELL_CHANGE",
+                player->cell.getDescription().c_str());
+        }
+        else
+        {
+            LOG_APPEND(Log::LOG_INFO, "- Ignored because %s is dead",
+                player->npc.mName.c_str());
+        }
+
+        break;
+    }
+    case ID_PLAYER_CELL_STATE:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_PLAYER_CELL_STATE from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(player);
+
+        CellController::get()->update(player);
+
+        Script::Call<Script::CallbackIdentity("OnPlayerCellState")>(player->getId());
+
+        break;
+    }
+    case ID_PLAYER_ATTRIBUTE:
+    {
+
+        if (!player->creatureStats.mDead)
+        {
+            myPacket->Read(player);
+            //myPacket->Send(player, true);
+
+            player->sendToLoaded(myPacket);
+
+            Script::Call<Script::CallbackIdentity("OnPlayerAttributesChange")>(player->getId());
+        }
+
+        break;
+    }
+    case ID_PLAYER_SKILL:
+    {
+
+        if (!player->creatureStats.mDead)
+        {
+            myPacket->Read(player);
+            //myPacket->Send(player, true);
+            player->sendToLoaded(myPacket);
+
+            Script::Call<Script::CallbackIdentity("OnPlayerSkillsChange")>(player->getId());
+        }
+
+        break;
+    }
+    case ID_PLAYER_LEVEL:
+    {
+
+        if (!player->creatureStats.mDead)
+        {
+            myPacket->Read(player);
+            //myPacket->Send(player, true);
+
+            Script::Call<Script::CallbackIdentity("OnPlayerLevelChange")>(player->getId());
+        }
+
+        break;
+    }
+    case ID_PLAYER_EQUIPMENT:
+    {
+        DEBUG_PRINTF("ID_PLAYER_EQUIPMENT\n");
+
+        myPacket->Read(player);
+        //myPacket->Send(player, true);
+
+        player->sendToLoaded(myPacket);
+
+        Script::Call<Script::CallbackIdentity("OnPlayerEquipmentChange")>(player->getId());
+
+        break;
+    }
+
+    case ID_PLAYER_INVENTORY:
+    {
+        DEBUG_PRINTF("ID_PLAYER_INVENTORY\n");
+        myPacket->Read(player);
+
+        Script::Call<Script::CallbackIdentity("OnPlayerInventoryChange")>(player->getId());
+
+        break;
+    }
+
+    case ID_PLAYER_SPELLBOOK:
+    {
+        DEBUG_PRINTF("ID_PLAYER_SPELLBOOK\n");
+        myPacket->Read(player);
+
+        Script::Call<Script::CallbackIdentity("OnPlayerSpellbookChange")>(player->getId());
+
+        break;
+    }
+
+    case ID_PLAYER_JOURNAL:
+    {
+        DEBUG_PRINTF("ID_PLAYER_JOURNAL\n");
+        myPacket->Read(player);
+
+        Script::Call<Script::CallbackIdentity("OnPlayerJournalChange")>(player->getId());
+
+        break;
+    }
+
+    case ID_PLAYER_ATTACK:
+    {
+        DEBUG_PRINTF("ID_PLAYER_ATTACK\n");
+
+        if (!player->creatureStats.mDead)
+        {
+            myPacket->Read(player);
+
+            Player *target = Players::getPlayer(player->attack.target);
+
+            if (target == nullptr)
+                target = player;
+
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Player: %s attacked %s state: %d", player->npc.mName.c_str(),
+                target->npc.mName.c_str(), player->attack.pressed == 1);
+            if (player->attack.pressed == 0)
+            {
+                LOG_APPEND(Log::LOG_VERBOSE, "success: %d", player->attack.success == 1);
+                if (player->attack.success == 1)
+                {
+                    LOG_APPEND(Log::LOG_VERBOSE, "damage: %d", player->attack.damage == 1);
+                    target->setLastAttackerId(player->getId());
+                    target->setLastAttackerTime(std::chrono::steady_clock::now());
+                }
+            }
+
+            //myPacket->Send(player, true);
+            player->sendToLoaded(myPacket);
+            playerController->GetPacket(ID_PLAYER_DYNAMICSTATS)->RequestData(player->attack.target);
+        }
+        break;
+    }
+
+    case ID_PLAYER_DYNAMICSTATS:
+    {
+        DEBUG_PRINTF("ID_PLAYER_DYNAMICSTATS\n");
+        myPacket->Read(player);
+        //myPacket->Send(player, true);
+
+        player->sendToLoaded(myPacket);
+
+        break;
+    }
+
+    case ID_GAME_DIE:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_GAME_DIE from %s",
+            player->npc.mName.c_str());
+
+        Player *killer = Players::getPlayer(player->getLastAttackerId());
+
+        short reason = 0; // unknown;
+        double secondsSinceLastAttacker = chrono::duration_cast<chrono::duration<double>>(
+            chrono::steady_clock::now() - player->getLastAttackerTime()).count();
+
+        if (!killer)
+            killer = player;
+
+        if (secondsSinceLastAttacker < 3.0f)
+            reason = 1; // killed
+        else
+            reason = 2; //suicide
+
+        player->resetLastAttacker();
+
+        player->creatureStats.mDead = true;
+        myPacket->Send(player, true);
+
+        Script::Call<Script::CallbackIdentity("OnPlayerDeath")>(player->getId(), reason, killer->getId());
+
+        break;
+    }
+
+    case ID_GAME_RESURRECT:
+    {
+        DEBUG_PRINTF("ID_GAME_RESURRECT\n");
+        //packetResurrect.Read(player);
+        player->creatureStats.mDead = false;
+        myPacket->Send(player, true);
+        playerController->GetPacket(ID_PLAYER_POS)->RequestData(player->guid);
+        playerController->GetPacket(ID_PLAYER_CELL_CHANGE)->RequestData(player->guid);
+
+        Script::Call<Script::CallbackIdentity("OnPlayerResurrect")>(player->getId());
+
+        break;
+    }
+
+    case ID_PLAYER_DRAWSTATE:
+    {
+        DEBUG_PRINTF("ID_PLAYER_DRAWSTATE\n");
+        myPacket->Read(player);
+        //myPacket->Send(player, true);
+
+        player->sendToLoaded(myPacket);
+
+        break;
+    }
+
+    case ID_CHAT_MESSAGE:
+    {
+        DEBUG_PRINTF("ID_CHAT_MESSAGE\n");
+        myPacket->Read(player);
+        Script::CallBackReturn<Script::CallbackIdentity("OnPlayerSendMessage")> result = true;
+        Script::Call<Script::CallbackIdentity("OnPlayerSendMessage")>(result, player->getId(), player->chatMessage.c_str());
+
+        if (result)
+        {
+            player->chatMessage = player->npc.mName + " (" + std::to_string(player->getId()) + "): "
+                + player->chatMessage + "\n";
+            myPacket->Send(player, false);
+            myPacket->Send(player, true);
+        }
+        break;
+    }
+    case ID_PLAYER_CHARGEN:
+    {
+        DEBUG_PRINTF("ID_PLAYER_CHARGEN\n");
+        myPacket->Read(player);
+
+        if (player->charGenStage.current == player->charGenStage.end && player->charGenStage.current != 0)
+        {
+            Script::Call<Script::CallbackIdentity("OnPlayerEndCharGen")>(player->getId());
+            cout << "RACE: " << player->npc.mRace << endl;
+        }
+        break;
+    }
+
+    case ID_GUI_MESSAGEBOX:
+    {
+        DEBUG_PRINTF("ID_GUI_MESSAGEBOX\n");
+        myPacket->Read(player);
+
+        Script::Call<Script::CallbackIdentity("OnGUIAction")>(player->getId(), (int)player->guiMessageBox.id,
+            player->guiMessageBox.data.c_str());
+        break;
+    }
+
+    case ID_PLAYER_CHARCLASS:
+    {
+        DEBUG_PRINTF("ID_PLAYER_CHARCLASS\n");
+        myPacket->Read(player);
+        break;
+    }
+
+    default:
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Unhandled PlayerPacket with identifier %i has arrived",
+            packet->data[0]);
+        break;
+    }
+}
+
+void Networking::processWorldPacket(RakNet::Packet *packet)
+{
+    Player *player = Players::getPlayer(packet->guid);
+
+    if (!player->isHandshaked() || player->getLoadState() != Player::POSTLOADED)
+        return;
+
+    WorldPacket *myPacket = worldController->GetPacket(packet->data[0]);
+
+    // Clear our baseEvent before loading new data in it
+    baseEvent.cell.blank();
+    baseEvent.objectChanges.objects.clear();
+    baseEvent.guid = packet->guid;
+
+    switch (packet->data[0])
+    {
+
+    case ID_OBJECT_PLACE:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_PLACE from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        Script::Call<Script::CallbackIdentity("OnObjectPlace")>(
+            player->getId(),
+            baseEvent.cell.getDescription().c_str());
+
+        break;
+    }
+
+    case ID_OBJECT_DELETE:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_DELETE from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        Script::Call<Script::CallbackIdentity("OnObjectDelete")>(
+            player->getId(),
+            baseEvent.cell.getDescription().c_str());
+
+        break;
+    }
+
+    case ID_OBJECT_SCALE:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_SCALE from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        Script::Call<Script::CallbackIdentity("OnObjectScale")>(
+            player->getId(),
+            baseEvent.cell.getDescription().c_str());
+
+        break;
+    }
+
+    case ID_OBJECT_LOCK:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_LOCK from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        Script::Call<Script::CallbackIdentity("OnObjectLock")>(
+            player->getId(),
+            baseEvent.cell.getDescription().c_str());
+
+        break;
+    }
+
+    case ID_OBJECT_UNLOCK:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_UNLOCK from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        Script::Call<Script::CallbackIdentity("OnObjectUnlock")>(
+            player->getId(),
+            baseEvent.cell.getDescription().c_str());
+
+        break;
+    }
+
+    case ID_OBJECT_MOVE:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_MOVE from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        break;
+    }
+
+    case ID_OBJECT_ROTATE:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_ROTATE from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        break;
+    }
+
+    case ID_OBJECT_ANIM_PLAY:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_ANIM_PLAY from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        break;
+    }
+
+    case ID_DOOR_STATE:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_DOOR_STATE from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        Script::Call<Script::CallbackIdentity("OnDoorState")>(
+            player->getId(),
+            baseEvent.cell.getDescription().c_str());
+
+        break;
+    }
+
+    case ID_CONTAINER:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_CONTAINER from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+
+        LOG_APPEND(Log::LOG_WARN, "- action: %i", baseEvent.action);
+
+        // Until we have a timestamp-based system, send packets pertaining to more
+        // than one container (i.e. replies to server requests for container contents)
+        // only to players who have the container's cell loaded
+        if (baseEvent.action == BaseEvent::SET && baseEvent.objectChanges.count > 1)
+            CellController::get()->getCell(&baseEvent.cell)->sendToLoaded(myPacket, &baseEvent);
+        else
+            myPacket->Send(&baseEvent, true);
+
+        Script::Call<Script::CallbackIdentity("OnContainer")>(
+            player->getId(),
+            baseEvent.cell.getDescription().c_str());
+
+        LOG_APPEND(Log::LOG_INFO, "- Finished processing ID_CONTAINER");
+
+        break;
+    }
+
+    case ID_SCRIPT_LOCAL_SHORT:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_SCRIPT_LOCAL_SHORT from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        break;
+    }
+
+    case ID_SCRIPT_LOCAL_FLOAT:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_SCRIPT_LOCAL_FLOAT from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        break;
+    }
+
+    case ID_SCRIPT_MEMBER_SHORT:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_SCRIPT_MEMBER_SHORT from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        break;
+    }
+
+    case ID_SCRIPT_GLOBAL_SHORT:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_SCRIPT_GLOBAL_SHORT from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        break;
+    }
+
+    case ID_MUSIC_PLAY:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_MUSIC_PLAY from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        break;
+    }
+
+    case ID_VIDEO_PLAY:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_VIDEO_PLAY from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(&baseEvent);
+        myPacket->Send(&baseEvent, true);
+
+        break;
+    }
+
+    default:
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Unhandled WorldPacket with identifier %i has arrived",
+            packet->data[0]);
+        break;
+    }
+
+}
+
+void Networking::update(RakNet::Packet *packet)
+{
+    Player *player = Players::getPlayer(packet->guid);
+
+    RakNet::BitStream bsIn(&packet->data[1], packet->length, false);
+
+    {
+        RakNet::RakNetGUID ignoredGUID;
+        bsIn.Read(ignoredGUID);
+        (void)ignoredGUID;
+    }
+
+    if (player == 0)
+    {
+        playerController->SetStream(&bsIn, 0);
+
+        playerController->GetPacket(ID_HANDSHAKE)->RequestData(packet->guid);
+        Players::newPlayer(packet->guid);
+        player = Players::getPlayer(packet->guid);
+        playerController->GetPacket(ID_USER_MYID)->Send(Players::getPlayer(packet->guid), false);
+        return;
+    }
+    else if (playerController->ContainsPacket(packet->data[0]))
+    {
+        playerController->SetStream(&bsIn, 0);
+        processPlayerPacket(packet);
+    }
+    else if (worldController->ContainsPacket(packet->data[0]))
+    {
+        worldController->SetStream(&bsIn, 0);
+        processWorldPacket(packet);
+    }
+    else
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Unhandled Raknet packet with identifier %i has arrived",
+            packet->data[0]);
+    }
+}
+
+void Networking::newPlayer(RakNet::RakNetGUID guid)
+{
+    playerController->GetPacket(ID_PLAYER_BASEINFO)->RequestData(guid);
+    playerController->GetPacket(ID_PLAYER_DYNAMICSTATS)->RequestData(guid);
+    playerController->GetPacket(ID_PLAYER_POS)->RequestData(guid);
+    playerController->GetPacket(ID_PLAYER_CELL_CHANGE)->RequestData(guid);
+    playerController->GetPacket(ID_PLAYER_EQUIPMENT)->RequestData(guid);
+
+    LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Sending info about other players to %lu",
+        guid.g);
+
+    for (TPlayers::iterator pl = players->begin(); pl != players->end(); pl++) //sending other players to new player
+    {
+        // If we are iterating over the new player, don't send the packets below
+        if (pl->first == guid) continue;
+
+        // If an invalid key makes it into the Players map, ignore it
+        else if (pl->first == RakNet::UNASSIGNED_RAKNET_GUID) continue;
+
+        // if player not fully connected
+        else if (pl->second == nullptr) continue;
+
+        // If we are iterating over a player who has inputted their name, proceed
+        else if (pl->second->getLoadState() == Player::POSTLOADED)
+        {
+            playerController->GetPacket(ID_PLAYER_BASEINFO)->Send(pl->second, guid);
+            playerController->GetPacket(ID_PLAYER_DYNAMICSTATS)->Send(pl->second, guid);
+            playerController->GetPacket(ID_PLAYER_ATTRIBUTE)->Send(pl->second, guid);
+            playerController->GetPacket(ID_PLAYER_SKILL)->Send(pl->second, guid);
+            playerController->GetPacket(ID_PLAYER_POS)->Send(pl->second, guid);
+            playerController->GetPacket(ID_PLAYER_CELL_CHANGE)->Send(pl->second, guid);
+            playerController->GetPacket(ID_PLAYER_EQUIPMENT)->Send(pl->second, guid);
+        }
+    }
+
+    LOG_APPEND(Log::LOG_WARN, "- Done");
+
+}
+
+void Networking::disconnectPlayer(RakNet::RakNetGUID guid)
+{
+    Player *player = Players::getPlayer(guid);
+    if (!player)
+        return;
+    Script::Call<Script::CallbackIdentity("OnPlayerDisconnect")>(player->getId());
+    playerController->GetPacket(ID_USER_DISCONNECTED)->Send(player, true);
+    Players::deletePlayer(guid);
+}
+
+PlayerPacketController *Networking::getPlayerController() const
+{
+    return playerController;
+}
+
+WorldPacketController *Networking::getWorldController() const
+{
+    return worldController;
+}
+
+BaseEvent *Networking::getLastEvent()
+{
+    return &baseEvent;
+}
+
+const Networking &Networking::get()
+{
+    return *sThis;
+}
+
+
+Networking *Networking::getPtr()
+{
+    return sThis;
+}
+
+void Networking::stopServer(int code)
+{
+    running = false;
+    exitCode = code;
+}
+
+int Networking::mainLoop()
+{
+    RakNet::Packet *packet;
+
+    while (running)
+    {
+        if (kbhit() && getch() == '\n')
+            break;
+        for (packet=peer->Receive(); packet; peer->DeallocatePacket(packet), packet=peer->Receive())
+        {
+            switch (packet->data[0])
+            {
+                case ID_REMOTE_DISCONNECTION_NOTIFICATION:
+                    LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Client at %s has disconnected",
+                        packet->systemAddress.ToString());
+                    break;
+                case ID_REMOTE_CONNECTION_LOST:
+                    LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Client at %s has lost connection",
+                        packet->systemAddress.ToString());
+                    break;
+                case ID_REMOTE_NEW_INCOMING_CONNECTION:
+                    LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Client at %s has connected",
+                        packet->systemAddress.ToString());
+                    break;
+                case ID_CONNECTION_REQUEST_ACCEPTED:    // client to server
+                {
+                    LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Our connection request has been accepted");
+                    break;
+                }
+                case ID_NEW_INCOMING_CONNECTION:
+                    LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "A connection is incoming from %s",
+                        packet->systemAddress.ToString());
+                    break;
+                case ID_NO_FREE_INCOMING_CONNECTIONS:
+                    LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "The server is full");
+                    break;
+                case ID_DISCONNECTION_NOTIFICATION:
+                    LOG_MESSAGE_SIMPLE(Log::LOG_WARN,  "Client at %s has disconnected",
+                        packet->systemAddress.ToString());
+                    disconnectPlayer(packet->guid);
+                    break;
+                case ID_CONNECTION_LOST:
+                    LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Client at %s has lost connection",
+                        packet->systemAddress.ToString());
+                    disconnectPlayer(packet->guid);
+                    break;
+                case ID_CONNECTED_PING:
+                case ID_UNCONNECTED_PING:
+                    break;
+                case ID_MASTER_QUERY:
+                {
+                    LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Query request from %s",
+                                       packet->systemAddress.ToString());
+                    RakNet::BitStream bs;
+                    bs.Write((unsigned char) ID_MASTER_QUERY);
+                    bs.Write(Players::getPlayers()->size());
+                    for (auto player : *Players::getPlayers())
+                        bs.Write(RakNet::RakString(player.second->npc.mName.c_str()));
+                    bs.Write(0); // plugins
+                    peer->Send(&bs, HIGH_PRIORITY, RELIABLE_ORDERED, 0, packet->systemAddress, false);
+                    break;
+                }
+                default:
+                    update(packet);
+                    break;
+            }
+        }
+        TimerAPI::Tick();
+        this_thread::sleep_for(chrono::milliseconds(1));
+    }
+
+    TimerAPI::Terminate();
+    return exitCode;
+}
+
+void Networking::kickPlayer(RakNet::RakNetGUID guid)
+{
+    peer->CloseConnection(guid, true);
+}
+
+unsigned short Networking::numberOfConnections() const
+{
+    return peer->NumberOfConnections();
+}
+
+unsigned int Networking::maxConnections() const
+{
+    return peer->GetMaximumIncomingConnections();
+}
+
+int Networking::getAvgPing(RakNet::AddressOrGUID addr) const
+{
+    return peer->GetAveragePing(addr);
+}
+
+MasterClient *Networking::getMasterClient()
+{
+    return mclient;
+}
+
+void Networking::InitQuery(std::string queryAddr, unsigned short queryPort, std::string serverAddr,
+                           unsigned short serverPort)
+{
+    mclient = new MasterClient(queryAddr, (unsigned short) queryPort, serverAddr, (unsigned short) serverPort);
+}
diff --git a/apps/openmw-mp/Networking.hpp b/apps/openmw-mp/Networking.hpp
new file mode 100644
index 000000000..286f1a602
--- /dev/null
+++ b/apps/openmw-mp/Networking.hpp
@@ -0,0 +1,67 @@
+//
+// Created by koncord on 12.01.16.
+//
+
+#ifndef OPENMW_NETWORKING_HPP
+#define OPENMW_NETWORKING_HPP
+
+#include <components/openmw-mp/Controllers/PlayerPacketController.hpp>
+#include <components/openmw-mp/Controllers/WorldPacketController.hpp>
+#include "Player.hpp"
+
+class MasterClient;
+namespace  mwmp
+{
+    class Networking
+    {
+    public:
+        Networking(RakNet::RakPeerInterface *peer);
+        ~Networking();
+
+        void newPlayer(RakNet::RakNetGUID guid);
+        void disconnectPlayer(RakNet::RakNetGUID guid);
+        void kickPlayer(RakNet::RakNetGUID guid);
+
+        void processPlayerPacket(RakNet::Packet *packet);
+        void processWorldPacket(RakNet::Packet *packet);
+        void update(RakNet::Packet *packet);
+
+        unsigned short numberOfConnections() const;
+        unsigned int maxConnections() const;
+        int getAvgPing(RakNet::AddressOrGUID) const;
+
+        int mainLoop();
+
+        void stopServer(int code);
+
+        PlayerPacketController *getPlayerController() const;
+        WorldPacketController *getWorldController() const;
+        BaseEvent *getLastEvent();
+
+        MasterClient *getMasterClient();
+        void InitQuery(std::string queryAddr, unsigned short queryPort, std::string serverAddr, unsigned short serverPort);
+        void setServerPassword(std::string passw) noexcept;
+        bool isPassworded() const;
+
+        static const Networking &get();
+        static Networking *getPtr();
+
+    private:
+        std::string serverPassword;
+        static Networking *sThis;
+        BaseEvent baseEvent;
+        RakNet::RakPeerInterface *peer;
+        RakNet::BitStream bsOut;
+        TPlayers *players;
+        MasterClient *mclient;
+
+        PlayerPacketController *playerController;
+        WorldPacketController *worldController;
+
+        bool running;
+        int exitCode;
+    };
+}
+
+
+#endif //OPENMW_NETWORKING_HPP
diff --git a/apps/openmw-mp/Player.cpp b/apps/openmw-mp/Player.cpp
new file mode 100644
index 000000000..db3e7b760
--- /dev/null
+++ b/apps/openmw-mp/Player.cpp
@@ -0,0 +1,180 @@
+//
+// Created by koncord on 05.01.16.
+//
+
+#include "Player.hpp"
+#include "Networking.hpp"
+
+TPlayers Players::players;
+TSlots Players::slots;
+
+void Players::deletePlayer(RakNet::RakNetGUID guid)
+{
+    LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Deleting player with guid %lu",
+        guid.g);
+
+    if (players[guid] != 0)
+    {
+        CellController::get()->deletePlayer(players[guid]);
+
+        LOG_APPEND(Log::LOG_INFO, "- Emptying slot %i",
+            players[guid]->getId());
+
+        slots[players[guid]->getId()] = 0;
+        delete players[guid];
+        players.erase(guid);
+    }
+}
+
+void Players::newPlayer(RakNet::RakNetGUID guid)
+{
+    LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Creating new player with guid %lu",
+        guid.g);
+
+    players[guid] = new Player(guid);
+    players[guid]->cell.blank();
+    players[guid]->npc.blank();
+    players[guid]->npcStats.blank();
+    players[guid]->creatureStats.blank();
+    players[guid]->charClass.blank();
+
+    for (unsigned int i = 0; i < mwmp::Networking::get().maxConnections(); i++)
+    {
+        if (slots[i] == 0)
+        {
+            LOG_APPEND(Log::LOG_INFO, "- Storing in slot %i",
+                i);
+
+            slots[i] = players[guid];
+            slots[i]->setId(i);
+            break;
+        }
+    }
+}
+
+Player *Players::getPlayer(RakNet::RakNetGUID guid)
+{
+    if (players.count(guid) == 0)
+        return nullptr;
+    return players[guid];
+}
+
+TPlayers *Players::getPlayers()
+{
+    return &players;
+}
+
+Player::Player(RakNet::RakNetGUID guid) : BasePlayer(guid)
+{
+    handshakeState = false;
+    loadState = NOTLOADED;
+    lastAttacker = 0;
+}
+
+Player::~Player()
+{
+
+}
+
+unsigned short Player::getId()
+{
+    return id;
+}
+
+void Player::setId(unsigned short id)
+{
+    this->id = id;
+}
+
+void Player::setHandshake()
+{
+    handshakeState = true;
+}
+
+bool Player::isHandshaked()
+{
+    return handshakeState;
+}
+
+void Player::setLoadState(int state)
+{
+    loadState = state;
+}
+
+int Player::getLoadState()
+{
+    return loadState;
+}
+
+Player *Players::getPlayer(unsigned short id)
+{
+    if (slots.find(id) == slots.end())
+        return nullptr;
+    return slots[id];
+}
+
+void Player::setLastAttackerId(unsigned short pid)
+{
+    lastAttacker = pid;
+}
+
+void Player::resetLastAttacker()
+{
+    lastAttacker = id;
+}
+
+unsigned short Player::getLastAttackerId()
+{
+    return lastAttacker;
+}
+
+void Player::setLastAttackerTime(std::chrono::steady_clock::time_point time)
+{
+    lastAttackerTime = time;
+}
+
+std::chrono::steady_clock::time_point Player::getLastAttackerTime()
+{
+    return lastAttackerTime;
+}
+
+CellController::TContainer *Player::getCells()
+{
+    return &cells;
+}
+
+void Player::sendToLoaded(mwmp::PlayerPacket *myPacket)
+{
+    std::list <Player*> plList;
+
+    for (auto cell : cells)
+        for (auto pl : *cell)
+            plList.push_back(pl);
+
+    plList.sort();
+    plList.unique();
+
+    for (auto pl : plList)
+    {
+        if (pl == this) continue;
+        myPacket->Send(this, pl->guid);
+    }
+}
+
+void Player::forEachLoaded(std::function<void(Player *pl, Player *other)> func)
+{
+    std::list <Player*> plList;
+
+    for (auto cell : cells)
+        for (auto pl : *cell)
+            plList.push_back(pl);
+
+    plList.sort();
+    plList.unique();
+
+    for (auto pl : plList)
+    {
+        if (pl == this) continue;
+        func(this, pl);
+    }
+}
diff --git a/apps/openmw-mp/Player.hpp b/apps/openmw-mp/Player.hpp
new file mode 100644
index 000000000..cf83b9688
--- /dev/null
+++ b/apps/openmw-mp/Player.hpp
@@ -0,0 +1,92 @@
+//
+// Created by koncord on 05.01.16.
+//
+
+#ifndef OPENMW_PLAYER_HPP
+#define OPENMW_PLAYER_HPP
+
+#include <map>
+#include <string>
+#include <chrono>
+#include <RakNetTypes.h>
+
+#include <components/esm/npcstats.hpp>
+#include <components/esm/cellid.hpp>
+#include <components/esm/loadnpc.hpp>
+#include <components/esm/loadcell.hpp>
+
+#include <components/openmw-mp/Log.hpp>
+#include <components/openmw-mp/Base/BasePlayer.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+#include "Cell.hpp"
+
+struct Player;
+typedef std::map<RakNet::RakNetGUID, Player*> TPlayers;
+typedef std::map<unsigned short, Player*> TSlots;
+
+class Players
+{
+public:
+    static void newPlayer(RakNet::RakNetGUID guid);
+    static void deletePlayer(RakNet::RakNetGUID guid);
+    static Player *getPlayer(RakNet::RakNetGUID guid);
+    static Player *getPlayer(unsigned short id);
+    static TPlayers *getPlayers();
+
+private:
+    static TPlayers players;
+    static TSlots slots;
+};
+
+class Player : public mwmp::BasePlayer
+{
+    friend class Cell;
+    unsigned short id;
+public:
+
+    enum
+    {
+        NOTLOADED=0,
+        LOADED,
+        POSTLOADED
+    };
+    Player(RakNet::RakNetGUID guid);
+
+    unsigned short getId();
+    void setId(unsigned short id);
+
+    bool isHandshaked();
+    void setHandshake();
+
+    void setLoadState(int state);
+    int getLoadState();
+
+    void setLastAttackerId(unsigned short pid);
+    void resetLastAttacker();
+    unsigned short getLastAttackerId();
+
+    void setLastAttackerTime(std::chrono::steady_clock::time_point time);
+    std::chrono::steady_clock::time_point getLastAttackerTime();
+
+    virtual ~Player();
+
+    CellController::TContainer *getCells();
+    void sendToLoaded(mwmp::PlayerPacket *myPacket);
+
+    void forEachLoaded(std::function<void(Player *pl, Player *other)> func);
+
+public:
+    mwmp::InventoryChanges inventoryChangesBuffer;
+    mwmp::SpellbookChanges spellbookChangesBuffer;
+    mwmp::JournalChanges journalChangesBuffer;
+
+private:
+    CellController::TContainer cells;
+    bool handshakeState;
+    int loadState;
+    unsigned short lastAttacker;
+    std::chrono::steady_clock::time_point lastAttackerTime;
+
+};
+
+#endif //OPENMW_PLAYER_HPP
diff --git a/apps/openmw-mp/Script/API/PublicFnAPI.cpp b/apps/openmw-mp/Script/API/PublicFnAPI.cpp
new file mode 100644
index 000000000..471d49e2f
--- /dev/null
+++ b/apps/openmw-mp/Script/API/PublicFnAPI.cpp
@@ -0,0 +1,93 @@
+//
+// Created by koncord on 14.05.16.
+//
+
+#include <Script/ScriptFunction.hpp>
+#include "PublicFnAPI.hpp"
+
+using namespace std;
+
+unordered_map<string, Public *> Public::publics;
+
+Public::~Public()
+{
+
+}
+
+Public::Public(ScriptFunc _public, const std::string &name, char ret_type, const std::string &def) : ScriptFunction(_public, ret_type, def)
+{
+    publics.emplace(name, this);
+}
+
+Public::Public(ScriptFuncLua _public, lua_State *lua, const std::string &name, char ret_type, const std::string &def) : ScriptFunction(
+        _public, lua, ret_type, def)
+{
+    publics.emplace(name, this);
+}
+
+#if defined(ENABLE_PAWN)
+Public::Public(ScriptFuncPAWN _public, AMX* amx, const std::string& name, char ret_type, const std::string& def): ScriptFunction(_public, amx, ret_type, def)
+{
+    publics.emplace(name, this);
+}
+#endif
+
+
+boost::any Public::Call(const std::string &name, const std::vector<boost::any> &args)
+{
+    auto it = publics.find(name);
+    if (it == publics.end())
+        throw runtime_error("Public with name \"" + name + "\" does not exist");
+
+    return it->second->ScriptFunction::Call(args);
+}
+
+
+const std::string &Public::GetDefinition(const std::string &name)
+{
+    auto it = publics.find(name);
+
+    if (it == publics.end())
+        throw runtime_error("Public with name \"" + name + "\" does not exist");
+
+    return it->second->def;
+}
+
+
+bool Public::IsLua(const std::string &name)
+{
+#if !defined(ENABLE_LUA)
+    return false;
+#else
+    auto it = publics.find(name);
+    if (it == publics.end())
+        throw runtime_error("Public with name \"" + name + "\" does not exist");
+
+    return it->second->script_type == SCRIPT_LUA;
+#endif
+}
+
+bool Public::IsPAWN(const std::string &name)
+{
+#if !defined(ENABLE_PAWN)
+    return false;
+#else
+    auto it = publics.find(name);
+
+    if (it == publics.end())
+        throw runtime_error("Public with name \"" + name + "\" does not exist");
+
+    return it->second->script_type == SCRIPT_PAWN;
+#endif
+}
+
+
+void Public::DeleteAll()
+{
+    for (auto it = publics.begin(); it != publics.end(); it++)
+    {
+        Public *_public = it->second;
+        delete _public;
+        publics.erase(it);
+    }
+}
diff --git a/apps/openmw-mp/Script/API/PublicFnAPI.hpp b/apps/openmw-mp/Script/API/PublicFnAPI.hpp
new file mode 100644
index 000000000..cd49185cf
--- /dev/null
+++ b/apps/openmw-mp/Script/API/PublicFnAPI.hpp
@@ -0,0 +1,42 @@
+//
+// Created by koncord on 14.05.16.
+//
+
+#ifndef PLUGINSYSTEM3_PUBLICFNAPI_HPP
+#define PLUGINSYSTEM3_PUBLICFNAPI_HPP
+
+#include <unordered_map>
+#include <Script/ScriptFunction.hpp>
+
+
+class Public : public ScriptFunction
+{
+private:
+    ~Public();
+
+    static std::unordered_map<std::string, Public *> publics;
+
+    Public(ScriptFunc _public, const std::string &name, char ret_type, const std::string &def);
+#if defined(ENABLE_PAWN)
+    Public(ScriptFuncPAWN _public, AMX* amx, const std::string& name, char ret_type, const std::string& def);
+#endif
+#if defined(ENABLE_LUA)
+    Public(ScriptFuncLua _public, lua_State *lua, const std::string &name, char ret_type, const std::string &def);
+#endif
+
+public:
+    template<typename... Args>
+    static void MakePublic(Args &&... args)
+    { new Public(std::forward<Args>(args)...); }
+
+    static boost::any Call(const std::string &name, const std::vector<boost::any> &args);
+
+    static const std::string& GetDefinition(const std::string& name);
+
+    static bool IsPAWN(const std::string &name);
+    static bool IsLua(const std::string &name);
+
+    static void DeleteAll();
+};
+
+#endif //PLUGINSYSTEM3_PUBLICFNAPI_HPP
diff --git a/apps/openmw-mp/Script/API/TimerAPI.cpp b/apps/openmw-mp/Script/API/TimerAPI.cpp
new file mode 100644
index 000000000..60b20b09e
--- /dev/null
+++ b/apps/openmw-mp/Script/API/TimerAPI.cpp
@@ -0,0 +1,238 @@
+//
+// Created by koncord on 15.03.16.
+//
+
+#include "TimerAPI.hpp"
+
+#include <chrono>
+
+#include <iostream>
+using namespace mwmp;
+using namespace std;
+
+Timer::Timer(ScriptFunc callback, long msec, const std::string& def, std::vector<boost::any> args) : ScriptFunction(callback, 'v', def)
+{
+    targetMsec = msec;
+    this->args = args;
+    end = true;
+}
+
+#if defined(ENABLE_PAWN)
+Timer::Timer(AMX *amx, ScriptFuncPAWN callback, long msec, const std::string &def, std::vector<boost::any> args): ScriptFunction(callback, amx, 'v', def)
+{
+    targetMsec = msec;
+    this->args = args;
+    end = true;
+}
+#endif
+#if defined(ENABLE_LUA)
+Timer::Timer(lua_State *lua, ScriptFuncLua callback, long msec, const std::string& def, std::vector<boost::any> args): ScriptFunction(callback, lua, 'v', def)
+{
+    targetMsec = msec;
+    this->args = args;
+    end = true;
+}
+#endif
+
+void Timer::Tick()
+{
+    if (end)
+        return;
+
+    const auto duration = chrono::system_clock::now().time_since_epoch();
+    const auto time = chrono::duration_cast<chrono::milliseconds>(duration).count();
+
+    if (time - startTime >= targetMsec)
+    {
+        Call(args);
+        end = true;
+    }
+}
+
+bool Timer::IsEnd()
+{
+    return end;
+}
+
+void Timer::Stop()
+{
+    end = true;
+}
+
+void Timer::Restart(int msec)
+{
+    targetMsec = msec;
+    Start();
+}
+
+void Timer::Start()
+{
+    end = false;
+
+    const auto duration = chrono::system_clock::now().time_since_epoch();
+    const auto msec = chrono::duration_cast<chrono::milliseconds>(duration).count();
+    startTime = msec;
+}
+
+int TimerAPI::pointer = 0;
+std::unordered_map<int, Timer* > TimerAPI::timers;
+
+#if defined(ENABLE_PAWN)
+int TimerAPI::CreateTimerPAWN(AMX *amx, ScriptFuncPAWN callback, long msec, const string& def, std::vector<boost::any> args)
+{
+    int id = -1;
+
+    for (auto timer : timers)
+    {
+        if (timer.second != nullptr)
+            continue;
+        timer.second = new Timer(amx, callback, msec, def, args);
+        id = timer.first;
+    }
+
+    if (id == -1)
+    {
+        timers[pointer] = new Timer(amx, callback, msec, def, args);
+        id = pointer;
+        pointer++;
+    }
+
+    return id;
+}
+#endif
+
+#if defined(ENABLE_LUA)
+int TimerAPI::CreateTimerLua(lua_State *lua, ScriptFuncLua callback, long msec, const std::string& def, std::vector<boost::any> args)
+{
+    int id = -1;
+
+    for (auto timer : timers)
+    {
+        if (timer.second != nullptr)
+            continue;
+        timer.second = new Timer(lua, callback, msec, def, args);
+        id = timer.first;
+    }
+
+    if (id == -1)
+    {
+        timers[pointer] = new Timer(lua, callback, msec, def, args);
+        id = pointer;
+        pointer++;
+    }
+
+    return id;
+}
+#endif
+
+
+int TimerAPI::CreateTimer(ScriptFunc callback, long msec, const std::string &def, std::vector<boost::any> args)
+{
+    int id = -1;
+
+    for (auto timer : timers)
+    {
+        if (timer.second != nullptr)
+            continue;
+        timer.second = new Timer(callback, msec, def, args);
+        id = timer.first;
+    }
+
+    if (id == -1)
+    {
+        timers[pointer] = new Timer(callback, msec, def, args);
+        id = pointer;
+        pointer++;
+    }
+
+    return id;
+}
+
+void TimerAPI::FreeTimer(int timerid)
+{
+
+    try
+    {
+        if (timers.at(timerid) != nullptr)
+        {
+            delete timers[timerid];
+            timers[timerid] = nullptr;
+        }
+    }
+    catch(...)
+    {
+        std::cerr << "Timer " << timerid << " not found!" << endl;
+    }
+}
+
+void TimerAPI::ResetTimer(int timerid, long msec)
+{
+    try
+    {
+        timers.at(timerid)->Restart(msec);
+    }
+    catch(...)
+    {
+        std::cerr << "Timer " << timerid << " not found!" << endl;
+    }
+}
+
+void TimerAPI::StartTimer(int timerid)
+{
+    try
+    {
+        Timer *timer = timers.at(timerid);
+        if (timer == nullptr)
+            throw 1;
+        timer->Start();
+    }
+    catch(...)
+    {
+        std::cerr << "Timer " << timerid << " not found!" << endl;
+    }
+}
+
+void TimerAPI::StopTimer(int timerid)
+{
+    try
+    {
+        timers.at(timerid)->Stop();
+    }
+    catch(...)
+    {
+        std::cerr << "Timer " << timerid << " not found!" << endl;
+    }
+}
+
+bool TimerAPI::IsEndTimer(int timerid)
+{
+    bool ret = false;
+    try
+    {
+        ret = timers.at(timerid)->IsEnd();
+    }
+    catch(...)
+    {
+        std::cerr << "Timer " << timerid << " not found!" << endl;
+    }
+    return ret;
+}
+
+void TimerAPI::Terminate()
+{
+    for (auto timer : timers)
+    {
+        if (timer.second != nullptr)
+            delete timer.second;
+        timer.second = nullptr;
+    }
+}
+
+void TimerAPI::Tick()
+{
+    for (auto timer : timers)
+    {
+        if (timer.second != nullptr)
+            timer.second->Tick();
+    }
+}
diff --git a/apps/openmw-mp/Script/API/TimerAPI.hpp b/apps/openmw-mp/Script/API/TimerAPI.hpp
new file mode 100644
index 000000000..eec896f6e
--- /dev/null
+++ b/apps/openmw-mp/Script/API/TimerAPI.hpp
@@ -0,0 +1,70 @@
+//
+// Created by koncord on 15.03.16.
+//
+
+#ifndef OPENMW_TIMERAPI_HPP
+#define OPENMW_TIMERAPI_HPP
+
+#include <string>
+
+#include <Script/Script.hpp>
+#include <Script/ScriptFunction.hpp>
+
+namespace mwmp
+{
+
+    class TimerAPI;
+
+    class Timer: public ScriptFunction
+    {
+        friend class TimerAPI;
+
+    public:
+
+        Timer(ScriptFunc callback, long msec, const std::string& def, std::vector<boost::any> args);
+#if defined(ENABLE_PAWN)
+        Timer(AMX *amx, ScriptFuncPAWN callback, long msec, const std::string& def, std::vector<boost::any> args);
+#endif
+#if defined(ENABLE_LUA)
+        Timer(lua_State *lua, ScriptFuncLua callback, long msec, const std::string& def, std::vector<boost::any> args);
+#endif
+        void Tick();
+
+        bool IsEnd();
+        void Stop();
+        void Start();
+        void Restart(int msec);
+    private:
+        double startTime, targetMsec;
+        std::string publ, arg_types;
+        std::vector<boost::any> args;
+        Script *scr;
+        bool end;
+    };
+
+    class TimerAPI
+    {
+    public:
+#if defined(ENABLE_PAWN)
+        static int CreateTimerPAWN(AMX *amx, ScriptFuncPAWN callback, long msec, const std::string& def, std::vector<boost::any> args);
+#endif
+#if defined(ENABLE_LUA)
+        static int CreateTimerLua(lua_State *lua, ScriptFuncLua callback, long msec, const std::string& def, std::vector<boost::any> args);
+#endif
+        static int CreateTimer(ScriptFunc callback, long msec, const std::string& def, std::vector<boost::any> args);
+        static void FreeTimer(int timerid);
+        static void ResetTimer(int timerid, long msec);
+        static void StartTimer(int timerid);
+        static void StopTimer(int timerid);
+        static bool IsEndTimer(int timerid);
+
+        static void Terminate();
+
+        static void Tick();
+    private:
+        static std::unordered_map<int, Timer* > timers;
+        static int pointer;
+    };
+}
+
+#endif //OPENMW_TIMERAPI_HPP
diff --git a/apps/openmw-mp/Script/Functions/Cells.cpp b/apps/openmw-mp/Script/Functions/Cells.cpp
new file mode 100644
index 000000000..507ffc7f4
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/Cells.cpp
@@ -0,0 +1,121 @@
+#include "Cells.hpp"
+#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <apps/openmw-mp/Player.hpp>
+#include <apps/openmw-mp/Networking.hpp>
+#include <components/openmw-mp/Log.hpp>
+
+#include <iostream>
+using namespace std;
+
+unsigned int CellFunctions::GetCellStateChangesSize(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->cellStateChanges.count;
+}
+
+unsigned int CellFunctions::GetCellStateType(unsigned short pid, unsigned int i) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->cellStateChanges.cellStates.at(i).type;
+}
+
+const char *CellFunctions::GetCellStateDescription(unsigned short pid, unsigned int i) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, "");
+
+    if (i >= player->cellStateChanges.count)
+        return "invalid";
+
+    string cellDescription = player->cellStateChanges.cellStates.at(i).cell.getDescription();
+
+    static vector<char> cstrDescription;
+    cstrDescription.reserve(cellDescription.size() + 1);
+    strncpy(&cstrDescription[0], cellDescription.c_str(), cstrDescription.capacity());
+
+    return &cstrDescription[0];
+}
+
+const char *CellFunctions::GetCell(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->cell.mName.c_str();
+}
+
+void CellFunctions::SetCell(unsigned short pid, const char *name) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Script is moving %s from %s to %s",
+        player->npc.mName.c_str(),
+        player->cell.getDescription().c_str(),
+        name);
+
+    // If the player is currently in an exterior, turn on the interior flag
+    // from the  cell so the player doesn't get teleported to their exterior
+    // grid position (which we haven't changed)
+    if (player->cell.isExterior()) {
+        player->cell.mData.mFlags |= ESM::Cell::Interior;
+    }
+
+    player->cell.mName = name;
+}
+
+void CellFunctions::SetExterior(unsigned short pid, int x, int y) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Script is moving %s from %s to %i,%i",
+        player->npc.mName.c_str(),
+        player->cell.getDescription().c_str(),
+        x,
+        y);
+
+    // If the player is currently in an interior, turn off the interior flag
+    // from the cell
+    if (!player->cell.isExterior()) {
+        player->cell.mData.mFlags &= ~ESM::Cell::Interior;
+    }
+
+    player->cell.mData.mX = x;
+    player->cell.mData.mY = y;
+}
+
+int CellFunctions::GetExteriorX(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,0);
+    return player->cell.mData.mX;
+}
+
+int CellFunctions::GetExteriorY(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,0);
+    return player->cell.mData.mY;
+}
+
+bool CellFunctions::IsInExterior(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, false);
+
+    return player->cell.isExterior();
+}
+
+void CellFunctions::SendCell(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_CELL_CHANGE)->Send(player, false);
+}
diff --git a/apps/openmw-mp/Script/Functions/Cells.hpp b/apps/openmw-mp/Script/Functions/Cells.hpp
new file mode 100644
index 000000000..3110cb1d3
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/Cells.hpp
@@ -0,0 +1,40 @@
+#ifndef OPENMW_CELLAPI_HPP
+#define OPENMW_CELLAPI_HPP
+
+#include "../Types.hpp"
+
+#define CELLAPI \
+    {"GetCellStateChangesSize", CellFunctions::GetCellStateChangesSize},\
+    \
+    {"GetCellStateType",        CellFunctions::GetCellStateType},\
+    {"GetCellStateDescription", CellFunctions::GetCellStateDescription},\
+    \
+    {"GetCell",                 CellFunctions::GetCell},\
+    {"SetCell",                 CellFunctions::SetCell},\
+    {"SetExterior",             CellFunctions::SetExterior},\
+    {"GetExteriorX",            CellFunctions::GetExteriorX},\
+    {"GetExteriorY",            CellFunctions::GetExteriorY},\
+    {"IsInExterior",            CellFunctions::IsInExterior},\
+    \
+    {"SendCell",                CellFunctions::SendCell}
+
+
+class CellFunctions
+{
+public:
+    static unsigned int GetCellStateChangesSize(unsigned short pid) noexcept;
+
+    static unsigned int GetCellStateType(unsigned short pid, unsigned int i) noexcept;
+    static const char *GetCellStateDescription(unsigned short pid, unsigned int i) noexcept;
+
+    static const char *GetCell(unsigned short pid) noexcept;
+    static void SetCell(unsigned short pid, const char *name) noexcept;
+    static void SetExterior(unsigned short pid, int x, int y) noexcept;
+    static int GetExteriorX(unsigned short pid) noexcept;
+    static int GetExteriorY(unsigned short pid) noexcept;
+    static bool IsInExterior(unsigned short pid) noexcept;
+
+    static void SendCell(unsigned short pid) noexcept;
+};
+
+#endif //OPENMW_CELLAPI_HPP
diff --git a/apps/openmw-mp/Script/Functions/CharClass.cpp b/apps/openmw-mp/Script/Functions/CharClass.cpp
new file mode 100644
index 000000000..85bd3d092
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/CharClass.cpp
@@ -0,0 +1,134 @@
+//
+// Created by koncord on 29.08.16.
+//
+
+#include "CharClass.hpp"
+#include <apps/openmw-mp/Networking.hpp>
+#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+using namespace std;
+using namespace ESM;
+
+void CharClassFunctions::SendClass(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_CHARCLASS)->Send(player, false);
+}
+
+void CharClassFunctions::SetDefaultClass(unsigned short pid, const char *id) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+    player->charClass.mId = id;
+}
+void CharClassFunctions::SetClassName(unsigned short pid, const char *name) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+    player->charClass.mName = name;
+    player->charClass.mId = "";
+}
+void CharClassFunctions::SetClassDesc(unsigned short pid, const char *desc) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+    player->charClass.mDescription = desc;
+}
+void CharClassFunctions::SetClassMajorAttribute(unsigned short pid, unsigned char slot, int attrId) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    if (slot > 1)
+        throw invalid_argument("Incorrect attribute slot id");
+
+    player->charClass.mData.mAttribute[slot] = attrId;
+
+}
+void CharClassFunctions::SetClassSpecialization(unsigned short pid, int spec) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+    player->charClass.mData.mSpecialization = spec;
+}
+void CharClassFunctions::SetClassMajorSkill(unsigned short pid, unsigned char slot, int skillId) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+    if (slot > 4)
+        throw invalid_argument("Incorrect skill slot id");
+    player->charClass.mData.mSkills[slot][1] = skillId;
+}
+void CharClassFunctions::SetClassMinorSkill(unsigned short pid, unsigned char slot, int skillId) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+    if (slot > 4)
+        throw invalid_argument("Incorrect skill slot id");
+    player->charClass.mData.mSkills[slot][0] = skillId;
+}
+
+int CharClassFunctions::IsClassDefault(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,0);
+    return !player->charClass.mId.empty(); // true if default
+}
+
+const char *CharClassFunctions::GetDefaultClass(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,"");
+    return player->charClass.mId.c_str();
+}
+
+const char *CharClassFunctions::GetClassName(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,"");
+    return player->charClass.mName.c_str();
+}
+
+const char *CharClassFunctions::GetClassDesc(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,"");
+    return player->charClass.mDescription.c_str();
+}
+
+int CharClassFunctions::GetClassMajorAttribute(unsigned short pid, unsigned char slot) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,0);
+    if (slot > 1)
+        throw invalid_argument("Incorrect attribute slot id");
+    return player->charClass.mData.mAttribute[slot];
+}
+
+int CharClassFunctions::GetClassSpecialization(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,0);
+    return player->charClass.mData.mSpecialization;
+}
+
+int CharClassFunctions::GetClassMajorSkill(unsigned short pid, unsigned char slot) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,0);
+    if (slot > 4)
+        throw invalid_argument("Incorrect skill slot id");
+    return player->charClass.mData.mSkills[slot][1];
+}
+
+int CharClassFunctions::GetClassMinorSkill(unsigned short pid, unsigned char slot) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,0);
+    if (slot > 4)
+        throw invalid_argument("Incorrect skill slot id");
+    return player->charClass.mData.mSkills[slot][0];
+}
diff --git a/apps/openmw-mp/Script/Functions/CharClass.hpp b/apps/openmw-mp/Script/Functions/CharClass.hpp
new file mode 100644
index 000000000..bfa54852e
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/CharClass.hpp
@@ -0,0 +1,82 @@
+//
+// Created by koncord on 29.08.16.
+//
+
+#ifndef OPENMW_CHARCLASS_HPP
+#define OPENMW_CHARCLASS_HPP
+
+#include "../Types.hpp"
+
+#define CHARCLASSFUNCTIONS \
+{"SetDefaultClass",     CharClassFunctions::SetDefaultClass},\
+{"SetClassName",        CharClassFunctions::SetClassName},\
+{"SetClassDesc",        CharClassFunctions::SetClassDesc},\
+{"SetClassMajorAttribute", CharClassFunctions::SetClassMajorAttribute},\
+{"SetClassSpecialization", CharClassFunctions::SetClassSpecialization},\
+{"SetClassMajorSkill", CharClassFunctions::SetClassMajorSkill},\
+{"SetClassMinorSkill", CharClassFunctions::SetClassMinorSkill},\
+{"GetDefaultClass",     CharClassFunctions::GetDefaultClass},\
+{"GetClassName",        CharClassFunctions::GetClassName},\
+{"GetClassDesc",        CharClassFunctions::GetClassDesc},\
+{"GetClassMajorAttribute", CharClassFunctions::GetClassMajorAttribute},\
+{"GetClassSpecialization", CharClassFunctions::GetClassSpecialization},\
+{"GetClassMajorSkill", CharClassFunctions::GetClassMajorSkill},\
+{"GetClassMinorSkill", CharClassFunctions::GetClassMinorSkill},\
+{"IsClassDefault", CharClassFunctions::IsClassDefault},\
+{"SendClass",           CharClassFunctions::SendClass}
+
+
+class CharClassFunctions
+{
+public:
+    CharClassFunctions() {}
+    static void SetDefaultClass(unsigned short pid, const char *id) noexcept;
+    static void SetClassName(unsigned short pid, const char *name) noexcept;
+    static void SetClassDesc(unsigned short pid, const char *desc) noexcept;
+    /**
+     * \param pid
+     * \param slot 0 = first, 1 = second
+     * \param attrId
+     */
+    static void SetClassMajorAttribute(unsigned short pid, unsigned char slot, int attrId) noexcept;
+    /**
+     * \param pid
+     * \param spec 0 = Combat, 1 = Magic, 2 = Stealth
+     */
+    static void SetClassSpecialization(unsigned short pid, int spec) noexcept;
+    /**
+     * \param pid
+     * \param slot 0 to 4
+     * \param skillId
+     */
+    static void SetClassMajorSkill(unsigned short pid, unsigned char slot, int skillId) noexcept;
+    static void SetClassMinorSkill(unsigned short pid, unsigned char slot, int skillId) noexcept;
+
+    static const char *GetDefaultClass(unsigned short pid) noexcept;
+    static const char *GetClassName(unsigned short pid) noexcept;
+    static const char *GetClassDesc(unsigned short pid) noexcept;
+    /**
+     * \param pid
+     * \param slot 0 = first, 1 = second
+     * \return attrId
+     */
+    static int GetClassMajorAttribute(unsigned short pid, unsigned char slot) noexcept;
+    /**
+     * \param pid
+     * \return spec 0 = Combat, 1 = Magic, 2 = Stealth
+     */
+    static int GetClassSpecialization(unsigned short pid) noexcept;
+    /**
+     * \param pid
+     * \param slot 0 to 4
+     * \return skillId
+     */
+    static int GetClassMajorSkill(unsigned short pid, unsigned char slot) noexcept;
+    static int GetClassMinorSkill(unsigned short pid, unsigned char slot) noexcept;
+
+    static int IsClassDefault(unsigned short pid) noexcept;
+
+    static void SendClass(unsigned short pid) noexcept;
+};
+
+#endif //OPENMW_CHARCLASS_HPP
diff --git a/apps/openmw-mp/Script/Functions/Chat.cpp b/apps/openmw-mp/Script/Functions/Chat.cpp
new file mode 100644
index 000000000..950cb6434
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/Chat.cpp
@@ -0,0 +1,31 @@
+//
+// Created by koncord on 29.04.16.
+//
+
+#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
+#include <apps/openmw-mp/Networking.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+void ScriptFunctions::SendMessage(unsigned short pid, const char *message, bool broadcast) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->chatMessage = message;
+
+    LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "System: %s", message);
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_CHAT_MESSAGE)->Send(player, false);
+    if (broadcast)
+        mwmp::Networking::get().getPlayerController()->GetPacket(ID_CHAT_MESSAGE)->Send(player, true);
+}
+
+void ScriptFunctions::CleanChat(unsigned short pid)
+{
+
+}
+
+void ScriptFunctions::CleanChat()
+{
+
+}
diff --git a/apps/openmw-mp/Script/Functions/GUI.cpp b/apps/openmw-mp/Script/Functions/GUI.cpp
new file mode 100644
index 000000000..0fe3908b2
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/GUI.cpp
@@ -0,0 +1,80 @@
+//
+// Created by koncord on 23.07.16.
+//
+
+#include "GUI.hpp"
+#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
+#include <apps/openmw-mp/Networking.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+
+
+void GUIFunctions::_MessageBox(unsigned short pid, int id, const char *label) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->guiMessageBox.id = id;
+    player->guiMessageBox.label = label;
+    player->guiMessageBox.type = Player::GUIMessageBox::MessageBox;
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_GUI_MESSAGEBOX)->Send(player, false);
+}
+
+void GUIFunctions::CustomMessageBox(unsigned short pid, int id, const char *label, const char *buttons) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->guiMessageBox.id = id;
+    player->guiMessageBox.label = label;
+    player->guiMessageBox.buttons = buttons;
+    player->guiMessageBox.type = Player::GUIMessageBox::CustomMessageBox;
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_GUI_MESSAGEBOX)->Send(player, false);
+}
+
+void GUIFunctions::InputDialog(unsigned short pid, int id, const char *label) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->guiMessageBox.id = id;
+    player->guiMessageBox.label = label;
+    player->guiMessageBox.type = Player::GUIMessageBox::InputDialog;
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_GUI_MESSAGEBOX)->Send(player, false);
+}
+
+void GUIFunctions::ListBox(unsigned short pid, int id, const char *label, const char *items)
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->guiMessageBox.id = id;
+    player->guiMessageBox.label = label;
+    player->guiMessageBox.data = items;
+    player->guiMessageBox.type = Player::GUIMessageBox::ListBox;
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_GUI_MESSAGEBOX)->Send(player, false);
+}
+
+void GUIFunctions::SetMapVisibility(unsigned short targetPID, unsigned short affectedPID, unsigned short state) noexcept
+{
+    LOG_MESSAGE(Log::LOG_WARN, "stub");
+}
+
+void GUIFunctions::SetMapVisibilityAll(unsigned short targetPID, unsigned short state) noexcept
+{
+    LOG_MESSAGE(Log::LOG_WARN, "stub");
+}
+
+void GUIFunctions::SetConsoleAllow(unsigned short pid, bool state)
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->consoleAllowed = state;
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_GAME_CONSOLE)->Send(player, false);
+}
diff --git a/apps/openmw-mp/Script/Functions/GUI.hpp b/apps/openmw-mp/Script/Functions/GUI.hpp
new file mode 100644
index 000000000..5cdb4a51d
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/GUI.hpp
@@ -0,0 +1,35 @@
+//
+// Created by koncord on 30.08.16.
+//
+
+#ifndef OPENMW_GUI_HPP
+#define OPENMW_GUI_HPP
+
+#define GUIFUNCTIONS \
+    {"MessageBox",          GUIFunctions::_MessageBox},\
+    {"CustomMessageBox",    GUIFunctions::CustomMessageBox},\
+    {"InputDialog",         GUIFunctions::InputDialog},\
+    {"ListBox",             GUIFunctions::ListBox},\
+    {"SetMapVisibility",    GUIFunctions::SetMapVisibility},\
+    {"SetMapVisibilityAll", GUIFunctions::SetMapVisibilityAll},\
+    {"SetConsoleAllow", GUIFunctions::SetConsoleAllow}\
+
+class GUIFunctions
+{
+public:
+    /* Do not rename into MessageBox to not conflict with WINAPI's MessageBox */
+    static void _MessageBox(unsigned short pid, int id, const char *label) noexcept;
+
+    static void CustomMessageBox(unsigned short pid, int id, const char *label, const char *buttons) noexcept;
+    static void InputDialog(unsigned short pid, int id, const char *label) noexcept;
+
+    static void ListBox(unsigned short pid, int id, const char *label, const char *items);
+
+    //state 0 - disallow, 1 - allow
+    static void SetMapVisibility(unsigned short targetPID, unsigned short affectedPID, unsigned short state) noexcept;
+    static void SetMapVisibilityAll(unsigned short targetPID, unsigned short state) noexcept;
+
+    static void SetConsoleAllow(unsigned short pid, bool state);
+};
+
+#endif //OPENMW_GUI_HPP
diff --git a/apps/openmw-mp/Script/Functions/Items.cpp b/apps/openmw-mp/Script/Functions/Items.cpp
new file mode 100644
index 000000000..82edb2c2c
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/Items.cpp
@@ -0,0 +1,161 @@
+//
+// Created by koncord on 02.03.16.
+//
+
+#include "Items.hpp"
+#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <apps/openmw-mp/Networking.hpp>
+#include <apps/openmw/mwworld/inventorystore.hpp>
+#include <components/misc/stringops.hpp>
+
+using namespace mwmp;
+
+int ItemFunctions::GetEquipmentSize() noexcept
+{
+    return MWWorld::InventoryStore::Slots;
+}
+
+unsigned int ItemFunctions::GetInventoryChangesSize(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->inventoryChanges.count;
+}
+
+void ItemFunctions::EquipItem(unsigned short pid, unsigned short slot, const char *refId, unsigned int count, int charge) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->equipedItems[slot].refId = refId;
+    player->equipedItems[slot].count = count;
+    player->equipedItems[slot].charge = charge;
+}
+
+void ItemFunctions::UnequipItem(unsigned short pid, unsigned short slot) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    ItemFunctions::EquipItem(pid, slot, "", 0, -1);
+}
+
+void ItemFunctions::AddItem(unsigned short pid, const char* refId, unsigned int count, int charge) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    Item item;
+    item.refId = refId;
+    item.count = count;
+    item.charge = charge;
+
+    player->inventoryChangesBuffer.items.push_back(item);
+    player->inventoryChangesBuffer.action = InventoryChanges::ADD;
+}
+
+void ItemFunctions::RemoveItem(unsigned short pid, const char* refId, unsigned short count) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    Item item;
+    item.refId = refId;
+    item.count = count;
+
+    player->inventoryChangesBuffer.items.push_back(item);
+    player->inventoryChangesBuffer.action = InventoryChanges::REMOVE;
+}
+
+void ItemFunctions::ClearInventory(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    player->inventoryChangesBuffer.items.clear();
+    player->inventoryChangesBuffer.action = InventoryChanges::SET;
+}
+
+bool ItemFunctions::HasItemEquipped(unsigned short pid, const char* refId)
+{
+    Player *player;
+    GET_PLAYER(pid, player, false);
+
+    for (int slot = 0; slot < MWWorld::InventoryStore::Slots; slot++)
+        if (Misc::StringUtils::ciEqual(player->equipedItems[slot].refId, refId))
+            return true;
+    return false;
+}
+
+const char *ItemFunctions::GetEquipmentItemRefId(unsigned short pid, unsigned short slot) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->equipedItems[slot].refId.c_str();
+}
+
+int ItemFunctions::GetEquipmentItemCount(unsigned short pid, unsigned short slot) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->equipedItems[slot].count;
+}
+
+int ItemFunctions::GetEquipmentItemCharge(unsigned short pid, unsigned short slot) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->equipedItems[slot].charge;
+}
+
+const char *ItemFunctions::GetInventoryItemRefId(unsigned short pid, unsigned int i) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, "");
+
+    if (i >= player->inventoryChanges.count)
+        return "invalid";
+
+    return player->inventoryChanges.items.at(i).refId.c_str();
+}
+
+int ItemFunctions::GetInventoryItemCount(unsigned short pid, unsigned int i) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->inventoryChanges.items.at(i).count;
+}
+
+int ItemFunctions::GetInventoryItemCharge(unsigned short pid, unsigned int i) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->inventoryChanges.items.at(i).charge;
+}
+
+void ItemFunctions::SendEquipment(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_EQUIPMENT)->Send(player, false);
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_EQUIPMENT)->Send(player, true);
+}
+
+void ItemFunctions::SendInventoryChanges(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    std::swap(player->inventoryChanges, player->inventoryChangesBuffer);
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_INVENTORY)->Send(player, false);
+    player->inventoryChanges = std::move(player->inventoryChangesBuffer);
+    player->inventoryChangesBuffer.items.clear();
+}
diff --git a/apps/openmw-mp/Script/Functions/Items.hpp b/apps/openmw-mp/Script/Functions/Items.hpp
new file mode 100644
index 000000000..4904d918a
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/Items.hpp
@@ -0,0 +1,62 @@
+//
+// Created by koncord on 30.08.16.
+//
+
+#ifndef OPENMW_ITEMS_HPP
+#define OPENMW_ITEMS_HPP
+
+#define ITEMAPI \
+    {"GetEquipmentSize",        ItemFunctions::GetEquipmentSize},\
+    {"GetInventoryChangesSize", ItemFunctions::GetInventoryChangesSize},\
+    \
+    {"EquipItem",               ItemFunctions::EquipItem},\
+    {"UnequipItem",             ItemFunctions::UnequipItem},\
+    \
+    {"AddItem",                 ItemFunctions::AddItem},\
+    {"RemoveItem",              ItemFunctions::RemoveItem},\
+    {"ClearInventory",          ItemFunctions::ClearInventory},\
+    \
+    {"HasItemEquipped",         ItemFunctions::HasItemEquipped},\
+    \
+    {"GetEquipmentItemRefId",   ItemFunctions::GetEquipmentItemRefId},\
+    {"GetEquipmentItemCount",   ItemFunctions::GetEquipmentItemCount},\
+    {"GetEquipmentItemCharge",  ItemFunctions::GetEquipmentItemCharge},\
+    \
+    {"GetInventoryItemRefId",   ItemFunctions::GetInventoryItemRefId},\
+    {"GetInventoryItemCount",   ItemFunctions::GetInventoryItemCount},\
+    {"GetInventoryItemCharge",  ItemFunctions::GetInventoryItemCharge},\
+    \
+    {"SendEquipment",           ItemFunctions::SendEquipment},\
+    {"SendInventoryChanges",    ItemFunctions::SendInventoryChanges}
+
+class ItemFunctions
+{
+public:
+
+    static int GetEquipmentSize() noexcept;
+    static unsigned int GetInventoryChangesSize(unsigned short pid) noexcept;
+
+    static void EquipItem(unsigned short pid, unsigned short slot, const char* refId, unsigned int count, int charge) noexcept;
+    static void UnequipItem(unsigned short pid, unsigned short slot) noexcept;
+
+    static void AddItem(unsigned short pid, const char* refId, unsigned int count, int charge) noexcept;
+    static void RemoveItem(unsigned short pid, const char* refId, unsigned short count) noexcept;
+    static void ClearInventory(unsigned short pid) noexcept;
+
+    static bool HasItemEquipped(unsigned short pid, const char* refId);
+
+    static const char *GetEquipmentItemRefId(unsigned short pid, unsigned short slot) noexcept;
+    static int GetEquipmentItemCount(unsigned short pid, unsigned short slot) noexcept;
+    static int GetEquipmentItemCharge(unsigned short pid, unsigned short slot) noexcept;
+
+    static const char *GetInventoryItemRefId(unsigned short pid, unsigned int i) noexcept;
+    static int GetInventoryItemCount(unsigned short pid, unsigned int i) noexcept;
+    static int GetInventoryItemCharge(unsigned short pid, unsigned int i) noexcept;
+
+    static void SendEquipment(unsigned short pid) noexcept;
+    static void SendInventoryChanges(unsigned short pid) noexcept;
+private:
+
+};
+
+#endif //OPENMW_ITEMS_HPP
diff --git a/apps/openmw-mp/Script/Functions/Positions.cpp b/apps/openmw-mp/Script/Functions/Positions.cpp
new file mode 100644
index 000000000..7c25b52e3
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/Positions.cpp
@@ -0,0 +1,113 @@
+#include "Positions.hpp"
+#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <apps/openmw-mp/Player.hpp>
+#include <apps/openmw-mp/Networking.hpp>
+#include <components/openmw-mp/Log.hpp>
+
+#include <iostream>
+using namespace std;
+
+void PositionFunctions::GetPos(unsigned short pid, float *x, float *y, float *z) noexcept
+{
+    *x = 0.00;
+    *y = 0.00;
+    *z = 0.00;
+
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    *x = player->position.pos[0];
+    *y = player->position.pos[1];
+    *z = player->position.pos[2];
+}
+
+double PositionFunctions::GetPosX(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    return player->position.pos[0];
+}
+
+double PositionFunctions::GetPosY(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    return player->position.pos[1];
+}
+
+double PositionFunctions::GetPosZ(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    return player->position.pos[2];
+}
+
+void PositionFunctions::GetAngle(unsigned short pid, float *x, float *y, float *z) noexcept
+{
+    *x = 0.00;
+    *y = 0.00;
+    *z = 0.00;
+
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    *x = player->position.rot[0];
+    *y = player->position.rot[1];
+    *z = player->position.rot[2];
+}
+
+double PositionFunctions::GetAngleX(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    return player->position.rot[0];
+}
+
+double PositionFunctions::GetAngleY(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    return player->position.rot[1];
+}
+
+double PositionFunctions::GetAngleZ(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    return player->position.rot[2];
+}
+
+void PositionFunctions::SetPos(unsigned short pid, double x, double y, double z) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->position.pos[0] = x;
+    player->position.pos[1] = y;
+    player->position.pos[2] = z;
+}
+
+void PositionFunctions::SetAngle(unsigned short pid, double x, double y, double z) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    player->position.rot[0] = x;
+    player->position.rot[1] = y;
+    player->position.rot[2] = z;
+}
+
+void PositionFunctions::SendPos(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_POS)->Send(player, false);
+}
diff --git a/apps/openmw-mp/Script/Functions/Positions.hpp b/apps/openmw-mp/Script/Functions/Positions.hpp
new file mode 100644
index 000000000..06a322534
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/Positions.hpp
@@ -0,0 +1,42 @@
+#ifndef OPENMW_POSITIONAPI_HPP
+#define OPENMW_POSITIONAPI_HPP
+
+#include "../Types.hpp"
+
+#define POSITIONAPI \
+    {"GetPos",              PositionFunctions::GetPos},\
+    {"GetPosX",             PositionFunctions::GetPosX},\
+    {"GetPosY",             PositionFunctions::GetPosY},\
+    {"GetPosZ",             PositionFunctions::GetPosZ},\
+\
+    {"GetAngle",            PositionFunctions::GetAngle},\
+    {"GetAngleX",           PositionFunctions::GetAngleX},\
+    {"GetAngleY",           PositionFunctions::GetAngleY},\
+    {"GetAngleZ",           PositionFunctions::GetAngleZ},\
+\
+    {"SetPos",              PositionFunctions::SetPos},\
+    {"SetAngle",            PositionFunctions::SetAngle},\
+\
+    {"SendPos",             PositionFunctions::SendPos}
+
+
+class PositionFunctions
+{
+public:
+    static void GetPos(unsigned short pid, float *x, float *y, float *z) noexcept;
+    static double GetPosX(unsigned short pid) noexcept;
+    static double GetPosY(unsigned short pid) noexcept;
+    static double GetPosZ(unsigned short pid) noexcept;
+
+    static void GetAngle(unsigned short pid, float *x, float *y, float *z) noexcept;
+    static double GetAngleX(unsigned short pid) noexcept;
+    static double GetAngleY(unsigned short pid) noexcept;
+    static double GetAngleZ(unsigned short pid) noexcept;
+
+    static void SetPos(unsigned short pid, double x, double y, double z) noexcept;
+    static void SetAngle(unsigned short pid, double x, double y, double z) noexcept;
+
+    static void SendPos(unsigned short pid) noexcept;
+};
+
+#endif //OPENMW_POSITIONAPI_HPP
diff --git a/apps/openmw-mp/Script/Functions/Quests.cpp b/apps/openmw-mp/Script/Functions/Quests.cpp
new file mode 100644
index 000000000..d3a527873
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/Quests.cpp
@@ -0,0 +1,79 @@
+#include "Quests.hpp"
+#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <apps/openmw-mp/Networking.hpp>
+#include <components/misc/stringops.hpp>
+
+using namespace mwmp;
+
+unsigned int QuestFunctions::GetJournalChangesSize(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->journalChanges.count;
+}
+
+void QuestFunctions::AddJournalEntry(unsigned short pid, const char* quest, unsigned int index) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    mwmp::JournalItem journalItem;
+    journalItem.type = JournalItem::ENTRY;
+    journalItem.quest = quest;
+    journalItem.index = index;
+
+    player->journalChangesBuffer.journalItems.push_back(journalItem);
+}
+
+void QuestFunctions::AddJournalIndex(unsigned short pid, const char* quest, unsigned int index) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    mwmp::JournalItem journalItem;
+    journalItem.type = JournalItem::INDEX;
+    journalItem.quest = quest;
+    journalItem.index = index;
+
+    player->journalChangesBuffer.journalItems.push_back(journalItem);
+}
+
+const char *QuestFunctions::GetJournalItemQuest(unsigned short pid, unsigned int i) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, "");
+
+    if (i >= player->journalChanges.count)
+        return "invalid";
+
+    return player->journalChanges.journalItems.at(i).quest.c_str();
+}
+
+int QuestFunctions::GetJournalItemIndex(unsigned short pid, unsigned int i) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->journalChanges.journalItems.at(i).index;
+}
+
+int QuestFunctions::GetJournalItemType(unsigned short pid, unsigned int i) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->journalChanges.journalItems.at(i).type;
+}
+
+void QuestFunctions::SendJournalChanges(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    std::swap(player->journalChanges, player->journalChangesBuffer);
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_JOURNAL)->Send(player, false);
+    player->journalChanges = std::move(player->journalChangesBuffer);
+    player->journalChangesBuffer.journalItems.clear();
+}
diff --git a/apps/openmw-mp/Script/Functions/Quests.hpp b/apps/openmw-mp/Script/Functions/Quests.hpp
new file mode 100644
index 000000000..d8fa18286
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/Quests.hpp
@@ -0,0 +1,34 @@
+#ifndef OPENMW_QUESTS_HPP
+#define OPENMW_QUESTS_HPP
+
+#define QUESTAPI \
+    {"GetJournalChangesSize",   QuestFunctions::GetJournalChangesSize},\
+    \
+    {"AddJournalEntry",         QuestFunctions::AddJournalEntry},\
+    {"AddJournalIndex",         QuestFunctions::AddJournalIndex},\
+    \
+    {"GetJournalItemQuest",     QuestFunctions::GetJournalItemQuest},\
+    {"GetJournalItemIndex",     QuestFunctions::GetJournalItemIndex},\
+    {"GetJournalItemType",      QuestFunctions::GetJournalItemType},\
+    \
+    {"SendJournalChanges",      QuestFunctions::SendJournalChanges}
+
+class QuestFunctions
+{
+public:
+
+    static unsigned int GetJournalChangesSize(unsigned short pid) noexcept;
+
+    static void AddJournalEntry(unsigned short pid, const char* quest, unsigned int index) noexcept;
+    static void AddJournalIndex(unsigned short pid, const char* quest, unsigned int index) noexcept;
+
+    static const char *GetJournalItemQuest(unsigned short pid, unsigned int i) noexcept;
+    static int GetJournalItemIndex(unsigned short pid, unsigned int i) noexcept;
+    static int GetJournalItemType(unsigned short pid, unsigned int i) noexcept;
+
+    static void SendJournalChanges(unsigned short pid) noexcept;
+private:
+
+};
+
+#endif //OPENMW_QUESTS_HPP
diff --git a/apps/openmw-mp/Script/Functions/Spells.cpp b/apps/openmw-mp/Script/Functions/Spells.cpp
new file mode 100644
index 000000000..fa6c6f2e8
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/Spells.cpp
@@ -0,0 +1,78 @@
+#include "Spells.hpp"
+#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <apps/openmw-mp/Networking.hpp>
+#include <components/misc/stringops.hpp>
+
+using namespace mwmp;
+
+unsigned int SpellFunctions::GetSpellbookChangesSize(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->spellbookChanges.count;
+}
+
+unsigned int SpellFunctions::GetSpellbookAction(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->spellbookChanges.action;
+}
+
+void SpellFunctions::AddSpell(unsigned short pid, const char* spellId) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    ESM::Spell spell;
+    spell.mId = spellId;
+
+    player->spellbookChangesBuffer.spells.push_back(spell);
+    player->spellbookChangesBuffer.action = SpellbookChanges::ADD;
+}
+
+void SpellFunctions::RemoveSpell(unsigned short pid, const char* spellId) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    ESM::Spell spell;
+    spell.mId = spellId;
+
+    player->spellbookChangesBuffer.spells.push_back(spell);
+    player->spellbookChangesBuffer.action = SpellbookChanges::REMOVE;
+}
+
+void SpellFunctions::ClearSpellbook(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    player->spellbookChangesBuffer.spells.clear();
+    player->spellbookChangesBuffer.action = SpellbookChanges::SET;
+}
+
+const char *SpellFunctions::GetSpellId(unsigned short pid, unsigned int i) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, "");
+
+    if (i >= player->spellbookChanges.count)
+        return "invalid";
+
+    return player->spellbookChanges.spells.at(i).mId.c_str();
+}
+
+void SpellFunctions::SendSpellbookChanges(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    std::swap(player->spellbookChanges, player->spellbookChangesBuffer);
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_SPELLBOOK)->Send(player, false);
+    player->spellbookChanges = std::move(player->spellbookChangesBuffer);
+    player->spellbookChangesBuffer.spells.clear();
+}
diff --git a/apps/openmw-mp/Script/Functions/Spells.hpp b/apps/openmw-mp/Script/Functions/Spells.hpp
new file mode 100644
index 000000000..b163b1e9f
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/Spells.hpp
@@ -0,0 +1,34 @@
+#ifndef OPENMW_SPELLS_HPP
+#define OPENMW_SPELLS_HPP
+
+#define SPELLAPI \
+    {"GetSpellbookChangesSize", SpellFunctions::GetSpellbookChangesSize},\
+    {"GetSpellbookAction",      SpellFunctions::GetSpellbookAction},\
+    \
+    {"AddSpell",                SpellFunctions::AddSpell},\
+    {"RemoveSpell",             SpellFunctions::RemoveSpell},\
+    {"ClearSpellbook",          SpellFunctions::ClearSpellbook},\
+    \
+    {"GetSpellId",              SpellFunctions::GetSpellId},\
+    \
+    {"SendSpellbookChanges",    SpellFunctions::SendSpellbookChanges}
+
+class SpellFunctions
+{
+public:
+
+    static unsigned int GetSpellbookChangesSize(unsigned short pid) noexcept;
+    static unsigned int GetSpellbookAction(unsigned short pid) noexcept;
+
+    static void AddSpell(unsigned short pid, const char* spellId) noexcept;
+    static void RemoveSpell(unsigned short pid, const char* spellId) noexcept;
+    static void ClearSpellbook(unsigned short pid) noexcept;
+
+    static const char *GetSpellId(unsigned short pid, unsigned int i) noexcept;
+
+    static void SendSpellbookChanges(unsigned short pid) noexcept;
+private:
+
+};
+
+#endif //OPENMW_SPELLS_HPP
diff --git a/apps/openmw-mp/Script/Functions/Stats.cpp b/apps/openmw-mp/Script/Functions/Stats.cpp
new file mode 100644
index 000000000..525e0276c
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/Stats.cpp
@@ -0,0 +1,508 @@
+//
+// Created by koncord on 29.02.16.
+//
+#include "Stats.hpp"
+
+#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <apps/openmw-mp/Networking.hpp>
+#include <components/esm/attr.hpp>
+#include <components/esm/loadskil.hpp>
+#include <components/misc/stringops.hpp>
+#include <components/openmw-mp/Log.hpp>
+#include <iostream>
+
+using namespace std;
+using namespace ESM;
+
+void StatsFunctions::SetName(unsigned short pid, const char *name) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    if (player->npc.mName == name)
+        return;
+
+    player->npc.mName = name;
+}
+
+const char *StatsFunctions::GetName(unsigned short pid) noexcept
+{
+
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->npc.mName.c_str();
+}
+
+void StatsFunctions::SetBirthsign(unsigned short pid, const char *sign) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    if (player->birthsign == sign)
+        return;
+
+    player->birthsign = sign;
+}
+
+const char *StatsFunctions::GetBirthsign(unsigned short pid) noexcept
+{
+
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->birthsign.c_str();
+}
+
+void StatsFunctions::SetRace(unsigned short pid, const char *race) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    if (player->npc.mRace == race)
+        return;
+
+    LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Setting race for %s: %s -> %s",
+        player->npc.mName.c_str(),
+        player->npc.mRace.c_str(),
+        race);
+
+    player->npc.mRace = race;
+}
+
+const char *StatsFunctions::GetRace(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->npc.mRace.c_str();
+}
+
+void StatsFunctions::SetHead(unsigned short pid, const char *head) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    if (player->npc.mHead == head)
+        return;
+
+    player->npc.mHead = head;
+}
+
+const char *StatsFunctions::GetHead(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->npc.mHead.c_str();
+}
+
+void StatsFunctions::SetHairstyle(unsigned short pid, const char *style) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    if (player->npc.mHair == style)
+        return;
+
+    player->npc.mHair = style;
+}
+
+const char *StatsFunctions::GetHairstyle(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    return player->npc.mHair.c_str();
+}
+
+int StatsFunctions::GetIsMale(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,false);
+
+    return player->npc.isMale();
+}
+
+void StatsFunctions::SetIsMale(unsigned short pid, int value) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->npc.setIsMale(value == true);
+}
+
+int StatsFunctions::GetLevel(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    return player->creatureStats.mLevel;
+}
+
+void StatsFunctions::SetLevel(unsigned short pid, int value) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    player->creatureStats.mLevel = value;
+}
+
+int StatsFunctions::GetLevelProgress(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    return player->npcStats.mLevelProgress;
+}
+
+void StatsFunctions::SetLevelProgress(unsigned short pid, int value) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    player->npcStats.mLevelProgress = value;
+}
+
+double StatsFunctions::GetHealthBase(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    return player->creatureStats.mDynamic[0].mBase;
+}
+
+void StatsFunctions::SetHealthBase(unsigned short pid, double value) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->creatureStats.mDynamic[0].mBase = value;
+}
+
+double StatsFunctions::GetHealthCurrent(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    return player->creatureStats.mDynamic[0].mCurrent;
+}
+
+void StatsFunctions::SetHealthCurrent(unsigned short pid, double value) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->creatureStats.mDynamic[0].mCurrent = value;
+}
+
+double StatsFunctions::GetMagickaBase(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    return player->creatureStats.mDynamic[1].mBase;
+}
+
+void StatsFunctions::SetMagickaBase(unsigned short pid, double value) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->creatureStats.mDynamic[1].mBase = value;
+}
+
+double StatsFunctions::GetMagickaCurrent(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    return player->creatureStats.mDynamic[1].mCurrent;
+}
+
+void StatsFunctions::SetMagickaCurrent(unsigned short pid, double value) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->creatureStats.mDynamic[1].mCurrent = value;
+}
+
+double StatsFunctions::GetFatigueBase(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    return player->creatureStats.mDynamic[2].mBase;
+}
+
+void StatsFunctions::SetFatigueBase(unsigned short pid, double value) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->creatureStats.mDynamic[2].mBase = value;
+}
+
+double StatsFunctions::GetFatigueCurrent(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    return player->creatureStats.mDynamic[2].mCurrent;
+}
+
+void StatsFunctions::SetFatigueCurrent(unsigned short pid, double value) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->creatureStats.mDynamic[2].mCurrent = value;
+}
+
+int StatsFunctions::GetAttributeCount() noexcept
+{
+    return Attribute::Length;
+}
+
+int StatsFunctions::GetSkillCount() noexcept
+{
+    return Skill::Length;
+}
+
+int StatsFunctions::GetAttributeId(const char *name) noexcept
+{
+    for (int x = 0; x < Attribute::Length; x++)
+    {
+        if (Misc::StringUtils::ciEqual(name, Attribute::sAttributeNames[x]))
+        {
+            return x;
+        }
+    }
+
+    return -1;
+}
+
+int StatsFunctions::GetSkillId(const char *name) noexcept
+{
+    for (int x = 0; x < Skill::Length; x++)
+    {
+        if (Misc::StringUtils::ciEqual(name, Skill::sSkillNames[x]))
+        {
+            return x;
+        }
+    }
+
+    return -1;
+}
+
+const char *StatsFunctions::GetAttributeName(unsigned short attribute) noexcept
+{
+    if (attribute >= Attribute::Length)
+        return "invalid";
+
+    return Attribute::sAttributeNames[attribute].c_str();
+}
+
+const char *StatsFunctions::GetSkillName(unsigned short skill) noexcept
+{
+    if (skill >= Skill::Length)
+        return "invalid";
+
+    return Skill::sSkillNames[skill].c_str();
+}
+
+int StatsFunctions::GetAttributeBase(unsigned short pid, unsigned short attribute) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    if (attribute >= Attribute::Length)
+        return 0;
+
+    return player->creatureStats.mAttributes[attribute].mBase;
+}
+
+void StatsFunctions::SetAttributeBase(unsigned short pid, unsigned short attribute, int value) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    if (attribute >= Attribute::Length)
+        return;
+
+    player->creatureStats.mAttributes[attribute].mBase = value;
+}
+
+int StatsFunctions::GetAttributeCurrent(unsigned short pid, unsigned short attribute) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    if (attribute >= Attribute::Length)
+        return 0;
+
+    return player->creatureStats.mAttributes[attribute].mCurrent;
+}
+
+void StatsFunctions::SetAttributeCurrent(unsigned short pid, unsigned short attribute, int value) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    if (attribute >= Attribute::Length)
+        return;
+
+    player->creatureStats.mAttributes[attribute].mCurrent = value;
+}
+
+int StatsFunctions::GetSkillBase(unsigned short pid, unsigned short skill) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    if (skill >= Skill::Length)
+        return 0;
+
+    return player->npcStats.mSkills[skill].mBase;
+}
+
+void StatsFunctions::SetSkillBase(unsigned short pid, unsigned short skill, int value) noexcept  //TODO: need packet for one value
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    if (skill >= Skill::Length)
+        return;
+
+    player->npcStats.mSkills[skill].mBase = value;
+}
+
+int StatsFunctions::GetSkillCurrent(unsigned short pid, unsigned short skill) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    if (skill >= Skill::Length)
+        return 0;
+
+    return player->npcStats.mSkills[skill].mCurrent;
+}
+
+void StatsFunctions::SetSkillCurrent(unsigned short pid, unsigned short skill, int value) noexcept //TODO: need packet for one value
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    if (skill >= Skill::Length)
+        return;
+
+    player->npcStats.mSkills[skill].mCurrent = value;
+}
+
+double StatsFunctions::GetSkillProgress(unsigned short pid, unsigned short skill) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0.0f);
+
+    if (skill >= Skill::Length)
+        return 0;
+
+    return player->npcStats.mSkills[skill].mProgress;
+}
+
+void StatsFunctions::SetSkillProgress(unsigned short pid, unsigned short skill, double value) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    if (skill >= Skill::Length)
+        return;
+
+    player->npcStats.mSkills[skill].mProgress = value;
+}
+
+int StatsFunctions::GetSkillIncrease(unsigned short pid, unsigned int attribute) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, 0);
+
+    if (attribute > Attribute::Length)
+        return 0;
+
+    return player->npcStats.mSkillIncrease[attribute];
+}
+
+void StatsFunctions::SetSkillIncrease(unsigned short pid, unsigned int attribute, int value) noexcept // TODO: need packet for transmit it
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    if (attribute > Attribute::Length)
+        return;
+
+    player->npcStats.mSkillIncrease[attribute] = value;
+}
+
+void StatsFunctions::SetCharGenStage(unsigned short pid, int start, int end) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->charGenStage.current = start;
+    player->charGenStage.end = end;
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_CHARGEN)->Send(player, false);
+}
+
+void StatsFunctions::Resurrect(unsigned short pid)
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_GAME_RESURRECT)->RequestData(player->guid);
+}
+
+void StatsFunctions::SendBaseInfo(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_BASEINFO)->Send(player, false);
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_BASEINFO)->Send(player, true);
+}
+
+void StatsFunctions::SendDynamicStats(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_DYNAMICSTATS)->Send(player, false);
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_DYNAMICSTATS)->Send(player, true);
+}
+
+void StatsFunctions::SendAttributes(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_ATTRIBUTE)->Send(player, false);
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_ATTRIBUTE)->Send(player, true);
+}
+
+void StatsFunctions::SendSkills(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_SKILL)->Send(player, false);
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_SKILL)->Send(player, true);
+}
+
+void StatsFunctions::SendLevel(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_LEVEL)->Send(player, false);
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_PLAYER_LEVEL)->Send(player, true);
+}
diff --git a/apps/openmw-mp/Script/Functions/Stats.hpp b/apps/openmw-mp/Script/Functions/Stats.hpp
new file mode 100644
index 000000000..64aaaab1b
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/Stats.hpp
@@ -0,0 +1,151 @@
+//
+// Created by koncord on 30.08.16.
+//
+
+#ifndef OPENMW_STATS_HPP
+#define OPENMW_STATS_HPP
+
+#define STATSFUNCTIONS \
+    {"GetName",                 StatsFunctions::GetName},\
+    {"SetName",                 StatsFunctions::SetName},\
+    \
+    {"GetRace",                 StatsFunctions::GetRace},\
+    {"SetRace",                 StatsFunctions::SetRace},\
+    \
+    {"GetHead",                 StatsFunctions::GetHead},\
+    {"SetHead",                 StatsFunctions::SetHead},\
+    \
+    {"GetHair",                 StatsFunctions::GetHairstyle},\
+    {"SetHair",                 StatsFunctions::SetHairstyle},\
+    \
+    {"GetIsMale",               StatsFunctions::GetIsMale},\
+    {"SetIsMale",               StatsFunctions::SetIsMale},\
+    \
+    {"GetLevel",                StatsFunctions::GetLevel},\
+    {"SetLevel",                StatsFunctions::SetLevel},\
+    {"GetLevelProgress",        StatsFunctions::GetLevelProgress},\
+    {"SetLevelProgress",        StatsFunctions::SetLevelProgress},\
+    \
+    {"GetBirthsign",            StatsFunctions::GetBirthsign},\
+    {"SetBirthsign",            StatsFunctions::SetBirthsign},\
+    \
+    {"GetAttributeCount",       StatsFunctions::GetAttributeCount},\
+    {"GetSkillCount",           StatsFunctions::GetSkillCount},\
+    {"GetAttributeId",          StatsFunctions::GetAttributeId},\
+    {"GetSkillId",              StatsFunctions::GetSkillId},\
+    {"GetAttributeName",        StatsFunctions::GetAttributeName},\
+    {"GetSkillName",            StatsFunctions::GetSkillName},\
+    \
+    {"GetAttributeBase",        StatsFunctions::GetAttributeBase},\
+    {"SetAttributeBase",        StatsFunctions::SetAttributeBase},\
+    {"GetAttributeCurrent",     StatsFunctions::GetAttributeCurrent},\
+    {"SetAttributeCurrent",     StatsFunctions::SetAttributeCurrent},\
+    \
+    {"GetSkillBase",            StatsFunctions::GetSkillBase},\
+    {"SetSkillBase",            StatsFunctions::SetSkillBase},\
+    {"GetSkillCurrent",         StatsFunctions::GetSkillCurrent},\
+    {"SetSkillCurrent",         StatsFunctions::SetSkillCurrent},\
+    {"GetSkillProgress",        StatsFunctions::GetSkillProgress},\
+    {"SetSkillProgress",        StatsFunctions::SetSkillProgress},\
+    \
+    {"GetHealthBase",           StatsFunctions::GetHealthBase},\
+    {"SetHealthBase",           StatsFunctions::SetHealthBase},\
+    {"GetHealthCurrent",        StatsFunctions::GetHealthCurrent},\
+    {"SetHealthCurrent",        StatsFunctions::SetHealthCurrent},\
+    \
+    {"GetMagickaBase",          StatsFunctions::GetMagickaBase},\
+    {"SetMagickaBase",          StatsFunctions::SetMagickaBase},\
+    {"GetMagickaCurrent",       StatsFunctions::GetMagickaCurrent},\
+    {"SetMagickaCurrent",       StatsFunctions::SetMagickaCurrent},\
+    \
+    {"SetFatigueBase",          StatsFunctions::SetFatigueBase},\
+    {"GetFatigueBase",          StatsFunctions::GetFatigueBase},\
+    {"SetFatigueCurrent",       StatsFunctions::SetFatigueCurrent},\
+    {"GetFatigueCurrent",       StatsFunctions::GetFatigueCurrent},\
+    \
+    {"GetSkillIncrease",        StatsFunctions::GetSkillIncrease},\
+    {"SetSkillIncrease",        StatsFunctions::SetSkillIncrease},\
+    \
+    {"SetCharGenStage",         StatsFunctions::SetCharGenStage},\
+    {"Resurrect",               StatsFunctions::Resurrect},\
+    {"SendBaseInfo",            StatsFunctions::SendBaseInfo},\
+    \
+    {"SendDynamicStats",        StatsFunctions::SendDynamicStats},\
+    {"SendAttributes",          StatsFunctions::SendAttributes},\
+    {"SendSkills",              StatsFunctions::SendSkills},\
+    {"SendLevel",               StatsFunctions::SendLevel}
+
+class StatsFunctions
+{
+public:
+    static void SetName(unsigned short pid, const char *name) noexcept;
+    static const char *GetName(unsigned short pid) noexcept;
+
+    static void SetBirthsign(unsigned short pid, const char *name) noexcept;
+    static const char *GetBirthsign(unsigned short pid) noexcept;
+
+    static void SetRace(unsigned short pid, const char *race) noexcept;
+    static const char *GetRace(unsigned short pid) noexcept;
+
+    static void SetHead(unsigned short pid, const char *head) noexcept;
+    static const char *GetHead(unsigned short pid) noexcept;
+
+    static void SetHairstyle(unsigned short pid, const char *style) noexcept;
+    static const char *GetHairstyle(unsigned short pid) noexcept;
+
+    static void SetIsMale(unsigned short pid, int male) noexcept;
+    static int GetIsMale(unsigned short pid) noexcept;
+
+    static int GetLevel(unsigned short pid) noexcept;
+    static void SetLevel(unsigned short pid, int value) noexcept;
+    static int GetLevelProgress(unsigned short pid) noexcept;
+    static void SetLevelProgress(unsigned short pid, int value) noexcept;
+
+    static double GetHealthBase(unsigned short pid) noexcept;
+    static void SetHealthBase(unsigned short pid, double value) noexcept;
+    static double GetHealthCurrent(unsigned short pid) noexcept;
+    static void SetHealthCurrent(unsigned short pid, double value) noexcept;
+
+    static double GetMagickaBase(unsigned short pid) noexcept;
+    static void SetMagickaBase(unsigned short pid, double value) noexcept;
+    static double GetMagickaCurrent(unsigned short pid) noexcept;
+    static void SetMagickaCurrent(unsigned short pid, double value) noexcept;
+
+    static double GetFatigueBase(unsigned short pid) noexcept;
+    static void SetFatigueBase(unsigned short pid, double value) noexcept;
+    static double GetFatigueCurrent(unsigned short pid) noexcept;
+    static void SetFatigueCurrent(unsigned short pid, double value) noexcept;
+
+    static int GetAttributeCount() noexcept;
+    static int GetSkillCount() noexcept;
+    static int GetAttributeId(const char *name) noexcept;
+    static int GetSkillId(const char *name) noexcept;
+    static const char *GetAttributeName(unsigned short attribute) noexcept;
+    static const char *GetSkillName(unsigned short skill) noexcept;
+
+    static int GetAttributeBase(unsigned short pid, unsigned short attribute) noexcept;
+    static void SetAttributeBase(unsigned short pid, unsigned short attribute, int value) noexcept;
+    static int GetAttributeCurrent(unsigned short pid, unsigned short attribute) noexcept;
+    static void SetAttributeCurrent(unsigned short pid, unsigned short attribute, int value) noexcept;
+
+    static int GetSkillBase(unsigned short pid, unsigned short skill) noexcept;
+    static void SetSkillBase(unsigned short pid, unsigned short skill, int value) noexcept;
+    static int GetSkillCurrent(unsigned short pid, unsigned short skill) noexcept;
+    static void SetSkillCurrent(unsigned short pid, unsigned short skill, int value) noexcept;
+    static double GetSkillProgress(unsigned short pid, unsigned short skill) noexcept;
+    static void SetSkillProgress(unsigned short pid, unsigned short skill, double value) noexcept;
+
+    static int GetSkillIncrease(unsigned short pid, unsigned int pos) noexcept;
+    static void SetSkillIncrease(unsigned short pid, unsigned int pos, int value) noexcept;
+
+    static void Resurrect(unsigned short pid);
+    static void SetCharGenStage(unsigned short pid, int start, int end) noexcept;
+    static void SendBaseInfo(unsigned short pid) noexcept;
+
+    static void SendDynamicStats(unsigned short pid) noexcept;
+    static void SendAttributes(unsigned short pid) noexcept;
+    static void SendSkills(unsigned short pid) noexcept;
+    static void SendLevel(unsigned short pid) noexcept;
+};
+
+#endif //OPENMW_STATS_HPP
diff --git a/apps/openmw-mp/Script/Functions/Timer.cpp b/apps/openmw-mp/Script/Functions/Timer.cpp
new file mode 100644
index 000000000..11c3a695e
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/Timer.cpp
@@ -0,0 +1,47 @@
+//
+// Created by koncord on 15.03.16.
+//
+
+#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <Player.hpp>
+#include <Networking.hpp>
+#include <Script/API/TimerAPI.hpp>
+
+using namespace std;
+using namespace mwmp;
+
+int ScriptFunctions::CreateTimer(ScriptFunc callback, int msec) noexcept
+{
+    return -1;
+}
+
+int ScriptFunctions::CreateTimerEx(ScriptFunc callback, int msec, const char *types, ...) noexcept
+{
+    return -1;
+}
+
+void ScriptFunctions::StartTimer(int timerId) noexcept
+{
+    TimerAPI::StartTimer(timerId);
+}
+
+void ScriptFunctions::StopTimer(int timerId) noexcept
+{
+    TimerAPI::StopTimer(timerId);
+}
+
+void ScriptFunctions::RestartTimer(int timerId, int msec) noexcept
+{
+    TimerAPI::ResetTimer(timerId, msec);
+}
+
+void ScriptFunctions::FreeTimer(int timerId) noexcept
+{
+    TimerAPI::FreeTimer(timerId);
+}
+
+bool ScriptFunctions::IsTimerElapsed(int timerId) noexcept
+{
+    return TimerAPI::IsEndTimer(timerId);
+}
diff --git a/apps/openmw-mp/Script/Functions/World.cpp b/apps/openmw-mp/Script/Functions/World.cpp
new file mode 100644
index 000000000..82d79833b
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/World.cpp
@@ -0,0 +1,333 @@
+#include <regex>
+
+#include <apps/openmw-mp/Player.hpp>
+#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
+#include <apps/openmw-mp/Networking.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <components/openmw-mp/Base/BaseEvent.hpp>
+#include "World.hpp"
+
+using namespace mwmp;
+
+BaseEvent scriptEvent;
+WorldObject tempWorldObject;
+ContainerItem tempContainerItem;
+
+std::regex exteriorCellPattern("^(-?\\d+), (-?\\d+)$");
+
+void WorldFunctions::InitScriptEvent(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player, );
+
+    scriptEvent.cell.blank();
+    scriptEvent.objectChanges.objects.clear();
+    scriptEvent.guid = player->guid;
+}
+
+unsigned int WorldFunctions::GetObjectChangesSize() noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.count;
+}
+
+unsigned char WorldFunctions::GetLastEventAction() noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->action;
+}
+
+const char *WorldFunctions::GetObjectRefId(unsigned int i) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).refId.c_str();
+}
+
+int WorldFunctions::GetObjectRefNumIndex(unsigned int i) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).refNumIndex;
+}
+
+int WorldFunctions::GetObjectCount(unsigned int i) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).count;
+}
+
+int WorldFunctions::GetObjectCharge(unsigned int i) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).charge;
+}
+
+int WorldFunctions::GetObjectGoldValue(unsigned int i) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).goldValue;
+}
+
+double WorldFunctions::GetObjectScale(unsigned int i) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).scale;
+}
+
+int WorldFunctions::GetObjectDoorState(unsigned int i) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).doorState;
+}
+
+int WorldFunctions::GetObjectLockLevel(unsigned int i) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).lockLevel;
+}
+
+double WorldFunctions::GetObjectPosX(unsigned int i) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).pos.pos[0];
+}
+
+double WorldFunctions::GetObjectPosY(unsigned int i) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).pos.pos[1];
+}
+
+double WorldFunctions::GetObjectPosZ(unsigned int i) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).pos.pos[2];
+}
+
+double WorldFunctions::GetObjectRotX(unsigned int i) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).pos.rot[0];
+}
+
+double WorldFunctions::GetObjectRotY(unsigned int i) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).pos.rot[1];
+}
+
+double WorldFunctions::GetObjectRotZ(unsigned int i) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(i).pos.rot[2];
+}
+
+unsigned int WorldFunctions::GetContainerChangesSize(unsigned int objectIndex) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(objectIndex).containerChanges.count;
+}
+
+const char *WorldFunctions::GetContainerItemRefId(unsigned int objectIndex, unsigned int itemIndex) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(objectIndex)
+        .containerChanges.items.at(itemIndex).refId.c_str();
+}
+
+int WorldFunctions::GetContainerItemCount(unsigned int objectIndex, unsigned int itemIndex) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(objectIndex)
+        .containerChanges.items.at(itemIndex).count;
+}
+
+int WorldFunctions::GetContainerItemCharge(unsigned int objectIndex, unsigned int itemIndex) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(objectIndex)
+        .containerChanges.items.at(itemIndex).charge;
+}
+
+int WorldFunctions::GetContainerItemActionCount(unsigned int objectIndex, unsigned int itemIndex) noexcept
+{
+    return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(objectIndex)
+        .containerChanges.items.at(itemIndex).actionCount;
+}
+
+void WorldFunctions::SetScriptEventCell(const char* cellDescription) noexcept
+{
+    std::string description = cellDescription;
+    std::smatch baseMatch;
+
+    if (std::regex_match(description, baseMatch, exteriorCellPattern))
+    {
+        scriptEvent.cell.mData.mFlags &= ~ESM::Cell::Interior;
+
+        // The first sub match is the whole string, so check for a length of 3
+        if (baseMatch.size() == 3)
+        {
+            scriptEvent.cell.mData.mX = stoi(baseMatch[1].str());
+            scriptEvent.cell.mData.mY = stoi(baseMatch[2].str());
+        }
+    }
+    else
+    {
+        scriptEvent.cell.mData.mFlags |= ESM::Cell::Interior;
+        scriptEvent.cell.mName = description;
+    }
+}
+
+void WorldFunctions::SetScriptEventAction(unsigned char action) noexcept
+{
+    scriptEvent.action = action;
+}
+
+void WorldFunctions::SetObjectRefId(const char* refId) noexcept
+{
+    tempWorldObject.refId = refId;
+}
+
+void WorldFunctions::SetObjectRefNumIndex(int refNumIndex) noexcept
+{
+    tempWorldObject.refNumIndex = refNumIndex;
+}
+
+void WorldFunctions::SetObjectCount(int count) noexcept
+{
+    tempWorldObject.count = count;
+}
+
+void WorldFunctions::SetObjectCharge(int charge) noexcept
+{
+    tempWorldObject.charge = charge;
+}
+
+void WorldFunctions::SetObjectGoldValue(int goldValue) noexcept
+{
+    tempWorldObject.goldValue = goldValue;
+}
+
+void WorldFunctions::SetObjectScale(double scale) noexcept
+{
+    tempWorldObject.scale = scale;
+}
+
+void WorldFunctions::SetObjectDoorState(int doorState) noexcept
+{
+    tempWorldObject.doorState = doorState;
+}
+
+void WorldFunctions::SetObjectLockLevel(int lockLevel) noexcept
+{
+    tempWorldObject.lockLevel = lockLevel;
+}
+
+void WorldFunctions::SetObjectPosition(double x, double y, double z) noexcept
+{
+    tempWorldObject.pos.pos[0] = x;
+    tempWorldObject.pos.pos[1] = y;
+    tempWorldObject.pos.pos[2] = z;
+}
+
+void WorldFunctions::SetObjectRotation(double x, double y, double z) noexcept
+{
+    tempWorldObject.pos.rot[0] = x;
+    tempWorldObject.pos.rot[1] = y;
+    tempWorldObject.pos.rot[2] = z;
+}
+
+void WorldFunctions::SetContainerItemRefId(const char* refId) noexcept
+{
+    tempContainerItem.refId = refId;
+}
+
+void WorldFunctions::SetContainerItemCount(int count) noexcept
+{
+    tempContainerItem.count = count;
+}
+
+void WorldFunctions::SetContainerItemCharge(int charge) noexcept
+{
+    tempContainerItem.charge = charge;
+}
+
+void WorldFunctions::AddWorldObject() noexcept
+{
+    WorldObject worldObject;
+    worldObject.refId = tempWorldObject.refId;
+    worldObject.refNumIndex = tempWorldObject.refNumIndex;
+    worldObject.count = tempWorldObject.count;
+    worldObject.charge = tempWorldObject.charge;
+    worldObject.goldValue = tempWorldObject.goldValue;
+    worldObject.scale = tempWorldObject.scale;
+    worldObject.doorState = tempWorldObject.doorState;
+    worldObject.lockLevel = tempWorldObject.lockLevel;
+    worldObject.pos = tempWorldObject.pos;
+    worldObject.containerChanges.items = tempWorldObject.containerChanges.items;
+
+    scriptEvent.objectChanges.objects.push_back(worldObject);
+
+    tempWorldObject.containerChanges.items.clear();
+}
+
+void WorldFunctions::AddContainerItem() noexcept
+{
+    ContainerItem containerItem;
+    containerItem.refId = tempContainerItem.refId;
+    containerItem.count = tempContainerItem.count;
+    containerItem.charge = tempContainerItem.charge;
+
+    tempWorldObject.containerChanges.items.push_back(containerItem);
+}
+
+void WorldFunctions::SendObjectDelete() noexcept
+{
+    mwmp::Networking::get().getWorldController()->GetPacket(ID_OBJECT_DELETE)->Send(&scriptEvent, scriptEvent.guid);
+}
+
+void WorldFunctions::SendObjectPlace() noexcept
+{
+    mwmp::Networking::get().getWorldController()->GetPacket(ID_OBJECT_PLACE)->Send(&scriptEvent, scriptEvent.guid);
+}
+
+void WorldFunctions::SendObjectScale() noexcept
+{
+    mwmp::Networking::get().getWorldController()->GetPacket(ID_OBJECT_SCALE)->Send(&scriptEvent, scriptEvent.guid);
+}
+
+void WorldFunctions::SendObjectLock() noexcept
+{
+    mwmp::Networking::get().getWorldController()->GetPacket(ID_OBJECT_LOCK)->Send(&scriptEvent, scriptEvent.guid);
+}
+
+void WorldFunctions::SendObjectUnlock() noexcept
+{
+    mwmp::Networking::get().getWorldController()->GetPacket(ID_OBJECT_UNLOCK)->Send(&scriptEvent, scriptEvent.guid);
+}
+
+void WorldFunctions::SendDoorState() noexcept
+{
+    mwmp::Networking::get().getWorldController()->GetPacket(ID_DOOR_STATE)->Send(&scriptEvent, scriptEvent.guid);
+}
+
+void WorldFunctions::SendContainer() noexcept
+{
+    mwmp::Networking::get().getWorldController()->GetPacket(ID_CONTAINER)->Send(&scriptEvent, scriptEvent.guid);
+}
+
+void WorldFunctions::SetHour(unsigned short pid, double hour) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->hour = hour;
+    player->month = -1;
+    player->day = -1;
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_GAME_TIME)->Send(player, false);
+}
+
+void WorldFunctions::SetMonth(unsigned short pid, int month) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->hour = -1;
+    player->month = month;
+    player->day = -1;
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_GAME_TIME)->Send(player, false);
+
+}
+
+void WorldFunctions::SetDay(unsigned short pid, int day) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+
+    player->hour = -1;
+    player->month = -1;
+    player->day = day;
+
+    mwmp::Networking::get().getPlayerController()->GetPacket(ID_GAME_TIME)->Send(player, false);
+}
diff --git a/apps/openmw-mp/Script/Functions/World.hpp b/apps/openmw-mp/Script/Functions/World.hpp
new file mode 100644
index 000000000..749e48ef7
--- /dev/null
+++ b/apps/openmw-mp/Script/Functions/World.hpp
@@ -0,0 +1,129 @@
+#ifndef OPENMW_WORLD_HPP
+#define OPENMW_WORLD_HPP
+
+#define WORLDFUNCTIONS \
+    {"InitScriptEvent",             WorldFunctions::InitScriptEvent},\
+    \
+    {"GetObjectChangesSize",        WorldFunctions::GetObjectChangesSize},\
+    {"GetLastEventAction",          WorldFunctions::GetLastEventAction},\
+    \
+    {"GetObjectRefId",              WorldFunctions::GetObjectRefId},\
+    {"GetObjectRefNumIndex",        WorldFunctions::GetObjectRefNumIndex},\
+    {"GetObjectCount",              WorldFunctions::GetObjectCount},\
+    {"GetObjectCharge",             WorldFunctions::GetObjectCharge},\
+    {"GetObjectGoldValue",          WorldFunctions::GetObjectGoldValue},\
+    {"GetObjectScale",              WorldFunctions::GetObjectScale},\
+    {"GetObjectDoorState",          WorldFunctions::GetObjectDoorState},\
+    {"GetObjectLockLevel",          WorldFunctions::GetObjectLockLevel},\
+    {"GetObjectPosX",               WorldFunctions::GetObjectPosX},\
+    {"GetObjectPosY",               WorldFunctions::GetObjectPosY},\
+    {"GetObjectPosZ",               WorldFunctions::GetObjectPosZ},\
+    {"GetObjectRotX",               WorldFunctions::GetObjectRotX},\
+    {"GetObjectRotY",               WorldFunctions::GetObjectRotY},\
+    {"GetObjectRotZ",               WorldFunctions::GetObjectRotZ},\
+    \
+    {"GetContainerChangesSize",     WorldFunctions::GetContainerChangesSize},\
+    {"GetContainerItemRefId",       WorldFunctions::GetContainerItemRefId},\
+    {"GetContainerItemCount",       WorldFunctions::GetContainerItemCount},\
+    {"GetContainerItemCharge",      WorldFunctions::GetContainerItemCharge},\
+    {"GetContainerItemActionCount", WorldFunctions::GetContainerItemActionCount},\
+    \
+    {"SetScriptEventCell",          WorldFunctions::SetScriptEventCell},\
+    {"SetScriptEventAction",        WorldFunctions::SetScriptEventAction},\
+    \
+    {"SetObjectRefId",              WorldFunctions::SetObjectRefId},\
+    {"SetObjectRefNumIndex",        WorldFunctions::SetObjectRefNumIndex},\
+    {"SetObjectCount",              WorldFunctions::SetObjectCount},\
+    {"SetObjectCharge",             WorldFunctions::SetObjectCharge},\
+    {"SetObjectGoldValue",          WorldFunctions::SetObjectGoldValue},\
+    {"SetObjectScale",              WorldFunctions::SetObjectScale},\
+    {"SetObjectDoorState",          WorldFunctions::SetObjectDoorState},\
+    {"SetObjectLockLevel",          WorldFunctions::SetObjectLockLevel},\
+    {"SetObjectPosition",           WorldFunctions::SetObjectPosition},\
+    {"SetObjectRotation",           WorldFunctions::SetObjectRotation},\
+    \
+    {"SetContainerItemRefId",       WorldFunctions::SetContainerItemRefId},\
+    {"SetContainerItemCount",       WorldFunctions::SetContainerItemCount},\
+    {"SetContainerItemCharge",      WorldFunctions::SetContainerItemCharge},\
+    \
+    {"AddWorldObject",              WorldFunctions::AddWorldObject},\
+    {"AddContainerItem",            WorldFunctions::AddContainerItem},\
+    \
+    {"SendObjectDelete",            WorldFunctions::SendObjectDelete},\
+    {"SendObjectPlace",             WorldFunctions::SendObjectPlace},\
+    {"SendObjectScale",             WorldFunctions::SendObjectScale},\
+    {"SendObjectLock",              WorldFunctions::SendObjectLock},\
+    {"SendObjectUnlock",            WorldFunctions::SendObjectUnlock},\
+    {"SendDoorState",               WorldFunctions::SendDoorState},\
+    {"SendContainer",               WorldFunctions::SendContainer},\
+    \
+    {"SetHour",                     WorldFunctions::SetHour},\
+    {"SetMonth",                    WorldFunctions::SetMonth},\
+    {"SetDay",                      WorldFunctions::SetDay}
+
+class WorldFunctions
+{
+public:
+
+    static void InitScriptEvent(unsigned short pid) noexcept;
+
+    static unsigned int GetObjectChangesSize() noexcept;
+    static unsigned char GetLastEventAction() noexcept;
+
+    static const char *GetObjectRefId(unsigned int i) noexcept;
+    static int GetObjectRefNumIndex(unsigned int i) noexcept;
+    static int GetObjectCount(unsigned int i) noexcept;
+    static int GetObjectCharge(unsigned int i) noexcept;
+    static int GetObjectGoldValue(unsigned int i) noexcept;
+    static double GetObjectScale(unsigned int i) noexcept;
+    static int GetObjectDoorState(unsigned int i) noexcept;
+    static int GetObjectLockLevel(unsigned int i) noexcept;
+    static double GetObjectPosX(unsigned int i) noexcept;
+    static double GetObjectPosY(unsigned int i) noexcept;
+    static double GetObjectPosZ(unsigned int i) noexcept;
+    static double GetObjectRotX(unsigned int i) noexcept;
+    static double GetObjectRotY(unsigned int i) noexcept;
+    static double GetObjectRotZ(unsigned int i) noexcept;
+
+    static unsigned int GetContainerChangesSize(unsigned int objectIndex) noexcept;
+    static const char *GetContainerItemRefId(unsigned int objectIndex, unsigned int itemIndex) noexcept;
+    static int GetContainerItemCount(unsigned int objectIndex, unsigned int itemIndex) noexcept;
+    static int GetContainerItemCharge(unsigned int objectIndex, unsigned int itemIndex) noexcept;
+    static int GetContainerItemActionCount(unsigned int objectIndex, unsigned int itemIndex) noexcept;
+
+    static void SetScriptEventCell(const char* cellDescription) noexcept;
+    static void SetScriptEventAction(unsigned char action) noexcept;
+
+    static void SetObjectRefId(const char* refId) noexcept;
+    static void SetObjectRefNumIndex(int refNumIndex) noexcept;
+    static void SetObjectCount(int count) noexcept;
+    static void SetObjectCharge(int charge) noexcept;
+    static void SetObjectGoldValue(int goldValue) noexcept;
+    static void SetObjectScale(double scale) noexcept;
+    static void SetObjectDoorState(int doorState) noexcept;
+    static void SetObjectLockLevel(int lockLevel) noexcept;
+    static void SetObjectPosition(double x, double y, double z) noexcept;
+    static void SetObjectRotation(double x, double y, double z) noexcept;
+
+    static void SetContainerItemRefId(const char* refId) noexcept;
+    static void SetContainerItemCount(int count) noexcept;
+    static void SetContainerItemCharge(int charge) noexcept;
+
+    static void AddWorldObject() noexcept;
+    static void AddContainerItem() noexcept;
+
+    static void SendObjectDelete() noexcept;
+    static void SendObjectPlace() noexcept;
+    static void SendObjectScale() noexcept;
+    static void SendObjectLock() noexcept;
+    static void SendObjectUnlock() noexcept;
+    static void SendDoorState() noexcept;
+    static void SendContainer() noexcept;
+
+    static void SetHour(unsigned short pid, double hour) noexcept;
+    static void SetMonth(unsigned short pid, int month) noexcept;
+    static void SetDay(unsigned short pid, int day) noexcept;
+};
+
+
+#endif //OPENMW_WORLD_HPP
diff --git a/apps/openmw-mp/Script/LangLua/LangLua.cpp b/apps/openmw-mp/Script/LangLua/LangLua.cpp
new file mode 100644
index 000000000..cfe7d21b7
--- /dev/null
+++ b/apps/openmw-mp/Script/LangLua/LangLua.cpp
@@ -0,0 +1,197 @@
+//
+// Created by koncord on 08.05.16.
+//
+
+#include <iostream>
+#include "LangLua.hpp"
+#include <Script/Script.hpp>
+#include <Script/Types.hpp>
+
+using namespace std;
+
+lib_t LangLua::GetInterface()
+{
+    return reinterpret_cast<lib_t>(lua);
+}
+
+LangLua::LangLua(lua_State *lua)
+{
+    this->lua = lua;
+}
+
+LangLua::LangLua()
+{
+    lua = luaL_newstate();
+    luaL_openlibs(lua); // load all lua std libs
+#if defined(ENABLE_TERRA)
+    terra_init(lua);
+#endif
+}
+
+LangLua::~LangLua()
+{
+
+}
+
+template<unsigned int I, unsigned int F>
+struct Lua_dispatch_ {
+    template<typename R, typename... Args>
+    inline static R Lua_dispatch(lua_State*&& lua, Args&&... args) noexcept {
+        constexpr ScriptFunctionData const& F_ = ScriptFunctions::functions[F];
+        auto arg = luabridge::Stack<typename CharType<F_.func.types[I - 1]>::type>::get(lua, I);
+        return Lua_dispatch_<I - 1, F>::template Lua_dispatch<R>(
+                forward<lua_State*>(lua),
+                arg,
+                forward<Args>(args)...);
+    }
+};
+
+template<unsigned int F>
+struct Lua_dispatch_<0, F> {
+    template<typename R, typename... Args>
+    inline static R Lua_dispatch(lua_State*&&, Args&&... args) noexcept {
+        constexpr ScriptFunctionData const& F_ = ScriptFunctions::functions[F];
+        return reinterpret_cast<FunctionEllipsis<R>>(F_.func.addr)(forward<Args>(args)...);
+    }
+};
+
+template<unsigned int I>
+static typename enable_if<ScriptFunctions::functions[I].func.ret == 'v', int>::type wrapper(lua_State* lua) noexcept {
+    Lua_dispatch_<ScriptFunctions::functions[I].func.numargs, I>::template Lua_dispatch<void>(forward<lua_State*>(lua));
+    return 0;
+}
+
+template<unsigned int I>
+static typename enable_if<ScriptFunctions::functions[I].func.ret != 'v', int>::type wrapper(lua_State* lua) noexcept {
+    auto ret = Lua_dispatch_<ScriptFunctions::functions[I].func.numargs, I>::template Lua_dispatch<typename CharType<ScriptFunctions::functions[I].func.ret>::type>(forward<lua_State*>(lua));
+    luabridge::Stack <typename CharType<ScriptFunctions::functions[I].func.ret>::type>::push (lua, ret);
+    return 1;
+}
+
+template<unsigned int I>
+struct F_
+{
+    static constexpr LuaFuctionData F{ScriptFunctions::functions[I].name, wrapper<I>};
+};
+
+
+template<> struct F_<0> { static constexpr LuaFuctionData F{"CreateTimer", LangLua::CreateTimer}; };
+template<> struct F_<1> { static constexpr LuaFuctionData F{"CreateTimerEx", LangLua::CreateTimerEx}; };
+template<> struct F_<2> { static constexpr LuaFuctionData F{"MakePublic", LangLua::MakePublic}; };
+template<> struct F_<3> { static constexpr LuaFuctionData F{"CallPublic", LangLua::CallPublic}; };
+
+template<size_t... Indices>
+inline LuaFuctionData *LangLua::functions(indices<Indices...>)
+{
+
+    static LuaFuctionData functions_[sizeof...(Indices)]{
+            F_<Indices>::F...
+    };
+
+    static_assert(
+            sizeof(functions_) / sizeof(functions_[0]) ==
+            sizeof(ScriptFunctions::functions) / sizeof(ScriptFunctions::functions[0]),
+            "Not all functions have been mapped to Lua");
+
+    return functions_;
+}
+
+void LangLua::LoadProgram(const char *filename)
+{
+    int err = 0;
+
+#if defined(ENABLE_TERRA)
+    if ((err = terra_loadfile(lua, filename)) != 0)
+#else
+    if ((err =luaL_loadfile(lua, filename)) != 0)
+#endif
+        throw runtime_error("Lua script " + string(filename) + " error (" + to_string(err) + "): \"" +
+                            string(lua_tostring(lua, -1)) + "\"");
+
+    constexpr auto functions_n = sizeof(ScriptFunctions::functions) / sizeof(ScriptFunctions::functions[0]);
+
+    LuaFuctionData *functions_ = functions(IndicesFor<functions_n>{});
+
+    luabridge::Namespace tes3mp = luabridge::getGlobalNamespace(lua).beginNamespace("tes3mp");
+
+    for (unsigned i = 0; i < functions_n; i++)
+        tes3mp.addCFunction(functions_[i].name, functions_[i].func);
+
+    tes3mp.endNamespace();
+
+    if ((err = lua_pcall(lua, 0, 0, 0)) != 0) // Run once script for load in memory.
+        throw runtime_error("Lua script " + string(filename) + " error (" + to_string(err) + "): \"" +
+                            string(lua_tostring(lua, -1)) + "\"");
+}
+
+int LangLua::FreeProgram()
+{
+    lua_close(lua);
+    return 0;
+}
+
+bool LangLua::IsCallbackPresent(const char *name)
+{
+    return luabridge::getGlobal(lua, name).isFunction();
+}
+
+boost::any LangLua::Call(const char *name, const char *argl, int buf, ...)
+{
+    va_list vargs;
+    va_start(vargs, buf);
+    std::vector<boost::any> args;
+
+    ScriptFunctions::GetArguments(args, vargs, argl);
+
+    return Call(name, argl, args);
+}
+
+boost::any LangLua::Call(const char *name, const char *argl, const std::vector<boost::any> &args)
+{
+    int n_args = (int)(strlen(argl)) ;
+
+    lua_getglobal (lua, name);
+
+    for (intptr_t i = 0; i < n_args; i++)
+    {
+        switch (argl[i])
+        {
+            case 'i':
+                luabridge::Stack<unsigned int>::push(lua, boost::any_cast<unsigned int>(args.at(i)));
+                break;
+
+            case 'q':
+                luabridge::Stack<signed int>::push(lua, boost::any_cast<signed int>(args.at(i)));
+                break;
+
+            case 'l':
+                luabridge::Stack<unsigned long long>::push(lua, boost::any_cast<unsigned long long>(args.at(i)));
+                break;
+
+            case 'w':
+                luabridge::Stack<signed long long>::push(lua, boost::any_cast<signed long long>(args.at(i)));
+                break;
+
+            case 'f':
+                luabridge::Stack<double>::push(lua, boost::any_cast<double>(args.at(i)));
+                break;
+
+            case 'p':
+                luabridge::Stack<void *>::push(lua, boost::any_cast<void *>(args.at(i)));
+                break;
+
+            case 's':
+                luabridge::Stack<const char *>::push(lua, boost::any_cast<const char *>(args.at(i)));
+                break;
+
+            case 'b':
+                luabridge::Stack<bool>::push(lua, boost::any_cast<int>(args.at(i)));
+                break;
+            default:
+                throw runtime_error("Lua call: Unknown argument identifier " + argl[i]);
+        }
+    }
+
+    luabridge::LuaException::pcall (lua, n_args, 1);
+    return boost::any(luabridge::LuaRef::fromStack(lua, -1));
+}
diff --git a/apps/openmw-mp/Script/LangLua/LangLua.hpp b/apps/openmw-mp/Script/LangLua/LangLua.hpp
new file mode 100644
index 000000000..8aecf1418
--- /dev/null
+++ b/apps/openmw-mp/Script/LangLua/LangLua.hpp
@@ -0,0 +1,62 @@
+//
+// Created by koncord on 08.05.16.
+//
+
+#ifndef PLUGINSYSTEM3_LANGLUA_HPP
+#define PLUGINSYSTEM3_LANGLUA_HPP
+
+#ifdef ENABLE_TERRA
+#include <terra/terra.h>
+#else
+#include "lua.hpp"
+#endif
+
+#include <extern/LuaBridge/LuaBridge.h>
+#include <LuaBridge.h>
+
+#include <boost/any.hpp>
+#include "../ScriptFunction.hpp"
+#include "../Language.hpp"
+
+struct LuaFuctionData
+{
+    const char* name;
+    lua_CFunction func;
+};
+
+class LangLua: public Language
+{
+private:
+    template<std::size_t... Is>
+    struct indices {};
+    template<std::size_t N, std::size_t... Is>
+    struct build_indices : build_indices<N-1, N-1, Is...> {};
+    template<std::size_t... Is>
+    struct build_indices<0, Is...> : indices<Is...> {};
+    template<std::size_t N>
+    using IndicesFor = build_indices<N>;
+
+public:
+    virtual lib_t GetInterface() override;
+    template<std::size_t... Indices>
+    static LuaFuctionData* functions(indices<Indices...>);
+    lua_State *lua;
+public:
+    LangLua();
+    LangLua(lua_State *lua);
+    ~LangLua();
+    static int MakePublic(lua_State *lua) noexcept;
+    static int CallPublic(lua_State *lua);
+
+    static int CreateTimer(lua_State *lua) noexcept;
+    static int CreateTimerEx(lua_State *lua);
+
+    virtual void LoadProgram(const char *filename) override;
+    virtual int FreeProgram() override;
+    virtual bool IsCallbackPresent(const char *name) override;
+    virtual boost::any Call(const char *name, const char *argl, int buf, ...) override;
+    virtual boost::any Call(const char *name, const char *argl, const std::vector<boost::any> &args) override;
+};
+
+
+#endif //PLUGINSYSTEM3_LANGLUA_HPP
diff --git a/apps/openmw-mp/Script/LangLua/LuaFunc.cpp b/apps/openmw-mp/Script/LangLua/LuaFunc.cpp
new file mode 100644
index 000000000..64fca01d7
--- /dev/null
+++ b/apps/openmw-mp/Script/LangLua/LuaFunc.cpp
@@ -0,0 +1,182 @@
+//
+// Created by koncord on 09.05.16.
+//
+
+#include <iostream>
+#include "LangLua.hpp"
+#include <Script/API/TimerAPI.hpp>
+#include <Script/API/PublicFnAPI.hpp>
+
+using namespace std;
+
+inline vector<boost::any> DefToVec(lua_State *lua, string types, int args_begin, int args_n)
+{
+    vector<boost::any> args;
+
+    for (int i = args_begin; i < args_n + args_begin; i++)
+    {
+        switch (types[i - args_begin])
+        {
+            case 'i':
+            {
+                args.emplace_back(luabridge::Stack<unsigned int>::get(lua, i));
+                break;
+            }
+
+            case 'q':
+            {
+                args.emplace_back(luabridge::Stack<signed int>::get(lua, i));
+                break;
+            }
+
+                /*case 'l':
+                {
+                    args.emplace_back(luabridge::Stack<unsigned long long>::get(lua, i));
+                    break;
+                }
+
+                case 'w':
+                {
+                    args.emplace_back(luabridge::Stack<signed long long>::get(lua, i));
+                    break;
+                }*/
+
+            case 'f':
+            {
+                args.emplace_back(luabridge::Stack<double>::get(lua, i));
+                break;
+            }
+
+            case 's':
+            {
+                args.emplace_back(luabridge::Stack<const char*>::get(lua, i));
+                break;
+            }
+
+            default:
+            {
+                stringstream ssErr;
+                ssErr << "Lua: Unknown argument identifier" << "\"" << types[i] << "\"" << endl;
+                throw std::runtime_error(ssErr.str());
+            }
+        }
+    }
+    return args;
+}
+
+int LangLua::MakePublic(lua_State *lua) noexcept
+{
+    const char * callback = luabridge::Stack<const char*>::get(lua, 1);
+    const char * name = luabridge::Stack<const char*>::get(lua, 2);
+    char ret_type = luabridge::Stack<char>::get(lua, 3);
+    const char * def = luabridge::Stack<const char*>::get(lua, 4);
+
+    Public::MakePublic(callback, lua, name, ret_type, def);
+    return 0;
+
+}
+
+int LangLua::CallPublic(lua_State *lua)
+{
+    const char * name = luabridge::Stack<const char*>::get(lua, 1);
+
+    int args_n = lua_gettop(lua) - 1;
+
+    string types = Public::GetDefinition(name);
+
+    if (args_n  != (long)types.size())
+        throw invalid_argument("Script call: Number of arguments does not match definition");
+
+    vector<boost::any> args = DefToVec(lua, types, 2, args_n);
+
+    boost::any result = Public::Call(&name[0], args);
+    if (result.empty())
+        return 0;
+
+    if (result.type().hash_code() == typeid(signed int).hash_code())
+        luabridge::Stack<signed int>::push(lua, boost::any_cast<signed int>(result));
+    else if (result.type().hash_code() == typeid(unsigned int).hash_code())
+        luabridge::Stack<unsigned int>::push(lua, boost::any_cast<unsigned int>(result));
+    else if (result.type().hash_code() == typeid(double).hash_code())
+        luabridge::Stack<double>::push(lua, boost::any_cast<double>(result));
+    else if (result.type().hash_code() == typeid(const char*).hash_code())
+        luabridge::Stack<const char*>::push(lua, boost::any_cast<const char*>(result));
+    return 1;
+}
+
+int LangLua::CreateTimer(lua_State *lua) noexcept
+{
+
+    const char * callback= luabridge::Stack<const char*>::get(lua, 1);
+    int msec = luabridge::Stack<int>::get(lua, 2);
+
+    int id = mwmp::TimerAPI::CreateTimerLua(lua, callback, msec, "", vector<boost::any>());
+    luabridge::push(lua, id);
+    return 1;
+}
+
+int LangLua::CreateTimerEx(lua_State *lua)
+{
+    const char * callback = luabridge::Stack<const char*>::get(lua, 1);
+    int msec = luabridge::Stack<int>::get(lua, 2);
+
+    const char * types = luabridge::Stack<const char*>::get(lua, 3);
+
+    int args_n = (int)lua_strlen(lua, 3);
+
+    vector<boost::any> args;
+
+    for (int i = 4; i < args_n + 4; i++)
+    {
+        switch (types[i - 4])
+        {
+            case 'i':
+            {
+                args.emplace_back(luabridge::Stack<unsigned int>::get(lua, i));
+                break;
+            }
+
+            case 'q':
+            {
+                args.emplace_back(luabridge::Stack<signed int>::get(lua, i));
+                break;
+            }
+
+                /*case 'l':
+                {
+                    args.emplace_back(luabridge::Stack<unsigned long long>::get(lua, i));
+                    break;
+                }
+
+                case 'w':
+                {
+                    args.emplace_back(luabridge::Stack<signed long long>::get(lua, i));
+                    break;
+                }*/
+
+            case 'f':
+            {
+                args.emplace_back(luabridge::Stack<double>::get(lua, i));
+                break;
+            }
+
+            case 's':
+            {
+                args.emplace_back(luabridge::Stack<const char*>::get(lua, i));
+                break;
+            }
+
+            default:
+            {
+                stringstream ssErr;
+                ssErr << "Lua: Unknown argument identifier" << "\"" << types[i] << "\"" << endl;
+                throw std::runtime_error(ssErr.str());
+            }
+        }
+    }
+
+
+    int id = mwmp::TimerAPI::CreateTimerLua(lua, callback, msec, types, args);
+    luabridge::push(lua, id);
+    return 1;
+}
diff --git a/apps/openmw-mp/Script/LangNative/LangNative.cpp b/apps/openmw-mp/Script/LangNative/LangNative.cpp
new file mode 100644
index 000000000..616557eb0
--- /dev/null
+++ b/apps/openmw-mp/Script/LangNative/LangNative.cpp
@@ -0,0 +1,102 @@
+//
+// Created by koncord on 09.05.16.
+//
+
+#ifndef _WIN32
+    #include <dlfcn.h>
+#endif
+
+#include <stdexcept>
+#include "LangNative.hpp"
+#include <Script/SystemInterface.hpp>
+#include <Script/Script.hpp>
+
+using namespace std;
+
+template<typename R>
+bool SetScript(lib_t lib, const char *name, R value)
+{
+    SystemInterface<R *> result(lib, name);
+
+    if (result)
+        *result.result = value;
+
+    return result.operator bool();
+}
+
+void LangNative::LoadProgram(const char *filename)
+{
+    FILE *file = fopen(filename, "rb");
+
+    if (!file)
+        throw runtime_error("Script not found: " + string(filename));
+
+    fclose(file);
+
+#ifdef _WIN32
+    lib = LoadLibrary(filename);
+#else
+    lib = dlopen(filename, RTLD_LAZY);
+#endif
+
+    if (!lib)
+        throw runtime_error("Was not able to load C++ script: " + string(filename));
+
+    try
+    {
+
+        const char *prefix = SystemInterface<const char *>(lib, "prefix").result;
+        string pf(prefix);
+
+        for (const auto &function : ScriptFunctions::functions)
+            if (!SetScript(lib, string(pf + function.name).c_str(), function.func.addr))
+                LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Script function pointer not found: %s", function.name);
+    }
+    catch (...)
+    {
+        FreeProgram();
+        throw;
+    }
+}
+
+int LangNative::FreeProgram()
+{
+#ifdef _WIN32
+    FreeLibrary(lib);
+#else
+    dlclose(lib);
+#endif
+    return 0;
+}
+
+bool LangNative::IsCallbackPresent(const char *name)
+{
+    return true;
+}
+
+boost::any LangNative::Call(const char *name, const char *argl, int buf, ...)
+{
+    return nullptr;
+}
+
+boost::any LangNative::Call(const char *name, const char *argl, const std::vector<boost::any> &args)
+{
+    return nullptr;
+}
+
+
+lib_t LangNative::GetInterface()
+{
+    return lib;
+}
+
+
+LangNative::LangNative()
+{
+
+}
+
+LangNative::~LangNative()
+{
+
+}
diff --git a/apps/openmw-mp/Script/LangNative/LangNative.hpp b/apps/openmw-mp/Script/LangNative/LangNative.hpp
new file mode 100644
index 000000000..bc1346ca1
--- /dev/null
+++ b/apps/openmw-mp/Script/LangNative/LangNative.hpp
@@ -0,0 +1,28 @@
+//
+// Created by koncord on 09.05.16.
+//
+
+#ifndef PLUGINSYSTEM3_LANGNATIVE_HPP
+#define PLUGINSYSTEM3_LANGNATIVE_HPP
+
+
+#include <Script/Language.hpp>
+#include <Script/SystemInterface.hpp>
+
+class LangNative : public Language
+{
+    lib_t lib;
+public:
+    virtual lib_t GetInterface() override;
+    LangNative();
+    ~LangNative();
+    virtual void LoadProgram(const char *filename) override;
+    virtual int FreeProgram() override;
+    virtual bool IsCallbackPresent(const char *name) override;
+    virtual boost::any Call(const char *name, const char *argl, int buf, ...) override;
+    virtual boost::any Call(const char *name, const char *argl, const std::vector<boost::any> &args) override;
+
+};
+
+
+#endif //PLUGINSYSTEM3_LANGNATIVE_HPP
diff --git a/apps/openmw-mp/Script/LangPawn/LangPAWN.cpp b/apps/openmw-mp/Script/LangPawn/LangPAWN.cpp
new file mode 100644
index 000000000..f80d72532
--- /dev/null
+++ b/apps/openmw-mp/Script/LangPawn/LangPAWN.cpp
@@ -0,0 +1,458 @@
+//
+// Created by koncord on 08.05.16.
+//
+
+#include "LangPAWN.hpp"
+
+
+#include <amxmodules.h>
+#include <amxaux.h>
+#include "Script.hpp"
+
+using namespace std;
+
+typedef long NetworkID;
+
+static vector<vector<char>> strings;
+static vector<pair<cell*, double>> floats;
+static pair<cell*, NetworkID*> data = {nullptr, nullptr};
+
+void free_strings() noexcept {
+    strings.clear();
+}
+
+void free_floats() noexcept {
+    for (const auto& value : floats)
+        *value.first = amx_ftoc(value.second);
+
+    floats.clear();
+}
+
+void free_data(unsigned int size) noexcept {
+    if (data.first && data.second)
+        for (unsigned int i = 0; i < size; ++i)
+            data.first[i] = data.second[i];
+
+    data.first = nullptr;
+    data.second = nullptr;
+}
+
+void after_call() noexcept {
+    free_strings();
+    free_floats();
+}
+
+template<typename R>
+void after_call(const R&) noexcept {
+    free_strings();
+    free_floats();
+}
+
+template<>
+void after_call(const unsigned int& result) noexcept {
+    free_strings();
+    free_floats();
+    free_data(result);
+}
+
+template<typename R, unsigned int I, unsigned int F>
+struct PAWN_extract_ {
+    inline static R PAWN_extract(AMX*&&, const cell*&& params) noexcept {
+        return static_cast<R>(forward<const cell*>(params)[I]);
+    }
+};
+
+template<unsigned int I, unsigned int F>
+struct PAWN_extract_<void*, I, F>
+{
+    inline static void* PAWN_extract(AMX *&&amx, const cell *&&params) noexcept
+    {
+        return amx_Address(amx, forward<const cell *>(params)[I]); // fixme: I'm not sure in this fix
+    }
+};
+
+template<unsigned int I, unsigned int F>
+struct PAWN_extract_<double, I, F> {
+    inline static double PAWN_extract(AMX*&&, const cell*&& params) noexcept {
+        return amx_ctof(forward<const cell*>(params)[I]);
+    }
+};
+
+template<unsigned int I, unsigned int F>
+struct PAWN_extract_<const char*, I, F> {
+    inline static const char* PAWN_extract(AMX*&& amx, const cell*&& params) noexcept {
+        int len;
+        cell* source;
+
+        source = amx_Address(amx, params[I]);
+        amx_StrLen(source, &len);
+
+        strings.emplace_back(len + 1);
+        char* value = &strings.back()[0];
+        amx_GetString(value, source, 0, UNLIMITED);
+
+        return value;
+    }
+};
+
+template<unsigned int I, unsigned int F>
+struct PAWN_extract_<double*, I, F> {
+    inline static double* PAWN_extract(AMX*&& amx, const cell*&& params) noexcept {
+        floats.emplace_back(amx_Address(amx, params[I]), 0.00);
+        return &floats.back().second;
+    }
+};
+
+template<unsigned int I, unsigned int F>
+struct PAWN_extract_<NetworkID**, I, F> {
+    inline static NetworkID** PAWN_extract(AMX*&& amx, const cell*&& params) noexcept {
+        constexpr ScriptFunctionData const& F_ = ScriptFunctions::functions[F];
+        static_assert(F_.func.numargs == I, "NetworkID** must be the last parameter");
+        data.first = amx_Address(amx, params[I]);
+        return &data.second;
+    }
+};
+
+template<unsigned int I, unsigned int F>
+struct PAWN_dispatch_ {
+    template<typename R, typename... Args>
+    inline static R PAWN_dispatch(AMX*&& amx, const cell*&& params, Args&&... args) noexcept {
+        constexpr ScriptFunctionData const& F_ = ScriptFunctions::functions[F];
+        auto arg = PAWN_extract_<typename CharType<F_.func.types[I - 1]>::type, I, F>::PAWN_extract(forward<AMX*>(amx), forward<const cell*>(params));
+        return PAWN_dispatch_<I - 1, F>::template PAWN_dispatch<R>(
+                forward<AMX*>(amx),
+                forward<const cell*>(params),
+                arg,
+                forward<Args>(args)...);
+    }
+};
+
+template<unsigned int F>
+struct PAWN_dispatch_<0, F> {
+    template<typename R, typename... Args>
+    inline static R PAWN_dispatch(AMX*&&, const cell*&&, Args&&... args) noexcept {
+        constexpr ScriptFunctionData const& F_ = ScriptFunctions::functions[F];
+        return reinterpret_cast<FunctionEllipsis<R>>(F_.func.addr)(forward<Args>(args)...);
+    }
+};
+
+template<unsigned int I>
+static typename enable_if<ScriptFunctions::functions[I].func.ret == 'v', cell>::type wrapper(AMX* amx, const cell* params) noexcept {
+    PAWN_dispatch_<ScriptFunctions::functions[I].func.numargs, I>::template PAWN_dispatch<void>(forward<AMX*>(amx), forward<const cell*>(params));
+    after_call();
+    return 1;
+}
+
+template<unsigned int I>
+static typename enable_if<ScriptFunctions::functions[I].func.ret == 'f', cell>::type wrapper(AMX* amx, const cell* params) noexcept {
+    double value = PAWN_dispatch_<ScriptFunctions::functions[I].func.numargs, I>::template PAWN_dispatch<double>(forward<AMX*>(amx), forward<const cell*>(params));
+    after_call();
+    return amx_ftoc(value);
+}
+
+template<unsigned int I>
+static typename enable_if<ScriptFunctions::functions[I].func.ret == 's', cell>::type wrapper(AMX* amx, const cell* params) noexcept {
+    const char* value = PAWN_dispatch_<ScriptFunctions::functions[I].func.numargs, I>::template PAWN_dispatch<const char*>(forward<AMX*>(amx), forward<const cell*>(params));
+    after_call();
+
+    if (value) {
+        cell* dest = amx_Address(amx, params[ScriptFunctions::functions[I].func.numargs + 1]);
+        amx_SetString(dest, value, 1, 0, strlen(value) + 1);
+        return 1;
+    }
+
+    return 0;
+}
+
+template<unsigned int I>
+static typename enable_if<ScriptFunctions::functions[I].func.ret != 'v' && ScriptFunctions::functions[I].func.ret != 'f' && ScriptFunctions::functions[I].func.ret != 's', cell>::type wrapper(AMX* amx, const cell* params) noexcept {
+    auto result = PAWN_dispatch_<ScriptFunctions::functions[I].func.numargs, I>::template PAWN_dispatch<typename CharType<ScriptFunctions::functions[I].func.ret>::type>(forward<AMX*>(amx), forward<const cell*>(params));
+    after_call(result);
+    return result;
+}
+
+template<unsigned int I> struct F_ { static constexpr AMX_NATIVE_INFO F{ScriptFunctions::functions[I].name, wrapper<I>}; };
+template<> struct F_<0> { static constexpr AMX_NATIVE_INFO F{"CreateTimer", LangPAWN::CreateTimer}; };
+template<> struct F_<1> { static constexpr AMX_NATIVE_INFO F{"CreateTimerEx", LangPAWN::CreateTimerEx}; };
+template<> struct F_<2> { static constexpr AMX_NATIVE_INFO F{"MakePublic", LangPAWN::MakePublic}; };
+template<> struct F_<3> { static constexpr AMX_NATIVE_INFO F{"CallPublic", LangPAWN::CallPublic}; };
+
+void LangPAWN::LoadProgram(const char *filename)
+{
+    int err = aux_LoadProgram(amx, filename, 0);
+    if (err != AMX_ERR_NONE)
+        throw runtime_error("PAWN script " + string(filename) + " error (" + to_string(err) + "): \"" + string(aux_StrError(err)) + "\"");
+
+    amx_CoreInit(amx);
+    amx_ConsoleInit(amx);
+    amx_FloatInit(amx);
+    amx_TimeInit(amx);
+    amx_StringInit(amx);
+    amx_FileInit(amx);
+
+    constexpr auto functions_n = sizeof(ScriptFunctions::functions) / sizeof(ScriptFunctions::functions[0]);
+
+    amx_Register(amx, functions(IndicesFor<functions_n>{}), functions_n); // TODO: throw if error
+
+}
+
+int LangPAWN::FreeProgram()
+{
+    int err = aux_FreeProgram(amx);
+    delete amx;
+    return err;
+}
+
+bool LangPAWN::IsCallbackPresent(const char *name)
+{
+    int idx;
+    return (amx_FindPublic(amx, name, &idx) == AMX_ERR_NONE);
+}
+
+boost::any LangPAWN::Call(const char *name, const char *argl, int buf, ...)
+{
+    va_list args;
+    va_start(args, buf);
+    cell ret = 0;
+    vector<pair<cell *, char *>> strings;
+
+    try
+    {
+        int idx = 0;
+        int err = 0;
+
+        err = amx_FindPublic(amx, name, &idx);
+
+        if (err != AMX_ERR_NONE)
+            throw runtime_error("PAWN runtime error (" + to_string(err) + "): \"" + string(aux_StrError(err)) + "\".");
+
+        unsigned int len = strlen(argl);
+        vector<cell> args_amx;
+
+        for (unsigned int i = 0; i < len; ++i)
+        {
+            switch (argl[i])
+            {
+                case 'i':
+                    args_amx.emplace_back(va_arg(args, unsigned
+                            int));
+                    break;
+
+                case 'q':
+                    args_amx.emplace_back(va_arg(args, signed
+                            int));
+                    break;
+
+                case 'l':
+                    args_amx.emplace_back(va_arg(args, unsigned
+                    long
+                            long));
+                    break;
+
+                case 'w':
+                    args_amx.emplace_back(va_arg(args, signed
+                    long
+                            long));
+                    break;
+
+                case 'f':
+                {
+                    double value = va_arg(args, double);
+                    args_amx.emplace_back(amx_ftoc(value));
+                    break;
+                }
+
+                case 'p':
+                    args_amx.emplace_back(reinterpret_cast<uintptr_t>(va_arg(args, void*)));
+                    break;
+
+                case 's':
+                    args_amx.emplace_back(reinterpret_cast<uintptr_t>(va_arg(args, char*)));
+                    break;
+
+                default:
+                    throw runtime_error("PAWN call: Unknown argument identifier " + argl[i]);
+            }
+        }
+
+        for (unsigned int i = len; i; --i)
+        {
+            switch (argl[i - 1])
+            {
+                case 's':
+                {
+                    char *string = reinterpret_cast<char *>(static_cast<unsigned int>(args_amx[i - 1]));
+                    cell *store;
+                    amx_PushString(amx, &store, string, 1, 0);
+                    strings.emplace_back(store, string);
+                    break;
+                }
+
+                default:
+                    amx_Push(amx, args_amx[i - 1]);
+                    break;
+            }
+        }
+
+        err = amx_Exec(amx, &ret, idx);
+
+        if (err != AMX_ERR_NONE)
+            throw runtime_error("PAWN runtime error (" + to_string(err) + "): \"" + string(aux_StrError(err)) + "\".");
+
+        if (buf != 0)
+            for (const auto &str : strings)
+                amx_GetString(str.second, str.first, 0, strlen(str.second) + 1);
+
+        if (!strings.empty())
+            amx_Release(amx, strings[0].first);
+    }
+
+    catch (...)
+    {
+        va_end(args);
+
+        if (!strings.empty())
+            amx_Release(amx, strings[0].first);
+
+        throw;
+    }
+
+    return boost::any(ret);
+}
+
+boost::any LangPAWN::Call(const char *name, const char *argl, const std::vector<boost::any> &args)
+{
+    cell ret = 0;
+    cell *str = nullptr;
+
+    try
+    {
+        int idx = 0;
+        int err = 0;
+
+        err = amx_FindPublic(amx, name, &idx);
+
+        if (err != AMX_ERR_NONE)
+            throw runtime_error("PAWN runtime error (" + to_string(err) + "): \"" + string(aux_StrError(err)) + "\".");
+
+        for (intptr_t i = strlen(argl) - 1; i >= 0; i--)
+        {
+            switch (argl[i])
+            {
+                case 'i':
+                {
+                    cell value = (cell) boost::any_cast<unsigned int>(args.at(i));
+                    amx_Push(amx, value);
+                    break;
+                }
+
+                case 'q':
+                {
+                    cell value = (cell) boost::any_cast<signed int>(args.at(i));
+                    amx_Push(amx, value);
+                    break;
+                }
+
+                case 'l':
+                {
+                    cell value = (cell) boost::any_cast<unsigned long long>(args.at(i));
+                    amx_Push(amx, value);
+                    break;
+                }
+
+                case 'w':
+                {
+                    cell value = (cell) boost::any_cast<signed long long>(args.at(i));
+                    amx_Push(amx, value);
+                    break;
+                }
+
+                case 'f':
+                {
+                    double value = boost::any_cast<double>(args.at(i));
+                    amx_Push(amx, amx_ftoc(value));
+                    break;
+                }
+
+                case 'p':
+                {
+                    cell value = (cell) boost::any_cast<void *>(args.at(i));
+                    amx_Push(amx, value);
+                    break;
+                }
+
+                case 's':
+                {
+                    string string_ = boost::any_cast<string>(args.at(i));
+                    cell *store;
+                    amx_PushString(amx, &store, string_.c_str(), 1, 0);
+
+                    if (!str)
+                        str = store;
+
+                    break;
+                }
+
+                default:
+                    throw runtime_error("PAWN call: Unknown argument identifier " + argl[i]);
+            }
+        }
+
+        err = amx_Exec(amx, &ret, idx);
+
+        if (err != AMX_ERR_NONE)
+            throw runtime_error("PAWN runtime error (" + to_string(err) + "): \"" + string(aux_StrError(err)) + "\".");
+
+        if (str)
+            amx_Release(amx, str);
+    }
+
+    catch (...)
+    {
+        if (str)
+            amx_Release(amx, str);
+
+        throw;
+    }
+
+    return ret;
+}
+
+template<size_t... Indices>
+inline AMX_NATIVE_INFO *LangPAWN::functions(indices<Indices...>)
+{
+
+    static AMX_NATIVE_INFO functions_[sizeof...(Indices)]{
+            F_<Indices>::F...
+    };
+
+    static_assert(
+            sizeof(functions_) / sizeof(functions_[0]) == sizeof(ScriptFunctions::functions) / sizeof(ScriptFunctions::functions[0]),
+            "Not all functions have been mapped to PAWN");
+
+    return functions_;
+}
+
+
+lib_t LangPAWN::GetInterface()
+{
+    return reinterpret_cast<lib_t>(amx);
+}
+
+LangPAWN::LangPAWN()
+{
+    //throw std::runtime_error("Pawn is no longer supported, use Terra/Lua!");
+    amx = new AMX();
+}
+
+
+LangPAWN::LangPAWN(AMX *amx)
+{
+    this->amx = amx;
+}
+
+
+LangPAWN::~LangPAWN()
+{
+
+}
diff --git a/apps/openmw-mp/Script/LangPawn/LangPAWN.hpp b/apps/openmw-mp/Script/LangPawn/LangPAWN.hpp
new file mode 100644
index 000000000..396970ad1
--- /dev/null
+++ b/apps/openmw-mp/Script/LangPawn/LangPAWN.hpp
@@ -0,0 +1,46 @@
+//
+// Created by koncord on 08.05.16.
+//
+
+#ifndef PLUGINSYSTEM3_LANGPAWN_HPP
+#define PLUGINSYSTEM3_LANGPAWN_HPP
+
+#include "Language.hpp"
+#include <amx.h>
+
+class LangPAWN: public Language
+{
+private:
+    template<std::size_t... Is>
+    struct indices {};
+    template<std::size_t N, std::size_t... Is>
+    struct build_indices : build_indices<N-1, N-1, Is...> {};
+    template<std::size_t... Is>
+    struct build_indices<0, Is...> : indices<Is...> {};
+    template<std::size_t N>
+    using IndicesFor = build_indices<N>;
+
+public:
+    virtual lib_t GetInterface() override;
+    template<std::size_t... Indices>
+    static AMX_NATIVE_INFO* functions(indices<Indices...>);
+
+    AMX *amx;
+public:
+    LangPAWN();
+    LangPAWN(AMX *amx);
+    ~LangPAWN();
+    static cell MakePublic(AMX *amx, const cell *params) noexcept;
+    static cell CallPublic(AMX *amx, const cell *params) noexcept;
+    static cell CreateTimer(AMX *amx, const cell *params) noexcept;
+    static cell CreateTimerEx(AMX *amx, const cell *params) noexcept;
+
+    virtual void LoadProgram(const char *filename) override;
+    virtual int FreeProgram() override;
+    virtual bool IsCallbackPresent(const char *name) override;
+    virtual boost::any Call(const char *name, const char *argl, int buf, ...) override;
+    virtual boost::any Call(const char *name, const char *argl, const std::vector<boost::any> &args) override;
+};
+
+
+#endif //PLUGINSYSTEM3_LANGPAWN_HPP
diff --git a/apps/openmw-mp/Script/LangPawn/PawnFunc.cpp b/apps/openmw-mp/Script/LangPawn/PawnFunc.cpp
new file mode 100644
index 000000000..890bae9ad
--- /dev/null
+++ b/apps/openmw-mp/Script/LangPawn/PawnFunc.cpp
@@ -0,0 +1,154 @@
+//
+// Created by koncord on 09.05.16.
+//
+
+#include <API/PublicFnAPI.hpp>
+#include "LangPAWN.hpp"
+#include "API/TimerAPI.hpp"
+
+using namespace std;
+
+cell LangPAWN::MakePublic(AMX *amx, const cell *params) noexcept
+{
+    int len;
+    cell* source;
+
+    source = amx_Address(amx, params[1]);
+    amx_StrLen(source, &len);
+    vector<char> real;
+    real.reserve(len + 1);
+
+    amx_GetString(&real[0], source, 0, UNLIMITED);
+
+    source = amx_Address(amx, params[2]);
+    amx_StrLen(source, &len);
+    vector<char> name;
+    name.reserve(len + 1);
+
+    amx_GetString(&name[0], source, 0, UNLIMITED);
+
+    cell *ret_addr = amx_Address(amx, params[3]);
+    char ret_type = static_cast<char>(*reinterpret_cast<cell*>(&ret_addr));
+
+    source = amx_Address(amx, params[4]);
+    amx_StrLen(source, &len);
+    vector<char> def;
+    def.reserve(len + 1);
+
+    amx_GetString(&def[0], source, 0, UNLIMITED);
+
+
+
+    Public::MakePublic(&real[0], amx, &name[0], ret_type, &def[0]);
+
+    return 1;
+}
+
+cell LangPAWN::CallPublic(AMX *amx, const cell *params) noexcept
+{
+    int len;
+    cell* source;
+
+    source = amx_Address(amx, params[1]);
+    amx_StrLen(source, &len);
+    vector<char> name;
+    name.reserve(len + 1);
+
+    amx_GetString(&name[0], source, 0, UNLIMITED);
+
+    string def;
+
+    try
+    {
+        def = Public::GetDefinition(&name[0]);
+    }
+    catch (...) { return 0; }
+
+    vector<boost::any> args;
+    unsigned int count = (params[0] / sizeof(cell)) - 1;
+
+    if (count != def.length())
+        throw runtime_error("Script call: Number of arguments does not match definition");
+
+    for (unsigned int i = 0; i < count; ++i)
+    {
+        cell* data = amx_Address(amx, params[i + 2]);
+
+        switch (def[i])
+        {
+            case 'i':
+            {
+                args.emplace_back((unsigned int) *data);
+                break;
+            }
+
+            case 'q':
+            {
+                args.emplace_back((signed int) *data);
+                break;
+            }
+
+            case 'l':
+            {
+                args.emplace_back((unsigned long long) *data);
+                break;
+            }
+
+            case 'w':
+            {
+                args.emplace_back((signed long long) *data);
+                break;
+            }
+
+            case 'f':
+            {
+                args.emplace_back((double) amx_ctof(*data));
+                break;
+            }
+
+            case 'p':
+            {
+                args.emplace_back((void*) data);
+                break;
+            }
+
+            case 's':
+            {
+                amx_StrLen(data, &len);
+                vector<char> str;
+                str.reserve(len + 1);
+                amx_GetString(&str[0], data, 0, UNLIMITED);
+                args.emplace_back(string(&str[0]).c_str());
+                break;
+            }
+
+            default:
+                throw runtime_error("PAWN call: Unknown argument identifier " + def[i]);
+        }
+    }
+
+    boost::any result = Public::Call(&name[0], args);
+    if (result.empty())
+        return 0;
+
+    cell ret = 0;
+
+    if (result.type().hash_code() == typeid(signed int).hash_code())
+        ret = boost::any_cast<signed int>(result);
+    else if (result.type().hash_code() == typeid(unsigned int).hash_code())
+        ret = boost::any_cast<unsigned int>(result);
+    else if (result.type().hash_code() == typeid(double).hash_code())
+        ret = amx_ftoc(result);
+
+    return ret;
+}
+
+cell LangPAWN::CreateTimer(AMX *amx, const cell *params) noexcept
+{
+
+}
+
+cell LangPAWN::CreateTimerEx(AMX *amx, const cell *params) noexcept
+{
+
+}
\ No newline at end of file
diff --git a/apps/openmw-mp/Script/Language.hpp b/apps/openmw-mp/Script/Language.hpp
new file mode 100644
index 000000000..1bc90b26e
--- /dev/null
+++ b/apps/openmw-mp/Script/Language.hpp
@@ -0,0 +1,28 @@
+//
+// Created by koncord on 19.03.16.
+//
+
+#ifndef PLUGINSYSTEM3_LANGUAGE_HPP
+#define PLUGINSYSTEM3_LANGUAGE_HPP
+
+#include "Types.hpp"
+
+#include <boost/any.hpp>
+#include <vector>
+
+class Language
+{
+public:
+    virtual ~Language(){}
+    virtual void LoadProgram(const char* filename) = 0;
+    virtual int FreeProgram() = 0;
+    virtual bool IsCallbackPresent(const char* name) = 0;
+    virtual boost::any Call(const char* name, const char* argl, int buf, ...) = 0;
+    virtual boost::any Call(const char* name, const char* argl, const std::vector<boost::any>& args) = 0;
+
+    virtual lib_t GetInterface() = 0;
+
+};
+
+
+#endif //PLUGINSYSTEM3_LANGUAGE_HPP
diff --git a/apps/openmw-mp/Script/Platform.hpp b/apps/openmw-mp/Script/Platform.hpp
new file mode 100644
index 000000000..a56447986
--- /dev/null
+++ b/apps/openmw-mp/Script/Platform.hpp
@@ -0,0 +1,20 @@
+//
+// Created by koncord on 23.01.16.
+//
+
+#ifndef PLATFORM_HPP
+#define PLATFORM_HPP
+
+#if _MSC_VER
+#ifdef _M_X86
+#define ARCH_X86
+#endif
+#endif
+
+#if __GNUC__
+#ifdef __i386__
+#define ARCH_X86
+#endif
+#endif
+
+#endif //PLATFORM_HPP
diff --git a/apps/openmw-mp/Script/Script.cpp b/apps/openmw-mp/Script/Script.cpp
new file mode 100644
index 000000000..e17588022
--- /dev/null
+++ b/apps/openmw-mp/Script/Script.cpp
@@ -0,0 +1,109 @@
+//
+// Created by koncord on 19.03.16.
+//
+
+#include "Script.hpp"
+#include "LangNative/LangNative.hpp"
+
+#if defined (ENABLE_PAWN)
+#include "LangPawn/LangPAWN.hpp"
+#endif
+#if defined (ENABLE_LUA)
+#include "LangLua/LangLua.hpp"
+#endif
+
+using namespace std;
+
+Script::ScriptList Script::scripts;
+
+Script::Script(const char *path)
+{
+    FILE *file = fopen(path, "rb");
+
+    if (!file)
+        throw runtime_error("Script not found: " + string(path));
+
+    fclose(file);
+
+#ifdef _WIN32
+    if (strstr(path, ".dll"))
+#else
+    if (strstr(path, ".so"))
+#endif
+    {
+        script_type = SCRIPT_CPP;
+        lang = new LangNative();
+    }
+#if defined (ENABLE_PAWN)
+    else if (strstr(path, ".amx"))
+    {
+        lang = new LangPAWN();
+        script_type = SCRIPT_PAWN;
+    }
+#endif
+#if defined (ENABLE_LUA)
+    else if (strstr(path, ".lua") || strstr(path, ".t"))
+    {
+        lang = new LangLua();
+        script_type = SCRIPT_LUA;
+    }
+#endif
+    else
+        throw runtime_error("Script type not recognized: " + string(path));
+
+    try
+    {
+        lang->LoadProgram(path);
+    }
+    catch (...)
+    {
+        lang->FreeProgram();
+        throw;
+    }
+
+}
+
+
+Script::~Script()
+{
+    lang->FreeProgram();
+
+    delete lang;
+}
+
+void Script::LoadScripts(char *scripts, const char *base)
+{
+    char *token = strtok(scripts, ",");
+
+    try
+    {
+        while (token)
+        {
+            char path[4096];
+            snprintf(path, sizeof(path), Utils::convertPath("%s/%s/%s").c_str(), base, "scripts", token);
+            Script::scripts.emplace_back(new Script(path));
+            token = strtok(nullptr, ",");
+        }
+    }
+    catch (...)
+    {
+        UnloadScripts();
+        throw;
+    }
+}
+
+void Script::UnloadScripts()
+{
+    //Public::DeleteAll();
+    scripts.clear();
+#if defined (ENABLE_TERRA)
+    terra_llvmshutdown();
+#endif
+}
+
+void Script::LoadScript(const char *script, const char *base)
+{
+    char path[4096];
+    snprintf(path, sizeof(path), Utils::convertPath("%s/%s/%s").c_str(), base, "scripts", script);
+    Script::scripts.emplace_back(new Script(path));
+}
diff --git a/apps/openmw-mp/Script/Script.hpp b/apps/openmw-mp/Script/Script.hpp
new file mode 100644
index 000000000..282f3a606
--- /dev/null
+++ b/apps/openmw-mp/Script/Script.hpp
@@ -0,0 +1,155 @@
+//
+// Created by koncord on 19.03.16.
+//
+
+#ifndef PLUGINSYSTEM3_SCRIPT_HPP
+#define PLUGINSYSTEM3_SCRIPT_HPP
+#include "Types.hpp"
+#include "SystemInterface.hpp"
+#include "ScriptFunction.hpp"
+#include "ScriptFunctions.hpp"
+#include "Language.hpp"
+
+#include <boost/any.hpp>
+#include <Utils.hpp>
+#include <unordered_map>
+#include <memory>
+
+class Script : private ScriptFunctions
+{
+    // http://imgur.com/hU0N4EH
+private:
+
+    Language *lang;
+
+    enum
+    {
+        SCRIPT_CPP,
+        SCRIPT_PAWN,
+        SCRIPT_LUA
+    };
+
+    template<typename R>
+    R GetScript(const char *name)
+    {
+        if (script_type == SCRIPT_CPP)
+        {
+            return SystemInterface<R>(lang->GetInterface(), name).result;
+        }
+        else
+        {
+            return reinterpret_cast<R>(lang->IsCallbackPresent(name));
+        }
+    }
+
+    int script_type;
+    std::unordered_map<unsigned int, FunctionEllipsis<void>> callbacks_;
+
+    typedef std::vector<std::unique_ptr<Script>> ScriptList;
+    static ScriptList scripts;
+
+    Script(const char *path);
+
+    Script(const Script&) = delete;
+    Script& operator=(const Script&) = delete;
+
+public:
+    ~Script();
+
+    static void LoadScript(const char *script, const char* base);
+    static void LoadScripts(char* scripts, const char* base);
+    static void UnloadScripts();
+
+    static constexpr ScriptCallbackData const& CallBackData(const unsigned int I, const unsigned int N = 0) {
+        return callbacks[N].index == I ? callbacks[N] : CallBackData(I, N + 1);
+    }
+
+    template<unsigned int I>
+    using CallBackReturn = typename CharType<CallBackData(I).callback.ret>::type;
+
+    template<size_t N>
+    static constexpr unsigned int CallbackIdentity(const char(&str)[N])
+    {
+        return Utils::hash(str);
+    }
+
+
+    template<unsigned int I, bool B = false, typename... Args>
+    static unsigned int Call(CallBackReturn<I>& result, Args&&... args) {
+        constexpr ScriptCallbackData const& data = CallBackData(I);
+        static_assert(data.callback.matches(TypeString<typename std::remove_reference<Args>::type...>::value), "Wrong number or types of arguments");
+
+        unsigned int count = 0;
+
+        for (auto& script : scripts)
+        {
+            if (!script->callbacks_.count(I))
+                script->callbacks_.emplace(I, script->GetScript<FunctionEllipsis<void>>(data.name));
+
+            auto callback = script->callbacks_[I];
+
+            if (!callback)
+                continue;
+
+
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Called function \"%s\"", data.name);
+
+            if (script->script_type == SCRIPT_CPP)
+                result = reinterpret_cast<FunctionEllipsis<CallBackReturn<I>>>(callback)(std::forward<Args>(args)...);
+#if defined (ENABLE_PAWN)
+            else if (script->script_type == SCRIPT_PAWN)
+            {
+                boost::any any = script->lang->Call(data.name, data.callback.types, B, std::forward<Args>(args)...);
+                result = reinterpret_cast<CallBackReturn<I>> ((int)boost::any_cast<int64_t>(any)); // TODO: WTF?! int?!
+            }
+#endif
+#if defined (ENABLE_LUA)
+            else if (script->script_type == SCRIPT_LUA)
+            {
+                boost::any any = script->lang->Call(data.name, data.callback.types, B, std::forward<Args>(args)...);
+                result = static_cast<CallBackReturn<I>>(boost::any_cast<luabridge::LuaRef>(any).cast<CallBackReturn<I>>());
+            }
+#endif
+            ++count;
+        }
+
+        return count;
+    }
+
+    template<unsigned int I, bool B = false, typename... Args>
+    static unsigned int Call(Args&&... args) {
+        constexpr ScriptCallbackData const& data = CallBackData(I);
+        static_assert(data.callback.matches(TypeString<typename std::remove_reference<Args>::type...>::value), "Wrong number or types of arguments");
+
+        unsigned int count = 0;
+
+        for (auto& script : scripts)
+        {
+            if (!script->callbacks_.count(I))
+                script->callbacks_.emplace(I, script->GetScript<FunctionEllipsis<void>>(data.name));
+
+            auto callback = script->callbacks_[I];
+
+            if (!callback)
+                continue;
+
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Called function \"%s\"", data.name);
+
+            if (script->script_type == SCRIPT_CPP)
+                reinterpret_cast<FunctionEllipsis<CallBackReturn<I>>>(callback)(std::forward<Args>(args)...);
+#if defined (ENABLE_PAWN)
+            else if (script->script_type == SCRIPT_PAWN)
+                script->lang->Call(data.name, data.callback.types, B, std::forward<Args>(args)...);
+#endif
+#if defined (ENABLE_LUA)
+            else if (script->script_type == SCRIPT_LUA)
+                script->lang->Call(data.name, data.callback.types, B, std::forward<Args>(args)...);
+#endif
+            ++count;
+        }
+
+        return count;
+    }
+};
+
+#endif //PLUGINSYSTEM3_SCRIPT_HPP
diff --git a/apps/openmw-mp/Script/ScriptFunction.cpp b/apps/openmw-mp/Script/ScriptFunction.cpp
new file mode 100644
index 000000000..f0a8e44d1
--- /dev/null
+++ b/apps/openmw-mp/Script/ScriptFunction.cpp
@@ -0,0 +1,224 @@
+//
+// Created by koncord on 23.01.16.
+//
+
+#include<iostream>
+#include <stdexcept>
+#include "ScriptFunction.hpp"
+
+#if defined (ENABLE_LUA)
+#include "LangLua/LangLua.hpp"
+#endif
+
+#if defined (ENABLE_PAWN)
+#include "LangPawn/LangPAWN.hpp"
+#endif
+
+using namespace std;
+
+ScriptFunction::ScriptFunction(ScriptFunc fCpp,char ret_type, const string &def) : fCpp(fCpp), ret_type(ret_type), def(def), script_type(SCRIPT_CPP)
+{
+
+}
+#if defined (ENABLE_LUA)
+ScriptFunction::ScriptFunction(const ScriptFuncLua &fLua, lua_State *lua, char ret_type, const std::string &def) :fLua({lua, fLua}), ret_type(ret_type), def(def), script_type(SCRIPT_LUA)
+{
+
+}
+#endif
+
+#if defined (ENABLE_PAWN)
+ScriptFunction::ScriptFunction(const ScriptFuncPAWN &fPawn, AMX *amx, char ret_type, const string &def) : fPawn({amx, fPawn}),
+                                                                                           def(def), ret_type(ret_type), script_type(SCRIPT_PAWN)
+{
+
+}
+#endif
+
+
+ScriptFunction::~ScriptFunction()
+{
+#if defined (ENABLE_PAWN)
+    if (script_type == SCRIPT_PAWN)
+        fPawn.name.~ScriptFuncPAWN();
+#if defined (ENABLE_LUA)
+    else
+#endif
+#endif
+#if defined (ENABLE_LUA)
+    if (script_type == SCRIPT_LUA)
+        fLua.name.~ScriptFuncLua();
+#endif
+}
+
+boost::any ScriptFunction::Call(const vector<boost::any> &args)
+{
+    boost::any result;
+
+    if (def.length() != args.size())
+        throw runtime_error("Script call: Number of arguments does not match definition");
+#if defined (ENABLE_PAWN)
+    if (script_type == SCRIPT_PAWN)
+    {
+        LangPAWN langPawn(fPawn.amx);
+        boost::any any = langPawn.Call(fPawn.name.c_str(), def.c_str(), args);
+        result = boost::any();
+
+        cell ret = boost::any_cast<cell>(any);
+
+        switch (ret_type)
+        {
+            case 'i':
+                result = static_cast<unsigned int>(ret);
+                break;
+            case 'q':
+                result = static_cast<signed int>(ret);
+                break;
+            case 's':
+                throw runtime_error("Pawn call: the Pawn does not supported strings in public functions");
+            case 'f':
+
+                result =  static_cast<double>(amx_ctof(ret));
+                break;
+            case 'v':
+                result = boost::any();
+                break;
+            default:
+                throw runtime_error("Pawn call: Unknown return type" + ret_type);
+        }
+    }
+#endif
+#if defined (ENABLE_LUA)
+    else if (script_type == SCRIPT_LUA)
+    {
+        LangLua langLua(fLua.lua);
+        boost::any any = langLua.Call(fLua.name.c_str(), def.c_str(), args);
+
+        switch (ret_type)
+        {
+            case 'i':
+                result = boost::any_cast<luabridge::LuaRef>(any).cast<unsigned int>();
+                break;
+            case 'q':
+                result = boost::any_cast<luabridge::LuaRef>(any).cast<signed int>();
+                break;
+            case 'f':
+                result = boost::any_cast<luabridge::LuaRef>(any).cast<double>();
+                break;
+            case 's':
+                result = boost::any_cast<luabridge::LuaRef>(any).cast<const char*>();
+                break;
+            case 'v':
+                result = boost::any();
+                break;
+            default:
+                throw runtime_error("Lua call: Unknown return type" + ret_type);
+        }
+    }
+#endif
+    else
+    {
+        throw runtime_error("Native Call: native calls does not supported yet");
+#if 0
+#ifdef ARCH_X86
+        // cdecl convention
+        string::iterator it;
+        vector<boost::any>::const_iterator it2;
+        vector<unsigned int> data;
+
+        for (it = def.begin(), it2 = args.begin(); it != def.end(); ++it, ++it2)
+        {
+            switch (*it)
+            {
+                case 'i':
+                {
+                    unsigned int value = boost::any_cast<unsigned int>(*it2);
+                    data.push_back(value);
+                    break;
+                }
+
+                case 'q':
+                {
+                    unsigned int value = boost::any_cast<signed int>(*it2);
+                    data.push_back(value);
+                    break;
+                }
+
+                case 'l':
+                {
+                    unsigned long long value = boost::any_cast<unsigned long long>(*it2);
+                    data.push_back(*reinterpret_cast<unsigned int *>(&value));
+                    data.push_back(*reinterpret_cast<unsigned int *>((unsigned) &value + 4));
+                    break;
+                }
+
+                case 'w':
+                {
+                    signed long long value = boost::any_cast<signed long long>(*it2);
+                    data.push_back(*reinterpret_cast<unsigned int *>(&value));
+                    data.push_back(*reinterpret_cast<unsigned int *>((unsigned) &value + 4));
+                    break;
+                }
+
+                case 'f':
+                {
+                    double value = boost::any_cast<double>(*it2);
+                    data.push_back(*reinterpret_cast<unsigned int *>(&value));
+                    data.push_back(*reinterpret_cast<unsigned int *>((unsigned) &value + 4));
+                    break;
+                }
+
+                case 'p':
+                {
+                    void *value = boost::any_cast<void *>(*it2);
+                    data.push_back(reinterpret_cast<unsigned int>(value));
+                    break;
+                }
+
+                case 's':
+                {
+                    const string *value = boost::any_cast<string>(&*it2);
+                    data.push_back(reinterpret_cast<unsigned int>(value->c_str()));
+                    break;
+                }
+
+                default:
+                    throw runtime_error("C++ call: Unknown argument identifier " + *it);
+            }
+        }
+
+        unsigned int result_low;
+        unsigned int result_high;
+        unsigned int *source = &data[0];
+        unsigned int size = data.size() * 4;
+
+        asm(
+            "MOV EDI,ESP\n"
+            "SUB EDI,%3\n"  // allocate memory in stack.
+            "MOV ESI,%4\n"  // move ptr of source to ESI.
+            "MOV ECX,%3\n"  // length of data.
+            "PUSH DS\n"     // move DS
+            "POP ES\n"      //         to ES.
+            "CLD\n"         // clear direction flag.
+            "REP MOVSB\n"   // Move bytes at address DS:ESI to address ES:EDI (move to stack).
+            "MOV ESI,ESP\n" // stack pointer.
+            "SUB ESP,%3\n"
+            "CALL %2\n"
+            "MOV ESP,ESI\n"
+            "MOV %0,EAX\n"  // move low result from eax
+            "MOV %1,EDX\n"  // move high result from edx
+        : "=m"(result_low), "=m"(result_high)
+        : "m"(fCpp) //2, "m"(size) //3, "m"(source) //4
+        : "eax", "edx", "ecx", "esi", "edi", "cc"
+        );
+
+        *reinterpret_cast<unsigned int *>(&result) = result_low;
+        *reinterpret_cast<unsigned int *>(((unsigned) &result) + 4) = result_high;
+#else
+        throw runtime_error("x64 Not supported yet (builtin timers and [Call/Make]Public");
+#endif
+#endif
+    }
+
+    return result;
+}
diff --git a/apps/openmw-mp/Script/ScriptFunction.hpp b/apps/openmw-mp/Script/ScriptFunction.hpp
new file mode 100644
index 000000000..1884ab8dd
--- /dev/null
+++ b/apps/openmw-mp/Script/ScriptFunction.hpp
@@ -0,0 +1,72 @@
+//
+// Created by koncord on 23.01.16.
+//
+
+#ifndef SCRIPTFUNCTION_HPP
+#define SCRIPTFUNCTION_HPP
+
+#include <boost/any.hpp>
+#include <string>
+#include <vector>
+#if defined (ENABLE_LUA)
+#include "LangLua/LangLua.hpp"
+#endif
+
+#if defined (ENABLE_PAWN)
+#include <amx.h>
+#endif
+
+typedef unsigned long long(*ScriptFunc)();
+#if defined (ENABLE_PAWN)
+typedef std::string ScriptFuncPAWN;
+#endif
+#if defined (ENABLE_LUA)
+typedef std::string ScriptFuncLua;
+#endif
+
+class ScriptFunction
+{
+protected:
+    union
+    {
+        ScriptFunc fCpp;
+#if defined (ENABLE_PAWN)
+        struct
+        {
+            AMX *amx;
+            ScriptFuncPAWN name;
+        } fPawn;
+#endif
+#if defined (ENABLE_LUA)
+        struct
+        {
+            lua_State *lua;
+            ScriptFuncLua name;
+        } fLua;
+#endif
+    };
+
+protected:
+    char ret_type;
+    std::string def;
+    int script_type;
+    enum
+    {
+        SCRIPT_CPP,
+        SCRIPT_PAWN,
+        SCRIPT_LUA
+    };
+
+    ScriptFunction(ScriptFunc fCpp, char ret_type, const std::string &def);
+#if defined (ENABLE_LUA)
+    ScriptFunction(const ScriptFuncLua &fPawn, lua_State *lua, char ret_type, const std::string &def);
+#endif
+#if defined (ENABLE_PAWN)
+    ScriptFunction(const ScriptFuncPAWN &fPawn, AMX *amx, char ret_type, const std::string &def);
+#endif
+    virtual ~ScriptFunction();
+
+    boost::any Call(const std::vector<boost::any> &args);
+};
+
+#endif //SCRIPTFUNCTION_HPP
diff --git a/apps/openmw-mp/Script/ScriptFunctions.cpp b/apps/openmw-mp/Script/ScriptFunctions.cpp
new file mode 100644
index 000000000..a4032238c
--- /dev/null
+++ b/apps/openmw-mp/Script/ScriptFunctions.cpp
@@ -0,0 +1,146 @@
+//
+// Created by koncord on 24.01.16.
+//
+
+#include "ScriptFunctions.hpp"
+#include "API/PublicFnAPI.hpp"
+#include <cstdarg>
+#include <iostream>
+#include <apps/openmw-mp/Player.hpp>
+#include <apps/openmw-mp/Networking.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <components/openmw-mp/Version.hpp>
+#include "MasterClient.hpp"
+
+template<typename... Types>
+constexpr char TypeString<Types...>::value[];
+constexpr ScriptFunctionData ScriptFunctions::functions[];
+constexpr ScriptCallbackData ScriptFunctions::callbacks[];
+
+using namespace std;
+
+void ScriptFunctions::GetArguments(std::vector<boost::any> &params, va_list args, const std::string &def)
+{
+    params.reserve(def.length());
+
+    try
+    {
+        for (char c : def)
+        {
+            switch (c)
+            {
+                case 'i':
+                    params.emplace_back(va_arg(args, unsigned int));
+                    break;
+
+                case 'q':
+                    params.emplace_back(va_arg(args, signed int));
+                    break;
+
+                case 'l':
+                    params.emplace_back(va_arg(args, unsigned long long));
+                    break;
+
+                case 'w':
+                    params.emplace_back(va_arg(args, signed long long));
+                    break;
+
+                case 'f':
+                    params.emplace_back(va_arg(args, double));
+                    break;
+
+                case 'p':
+                    params.emplace_back(va_arg(args, void*));
+                    break;
+
+                case 's':
+                    params.emplace_back(va_arg(args, const char*));
+                    break;
+
+                case 'b':
+                    params.emplace_back(va_arg(args, int));
+                    break;
+
+                default:
+                    throw runtime_error("C++ call: Unknown argument identifier " + c);
+            }
+        }
+    }
+
+    catch (...)
+    {
+        va_end(args);
+        throw;
+    }
+    va_end(args);
+}
+
+void ScriptFunctions::MakePublic(ScriptFunc _public, const char *name, char ret_type, const char *def) noexcept
+{
+    Public::MakePublic(_public, name, ret_type, def);
+}
+
+boost::any ScriptFunctions::CallPublic(const char *name, ...) noexcept
+{
+    vector<boost::any> params;
+
+    try
+    {
+        string def = Public::GetDefinition(name);
+
+        va_list args;
+        va_start(args, name);
+        GetArguments(params, args, def);
+        va_end(args);
+
+        return Public::Call(name, params);
+    }
+    catch (...) {}
+
+    return 0;
+}
+
+void ScriptFunctions::StopServer(int code) noexcept
+{
+    mwmp::Networking::getPtr()->stopServer(code);
+}
+
+void ScriptFunctions::Kick(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,);
+    mwmp::Networking::getPtr()->kickPlayer(player->guid);
+}
+
+const char *ScriptFunctions::GetServerVersion() noexcept
+{
+    return TES3MP_VERSION;
+}
+
+const char *ScriptFunctions::GetProtocolVersion() noexcept
+{
+    static string version = to_string(TES3MP_PROTO_VERSION);
+    return version.c_str();
+}
+
+int ScriptFunctions::GetAvgPing(unsigned short pid) noexcept
+{
+    Player *player;
+    GET_PLAYER(pid, player,-1);
+    return mwmp::Networking::get().getAvgPing(player->guid);
+}
+
+void ScriptFunctions::SetModname(const char *name) noexcept
+{
+    mwmp::Networking::getPtr()->getMasterClient()->SetModname(name);
+}
+
+void ScriptFunctions::SetHostname(const char *name) noexcept
+{
+    mwmp::Networking::getPtr()->getMasterClient()->SetHostname(name);
+}
+
+void ScriptFunctions::SetServerPassword(const char *passw) noexcept
+{
+    mwmp::Networking::getPtr()->setServerPassword(passw);
+}
diff --git a/apps/openmw-mp/Script/ScriptFunctions.hpp b/apps/openmw-mp/Script/ScriptFunctions.hpp
new file mode 100644
index 000000000..9d8817597
--- /dev/null
+++ b/apps/openmw-mp/Script/ScriptFunctions.hpp
@@ -0,0 +1,135 @@
+//
+// Created by koncord on 24.01.16.
+//
+
+#ifndef SCRIPTFUNCTIONS_HPP
+#define SCRIPTFUNCTIONS_HPP
+
+#include <Script/Functions/CharClass.hpp>
+#include <Script/Functions/Positions.hpp>
+#include <Script/Functions/Cells.hpp>
+#include <Script/Functions/GUI.hpp>
+#include <Script/Functions/Stats.hpp>
+#include <Script/Functions/Items.hpp>
+#include <Script/Functions/Quests.hpp>
+#include <Script/Functions/Spells.hpp>
+#include <Script/Functions/World.hpp>
+#include <RakNetTypes.h>
+//#include <amx/amx.h>
+#include <tuple>
+#include <apps/openmw-mp/Player.hpp>
+#include "ScriptFunction.hpp"
+#include "Types.hpp"
+
+#define GET_PLAYER(pid, pl, retvalue) \
+     pl = Players::getPlayer(pid); \
+     if (player == 0) {\
+        fprintf(stderr, "%s: Player with pid \'%d\' not found\n", __PRETTY_FUNCTION__, pid);\
+        /*ScriptFunctions::StopServer(1);*/ \
+        return retvalue;\
+}
+
+
+class ScriptFunctions
+{
+public:
+
+    static void GetArguments(std::vector<boost::any> &params, va_list args, const std::string &def);
+
+    static void StopServer(int code) noexcept;
+
+    static void MakePublic(ScriptFunc _public, const char *name, char ret_type, const char *def) noexcept;
+    static boost::any CallPublic(const char *name, ...) noexcept;
+
+    static void SendMessage(unsigned short pid, const char *message, bool broadcast) noexcept;
+    static void CleanChat(unsigned short pid);
+    static void CleanChat();
+
+    /**
+     * \brief Create timer
+     * \param callback
+     * \param msec
+     * \return return timer id
+     */
+    static int CreateTimer(ScriptFunc callback, int msec) noexcept;
+    static int CreateTimerEx(ScriptFunc callback, int msec, const char *types, ...) noexcept;
+
+    static void StartTimer(int timerId) noexcept;
+    static void StopTimer(int timerId) noexcept;
+    static void RestartTimer(int timerId, int msec) noexcept;
+    static void FreeTimer(int timerId) noexcept;
+    static bool IsTimerElapsed(int timerId) noexcept;
+
+    static void Kick(unsigned short pid) noexcept;
+    static const char *GetServerVersion() noexcept;
+    static const char *GetProtocolVersion() noexcept;
+    static int GetAvgPing(unsigned short pid) noexcept;
+    static void SetModname(const char* name) noexcept;
+    static void SetHostname(const char* name) noexcept;
+    static void SetServerPassword(const char *passw) noexcept;
+
+    static constexpr ScriptFunctionData functions[]{
+            {"CreateTimer",         ScriptFunctions::CreateTimer},
+            {"CreateTimerEx",       reinterpret_cast<Function<void>>(ScriptFunctions::CreateTimerEx)},
+            {"MakePublic",          ScriptFunctions::MakePublic},
+            {"CallPublic",          reinterpret_cast<Function<void>>(ScriptFunctions::CallPublic)},
+
+            {"StartTimer",          ScriptFunctions::StartTimer},
+            {"StopTimer",           ScriptFunctions::StopTimer},
+            {"RestartTimer",        ScriptFunctions::RestartTimer},
+            {"FreeTimer",           ScriptFunctions::FreeTimer},
+            {"IsTimerElapsed",      ScriptFunctions::IsTimerElapsed},
+
+            {"StopServer",          ScriptFunctions::StopServer},
+
+            {"SendMessage",         ScriptFunctions::SendMessage},
+            {"Kick",                ScriptFunctions::Kick},
+            {"GetServerVersion",    ScriptFunctions::GetServerVersion},
+            {"GetProtocolVersion",  ScriptFunctions::GetProtocolVersion},
+            {"GetAvgPing",          ScriptFunctions::GetAvgPing},
+            {"SetModname",          ScriptFunctions::SetModname},
+            {"SetHostname",         ScriptFunctions::SetHostname},
+            {"SetServerPassword",   ScriptFunctions::SetServerPassword},
+
+            POSITIONAPI,
+            CELLAPI,
+            STATSFUNCTIONS,
+            ITEMAPI,
+            QUESTAPI,
+            SPELLAPI,
+            GUIFUNCTIONS,
+            CHARCLASSFUNCTIONS,
+            WORLDFUNCTIONS,
+    };
+
+    static constexpr ScriptCallbackData callbacks[]{
+            {"Main",                     Function<int, int, int>()},
+            {"OnServerInit",             Function<void>()},
+            {"OnServerExit",             Function<void, bool>()},
+            {"OnPlayerConnect",          Function<bool, unsigned short>()},
+            {"OnPlayerDisconnect",       Function<void, unsigned short>()},
+            {"OnPlayerDeath",            Function<void, unsigned short, short, unsigned short>()},
+            {"OnPlayerResurrect",        Function<void, unsigned short>()},
+            {"OnPlayerCellChange",       Function<void, unsigned short>()},
+            {"OnPlayerCellState",        Function<void, unsigned short>()},
+            {"OnPlayerAttributesChange", Function<void, unsigned short>()},
+            {"OnPlayerSkillsChange",     Function<void, unsigned short>()},
+            {"OnPlayerLevelChange",      Function<void, unsigned short>()},
+            {"OnPlayerEquipmentChange",  Function<void, unsigned short>()},
+            {"OnPlayerInventoryChange",  Function<void, unsigned short>()},
+            {"OnPlayerSpellbookChange",  Function<void, unsigned short>()},
+            {"OnPlayerJournalChange",    Function<void, unsigned short>()},
+            {"OnObjectPlace",            Function<void, unsigned short, const char*>()},
+            {"OnObjectDelete",           Function<void, unsigned short, const char*>()},
+            {"OnObjectScale",            Function<void, unsigned short, const char*>()},
+            {"OnObjectLock",             Function<void, unsigned short, const char*>()},
+            {"OnObjectUnlock",           Function<void, unsigned short, const char*>()},
+            {"OnDoorState",              Function<void, unsigned short, const char*>()},
+            {"OnContainer",              Function<void, unsigned short, const char*>()},
+            {"OnPlayerSendMessage",      Function<bool, unsigned short, const char*>()},
+            {"OnPlayerEndCharGen",       Function<void, unsigned short>()},
+            {"OnGUIAction",              Function<void, unsigned short, int, const char*>()}
+    };
+};
+
+#endif //SCRIPTFUNCTIONS_HPP
\ No newline at end of file
diff --git a/apps/openmw-mp/Script/SystemInterface.hpp b/apps/openmw-mp/Script/SystemInterface.hpp
new file mode 100644
index 000000000..61f5daafb
--- /dev/null
+++ b/apps/openmw-mp/Script/SystemInterface.hpp
@@ -0,0 +1,43 @@
+//
+// Created by koncord on 19.03.16.
+//
+
+#ifndef PLUGINSYSTEM3_SYSTEMINTERFACE_HPP
+#define PLUGINSYSTEM3_SYSTEMINTERFACE_HPP
+
+#ifdef _WIN32
+#include <winsock2.h>
+#else
+#include <dlfcn.h>
+#endif
+
+#include "Types.hpp"
+
+template<typename R = void*>
+struct SystemInterface
+{
+
+    union
+    {
+        R result;
+#ifdef _WIN32
+        decltype(GetProcAddress(lib_t(), nullptr)) data;
+#else
+        decltype(dlsym(lib_t(), nullptr)) data;
+#endif
+    };
+
+#ifndef _WIN32
+    static_assert(sizeof(result) == sizeof(data), "R should have the same size");
+#endif
+
+    SystemInterface() : data(nullptr) {}
+    explicit operator bool() { return data; }
+
+#ifdef _WIN32
+    SystemInterface(lib_t handle, const char* name) : data(GetProcAddress(handle, name)) {}
+#else
+    SystemInterface(lib_t handle, const char* name) : data(dlsym(handle, name)) {}
+#endif
+};
+#endif //PLUGINSYSTEM3_SYSTEMINTERFACE_HPP
diff --git a/apps/openmw-mp/Script/Types.hpp b/apps/openmw-mp/Script/Types.hpp
new file mode 100644
index 000000000..84bb988d6
--- /dev/null
+++ b/apps/openmw-mp/Script/Types.hpp
@@ -0,0 +1,113 @@
+//
+// Created by koncord on 23.01.16.
+//
+
+#ifndef TMPTYPES_HPP
+#define TMPTYPES_HPP
+
+
+#include <cstddef>
+#include <cstdint>
+#include <type_traits>
+#include <RakNetTypes.h>
+#include <Utils.hpp>
+
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
+
+#ifdef _WIN32
+typedef HMODULE lib_t;
+#else
+typedef void* lib_t;
+#endif
+
+template<typename T> struct sizeof_void { enum { value = sizeof(T) }; };
+template<> struct sizeof_void<void> { enum { value = 0 }; };
+
+
+template<typename T, size_t t> struct TypeChar { static_assert(!t, "Unsupported type in variadic type list"); };
+template<> struct TypeChar<bool, sizeof(bool)> { enum { value = 'b' }; };
+template<typename T> struct TypeChar<T*, sizeof(void*)> { enum { value = 'p' }; };
+template<> struct TypeChar<double*, sizeof(double*)> { enum { value = 'd' }; };
+template<> struct TypeChar<RakNet::NetworkID**, sizeof(RakNet::NetworkID**)> { enum { value = 'n' }; };
+template<typename T> struct TypeChar<T, sizeof(uint8_t)> { enum { value = std::is_signed<T>::value ? 'q' : 'i' }; };
+template<typename T> struct TypeChar<T, sizeof(uint16_t)> { enum { value = std::is_signed<T>::value ? 'q' : 'i' }; };
+template<typename T> struct TypeChar<T, sizeof(uint32_t)> { enum { value = std::is_signed<T>::value ? 'q' : 'i' }; };
+template<typename T> struct TypeChar<T, sizeof(uint64_t)> { enum { value = std::is_signed<T>::value ? 'w' : 'l' }; };
+template<> struct TypeChar<double, sizeof(double)> { enum { value = 'f' }; };
+template<> struct TypeChar<char*, sizeof(char*)> { enum { value = 's' }; };
+template<> struct TypeChar<const char*, sizeof(const char*)> { enum { value = 's' }; };
+template<> struct TypeChar<void, sizeof_void<void>::value> { enum { value = 'v' }; };
+
+template<const char t> struct CharType { static_assert(!t, "Unsupported type in variadic type list"); };
+template<> struct CharType<'b'> { typedef bool type; };
+template<> struct CharType<'p'> { typedef void* type; };
+template<> struct CharType<'d'> { typedef double* type; };
+template<> struct CharType<'n'> { typedef RakNet::NetworkID** type; };
+template<> struct CharType<'q'> { typedef signed int type; };
+template<> struct CharType<'i'> { typedef unsigned int type; };
+template<> struct CharType<'w'> { typedef signed long long type; };
+template<> struct CharType<'l'> { typedef unsigned long long type; };
+template<> struct CharType<'f'> { typedef double type; };
+template<> struct CharType<'s'> { typedef const char* type; };
+template<> struct CharType<'v'> { typedef void type; };
+
+template<typename... Types>
+struct TypeString {
+    static constexpr char value[sizeof...(Types) + 1] = {
+            TypeChar<Types, sizeof(Types)>::value...
+    };
+};
+
+
+template<typename R, typename... Types>
+using Function = R(*)(Types...);
+
+template<typename R>
+using FunctionEllipsis = R(*)(...);
+
+struct ScriptIdentity
+{
+    const char* types;
+    const char ret;
+    const unsigned int numargs;
+
+    constexpr bool matches(const char* types, const unsigned int N = 0) const
+    {
+        return N < numargs ? this->types[N] == types[N] && matches(types, N + 1) : this->types[N] == types[N];
+    }
+
+    template<typename R, typename... Types>
+    constexpr ScriptIdentity(Function<R, Types...>) : types(TypeString<Types...>::value), ret(TypeChar<R, sizeof_void<R>::value>::value), numargs(sizeof(TypeString<Types...>::value) - 1) {}
+};
+
+
+
+struct ScriptFunctionPointer : public ScriptIdentity
+{
+    Function<void> addr;
+
+    template<typename R, typename... Types>
+    constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(reinterpret_cast<Function<void>>(addr)) {}
+};
+
+struct ScriptFunctionData
+{
+    const char* name;
+    const ScriptFunctionPointer func;
+
+    constexpr ScriptFunctionData(const char* name, ScriptFunctionPointer func) : name(name), func(func) {}
+};
+
+struct ScriptCallbackData
+{
+    const char* name;
+    const unsigned int index;
+    const ScriptIdentity callback;
+
+    template<size_t N>
+    constexpr ScriptCallbackData(const char(&name)[N], ScriptIdentity _callback) : name(name), index(Utils::hash(name)), callback(_callback) {}
+};
+
+#endif //TMPTYPES_HPP
diff --git a/apps/openmw-mp/Utils.cpp b/apps/openmw-mp/Utils.cpp
new file mode 100644
index 000000000..cb79fd9d6
--- /dev/null
+++ b/apps/openmw-mp/Utils.cpp
@@ -0,0 +1,248 @@
+//
+// Created by koncord on 24.01.16.
+//
+
+#include "Utils.hpp"
+
+#include <cstring>
+#include <ctime>
+#include <cmath>
+#include <memory>
+
+using namespace std;
+
+#ifdef _WIN32
+int setenv(const char *name, const char *value, int overwrite)
+{
+    printf("%s: %s\n", name, value);
+    return _putenv_s(name, value);
+}
+#endif
+
+
+std::string Utils::convertPath(std::string str)
+{
+#if defined(_WIN32)
+#define _SEP_ '\\'
+#elif defined(__APPLE__)
+#define _SEP_ ':'
+#endif
+
+#if defined(_WIN32) || defined(__APPLE__)
+    for (auto &ch : str)
+        if (ch == '/')
+               ch = _SEP_;
+#endif //defined(_WIN32) || defined(__APPLE__)
+    return str;
+
+#undef _SEP_
+}
+
+const vector<string> Utils::split(const string &str, int delimiter)
+{
+    string buffer;
+    vector<string> result;
+
+    for (auto symb:str)
+        if (symb != delimiter)
+            buffer += symb;
+        else if (!buffer.empty())
+        {
+            result.push_back(move(buffer));
+            buffer.clear();
+        }
+    if (!buffer.empty())
+        result.push_back(move(buffer));
+
+    return result;
+}
+
+void Utils::timestamp()
+{
+    time_t ltime;
+    ltime = time(nullptr);
+    char t[32];
+    snprintf(t, sizeof(t), "[%s", asctime(localtime(&ltime)));
+    char* newline = strchr(t, '\n');
+    *newline = ']';
+    strcat(t, " ");
+    printf("%s", t);
+}
+
+// http://stackoverflow.com/questions/1637587/c-libcurl-console-progress-bar
+int Utils::progress_func(double TotalToDownload, double NowDownloaded)
+{
+    // how wide you want the progress meter to be
+    int totaldotz=40;
+    double fractiondownloaded = NowDownloaded / TotalToDownload;
+    // part of the progressmeter that's already "full"
+    int dotz = round(fractiondownloaded * totaldotz);
+
+    // create the "meter"
+    int ii=0;
+    printf("%3.0f%% [",fractiondownloaded*100);
+    // part  that's full already
+    for ( ; ii < dotz;ii++) {
+        printf("=");
+    }
+    // remaining part (spaces)
+    for ( ; ii < totaldotz;ii++) {
+        printf(" ");
+    }
+    // and back to line begin - do not forget the fflush to avoid output buffering problems!
+    printf("]\r");
+    fflush(stdout);
+    return 1;
+}
+
+bool Utils::DoubleCompare(double a, double b, double epsilon)
+{
+    return fabs(a - b) < epsilon;
+}
+
+string Utils::str_replace(const string& source, const char* find, const char* replace)
+{
+    unsigned int find_len = strlen(find);
+    unsigned int replace_len = strlen(replace);
+    size_t pos = 0;
+
+    string dest = source;
+
+    while ((pos = dest.find(find, pos)) != string::npos)
+    {
+        dest.replace(pos, find_len, replace);
+        pos += replace_len;
+    }
+
+    return dest;
+}
+
+string& Utils::RemoveExtension(string& file)
+{
+    size_t pos = file.find_last_of('.');
+
+    if (pos)
+        file = file.substr(0, pos);
+
+    return file;
+}
+
+long int Utils::FileLength(const char* file)
+{
+    FILE* _file = fopen(file, "rb");
+
+    if (!_file)
+        return 0;
+
+    fseek(_file, 0, SEEK_END);
+    long int size = ftell(_file);
+    fclose(_file);
+
+    return size;
+}
+
+/* From:
+        http://web.archive.org/web/20080303102530/http://c.snippets.org/snip_lister.php?fname=crc_32.c
+*/
+
+#define UPDC32(octet,crc) (crc_32_tab[((crc)\
+                                       ^ ((unsigned char)octet)) & 0xff] ^ ((crc) >> 8))
+
+static unsigned int crc_32_tab[] =   /* CRC polynomial 0xedb88320 */
+        {
+                0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+                0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+                0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+                0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+                0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+                0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+                0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+                0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+                0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+                0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+                0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+                0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+                0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+                0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+                0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+                0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+                0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+                0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+                0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+                0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+                0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+                0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+                0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+                0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+                0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+                0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+                0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+                0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+                0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+                0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+                0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+                0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+                0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+                0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+                0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+                0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+                0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+                0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+                0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+                0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+                0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+                0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+                0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+        };
+
+unsigned int Utils::updateCRC32(unsigned char ch, unsigned int crc)
+{
+    return UPDC32(ch, crc);
+}
+
+bool Utils::crc32file(const char* name, unsigned int* crc)
+{
+    FILE* fin;
+    unsigned int oldcrc32;
+    long charcnt;
+    int c;
+
+    oldcrc32 = 0xFFFFFFFF;
+    charcnt = 0;
+
+    if ((fin = fopen(name, "rb")) == nullptr)
+    {
+        return false;
+    }
+
+    while ((c = getc(fin)) != EOF)
+    {
+        ++charcnt;
+        oldcrc32 = UPDC32(c, oldcrc32);
+    }
+
+    if (ferror(fin))
+    {
+        charcnt = -1;
+    }
+
+    fclose(fin);
+
+    *crc = oldcrc32 = ~oldcrc32;
+
+    return true;
+}
+
+unsigned int Utils::crc32buf(char* buf, size_t len)
+{
+    unsigned int oldcrc32;
+
+    oldcrc32 = 0xFFFFFFFF;
+
+    for (; len; --len, ++buf)
+    {
+        oldcrc32 = UPDC32(*buf, oldcrc32);
+    }
+
+    return ~oldcrc32;
+}
diff --git a/apps/openmw-mp/Utils.hpp b/apps/openmw-mp/Utils.hpp
new file mode 100644
index 000000000..526fbf2e2
--- /dev/null
+++ b/apps/openmw-mp/Utils.hpp
@@ -0,0 +1,77 @@
+//
+// Created by koncord on 24.01.16.
+//
+
+#ifndef UTILS_HPP
+#define UTILS_HPP
+
+#include <cstddef>
+#include <string>
+#include <vector>
+
+#if (!defined(DEBUG_PRINTF) && defined(DEBUG))
+#define DEBUG_PRINTF(...) LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, __VA_ARGS__)
+#else
+#define DEBUG_PRINTF(...)
+#endif
+
+#ifdef _WIN32
+int setenv(const char *name, const char *value, int overwrite);
+#endif
+
+namespace Utils
+{
+
+    const std::vector<std::string> split(const std::string &str, int delimiter);
+
+    std::string convertPath(std::string str);
+    template<size_t N>
+    constexpr unsigned int hash(const char(&str)[N], size_t I = N)
+    {
+        return (I == 1 ? ((2166136261u ^ str[0]) * 16777619u) : ((hash(str, I - 1) ^ str[I - 1]) * 16777619u));
+    }
+
+    inline unsigned int hash(const char *str, std::size_t I)
+    {
+        return (I == 1 ? ((2166136261u ^ str[0]) * 16777619u) : ((hash(str, I - 1) ^ str[I - 1]) * 16777619u));
+    }
+
+    void timestamp();
+
+    int progress_func(double TotalToDownload, double NowDownloaded);
+
+    bool DoubleCompare(double a, double b, double epsilon);
+
+    std::string str_replace(const std::string &source, const char *find, const char *replace);
+
+    std::string &RemoveExtension(std::string &file);
+
+    long int FileLength(const char *file);
+
+    unsigned int crc32buf(char *buf, size_t len);
+
+    unsigned int updateCRC32(unsigned char ch, unsigned int crc);
+
+    bool crc32file(const char *name, unsigned int *crc);
+
+    template<typename F, typename T, typename E = void>
+    struct is_static_castable : std::false_type
+    {
+    };
+    template<typename F, typename T>
+    struct is_static_castable<F, T, typename std::conditional<true, void, decltype(static_cast<T>(std::declval<F>()))>::type>
+            : std::true_type
+    {
+    };
+
+    template<typename T, typename F>
+    inline static typename std::enable_if<is_static_castable<F *, T *>::value, T *>::type static_or_dynamic_cast(
+            F *from)
+    { return static_cast<T *>(from); }
+
+    template<typename T, typename F>
+    inline static typename std::enable_if<!is_static_castable<F *, T *>::value, T *>::type static_or_dynamic_cast(
+            F *from)
+    { return dynamic_cast<T *>(from); }
+}
+#endif //UTILS_HPP
diff --git a/apps/openmw-mp/amx/CMakeLists.txt b/apps/openmw-mp/amx/CMakeLists.txt
new file mode 100644
index 000000000..62602e091
--- /dev/null
+++ b/apps/openmw-mp/amx/CMakeLists.txt
@@ -0,0 +1,23 @@
+include_directories(./linux)
+
+add_definitions(-DPAWN_CELL_SIZE=64)
+
+set(source_amx
+        amxexec_gcc.c
+        amxfile.c
+        fpattern.c
+        minIni.c
+        amxcons.c
+        amxcore.c
+        amxstring.c
+        amxtime.c
+        amxfloat.c
+        amxaux.c
+        amx.c
+        linux/binreloc.c
+        linux/getch.c
+        )
+
+source_group(amx FILES ${source_amx})
+
+add_library(amx STATIC ${source_amx} )
diff --git a/apps/openmw-mp/amx/amx.c b/apps/openmw-mp/amx/amx.c
new file mode 100644
index 000000000..e8254be48
--- /dev/null
+++ b/apps/openmw-mp/amx/amx.c
@@ -0,0 +1,3798 @@
+/*  Pawn Abstract Machine (for the Pawn language)
+ *
+ *  Copyright (c) ITB CompuPhase, 1997-2015
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ *  use this file except in compliance with the License. You may obtain a copy
+ *  of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ *
+ *  Version: $Id: amx.c 5181 2015-01-21 09:44:28Z thiadmer $
+ */
+
+#define WIN32_LEAN_AND_MEAN
+#if defined _UNICODE || defined __UNICODE__ || defined UNICODE
+# if !defined UNICODE   /* for Windows API */
+#   define UNICODE
+# endif
+# if !defined _UNICODE  /* for C library */
+#   define _UNICODE
+# endif
+#endif
+
+#include <assert.h>
+#include <stdarg.h>
+#include <stddef.h>     /* for wchar_t */
+#include <stdlib.h>     /* for getenv() */
+#include <string.h>
+#include "osdefs.h"
+#if defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
+  #include <sclinux.h>
+  #if !defined AMX_NODYNALOAD
+    #include <dlfcn.h>
+  #endif
+  #if defined AMX_JIT
+    #include <sys/types.h>
+    #include <sys/mman.h>
+  #endif
+#endif
+#if defined __LCC__ || defined __LINUX__
+  #include <wchar.h>    /* for wcslen() */
+#endif
+
+#if defined __ECOS__
+  /* eCos puts include files in cyg/package_name */
+  #include <cyg/pawn/amx.h>
+#else
+  #include "amx.h"
+#endif
+
+#if (defined _Windows && !defined AMX_NODYNALOAD) || (defined AMX_JIT && __WIN32__)
+  #include <windows.h>
+#endif
+
+
+/* When one or more of the AMX_funcname macros are defined, we want
+ * to compile only those functions. However, when none of these macros
+ * is present, we want to compile everything.
+ */
+#if defined AMX_ALIGN       || defined AMX_ALLOT        || defined AMX_CLEANUP
+  #define AMX_EXPLIT_FUNCTIONS
+#endif
+#if defined AMX_CLONE       || defined AMX_DEFCALLBACK  || defined AMX_EXEC
+  #define AMX_EXPLIT_FUNCTIONS
+#endif
+#if defined AMX_FLAGS       || defined AMX_INIT         || defined AMX_MEMINFO
+  #define AMX_EXPLIT_FUNCTIONS
+#endif
+#if defined AMX_NAMELENGTH   || defined AMX_NATIVEINFO  || defined AMX_PUSHXXX
+  #define AMX_EXPLIT_FUNCTIONS
+#endif
+#if defined AMX_RAISEERROR   || defined AMX_REGISTER    || defined AMX_SETCALLBACK
+  #define AMX_EXPLIT_FUNCTIONS
+#endif
+#if defined AMX_SETDEBUGHOOK || defined AMX_UTF8XXX     || defined AMX_XXXNATIVES
+  #define AMX_EXPLIT_FUNCTIONS
+#endif
+#if defined AMX_XXXPUBLICS  || defined AMX_XXXPUBVARS   || defined AMX_XXXSTRING
+  #define AMX_EXPLIT_FUNCTIONS
+#endif
+#if defined AMX_XXXTAGS     || defined AMX_XXXUSERDATA
+  #define AMX_EXPLIT_FUNCTIONS
+#endif
+#if !defined AMX_EXPLIT_FUNCTIONS
+  /* no constant set, set them all */
+  #define AMX_ALIGN             /* amx_Align16(), amx_Align32() and amx_Align64() */
+  #define AMX_ALLOT             /* amx_Allot() and amx_Release() */
+  #define AMX_DEFCALLBACK       /* amx_Callback() */
+  #define AMX_CLEANUP           /* amx_Cleanup() */
+  #define AMX_CLONE             /* amx_Clone() */
+  #define AMX_EXEC              /* amx_Exec() */
+  #define AMX_FLAGS             /* amx_Flags() */
+  #define AMX_INIT              /* amx_Init() and amx_InitJIT() */
+  #define AMX_MEMINFO           /* amx_MemInfo() */
+  #define AMX_NAMELENGTH        /* amx_NameLength() */
+  #define AMX_NATIVEINFO        /* amx_NativeInfo() */
+  #define AMX_PUSHXXX           /* amx_Push(), amx_PushAddress(), amx_PushArray() and amx_PushString() */
+  #define AMX_RAISEERROR        /* amx_RaiseError() */
+  #define AMX_REGISTER          /* amx_Register() */
+  #define AMX_SETCALLBACK       /* amx_SetCallback() */
+  #define AMX_SETDEBUGHOOK      /* amx_SetDebugHook() */
+  #define AMX_UTF8XXX           /* amx_UTF8Check(), amx_UTF8Get(), amx_UTF8Len() and amx_UTF8Put() */
+  #define AMX_XXXNATIVES        /* amx_NumNatives(), amx_GetNative() and amx_FindNative() */
+  #define AMX_XXXPUBLICS        /* amx_NumPublics(), amx_GetPublic() and amx_FindPublic() */
+  #define AMX_XXXPUBVARS        /* amx_NumPubVars(), amx_GetPubVar() and amx_FindPubVar() */
+  #define AMX_XXXSTRING         /* amx_StrLen(), amx_GetString() and amx_SetString() */
+  #define AMX_XXXTAGS           /* amx_NumTags(), amx_GetTag() and amx_FindTagId() */
+  #define AMX_XXXUSERDATA       /* amx_GetUserData() and amx_SetUserData() */
+#endif
+#undef AMX_EXPLIT_FUNCTIONS
+#if defined AMX_ANSIONLY
+  #undef AMX_UTF8XXX            /* no UTF-8 support in ANSI/ASCII-only version */
+#endif
+#if defined AMX_NO_NATIVEINFO
+  #undef AMX_NATIVEINFO
+#endif
+#if AMX_USERNUM <= 0
+  #undef AMX_XXXUSERDATA
+#endif
+#if defined AMX_JIT
+  /* JIT is incompatible with macro instructions, packed opcodes and overlays */
+  #if !defined AMX_NO_MACRO_INSTR
+    #define AMX_NO_MACRO_INSTR
+  #endif
+  #if !defined AMX_NO_PACKED_OPC
+    #define AMX_NO_PACKED_OPC
+  #endif
+  #if !defined AMX_NO_OVERLAY
+    #define AMX_NO_OVERLAY
+  #endif
+#endif
+#if (defined AMX_ASM || defined AMX_JIT) && !defined AMX_ALTCORE
+  /* do not use the standard ANSI-C amx_Exec() function */
+  #define AMX_ALTCORE
+#endif
+#if !defined AMX_NO_PACKED_OPC && !defined AMX_TOKENTHREADING
+  #define AMX_TOKENTHREADING    /* packed opcodes require token threading */
+#endif
+
+#if defined AMX_ALTCORE
+  #if defined __WIN32__
+    /* For Watcom C/C++ use register calling convention (faster); for
+     * Microsoft C/C++ (and most other C compilers) use "cdecl".
+     * The important point is that you assemble AMXEXEC.ASM with the matching
+     * calling convention, or the right JIT, respectively.
+     * AMXJITR.ASM is for Watcom's register calling convention, AMXJITS.ASM and
+     * AMXJITSN.ASM are for "cdecl".
+     */
+    #if defined __WATCOMC__ && !defined STACKARGS
+      /* register calling convention; the #pragma tells the compiler into which
+       * registers the parameters should go
+       */
+      extern cell amx_exec_run(AMX *amx,cell *retval,unsigned char *data);
+          #pragma aux amx_exec_run parm [eax] [edx] [ebx];
+      extern int amx_exec_list(const AMX *amx,const cell **opcodelist,int *numopcodes);
+          #pragma aux amx_exec_run parm [eax] [edx] [ebx];
+      extern cell amx_jit_compile(void *pcode, void *jumparray, void *nativecode);
+          #pragma aux amx_exec_run parm [eax] [edx] [ebx];
+      extern cell amx_jit_run(AMX *amx,cell *retval,unsigned char *data);
+          #pragma aux amx_jit_run parm [eax] [edx] [ebx];
+      extern int  amx_jit_list(const AMX *amx,const cell **opcodelist,int *numopcodes);
+          #pragma aux amx_exec_run parm [eax] [edx] [ebx];
+    #elif defined __GNUC__
+      /* force "cdecl" by adding an "attribute" to the declaration */
+      extern cell amx_exec_run(AMX *amx,cell *retval,unsigned char *data) __attribute__((cdecl));
+      extern int amx_exec_list(const AMX *amx,const cell **opcodelist,int *numopcodes) __attribute__((cdecl));
+      extern cell amx_jit_compile(void *pcode, void *jumparray, void *nativecode) __attribute__((cdecl));
+      extern cell amx_jit_run(AMX *amx,cell *retval,unsigned char *data) __attribute__((cdecl));
+      extern int  amx_jit_list(const AMX *amx,const cell **opcodelist,int *numopcodes) __attribute__((cdecl));
+    #else
+      /* force "cdecl" by specifying it as a "function class" with the "__cdecl" keyword */
+      extern cell __cdecl amx_exec_run(AMX *amx,cell *retval,unsigned char *data);
+      extern int __cdecl amx_exec_list(const AMX *amx,const cell **opcodelist,int *numopcodes);
+      extern cell __cdecl amx_jit_compile(void *pcode, void *jumparray, void *nativecode);
+      extern cell __cdecl amx_jit_run(AMX *amx,cell *retval,unsigned char *data);
+      extern int  __cdecl amx_jit_list(const AMX *amx,const cell **opcodelist,int *numopcodes);
+    #endif
+  #else /* __WIN32__ */
+    /* assume no specific calling conventions for other platforms than Windows */
+    extern cell amx_exec_run(AMX *amx,cell *retval,unsigned char *data);
+    extern int amx_exec_list(const AMX *amx,const cell **opcodelist,int *numopcodes);
+    extern cell amx_jit_compile(void *pcode, void *jumparray, void *nativecode);
+    extern cell amx_jit_run(AMX *amx,cell *retval,unsigned char *data);
+    extern int  amx_jit_list(const AMX *amx,const cell **opcodelist,int *numopcodes);
+  #endif /* __WIN32__ */
+#else
+  int amx_exec_list(AMX *amx,const cell **opcodelist,int *numopcodes);
+#endif /* AMX_ALTCORE */
+
+typedef enum {
+  OP_NOP,
+  OP_LOAD_PRI,
+  OP_LOAD_ALT,
+  OP_LOAD_S_PRI,
+  OP_LOAD_S_ALT,
+  OP_LREF_S_PRI,
+  OP_LREF_S_ALT,
+  OP_LOAD_I,
+  OP_LODB_I,
+  OP_CONST_PRI,
+  OP_CONST_ALT,
+  OP_ADDR_PRI,
+  OP_ADDR_ALT,
+  OP_STOR,
+  OP_STOR_S,
+  OP_SREF_S,
+  OP_STOR_I,
+  OP_STRB_I,
+  OP_ALIGN_PRI,
+  OP_LCTRL,
+  OP_SCTRL,
+  OP_XCHG,
+  OP_PUSH_PRI,
+  OP_PUSH_ALT,
+  OP_PUSHR_PRI,
+  OP_POP_PRI,
+  OP_POP_ALT,
+  OP_PICK,
+  OP_STACK,
+  OP_HEAP,
+  OP_PROC,
+  OP_RET,
+  OP_RETN,
+  OP_CALL,
+  OP_JUMP,
+  OP_JZER,
+  OP_JNZ,
+  OP_SHL,
+  OP_SHR,
+  OP_SSHR,
+  OP_SHL_C_PRI,
+  OP_SHL_C_ALT,
+  OP_SMUL,
+  OP_SDIV,
+  OP_ADD,
+  OP_SUB,
+  OP_AND,
+  OP_OR,
+  OP_XOR,
+  OP_NOT,
+  OP_NEG,
+  OP_INVERT,
+  OP_EQ,
+  OP_NEQ,
+  OP_SLESS,
+  OP_SLEQ,
+  OP_SGRTR,
+  OP_SGEQ,
+  OP_INC_PRI,
+  OP_INC_ALT,
+  OP_INC_I,
+  OP_DEC_PRI,
+  OP_DEC_ALT,
+  OP_DEC_I,
+  OP_MOVS,
+  OP_CMPS,
+  OP_FILL,
+  OP_HALT,
+  OP_BOUNDS,
+  OP_SYSREQ,
+  OP_SWITCH,
+  OP_SWAP_PRI,
+  OP_SWAP_ALT,
+  OP_BREAK,
+  OP_CASETBL,
+  /* patched instructions */
+  OP_SYSREQ_D,
+  OP_SYSREQ_ND,
+  /* overlay instructions */
+  OP_CALL_OVL,
+  OP_RETN_OVL,
+  OP_SWITCH_OVL,
+  OP_CASETBL_OVL,
+#if !defined AMX_NO_MACRO_INSTR
+  /* supplemental & macro instructions */
+  OP_LIDX,
+  OP_LIDX_B,
+  OP_IDXADDR,
+  OP_IDXADDR_B,
+  OP_PUSH_C,
+  OP_PUSH,
+  OP_PUSH_S,
+  OP_PUSH_ADR,
+  OP_PUSHR_C,
+  OP_PUSHR_S,
+  OP_PUSHR_ADR,
+  OP_JEQ,
+  OP_JNEQ,
+  OP_JSLESS,
+  OP_JSLEQ,
+  OP_JSGRTR,
+  OP_JSGEQ,
+  OP_SDIV_INV,
+  OP_SUB_INV,
+  OP_ADD_C,
+  OP_SMUL_C,
+  OP_ZERO_PRI,
+  OP_ZERO_ALT,
+  OP_ZERO,
+  OP_ZERO_S,
+  OP_EQ_C_PRI,
+  OP_EQ_C_ALT,
+  OP_INC,
+  OP_INC_S,
+  OP_DEC,
+  OP_DEC_S,
+  /* macro instructions */
+  OP_SYSREQ_N,
+  OP_PUSHM_C,
+  OP_PUSHM,
+  OP_PUSHM_S,
+  OP_PUSHM_ADR,
+  OP_PUSHRM_C,
+  OP_PUSHRM_S,
+  OP_PUSHRM_ADR,
+  OP_LOAD2,
+  OP_LOAD2_S,
+  OP_CONST,
+  OP_CONST_S,
+#endif
+#if !defined AMX_NO_PACKED_OPC
+  /* packed instructions */
+  OP_LOAD_P_PRI,
+  OP_LOAD_P_ALT,
+  OP_LOAD_P_S_PRI,
+  OP_LOAD_P_S_ALT,
+  OP_LREF_P_S_PRI,
+  OP_LREF_P_S_ALT,
+  OP_LODB_P_I,
+  OP_CONST_P_PRI,
+  OP_CONST_P_ALT,
+  OP_ADDR_P_PRI,
+  OP_ADDR_P_ALT,
+  OP_STOR_P,
+  OP_STOR_P_S,
+  OP_SREF_P_S,
+  OP_STRB_P_I,
+  OP_LIDX_P_B,
+  OP_IDXADDR_P_B,
+  OP_ALIGN_P_PRI,
+  OP_PUSH_P_C,
+  OP_PUSH_P,
+  OP_PUSH_P_S,
+  OP_PUSH_P_ADR,
+  OP_PUSHR_P_C,
+  OP_PUSHR_P_S,
+  OP_PUSHR_P_ADR,
+  OP_PUSHM_P_C,
+  OP_PUSHM_P,
+  OP_PUSHM_P_S,
+  OP_PUSHM_P_ADR,
+  OP_PUSHRM_P_C,
+  OP_PUSHRM_P_S,
+  OP_PUSHRM_P_ADR,
+  OP_STACK_P,
+  OP_HEAP_P,
+  OP_SHL_P_C_PRI,
+  OP_SHL_P_C_ALT,
+  OP_ADD_P_C,
+  OP_SMUL_P_C,
+  OP_ZERO_P,
+  OP_ZERO_P_S,
+  OP_EQ_P_C_PRI,
+  OP_EQ_P_C_ALT,
+  OP_INC_P,
+  OP_INC_P_S,
+  OP_DEC_P,
+  OP_DEC_P_S,
+  OP_MOVS_P,
+  OP_CMPS_P,
+  OP_FILL_P,
+  OP_HALT_P,
+  OP_BOUNDS_P,
+#endif
+  /* ----- */
+  OP_NUM_OPCODES
+} OPCODE;
+
+#define NUMENTRIES(hdr,field,nextfield) \
+                        (unsigned)(((hdr)->nextfield - (hdr)->field) / (hdr)->defsize)
+#define GETENTRY(hdr,table,index) \
+                        (AMX_FUNCSTUB *)((unsigned char*)(hdr) + (unsigned)(hdr)->table + (unsigned)index*(hdr)->defsize)
+#define GETENTRYNAME(hdr,entry) \
+                        (char *)((unsigned char*)(hdr) + (unsigned)((AMX_FUNCSTUB*)(entry))->nameofs)
+
+#if !defined NDEBUG
+  static int check_endian(void)
+  {
+    uint16_t val=0x00ff;
+    unsigned char *ptr=(unsigned char *)&val;
+    /* "ptr" points to the starting address of "val". If that address
+     * holds the byte "0xff", the computer stored the low byte of "val"
+     * at the lower address, and so the memory lay out is Little Endian.
+     */
+    assert(*ptr==0xff || *ptr==0x00);
+    #if BYTE_ORDER==BIG_ENDIAN
+      return *ptr==0x00;  /* return "true" if big endian */
+    #else
+      return *ptr==0xff;  /* return "true" if little endian */
+    #endif
+  }
+#endif
+
+#if BYTE_ORDER==BIG_ENDIAN || PAWN_CELL_SIZE==16
+  void amx_Swap16(uint16_t *v)
+  {
+    unsigned char *s = (unsigned char *)v;
+    unsigned char t;
+
+    assert_static(sizeof(*v)==2);
+    /* swap two bytes */
+    t=s[0];
+    s[0]=s[1];
+    s[1]=t;
+  }
+#endif
+
+#if BYTE_ORDER==BIG_ENDIAN || PAWN_CELL_SIZE==32
+  void amx_Swap32(uint32_t *v)
+  {
+    unsigned char *s = (unsigned char *)v;
+    unsigned char t;
+
+    assert_static(sizeof(*v)==4);
+    /* swap outer two bytes */
+    t=s[0];
+    s[0]=s[3];
+    s[3]=t;
+    /* swap inner two bytes */
+    t=s[1];
+    s[1]=s[2];
+    s[2]=t;
+  }
+#endif
+
+#if (BYTE_ORDER==BIG_ENDIAN || PAWN_CELL_SIZE==64) && (defined _I64_MAX || defined HAVE_I64)
+  void amx_Swap64(uint64_t *v)
+  {
+    unsigned char *s = (unsigned char *)v;
+    unsigned char t;
+
+    assert(sizeof(*v)==8);
+
+    t=s[0];
+    s[0]=s[7];
+    s[7]=t;
+
+    t=s[1];
+    s[1]=s[6];
+    s[6]=t;
+
+    t=s[2];
+    s[2]=s[5];
+    s[5]=t;
+
+    t=s[3];
+    s[3]=s[4];
+    s[4]=t;
+  }
+#endif
+
+#if defined AMX_ALIGN || defined AMX_INIT
+uint16_t * AMXAPI amx_Align16(uint16_t *v)
+{
+  assert_static(sizeof(*v)==2);
+  assert(check_endian());
+  #if BYTE_ORDER==BIG_ENDIAN
+    amx_Swap16(v);
+  #endif
+  return v;
+}
+
+uint32_t * AMXAPI amx_Align32(uint32_t *v)
+{
+  assert_static(sizeof(*v)==4);
+  assert(check_endian());
+  #if BYTE_ORDER==BIG_ENDIAN
+    amx_Swap32(v);
+  #endif
+  return v;
+}
+
+#if defined _I64_MAX || defined HAVE_I64
+uint64_t * AMXAPI amx_Align64(uint64_t *v)
+{
+  assert(sizeof(*v)==8);
+  assert(check_endian());
+  #if BYTE_ORDER==BIG_ENDIAN
+    amx_Swap64(v);
+  #endif
+  return v;
+}
+#endif  /* _I64_MAX || HAVE_I64 */
+#endif  /* AMX_ALIGN || AMX_INIT */
+
+#if defined AMX_FLAGS
+int AMXAPI amx_Flags(AMX *amx,uint16_t *flags)
+{
+  AMX_HEADER *hdr;
+
+  *flags=0;
+  if (amx==NULL)
+    return AMX_ERR_FORMAT;
+  hdr=(AMX_HEADER *)amx->base;
+  if (hdr->magic!=AMX_MAGIC)
+    return AMX_ERR_FORMAT;
+  if (hdr->file_version>CUR_FILE_VERSION || hdr->amx_version<MIN_FILE_VERSION)
+    return AMX_ERR_VERSION;
+  *flags=hdr->flags;
+  return AMX_ERR_NONE;
+}
+#endif /* AMX_FLAGS */
+
+#if defined AMX_DEFCALLBACK
+int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, const cell *params)
+{
+#if defined AMX_NATIVETABLE
+  extern AMX_NATIVE const AMX_NATIVETABLE[];
+#endif
+  AMX_HEADER *hdr;
+  AMX_FUNCSTUB *func;
+  AMX_NATIVE f;
+
+  assert(amx!=NULL);
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  assert(hdr->natives<=hdr->libraries);
+#if defined AMX_NATIVETABLE
+  if (index<0) {
+    /* size of AMX_NATIVETABLE is unknown here, so we cannot verify index */
+    f=(AMX_NATIVETABLE)[-(index+1)];
+  } else {
+#endif
+    assert(index>=0 && index<(cell)NUMENTRIES(hdr,natives,libraries));
+    func=GETENTRY(hdr,natives,index);
+    f=(AMX_NATIVE)(intptr_t)func->address;
+#if defined AMX_NATIVETABLE
+  } /* if */
+#endif
+  assert(f!=NULL);
+
+  /* Now that we have found the function, patch the program so that any
+   * subsequent call will call the function directly (bypassing this
+   * callback).
+   * This trick cannot work in the JIT, because the program would need to
+   * be re-JIT-compiled after patching a P-code instruction.
+   */
+  assert((amx->flags & AMX_FLAG_JITC)==0 || amx->sysreq_d==0);
+  if (amx->sysreq_d!=0) {
+    /* at the point of the call, the CIP pseudo-register points directly
+     * behind the SYSREQ(.N) instruction and its parameter(s)
+     */
+    unsigned char *code=amx->code+(int)amx->cip-sizeof(cell);
+    if (amx->flags & AMX_FLAG_SYSREQN) /* SYSREQ.N has 2 parameters */
+      code-=sizeof(cell);
+    assert(amx->code!=NULL);
+    assert(amx->cip>=4 && amx->cip<(hdr->dat - hdr->cod));
+    assert(sizeof(f)<=sizeof(cell)); /* function pointer must fit in a cell */
+    assert(*(cell*)code==index);
+    #if defined AMX_TOKENTHREADING || !(defined __GNUC__ || defined __ICC || defined AMX_ASM || defined AMX_JIT)
+      assert(!(amx->flags & AMX_FLAG_SYSREQN) && *(cell*)(code-sizeof(cell))==OP_SYSREQ
+             || (amx->flags & AMX_FLAG_SYSREQN) && *(cell*)(code-sizeof(cell))==OP_SYSREQ_N);
+    #endif
+    *(cell*)(code-sizeof(cell))=amx->sysreq_d;
+    *(cell*)code=(cell)(intptr_t)f;
+  } /* if */
+
+  /* Note:
+   *   params[0] == number of bytes for the additional parameters passed to the native function
+   *   params[1] == first argument
+   *   etc.
+   */
+
+  amx->error=AMX_ERR_NONE;
+  *result = f(amx,params);
+  return amx->error;
+}
+#endif /* defined AMX_DEFCALLBACK */
+
+
+#if defined AMX_JIT
+  /* convert from relative addresses to absolute physical addresses */
+  #define RELOC_ABS(base,off)   (*(ucell *)((base)+(int)(off)) += (ucell)(base)+(int)(off)-sizeof(cell))
+#else
+  #define JUMPREL(ip)           ((cell*)((intptr_t)(ip)+*(cell*)(ip)-sizeof(cell)))
+#endif
+#if defined AMX_ASM || defined AMX_JIT
+  #define RELOCATE_ADDR(base,v) ((v)+((ucell)(base)))
+#else
+  #define RELOCATE_ADDR(base,v) (v)
+#endif
+
+#define DBGPARAM(v)     ( (v)=*(cell *)(amx->code+(int)cip), cip+=sizeof(cell) )
+
+#if !defined GETOPCODE
+  #if defined AMX_NO_PACKED_OPC
+    #define GETOPCODE(c)  (OPCODE)(c)
+  #else
+    #define GETOPCODE(c)  (OPCODE)((c) & ((1 << sizeof(cell)*4)-1))
+  #endif
+#endif
+#if !defined GETPARAM_P
+  #define GETPARAM_P(v,o) ( v=((cell)(o) >> (int)(sizeof(cell)*4)) )
+#endif
+
+#if defined AMX_INIT
+
+static int VerifyPcode(AMX *amx)
+{
+  AMX_HEADER *hdr;
+  cell op,cip,tgt,opmask;
+  int sysreq_flg,max_opcode;
+  int datasize,stacksize;
+  const cell *opcode_list;
+  #if defined AMX_JIT
+    int opcode_count=0;
+    int reloc_count=0;
+    int jit_codesize=0;
+  #endif
+
+  assert(amx!=NULL);
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  amx->flags|=AMX_FLAG_VERIFY;
+  datasize=hdr->hea-hdr->dat;
+  stacksize=hdr->stp-hdr->hea;
+
+  #if defined AMX_ASM && defined AMX_JIT
+    if ((amx->flags & AMX_FLAG_JITC)!=0)
+      jit_codesize=amx_jit_list(amx,&opcode_list,&max_opcode);
+    else
+      amx_exec_list(amx,&opcode_list,&max_opcode);
+  #elif defined AMX_JIT
+    jit_codesize=amx_jit_list(amx,&opcode_list,&max_opcode);
+  #else
+    amx_exec_list(amx,&opcode_list,&max_opcode);
+  #endif
+  #if defined AMX_TOKENTHREADING
+    opcode_list=NULL; /* avoid token translation if token threading is in effect */
+  #endif
+  #if defined AMX_NO_PACKED_OPC
+    opmask= ~0;
+  #else
+    opmask=(1 << sizeof(cell)*4)-1;
+  #endif
+
+  /* sanity checks */
+  assert_static(OP_XCHG==21);
+  assert_static(OP_SMUL==42);
+  assert_static(OP_MOVS==64);
+  #if !defined AMX_NO_MACRO_INSTR
+    assert_static(OP_LIDX==81);
+    assert_static(OP_ZERO_PRI==102);
+    assert_static(OP_LOAD2==120);
+  #endif
+  #if !defined AMX_NO_PACKED_OPC
+    assert_static(OP_LOAD_P_PRI==124);
+    assert_static(OP_ALIGN_P_PRI==141);
+    assert_static(OP_BOUNDS_P==174);
+  #endif
+
+  sysreq_flg=0;
+  if (opcode_list!=NULL) {
+    if (amx->sysreq_d==opcode_list[OP_SYSREQ_D])
+      sysreq_flg=0x01;
+    else if (amx->sysreq_d==opcode_list[OP_SYSREQ_ND])
+      sysreq_flg=0x02;
+  } else {
+    if (amx->sysreq_d==OP_SYSREQ_D)
+      sysreq_flg=0x01;
+    else if (amx->sysreq_d==OP_SYSREQ_ND)
+      sysreq_flg=0x02;
+  } /* if */
+  amx->sysreq_d=0;      /* preset */
+
+  /* start browsing code */
+  assert(amx->code!=NULL);  /* should already have been set in amx_Init() */
+  for (cip=0; cip<amx->codesize; ) {
+    op=*(cell *)(amx->code+(int)cip);
+    if ((op & opmask)>=max_opcode) {
+      amx->flags &= ~AMX_FLAG_VERIFY;
+      return AMX_ERR_INVINSTR;
+    } /* if */
+    /* relocate opcode (only works if the size of an opcode is at least
+     * as big as the size of a pointer (jump address); so basically we
+     * rely on the opcode and a pointer being 32-bit
+     */
+    if (opcode_list!=NULL) {
+      /* verify that opcode_list[op]!=NULL, if it is, this instruction
+       * is unsupported
+       */
+      if (opcode_list[op & opmask]==0) {
+        amx->flags &= ~AMX_FLAG_VERIFY;
+        return AMX_ERR_INVINSTR;
+      } /* if */
+      *(cell *)(amx->code+(int)cip)=opcode_list[op & opmask];
+    } /* if */
+    #if defined AMX_JIT
+      opcode_count++;
+    #endif
+    cip+=sizeof(cell);
+    switch (op & opmask) {
+#if !defined AMX_NO_MACRO_INSTR
+    case OP_PUSHM_C:    /* instructions with variable number of parameters */
+    case OP_PUSHM:
+    case OP_PUSHM_S:
+    case OP_PUSHM_ADR:
+    case OP_PUSHRM_C:
+    case OP_PUSHRM_S:
+    case OP_PUSHRM_ADR:
+      tgt=*(cell*)(amx->code+(int)cip); /* get count */
+      cip+=sizeof(cell)*(tgt+1);
+      break;
+
+    case OP_LOAD2:
+      tgt=*(cell*)(amx->code+(int)cip); /* verify both addresses */
+      if (tgt<0 || tgt>=datasize) {
+        amx->flags &= ~AMX_FLAG_VERIFY;
+        return AMX_ERR_BOUNDS;
+      } /* if */
+      tgt=*(cell*)(amx->code+(int)cip+(int)sizeof(cell));
+      if (tgt<0 || tgt>=datasize) {
+        amx->flags &= ~AMX_FLAG_VERIFY;
+        return AMX_ERR_BOUNDS;
+      } /* if */
+      cip+=sizeof(cell)*2;
+      break;
+
+    case OP_LOAD2_S:
+      tgt=*(cell*)(amx->code+(int)cip); /* verify both addresses */
+      if (tgt<-stacksize || tgt>stacksize) {
+        amx->flags &= ~AMX_FLAG_VERIFY;
+        return AMX_ERR_BOUNDS;
+      } /* if */
+      tgt=*(cell*)(amx->code+(int)cip+(int)sizeof(cell));
+      if (tgt<-stacksize || tgt>stacksize) {
+        amx->flags &= ~AMX_FLAG_VERIFY;
+        return AMX_ERR_BOUNDS;
+      } /* if */
+      cip+=sizeof(cell)*2;
+      break;
+
+    case OP_CONST:
+      tgt=*(cell*)(amx->code+(int)cip); /* verify address */
+      if (tgt<0 || tgt>=datasize) {
+        amx->flags &= ~AMX_FLAG_VERIFY;
+        return AMX_ERR_BOUNDS;
+      } /* if */
+      cip+=sizeof(cell)*2;
+      break;
+
+    case OP_CONST_S:
+      tgt=*(cell*)(amx->code+(int)cip); /* verify both addresses */
+      if (tgt<-stacksize || tgt>stacksize) {
+        amx->flags &= ~AMX_FLAG_VERIFY;
+        return AMX_ERR_BOUNDS;
+      } /* if */
+      cip+=sizeof(cell)*2;
+      break;
+#endif /* !defined AMX_NO_MACRO_INSTR */
+
+#if !defined AMX_NO_PACKED_OPC
+    case OP_LODB_P_I:   /* instructions with 1 parameter packed inside the same cell */
+    case OP_CONST_P_PRI:
+    case OP_CONST_P_ALT:
+    case OP_ADDR_P_PRI:
+    case OP_ADDR_P_ALT:
+    case OP_STRB_P_I:
+    case OP_LIDX_P_B:
+    case OP_IDXADDR_P_B:
+    case OP_ALIGN_P_PRI:
+    case OP_PUSH_P_C:
+    case OP_PUSH_P:
+    case OP_PUSH_P_S:
+    case OP_PUSH_P_ADR:
+    case OP_PUSHR_P_C:
+    case OP_PUSHR_P_S:
+    case OP_PUSHR_P_ADR:
+    case OP_STACK_P:
+    case OP_HEAP_P:
+    case OP_SHL_P_C_PRI:
+    case OP_SHL_P_C_ALT:
+    case OP_ADD_P_C:
+    case OP_SMUL_P_C:
+    case OP_ZERO_P:
+    case OP_ZERO_P_S:
+    case OP_EQ_P_C_PRI:
+    case OP_EQ_P_C_ALT:
+    case OP_MOVS_P:
+    case OP_CMPS_P:
+    case OP_FILL_P:
+    case OP_HALT_P:
+    case OP_BOUNDS_P:
+      break;
+
+    case OP_LOAD_P_PRI: /* data instructions with 1 parameter packed inside the same cell */
+    case OP_LOAD_P_ALT:
+    case OP_STOR_P:
+    case OP_INC_P:
+    case OP_DEC_P:
+      GETPARAM_P(tgt,op); /* verify address */
+      if (tgt<0 || tgt>=datasize) {
+        amx->flags &= ~AMX_FLAG_VERIFY;
+        return AMX_ERR_BOUNDS;
+      } /* if */
+      break;
+
+    case OP_LOAD_P_S_PRI: /* stack instructions with 1 parameter packed inside the same cell */
+    case OP_LOAD_P_S_ALT:
+    case OP_LREF_P_S_PRI:
+    case OP_LREF_P_S_ALT:
+    case OP_STOR_P_S:
+    case OP_SREF_P_S:
+    case OP_INC_P_S:
+    case OP_DEC_P_S:
+      GETPARAM_P(tgt,op); /* verify address */
+      if (tgt<-stacksize || tgt>stacksize) {
+        amx->flags &= ~AMX_FLAG_VERIFY;
+        return AMX_ERR_BOUNDS;
+      } /* if */
+      break;
+
+    case OP_PUSHM_P_C:    /* instructions with variable number of parameters */
+    case OP_PUSHM_P:
+    case OP_PUSHM_P_S:
+    case OP_PUSHM_P_ADR:
+    case OP_PUSHRM_P_C:
+    case OP_PUSHRM_P_S:
+    case OP_PUSHRM_P_ADR:
+      GETPARAM_P(tgt,op); /* verify address */
+      cip+=sizeof(cell)*tgt;
+      break;
+#endif /* !defined AMX_NO_PACKED_OPC */
+
+    case OP_LODB_I:     /* instructions with 1 parameter (not packed) */
+    case OP_CONST_PRI:
+    case OP_CONST_ALT:
+    case OP_ADDR_PRI:
+    case OP_ADDR_ALT:
+    case OP_STRB_I:
+    case OP_ALIGN_PRI:
+    case OP_LCTRL:
+    case OP_SCTRL:
+    case OP_PICK:
+    case OP_STACK:
+    case OP_HEAP:
+    case OP_SHL_C_PRI:
+    case OP_SHL_C_ALT:
+    case OP_MOVS:
+    case OP_CMPS:
+    case OP_FILL:
+    case OP_HALT:
+    case OP_BOUNDS:
+#if !defined AMX_NO_MACRO_INSTR
+    case OP_LIDX_B:
+    case OP_IDXADDR_B:
+    case OP_PUSH_C:
+    case OP_PUSH_ADR:
+    case OP_PUSHR_C:
+    case OP_PUSHR_ADR:
+    case OP_ADD_C:
+    case OP_SMUL_C:
+    case OP_ZERO:
+    case OP_ZERO_S:
+    case OP_EQ_C_PRI:
+    case OP_EQ_C_ALT:
+#endif
+      cip+=sizeof(cell);
+      break;
+
+    case OP_LOAD_PRI:
+    case OP_LOAD_ALT:
+    case OP_STOR:
+#if !defined AMX_NO_MACRO_INSTR
+    case OP_PUSH:
+    case OP_INC:
+    case OP_DEC:
+#endif
+      tgt=*(cell*)(amx->code+(int)cip); /* verify address */
+      if (tgt<0 || tgt>=datasize) {
+        amx->flags &= ~AMX_FLAG_VERIFY;
+        return AMX_ERR_BOUNDS;
+      } /* if */
+      cip+=sizeof(cell);
+      break;
+
+    case OP_LOAD_S_PRI:
+    case OP_LOAD_S_ALT:
+    case OP_LREF_S_PRI:
+    case OP_LREF_S_ALT:
+    case OP_STOR_S:
+    case OP_SREF_S:
+#if !defined AMX_NO_MACRO_INSTR
+    case OP_PUSH_S:
+    case OP_PUSHR_S:
+    case OP_INC_S:
+    case OP_DEC_S:
+#endif
+      tgt=*(cell*)(amx->code+(int)cip); /* verify address */
+      if (tgt<-stacksize || tgt>stacksize) {
+        amx->flags &= ~AMX_FLAG_VERIFY;
+        return AMX_ERR_BOUNDS;
+      } /* if */
+      cip+=sizeof(cell);
+      break;
+
+    case OP_NOP:        /* instructions without parameters */
+    case OP_LOAD_I:
+    case OP_STOR_I:
+    case OP_XCHG:
+    case OP_PUSH_PRI:
+    case OP_PUSH_ALT:
+    case OP_PUSHR_PRI:
+    case OP_POP_PRI:
+    case OP_POP_ALT:
+    case OP_PROC:
+    case OP_RET:
+    case OP_RETN:
+    case OP_SHL:
+    case OP_SHR:
+    case OP_SSHR:
+    case OP_SMUL:
+    case OP_SDIV:
+    case OP_ADD:
+    case OP_SUB:
+    case OP_AND:
+    case OP_OR:
+    case OP_XOR:
+    case OP_NOT:
+    case OP_NEG:
+    case OP_INVERT:
+    case OP_EQ:
+    case OP_NEQ:
+    case OP_SLESS:
+    case OP_SLEQ:
+    case OP_SGRTR:
+    case OP_SGEQ:
+    case OP_INC_PRI:
+    case OP_INC_ALT:
+    case OP_INC_I:
+    case OP_DEC_PRI:
+    case OP_DEC_ALT:
+    case OP_DEC_I:
+    case OP_SWAP_PRI:
+    case OP_SWAP_ALT:
+    case OP_BREAK:
+#if !defined AMX_NO_MACRO_INSTR
+    case OP_LIDX:
+    case OP_IDXADDR:
+    case OP_SDIV_INV:
+    case OP_SUB_INV:
+    case OP_ZERO_PRI:
+    case OP_ZERO_ALT:
+#endif
+      break;
+
+    case OP_CALL:       /* opcodes that need relocation (JIT only), or conversion to position-independent code */
+    case OP_JUMP:
+    case OP_JZER:
+    case OP_JNZ:
+    case OP_SWITCH:
+#if !defined AMX_NO_MACRO_INSTR
+    case OP_JEQ:
+    case OP_JNEQ:
+    case OP_JSLESS:
+    case OP_JSLEQ:
+    case OP_JSGRTR:
+    case OP_JSGEQ:
+#endif
+      tgt=*(cell*)(amx->code+(int)cip)+cip-sizeof(cell);
+      if (tgt<0 || tgt>amx->codesize) {
+        amx->flags &= ~AMX_FLAG_VERIFY;
+        return AMX_ERR_BOUNDS;
+      } /* if */
+      #if defined AMX_JIT
+        reloc_count++;
+        RELOC_ABS(amx->code, cip);  /* change to absolute physical address */
+      #endif
+      cip+=sizeof(cell);
+      break;
+
+#if !defined AMX_NO_OVERLAY
+    /* overlay opcodes (overlays must be enabled) */
+    case OP_SWITCH_OVL:
+      assert(hdr->file_version>=10);
+      tgt=*(cell*)(amx->code+(int)cip)+cip-sizeof(cell);
+      if (tgt<0 || tgt>amx->codesize) {
+        amx->flags &= ~AMX_FLAG_VERIFY;
+        return AMX_ERR_BOUNDS;
+      } /* if */
+      /* drop through */
+    case OP_CALL_OVL:
+      cip+=sizeof(cell);
+      /* drop through */
+    case OP_RETN_OVL:
+      assert(hdr->overlays!=0 && hdr->overlays!=hdr->nametable);
+      #if defined AMX_JIT
+        if ((amx->flags & AMX_FLAG_JITC)!=0)
+          return AMX_ERR_OVERLAY;     /* JIT does not support overlays */
+      #endif
+      if (amx->overlay==NULL)
+        return AMX_ERR_OVERLAY;       /* no overlay callback */
+      break;
+    case OP_CASETBL_OVL: {
+      cell num;
+      DBGPARAM(num);    /* number of records follows the opcode */
+      cip+=(2*num + 1)*sizeof(cell);
+      if (amx->overlay==NULL)
+        return AMX_ERR_OVERLAY;       /* no overlay callback */
+      break;
+    } /* case */
+#endif
+
+    case OP_SYSREQ:
+      cip+=sizeof(cell);
+      sysreq_flg|=0x01; /* mark SYSREQ found */
+      break;
+#if !defined AMX_NO_MACRO_INSTR
+    case OP_SYSREQ_N:
+      cip+=sizeof(cell)*2;
+      sysreq_flg|=0x02; /* mark SYSREQ.N found */
+      break;
+#endif
+
+    case OP_CASETBL: {
+      cell num,offs;
+      int i;
+      DBGPARAM(num);    /* number of records follows the opcode */
+      for (i=0; i<=num; i++) {
+        offs=cip+2*i*sizeof(cell);
+        tgt=*(cell*)(amx->code+(int)offs)+offs-sizeof(cell);
+        if (tgt<0 || tgt>amx->codesize) {
+          amx->flags &= ~AMX_FLAG_VERIFY;
+          return AMX_ERR_BOUNDS;
+        } /* if */
+        #if defined AMX_JIT
+          RELOC_ABS(amx->code, cip+2*i*sizeof(cell));
+          reloc_count++;
+        #endif
+      } /* for */
+      cip+=(2*num + 1)*sizeof(cell);
+      break;
+    } /* case */
+
+    default:
+      amx->flags &= ~AMX_FLAG_VERIFY;
+      return AMX_ERR_INVINSTR;
+    } /* switch */
+  } /* for */
+
+  #if !defined AMX_DONT_RELOCATE
+    /* only either type of system request opcode should be found (otherwise,
+     * we probably have a non-conforming compiler
+     */
+    if ((sysreq_flg==0x01 || sysreq_flg==0x02) && (amx->flags & AMX_FLAG_JITC)==0) {
+      /* to use direct system requests, a function pointer must fit in a cell;
+       * because the native function's address will be stored as the parameter
+       * of SYSREQ.(N)D
+       */
+      if (sizeof(AMX_NATIVE)<=sizeof(cell)) {
+        if (opcode_list!=NULL)
+          amx->sysreq_d=(sysreq_flg==0x01) ? opcode_list[OP_SYSREQ_D] : opcode_list[OP_SYSREQ_ND];
+        else
+          amx->sysreq_d=(sysreq_flg==0x01) ? OP_SYSREQ_D : OP_SYSREQ_ND;
+      } /* if */
+    } /* if */
+  #endif
+
+  #if defined AMX_JIT
+    /* adjust the code size to mean: estimated code size of the native code
+     * (instead of the size of the P-code)
+     */
+    amx->codesize=jit_codesize*opcode_count + hdr->cod + (hdr->stp - hdr->dat);
+    amx->reloc_size=2*sizeof(cell)*reloc_count;
+  #endif
+
+  amx->flags &= ~AMX_FLAG_VERIFY;
+  amx->flags |= AMX_FLAG_INIT;
+  if (sysreq_flg & 0x02)
+    amx->flags |= AMX_FLAG_SYSREQN;
+
+  return AMX_ERR_NONE;
+}
+
+/* definitions used for amx_Init() and amx_Cleanup() */
+#if (defined _Windows || defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__) && !defined AMX_NODYNALOAD
+  typedef int AMXEXPORT (AMXAPI _FAR *AMX_ENTRY)(AMX _FAR *amx);
+#endif
+
+int AMXAPI amx_Init(AMX *amx,void *program)
+{
+  AMX_HEADER *hdr;
+  int err;
+  uint16_t *namelength;
+  unsigned char *data;
+  #if (defined _Windows || defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__) && !defined AMX_NODYNALOAD
+    #if defined _Windows
+      char libname[sNAMEMAX+8]; /* +1 for '\0', +3 for 'amx' prefix, +4 for extension */
+      HINSTANCE hlib;
+    #elif defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
+      char libname[_MAX_PATH];
+      char *root;
+      void *hlib;
+      #if !defined AMX_LIBPATH
+        #define AMX_LIBPATH     "AMXLIB"
+      #endif
+    #endif
+    int numlibraries;
+    AMX_FUNCSTUB *lib;
+    AMX_ENTRY libinit;
+  #endif
+
+  if ((amx->flags & AMX_FLAG_INIT)!=0)
+    return AMX_ERR_INIT;  /* already initialized (may not do so twice) */
+
+  hdr=(AMX_HEADER *)program;
+  /* the header is in Little Endian, on a Big Endian machine, swap all
+   * multi-byte words
+   */
+  assert(check_endian());
+  #if BYTE_ORDER==BIG_ENDIAN
+    amx_Align32((uint32_t*)&hdr->size);
+    amx_Align16(&hdr->magic);
+    amx_Align16((uint16_t*)&hdr->flags);
+    amx_Align16((uint16_t*)&hdr->defsize);
+    amx_Align32((uint32_t*)&hdr->cod);
+    amx_Align32((uint32_t*)&hdr->dat);
+    amx_Align32((uint32_t*)&hdr->hea);
+    amx_Align32((uint32_t*)&hdr->stp);
+    amx_Align32((uint32_t*)&hdr->cip);
+    amx_Align32((uint32_t*)&hdr->publics);
+    amx_Align32((uint32_t*)&hdr->natives);
+    amx_Align32((uint32_t*)&hdr->libraries);
+    amx_Align32((uint32_t*)&hdr->pubvars);
+    amx_Align32((uint32_t*)&hdr->tags);
+    if (hdr->file_version>=10)
+      amx_Align32((uint32_t*)&hdr->overlays);
+  #endif
+
+  if (hdr->magic!=AMX_MAGIC)
+    return AMX_ERR_FORMAT;
+  if (hdr->file_version>CUR_FILE_VERSION || hdr->amx_version<MIN_FILE_VERSION)
+    return AMX_ERR_VERSION;
+  if (hdr->defsize!=sizeof(AMX_FUNCSTUB))
+    return AMX_ERR_FORMAT;
+  /* check the maximum name length in the separate name table */
+  amx_Align32((uint32_t*)&hdr->nametable);
+  namelength=(uint16_t*)((unsigned char*)program + (unsigned)hdr->nametable);
+  amx_Align16(namelength);
+  if (*namelength>sNAMEMAX)
+    return AMX_ERR_FORMAT;
+  if (hdr->stp<=0)
+    return AMX_ERR_FORMAT;
+  assert(hdr->hea == hdr->size);
+  #if BYTE_ORDER==BIG_ENDIAN
+    if ((hdr->flags & AMX_FLAG_COMPACT)==0) {
+      ucell *code=(ucell *)((unsigned char *)program+(int)hdr->cod);
+      while (code<(ucell *)((unsigned char *)program+(int)hdr->hea))
+        amx_SwapCell(code++);
+    } /* if */
+  #endif
+
+  amx->base=(unsigned char *)program;
+
+  /* set initial values */
+  amx->hlw=hdr->hea - hdr->dat; /* stack and heap relative to data segment */
+  amx->stp=hdr->stp - hdr->dat - sizeof(cell);
+  amx->hea=amx->hlw;
+  amx->stk=amx->stp;
+  #if defined AMX_DEFCALLBACK
+    if (amx->callback==NULL)
+      amx->callback=amx_Callback;
+  #endif
+
+  /* when running P-code from ROM (with the header with the native function
+   * table in RAM), the "code" field must be set to a non-NULL value on
+   * initialization, before calling amx_Init(); in an overlay scheme, the
+   * code field is modified dynamically by the overlay callback
+   */
+  if (amx->code==NULL)
+    amx->code=amx->base+(int)hdr->cod;
+  if (amx->codesize==0)
+    amx->codesize=hdr->dat-hdr->cod;
+
+  /* to split the data segment off the code segment, the "data" field must
+   * be set to a non-NULL value on initialization, before calling amx_Init();
+   * you may also need to explicitly initialize the data section with the
+   * contents read from the AMX file
+   */
+  if (amx->data!=NULL) {
+    data=amx->data;
+    if ((amx->flags & AMX_FLAG_DSEG_INIT)==0 && amx->overlay==NULL)
+      memcpy(data,amx->base+(int)hdr->dat,(size_t)(hdr->hea-hdr->dat));
+  } else {
+    data=amx->base+(int)hdr->dat;
+  } /* if */
+
+  /* Set a zero cell at the top of the stack, which functions
+   * as a sentinel for strings.
+   */
+  * (cell *)(data+(int)(hdr->stp-hdr->dat-sizeof(cell)))=0;
+
+  /* also align all addresses in the public function, public variable,
+   * public tag and native function tables --offsets into the name table
+   * (if present) must also be swapped.
+   */
+  #if BYTE_ORDER==BIG_ENDIAN
+  { /* local */
+    AMX_FUNCSTUB *fs;
+    int i,num;
+
+    fs=GETENTRY(hdr,natives,0);
+    num=NUMENTRIES(hdr,natives,libraries);
+    for (i=0; i<num; i++) {
+      amx_Align32(&fs->address);  /* redundant, because it should be zero */
+      amx_Align32(&fs->nameofs);
+      fs=(AMX_FUNCSTUB*)((unsigned char *)fs+hdr->defsize);
+    } /* for */
+
+    fs=GETENTRY(hdr,publics,0);
+    assert(hdr->publics<=hdr->natives);
+    num=NUMENTRIES(hdr,publics,natives);
+    for (i=0; i<num; i++) {
+      amx_Align32(&fs->address);
+      amx_Align32(&fs->nameofs);
+      fs=(AMX_FUNCSTUB*)((unsigned char *)fs+hdr->defsize);
+    } /* for */
+
+    fs=GETENTRY(hdr,pubvars,0);
+    assert(hdr->pubvars<=hdr->tags);
+    num=NUMENTRIES(hdr,pubvars,tags);
+    for (i=0; i<num; i++) {
+      amx_Align32(&fs->address);
+      amx_Align32(&fs->nameofs);
+      fs=(AMX_FUNCSTUB*)((unsigned char *)fs+hdr->defsize);
+    } /* for */
+
+    fs=GETENTRY(hdr,tags,0);
+    if (hdr->file_version<7) {  /* file version 7 introduced the name table */
+      assert(hdr->tags<=hdr->cod);
+      num=NUMENTRIES(hdr,tags,cod);
+    } else {
+      assert(hdr->tags<=hdr->nametable);
+      num=NUMENTRIES(hdr,tags,nametable);
+    } /* if */
+    for (i=0; i<num; i++) {
+      amx_Align32(&fs->address);
+      amx_Align32(&fs->nameofs);
+      fs=(AMX_FUNCSTUB*)((unsigned char *)fs+hdr->defsize);
+    } /* for */
+  } /* local */
+  #endif
+
+  /* verify P-code and relocate address in the case of the JIT */
+  if ((hdr->flags & AMX_FLAG_OVERLAY)==0) {
+    err=VerifyPcode(amx);
+  } else {
+    int i;
+    err=(amx->overlay==NULL) ? AMX_ERR_OVERLAY : AMX_ERR_NONE;
+    /* load every overlay on initialization and verify explicitly; we must
+     * do this to know whether to use new or old system requests
+     */
+    for (i=0; err==AMX_ERR_NONE && i<(int)((hdr->nametable - hdr->overlays)/sizeof(AMX_OVERLAYINFO)); i++) {
+      err=amx->overlay(amx, i);
+      if (err==AMX_ERR_NONE)
+        err=VerifyPcode(amx);
+    } /* for */
+  } /* if */
+  if (err!=AMX_ERR_NONE)
+    return err;
+
+  /* load any extension modules that the AMX refers to */
+  #if (defined _Windows || defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__) && !defined AMX_NODYNALOAD
+  { /* local */
+    int i;
+    #if defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
+      root=getenv("AMXLIB");
+    #endif
+    hdr=(AMX_HEADER *)amx->base;
+    numlibraries=NUMENTRIES(hdr,libraries,pubvars);
+    for (i=0; i<numlibraries; i++) {
+      lib=GETENTRY(hdr,libraries,i);
+      libname[0]='\0';
+      #if defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
+        if (root!=NULL && *root!='\0') {
+          strcpy(libname,root);
+          if (libname[strlen(libname)-1]!='/')
+            strcat(libname,"/");
+        } /* if */
+      #endif
+      strcat(libname,"amx");
+      strcat(libname,GETENTRYNAME(hdr,lib));
+      #if defined _Windows
+        strcat(libname,".dll");
+        #if defined __WIN32__
+          hlib=LoadLibraryA(libname);
+        #else
+          hlib=LoadLibrary(libname);
+          if (hlib<=HINSTANCE_ERROR)
+            hlib=NULL;
+        #endif
+      #elif defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
+        strcat(libname,".so");
+        hlib=dlopen(libname,RTLD_NOW);
+      #endif
+      if (hlib!=NULL) {
+        /* a library that cannot be loaded or that does not have the required
+         * initialization function is simply ignored
+         */
+        char funcname[sNAMEMAX+9]; /* +1 for '\0', +4 for 'amx_', +4 for 'Init' */
+        strcpy(funcname,"amx_");
+        strcat(funcname,GETENTRYNAME(hdr,lib));
+        strcat(funcname,"Init");
+        #if defined _Windows
+          libinit=(AMX_ENTRY)GetProcAddress(hlib,funcname);
+        #elif defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
+          libinit=(AMX_ENTRY)dlsym(hlib,funcname);
+        #endif
+        if (libinit!=NULL)
+          libinit(amx);
+      } /* if */
+      lib->address=(ucell)(intptr_t)hlib;
+    } /* for */
+  } /* local */
+  #endif
+
+  return AMX_ERR_NONE;
+}
+
+#if defined AMX_JIT
+
+  #define CODESIZE_JIT    8192  /* approximate size of the code for the JIT */
+
+  #if defined __WIN32__   /* this also applies to Win32 "console" applications */
+
+    #define ALIGN(addr)     (addr)
+
+    #define PROT_READ       0x1         /* page can be read */
+    #define PROT_WRITE      0x2         /* page can be written */
+    #define PROT_EXEC       0x4         /* page can be executed */
+    #define PROT_NONE       0x0         /* page can not be accessed */
+
+    static int mprotect(void *addr, size_t len, int prot)
+    {
+      DWORD prev, p = 0;
+      if ((prot & PROT_WRITE)!=0)
+        p = PAGE_EXECUTE_READWRITE;
+      else
+        p |= PAGE_EXECUTE_READ;
+      return !VirtualProtect(addr, len, p, &prev);
+    }
+
+  #elif defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
+
+    /* Linux, BSD and OSX already have mprotect() */
+    #define ALIGN(addr) (char *)(((long)addr + sysconf(_SC_PAGESIZE)-1) & ~(sysconf(_SC_PAGESIZE)-1))
+
+  #else
+
+    // TODO: Add cases for Mac OS/X and other operating systems
+
+    /* DOS32 has no imposed limits on its segments */
+    #define ALIGN(addr)     (addr)
+    #define mprotect(addr, len, prot)   (0)
+
+  #endif /* #if defined __WIN32 __ */
+
+int AMXAPI amx_InitJIT(AMX *amx, void *reloc_table, void *native_code)
+{
+  int res;
+  AMX_HEADER *hdr;
+
+  if ((amx->flags & AMX_FLAG_JITC)==0)
+    return AMX_ERR_INIT_JIT;    /* flag not set, this AMX is not prepared for JIT */
+  if (hdr->file_version>MAX_FILE_VER_JIT)
+    return AMX_ERR_VERSION;     /* JIT may not support the newest file version(s) */
+  /* the JIT does not support overlays, but this is already checked in VerifyPcode()
+   * the same goes for macro instructions: not supported in the JIT, but already
+   * checked in VerifyPcode()
+   */
+
+  /* Patching SYSREQ(.N) opcodes to SYSREQ.(N)D cannot work in the JIT, because
+   * the program would need to be re-JIT-compiled after patching a P-code
+   * instruction. If this field is not zero, something went wrong in
+   * VerifyPcode().
+   */
+  assert(amx->sysreq_d==0);
+
+  if (mprotect(ALIGN(amx_jit_compile), CODESIZE_JIT, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
+    return AMX_ERR_INIT_JIT;
+
+  /* copy the prefix */
+  memcpy(native_code, amx->base, ((AMX_HEADER *)(amx->base))->cod);
+  hdr = native_code;
+
+  /* MP: added check for correct compilation */
+  if ((res = amx_jit_compile(amx->base, reloc_table, native_code)) == 0) {
+    /* update the required memory size (the previous value was a
+     * conservative estimate, now we know the exact size)
+     */
+    amx->codesize = (hdr->dat + hdr->stp + sizeof(cell)) & ~(sizeof(cell)-1);
+    /* The compiled code is relocatable, since only relative jumps are
+     * used for destinations within the generated code, and absolute
+     * addresses are only for jumps into the runtime, which is fixed
+     * in memory.
+     */
+    /* set the new pointers */
+    amx->base = (unsigned char*)native_code;
+    amx->code = amx->base + (int)hdr->cod;
+    amx->cip = hdr->cip;
+  } /* if */
+
+  return (res == 0) ? AMX_ERR_NONE : AMX_ERR_INIT_JIT;
+}
+
+#else /* #if defined AMX_JIT */
+
+int AMXAPI amx_InitJIT(AMX *amx,void *compiled_program,void *reloc_table)
+{
+  (void)amx;
+  (void)compiled_program;
+  (void)reloc_table;
+  return AMX_ERR_INIT_JIT;
+}
+
+#endif  /* #if defined AMX_JIT */
+
+#endif  /* AMX_INIT */
+
+#if defined AMX_CLEANUP
+int AMXAPI amx_Cleanup(AMX *amx)
+{
+  #if (defined _Windows || defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__) && !defined AMX_NODYNALOAD
+    AMX_HEADER *hdr;
+    int numlibraries,i;
+    AMX_FUNCSTUB *lib;
+    AMX_ENTRY libcleanup;
+  #endif
+
+  /* unload all extension modules */
+  #if (defined _Windows || defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__) && !defined AMX_NODYNALOAD
+    hdr=(AMX_HEADER *)amx->base;
+    assert(hdr->magic==AMX_MAGIC);
+    numlibraries=NUMENTRIES(hdr,libraries,pubvars);
+    for (i=0; i<numlibraries; i++) {
+      lib=GETENTRY(hdr,libraries,i);
+      if (lib->address!=0) {
+        char funcname[sNAMEMAX+12]; /* +1 for '\0', +4 for 'amx_', +7 for 'Cleanup' */
+        strcpy(funcname,"amx_");
+        strcat(funcname,GETENTRYNAME(hdr,lib));
+        strcat(funcname,"Cleanup");
+        #if defined _Windows
+          libcleanup=(AMX_ENTRY)GetProcAddress((HINSTANCE)lib->address,funcname);
+        #elif defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
+          libcleanup=(AMX_ENTRY)dlsym((void*)(intptr_t)lib->address,funcname);
+        #endif
+        if (libcleanup!=NULL)
+          libcleanup(amx);
+        #if defined _Windows
+          FreeLibrary((HINSTANCE)lib->address);
+        #elif defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
+          dlclose((void*)(intptr_t)lib->address);
+        #endif
+      } /* if */
+    } /* for */
+  #else
+    (void)amx;
+  #endif
+  return AMX_ERR_NONE;
+}
+#endif /* AMX_CLEANUP */
+
+#if defined AMX_CLONE
+int AMXAPI amx_Clone(AMX *amxClone, AMX *amxSource, void *data)
+{
+  AMX_HEADER *hdr;
+  unsigned char _FAR *dataSource;
+
+  if (amxSource==NULL)
+    return AMX_ERR_FORMAT;
+  if (amxClone==NULL)
+    return AMX_ERR_PARAMS;
+  if ((amxSource->flags & AMX_FLAG_INIT)==0)
+    return AMX_ERR_INIT;
+  hdr=(AMX_HEADER *)amxSource->base;
+  if (hdr->magic!=AMX_MAGIC)
+    return AMX_ERR_FORMAT;
+  if (hdr->file_version>CUR_FILE_VERSION || hdr->amx_version<MIN_FILE_VERSION)
+    return AMX_ERR_VERSION;
+
+  /* set initial values */
+  amxClone->base=amxSource->base;
+  amxClone->code=amxSource->code;
+  amxClone->codesize=amxSource->codesize;
+  amxClone->hlw=hdr->hea - hdr->dat; /* stack and heap relative to data segment */
+  amxClone->stp=hdr->stp - hdr->dat - sizeof(cell);
+  amxClone->hea=amxClone->hlw;
+  amxClone->stk=amxClone->stp;
+  if (amxClone->callback==NULL)
+    amxClone->callback=amxSource->callback;
+  if (amxClone->debug==NULL)
+    amxClone->debug=amxSource->debug;
+  amxClone->flags=amxSource->flags;
+
+  /* copy the data segment; the stack and the heap can be left uninitialized */
+  assert(data!=NULL);
+  amxClone->data=(unsigned char _FAR *)data;
+  dataSource=(amxSource->data!=NULL) ? amxSource->data : amxSource->base+(int)hdr->dat;
+  memcpy(amxClone->data,dataSource,(size_t)(hdr->hea-hdr->dat));
+
+  /* Set a zero cell at the top of the stack, which functions
+   * as a sentinel for strings.
+   */
+  * (cell *)(amxClone->data+(int)amxClone->stp) = 0;
+
+  return AMX_ERR_NONE;
+}
+#endif /* AMX_CLONE */
+
+#if defined AMX_MEMINFO
+int AMXAPI amx_MemInfo(AMX *amx, long *codesize, long *datasize, long *stackheap)
+{
+  AMX_HEADER *hdr;
+
+  if (amx==NULL)
+    return AMX_ERR_FORMAT;
+  hdr=(AMX_HEADER *)amx->base;
+  if (hdr->magic!=AMX_MAGIC)
+    return AMX_ERR_FORMAT;
+  if (hdr->file_version>CUR_FILE_VERSION || hdr->amx_version<MIN_FILE_VERSION)
+    return AMX_ERR_VERSION;
+
+  if (codesize!=NULL)
+    *codesize=amx->codesize;
+  if (datasize!=NULL)
+    *datasize=hdr->hea - hdr->dat;
+  if (stackheap!=NULL)
+    *stackheap=hdr->stp - hdr->hea;
+
+  return AMX_ERR_NONE;
+}
+#endif /* AMX_MEMINFO */
+
+#if defined AMX_NAMELENGTH
+int AMXAPI amx_NameLength(AMX *amx, int *length)
+{
+  AMX_HEADER *hdr;
+  uint16_t *namelength;
+
+  assert(amx!=NULL);
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  namelength=(uint16_t*)(amx->base + (unsigned)hdr->nametable);
+  *length=*namelength;
+  return AMX_ERR_NONE;
+}
+#endif /* AMX_NAMELENGTH */
+
+#if defined AMX_XXXNATIVES
+int AMXAPI amx_NumNatives(AMX *amx, int *number)
+{
+  AMX_HEADER *hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  assert(hdr->natives<=hdr->libraries);
+  *number=NUMENTRIES(hdr,natives,libraries);
+  return AMX_ERR_NONE;
+}
+
+int AMXAPI amx_GetNative(AMX *amx, int index, char *name)
+{
+  AMX_HEADER *hdr;
+  AMX_FUNCSTUB *func;
+
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  assert(hdr->natives<=hdr->libraries);
+  if (index>=(cell)NUMENTRIES(hdr,natives,libraries))
+    return AMX_ERR_INDEX;
+
+  func=GETENTRY(hdr,natives,index);
+  strcpy(name,GETENTRYNAME(hdr,func));
+  return AMX_ERR_NONE;
+}
+
+int AMXAPI amx_FindNative(AMX *amx, const char *name, int *index)
+{
+  int idx,last;
+  char pname[sNAMEMAX+1];
+
+  amx_NumNatives(amx, &last);
+  /* linear search, the natives table is not sorted alphabetically */
+  for (idx=0; idx<last; idx++) {
+    amx_GetNative(amx,idx,pname);
+    if (strcmp(pname,name)==0) {
+      *index=idx;
+      return AMX_ERR_NONE;
+    } /* if */
+  } /* for */
+  *index=INT_MAX;
+  return AMX_ERR_NOTFOUND;
+}
+#endif /* AMX_XXXNATIVES */
+
+#if defined AMX_XXXPUBLICS
+int AMXAPI amx_NumPublics(AMX *amx, int *number)
+{
+  AMX_HEADER *hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  assert(hdr->publics<=hdr->natives);
+  *number=NUMENTRIES(hdr,publics,natives);
+  return AMX_ERR_NONE;
+}
+
+int AMXAPI amx_GetPublic(AMX *amx, int index, char *name, ucell *address)
+{
+  AMX_HEADER *hdr;
+  AMX_FUNCSTUB *func;
+
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  assert(hdr->publics<=hdr->natives);
+  if (index>=(cell)NUMENTRIES(hdr,publics,natives))
+    return AMX_ERR_INDEX;
+
+  func=GETENTRY(hdr,publics,index);
+  if (name!=NULL)
+    strcpy(name,GETENTRYNAME(hdr,func));
+  if (address!=NULL)
+    *address=func->address;
+  return AMX_ERR_NONE;
+}
+
+int AMXAPI amx_FindPublic(AMX *amx, const char *name, int *index)
+{
+  int first,last,mid,result;
+  char pname[sNAMEMAX+1];
+
+  amx_NumPublics(amx, &last);
+  last--;       /* last valid index is 1 less than the number of functions */
+  first=0;
+  /* binary search */
+  while (first<=last) {
+    mid=(first+last)/2;
+    amx_GetPublic(amx,mid,pname,NULL);
+    result=strcmp(pname,name);
+    if (result>0) {
+      last=mid-1;
+    } else if (result<0) {
+      first=mid+1;
+    } else {
+      *index=mid;
+      return AMX_ERR_NONE;
+    } /* if */
+  } /* while */
+  /* not found, set to an invalid index, so amx_Exec() on this index will fail
+   * with an error
+   */
+  *index=INT_MAX;
+  return AMX_ERR_NOTFOUND;
+}
+#endif /* AMX_XXXPUBLICS */
+
+#if defined AMX_XXXPUBVARS
+int AMXAPI amx_NumPubVars(AMX *amx, int *number)
+{
+  AMX_HEADER *hdr;
+
+  assert(amx!=NULL);
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  assert(hdr->pubvars<=hdr->tags);
+  *number=NUMENTRIES(hdr,pubvars,tags);
+  return AMX_ERR_NONE;
+}
+
+int AMXAPI amx_GetPubVar(AMX *amx, int index, char *name, cell **address)
+{
+  AMX_HEADER *hdr;
+  AMX_FUNCSTUB *var;
+  unsigned char *data;
+
+  assert(amx!=NULL);
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  assert(hdr->pubvars<=hdr->tags);
+  if (index>=(cell)NUMENTRIES(hdr,pubvars,tags))
+    return AMX_ERR_INDEX;
+
+  var=GETENTRY(hdr,pubvars,index);
+  strcpy(name,GETENTRYNAME(hdr,var));
+  data=(amx->data!=NULL) ? amx->data : amx->base+(int)hdr->dat;
+  assert(address!=NULL);
+  *address=(cell *)(data+(int)var->address);
+  return AMX_ERR_NONE;
+}
+
+int AMXAPI amx_FindPubVar(AMX *amx, const char *name, cell **address)
+{
+  int first,last,mid,result;
+  char pname[sNAMEMAX+1];
+
+  amx_NumPubVars(amx,&last);
+  last--;       /* last valid index is 1 less than the number of functions */
+  first=0;
+  /* binary search */
+  while (first<=last) {
+    mid=(first+last)/2;
+    amx_GetPubVar(amx,mid,pname,address);
+    result=strcmp(pname,name);
+    if (result>0)
+      last=mid-1;
+    else if (result<0)
+      first=mid+1;
+    else
+      return AMX_ERR_NONE;
+  } /* while */
+  /* not found */
+  assert(address!=NULL);
+  *address=NULL;
+  return AMX_ERR_NOTFOUND;
+}
+#endif /* AMX_XXXPUBVARS */
+
+#if defined AMX_XXXTAGS
+int AMXAPI amx_NumTags(AMX *amx, int *number)
+{
+  AMX_HEADER *hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  if (hdr->file_version<5) {    /* the tagname table appeared in file format 5 */
+    *number=0;
+    return AMX_ERR_VERSION;
+  } /* if */
+  if (hdr->file_version<7) {    /* file version 7 introduced the name table */
+    assert(hdr->tags<=hdr->cod);
+    *number=NUMENTRIES(hdr,tags,cod);
+  } else {
+    assert(hdr->tags<=hdr->nametable);
+    *number=NUMENTRIES(hdr,tags,nametable);
+  } /* if */
+  return AMX_ERR_NONE;
+}
+
+int AMXAPI amx_GetTag(AMX *amx, int index, char *tagname, cell *tag_id)
+{
+  AMX_HEADER *hdr;
+  AMX_FUNCSTUB *tag;
+
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  if (hdr->file_version<5) {    /* the tagname table appeared in file format 5 */
+    *tagname='\0';
+    *tag_id=0;
+    return AMX_ERR_VERSION;
+  } /* if */
+
+  if (hdr->file_version<7) {    /* file version 7 introduced the name table */
+    assert(hdr->tags<=hdr->cod);
+    if (index>=(cell)NUMENTRIES(hdr,tags,cod))
+      return AMX_ERR_INDEX;
+  } else {
+    assert(hdr->tags<=hdr->nametable);
+    if (index>=(cell)NUMENTRIES(hdr,tags,nametable))
+      return AMX_ERR_INDEX;
+  } /* if */
+
+  tag=GETENTRY(hdr,tags,index);
+  strcpy(tagname,GETENTRYNAME(hdr,tag));
+  *tag_id=tag->address;
+
+  return AMX_ERR_NONE;
+}
+
+int AMXAPI amx_FindTagId(AMX *amx, cell tag_id, char *tagname)
+{
+  int first,last,mid;
+  cell mid_id;
+
+  #if !defined NDEBUG
+    /* verify that the tagname table is sorted on the tag_id */
+    amx_NumTags(amx, &last);
+    if (last>0) {
+      cell cur_id;
+      amx_GetTag(amx,0,tagname,&cur_id);
+      for (first=1; first<last; first++) {
+        amx_GetTag(amx,first,tagname,&mid_id);
+        assert(cur_id<mid_id);
+        cur_id=mid_id;
+      } /* for */
+    } /* if */
+  #endif
+
+  amx_NumTags(amx, &last);
+  last--;       /* last valid index is 1 less than the number of functions */
+  first=0;
+  /* binary search */
+  while (first<=last) {
+    mid=(first+last)/2;
+    amx_GetTag(amx,mid,tagname,&mid_id);
+    if (mid_id>tag_id)
+      last=mid-1;
+    else if (mid_id<tag_id)
+      first=mid+1;
+    else
+      return AMX_ERR_NONE;
+  } /* while */
+  /* not found */
+  *tagname='\0';
+  return AMX_ERR_NOTFOUND;
+}
+#endif /* AMX_XXXTAGS */
+
+#if defined AMX_XXXUSERDATA
+int AMXAPI amx_GetUserData(AMX *amx, long tag, void **ptr)
+{
+  int index;
+
+  assert(amx!=NULL);
+  assert(tag!=0);
+  for (index=0; index<AMX_USERNUM && amx->usertags[index]!=tag; index++)
+    /* nothing */;
+  if (index>=AMX_USERNUM)
+    return AMX_ERR_USERDATA;
+  *ptr=amx->userdata[index];
+  return AMX_ERR_NONE;
+}
+
+int AMXAPI amx_SetUserData(AMX *amx, long tag, void *ptr)
+{
+  int index;
+
+  assert(amx!=NULL);
+  assert(tag!=0);
+  /* try to find existing tag */
+  for (index=0; index<AMX_USERNUM && amx->usertags[index]!=tag; index++)
+    /* nothing */;
+  /* if not found, try to find empty tag */
+  if (index>=AMX_USERNUM)
+    for (index=0; index<AMX_USERNUM && amx->usertags[index]!=0; index++)
+      /* nothing */;
+  /* if still not found, quit with error */
+  if (index>=AMX_USERNUM)
+    return AMX_ERR_INDEX;
+  /* set the tag and the value */
+  amx->usertags[index]=tag;
+  amx->userdata[index]=ptr;
+  return AMX_ERR_NONE;
+}
+#endif /* AMX_XXXUSERDATA */
+
+#if defined AMX_REGISTER
+static AMX_NATIVE findfunction(char *name, const AMX_NATIVE_INFO *list, int number)
+{
+  int i;
+
+  assert(list!=NULL);
+  for (i=0; list[i].name!=NULL && (i<number || number==-1); i++)
+    if (strcmp(name,list[i].name)==0)
+      return list[i].func;
+  return NULL;
+}
+
+int AMXAPI amx_Register(AMX *amx, const AMX_NATIVE_INFO *list, int number)
+{
+  AMX_FUNCSTUB *func;
+  AMX_HEADER *hdr;
+  int i,numnatives,err;
+  AMX_NATIVE funcptr;
+
+  assert(amx!=NULL);
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  assert(hdr->natives<=hdr->libraries);
+  numnatives=NUMENTRIES(hdr,natives,libraries);
+
+  err=AMX_ERR_NONE;
+  func=GETENTRY(hdr,natives,0);
+  for (i=0; i<numnatives; i++) {
+    if (func->address==0) {
+      /* this function is not yet located */
+      funcptr=(list!=NULL) ? findfunction(GETENTRYNAME(hdr,func),list,number) : NULL;
+      if (funcptr!=NULL)
+        func->address=(ucell)(intptr_t)funcptr;
+      else
+        err=AMX_ERR_NOTFOUND;
+    } /* if */
+    func=(AMX_FUNCSTUB*)((unsigned char*)func+hdr->defsize);
+  } /* for */
+  if (err==AMX_ERR_NONE)
+    amx->flags|=AMX_FLAG_NTVREG;
+  return err;
+}
+#endif /* AMX_REGISTER */
+
+#if defined AMX_NATIVEINFO
+AMX_NATIVE_INFO * AMXAPI amx_NativeInfo(const char *name, AMX_NATIVE func)
+{
+  static AMX_NATIVE_INFO n;
+  n.name=name;
+  n.func=func;
+  return &n;
+}
+#endif /* AMX_NATIVEINFO */
+
+
+#define STKMARGIN       ((cell)(16*sizeof(cell)))
+
+#if defined AMX_PUSHXXX
+
+int AMXAPI amx_Push(AMX *amx, cell value)
+{
+  AMX_HEADER *hdr;
+  unsigned char *data;
+
+  if (amx->hea+STKMARGIN>amx->stk)
+    return AMX_ERR_STACKERR;
+  hdr=(AMX_HEADER *)amx->base;
+  data=(amx->data!=NULL) ? amx->data : amx->base+(int)hdr->dat;
+  amx->stk-=sizeof(cell);
+  amx->paramcount+=1;
+  *(cell *)(data+(int)amx->stk)=value;
+  return AMX_ERR_NONE;
+}
+
+int AMXAPI amx_PushAddress(AMX *amx, cell *address)
+{
+  AMX_HEADER *hdr;
+  unsigned char *data;
+  cell xaddr;
+
+  /* reverse relocate the address */
+  assert(amx!=NULL);
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  data=(amx->data!=NULL) ? amx->data : amx->base+(int)hdr->dat;
+  xaddr=(cell)((unsigned char*)address-data);
+  if ((ucell)xaddr>=(ucell)amx->stp)
+    return AMX_ERR_MEMACCESS;
+  return amx_Push(amx,xaddr);
+}
+
+int AMXAPI amx_PushArray(AMX *amx, cell **address, const cell array[], int numcells)
+{
+  cell xaddr,*paddr;
+  int err;
+
+  assert(amx!=NULL);
+  assert(array!=NULL);
+
+  xaddr=amx->hea; /* save, before it is modified by amx_Allot() */
+  err=amx_Allot(amx,numcells,&paddr);
+  if (err==AMX_ERR_NONE) {
+    memcpy(paddr,array,numcells*sizeof(cell));
+    err=amx_Push(amx,xaddr);
+  } /* if */
+  if (address!=NULL)
+    *address=paddr;
+  return err;
+}
+
+int AMXAPI amx_PushString(AMX *amx, cell **address, const char *string, int pack, int use_wchar)
+{
+  cell xaddr,*paddr;
+  int numcells,err;
+
+  assert(amx!=NULL);
+  assert(string!=NULL);
+
+  #if defined AMX_ANSIONLY
+    numcells=strlen(string) + 1;
+  #else
+    numcells= (int)(use_wchar ? wcslen((const wchar_t*)string) : strlen(string)) + 1;
+  #endif
+  if (pack)
+    numcells=(numcells+sizeof(cell)-1)/sizeof(cell);
+  xaddr=amx->hea; /* save, before it is modified by amx_Allot() */
+  err=amx_Allot(amx,numcells,&paddr);
+  if (err==AMX_ERR_NONE) {
+    amx_SetString(paddr,string,pack,use_wchar,numcells);
+    err=amx_Push(amx,xaddr);
+  } /* if */
+  if (address!=NULL)
+    *address=paddr;
+  return err;
+}
+#endif /* AMX_PUSHXXX */
+
+#if defined AMX_EXEC
+
+/* It is assumed that the abstract machine can simply access the memory area
+ * for the global data and the stack. If this is not the case, you need to
+ * define the macro sets _R() and _W(), for reading and writing to memory.
+ */
+#if !defined _R
+  #define _R_DEFAULT            /* mark default memory access */
+  #define _R(base,addr)         (* (cell *)((unsigned char*)(base)+(int)(addr)))
+  #define _R8(base,addr)        (* (unsigned char *)((unsigned char*)(base)+(int)(addr)))
+  #define _R16(base,addr)       (* (uint16_t *)((unsigned char*)(base)+(int)(addr)))
+  #define _R32(base,addr)       (* (uint32_t *)((unsigned char*)(base)+(int)(addr)))
+#endif
+#if !defined _W
+  #define _W_DEFAULT            /* mark default memory access */
+  #define _W(base,addr,value)   ((*(cell *)((unsigned char*)(base)+(int)(addr)))=(cell)(value))
+  #define _W8(base,addr,value)  ((*(unsigned char *)((unsigned char*)(base)+(int)(addr)))=(unsigned char)(value))
+  #define _W16(base,addr,value) ((*(uint16_t *)((unsigned char*)(base)+(int)(addr)))=(uint16_t)(value))
+  #define _W32(base,addr,value) ((*(uint32_t *)((unsigned char*)(base)+(int)(addr)))=(uint32_t)(value))
+#endif
+
+#if -8/3==-2 && 8/-3==-2
+  #define TRUNC_SDIV    /* signed divisions are truncated on this platform */
+#else
+  #define IABS(a)       ((a)>=0 ? (a) : (-a))
+#endif
+
+/* The pseudo-instructions come from the code stream. Normally, these are just
+ * accessed from memory. When the instructions must be fetched in some other
+ * way, the definition below must be pre-defined.
+ * N.B.:
+ *   - reading from a code address should increment the instruction pointer
+ *     (called "cip")
+ *   - only cell-sized accesses occur in code memory
+ */
+#if !defined _RCODE
+  #define _RCODE()      ( *cip++ )
+#endif
+
+#if !defined GETPARAM
+  #define GETPARAM(v)   ( v=_RCODE() )   /* read a parameter from the opcode stream */
+#endif
+#if !defined SKIPPARAM
+  #define SKIPPARAM(n)  ( cip=(cell *)cip+(n) ) /* for obsolete opcodes */
+#endif
+
+#define AMXPUSH(v)      ( amx->stk-=sizeof(cell), *(cell*)(data+amx->stk)=(v) )
+#define ABORT(amx,v)    { (amx)->stk=reset_stk; (amx)->hea=reset_hea; return v; }
+
+
+#if !defined AMX_ALTCORE
+int amx_exec_list(AMX *amx,const cell **opcodelist,int *numopcodes)
+{
+  (void)amx;
+  assert(opcodelist!=NULL);
+  *opcodelist=NULL;
+  assert(numopcodes!=NULL);
+  *numopcodes=OP_NUM_OPCODES;
+  return 0;
+}
+#endif
+
+int AMXAPI amx_Exec(AMX *amx, cell *retval, int index)
+{
+  AMX_HEADER *hdr;
+  AMX_FUNCSTUB *func;
+  unsigned char *data;
+  cell reset_stk,reset_hea;
+  int i;
+#if !defined AMX_ALTCORE
+  cell pri,alt,stk,frm,hea;
+  cell *cip,op,offs,val;
+#endif
+
+  assert(amx!=NULL);
+  if ((amx->flags & AMX_FLAG_INIT)==0)
+    return AMX_ERR_INIT;
+  if (amx->callback==NULL)
+    return AMX_ERR_CALLBACK;
+
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+
+  if ((amx->flags & AMX_FLAG_NTVREG)==0) {
+    /* verify that all native functions have been registered (or do not
+     * need registering)
+     */
+    int numnatives;
+    assert(hdr->natives<=hdr->libraries);
+    numnatives=NUMENTRIES(hdr,natives,libraries);
+    func=GETENTRY(hdr,natives,0);
+    for (i=0; i<numnatives && func->address!=0; i++)
+      func=(AMX_FUNCSTUB*)((unsigned char*)func+hdr->defsize);
+    if (i<numnatives)
+      return AMX_ERR_NOTFOUND;
+    amx->flags|=AMX_FLAG_NTVREG;  /* no need to check this again */
+  } /* if */
+  assert((amx->flags & AMX_FLAG_VERIFY)==0);
+
+  /* set up the registers */
+  assert(hdr!=NULL && hdr->magic==AMX_MAGIC);
+  assert(amx->code!=NULL || hdr->overlays!=hdr->nametable);
+  data=(amx->data!=NULL) ? amx->data : amx->base+(int)hdr->dat;
+  reset_stk=amx->stk;
+  reset_hea=amx->hea;
+  amx->error=AMX_ERR_NONE;
+
+  /* get the start address */
+  if (index==AMX_EXEC_MAIN) {
+    if (hdr->cip<0)
+      return AMX_ERR_INDEX;
+    amx->cip=hdr->cip;
+    if (hdr->overlays!=hdr->nametable) {
+      assert(hdr->overlays!=0);
+      assert(amx->overlay!=NULL);
+      amx->ovl_index=(int)hdr->cip;
+      if ((i=amx->overlay(amx,amx->ovl_index))!=AMX_ERR_NONE)
+        return i;
+      amx->cip=0;
+    } /* if */
+  } else if (index==AMX_EXEC_CONT) {
+    /* restore registers reset_stk & reset_hea */
+    reset_stk=amx->reset_stk;
+    reset_hea=amx->reset_hea;
+    if (hdr->overlays!=hdr->nametable) {
+      assert(hdr->overlays!=0);
+      assert(amx->overlay!=NULL);
+      if ((i=amx->overlay(amx,amx->ovl_index))!=AMX_ERR_NONE)
+        return i;
+    } /* if */
+  } else if (index<0) {
+    return AMX_ERR_INDEX;
+  } else {
+    if (index>=(int)NUMENTRIES(hdr,publics,natives))
+      return AMX_ERR_INDEX;
+    func=GETENTRY(hdr,publics,index);
+    amx->cip=func->address;
+    if (hdr->overlays!=hdr->nametable) {
+      assert(hdr->overlays!=0);
+      assert(amx->overlay!=NULL);
+      amx->ovl_index=func->address;
+      if ((i=amx->overlay(amx,amx->ovl_index))!=AMX_ERR_NONE)
+        return i;
+      amx->cip=0;
+    } /* if */
+  } /* if */
+  /* check values just copied */
+  if (amx->stk>amx->stp)
+    return AMX_ERR_STACKLOW;
+  if (amx->hea<amx->hlw)
+    return AMX_ERR_HEAPLOW;
+  assert(check_endian());
+
+  /* sanity checks */
+  assert_static(OP_XCHG==21);
+  assert_static(OP_SMUL==42);
+  assert_static(OP_MOVS==64);
+  #if !defined AMX_NO_MACRO_INSTR
+    assert_static(OP_LIDX==81);
+    assert_static(OP_ZERO_PRI==102);
+    assert_static(OP_LOAD2==120);
+  #endif
+  #if !defined AMX_NO_PACKED_OPC
+    assert_static(OP_LOAD_P_PRI==124);
+    assert_static(OP_ALIGN_P_PRI==141);
+    assert_static(OP_BOUNDS_P==174);
+  #endif
+  #if PAWN_CELL_SIZE==16
+    assert_static(sizeof(cell)==2);
+  #elif PAWN_CELL_SIZE==32
+    assert_static(sizeof(cell)==4);
+  #elif PAWN_CELL_SIZE==64
+    assert_static(sizeof(cell)==8);
+  #else
+    #error Unsupported cell size
+  #endif
+
+  if (index!=AMX_EXEC_CONT) {
+    reset_stk+=amx->paramcount*sizeof(cell);
+    AMXPUSH(amx->paramcount*sizeof(cell));
+    amx->paramcount=0;          /* push the parameter count to the stack & reset */
+    AMXPUSH(0);                 /* return address (for overlays: overlay 0, offset 0) */
+  } /* if */
+  /* check stack/heap before starting to run */
+  if (amx->hea+STKMARGIN>amx->stk)
+    return AMX_ERR_STACKERR;
+
+#if defined AMX_ALTCORE
+
+  /* start running either the ARM or 80x86 assembler abstract machine or the JIT */
+  #if defined AMX_ASM && defined AMX_JIT
+    if ((amx->flags & AMX_FLAG_JITC)!=0)
+      i = amx_jit_run(amx,retval,data);
+    else
+      i = amx_exec_run(amx,retval,data);
+  #elif defined AMX_JIT
+    i = amx_jit_run(amx,retval,data);
+  #else
+    /* also for GNU GCC and Intel C/C++ versions */
+    i = amx_exec_run(amx,retval,data);
+  #endif
+  if (i == AMX_ERR_SLEEP) {
+    amx->reset_stk=reset_stk;
+    amx->reset_hea=reset_hea;
+  } else {
+    /* remove parameters from the stack; do this the "hard" way, because
+     * the assembler version has no internal knowledge of the local
+     * variables, so any "clean" way would be a kludge anyway.
+     */
+    amx->stk=reset_stk;
+    amx->hea=reset_hea;
+  } /* if */
+  return i;
+
+#else
+
+  #define CHKMARGIN()   if (hea+STKMARGIN>stk) return AMX_ERR_STACKERR
+  #define CHKSTACK()    if (stk>amx->stp) return AMX_ERR_STACKLOW
+  #define CHKHEAP()     if (hea<amx->hlw) return AMX_ERR_HEAPLOW
+
+  /* PUSH() and POP() are defined in terms of the _R() and _W() macros */
+  #define PUSH(v)       ( stk-=sizeof(cell), _W(data,stk,v) )
+  #define POP(v)        ( v=_R(data,stk), stk+=sizeof(cell) )
+
+  /* set up registers for ANSI-C core: pri, alt, frm, cip, hea, stk */
+  pri=amx->pri;
+  alt=amx->alt;
+  frm=amx->frm;
+  cip=(cell *)(amx->code+(int)amx->cip);
+  hea=amx->hea;
+  stk=amx->stk;
+
+  /* start running */
+  for ( ;; ) {
+    op=_RCODE();
+    switch (GETOPCODE(op)) {
+    /* core instruction set */
+    case OP_NOP:
+      break;
+    case OP_LOAD_PRI:
+      GETPARAM(offs);
+      pri=_R(data,offs);
+      break;
+    case OP_LOAD_ALT:
+      GETPARAM(offs);
+      alt=_R(data,offs);
+      break;
+    case OP_LOAD_S_PRI:
+      GETPARAM(offs);
+      pri=_R(data,frm+offs);
+      break;
+    case OP_LOAD_S_ALT:
+      GETPARAM(offs);
+      alt=_R(data,frm+offs);
+      break;
+    case OP_LREF_S_PRI:
+      GETPARAM(offs);
+      offs=_R(data,frm+offs);
+      pri=_R(data,offs);
+      break;
+    case OP_LREF_S_ALT:
+      GETPARAM(offs);
+      offs=_R(data,frm+offs);
+      alt=_R(data,offs);
+      break;
+    case OP_LOAD_I:
+      /* verify address */
+      if (pri>=hea && pri<stk || (ucell)pri>=(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      pri=_R(data,pri);
+      break;
+    case OP_LODB_I:
+      GETPARAM(offs);
+    __lodb_i:
+      /* verify address */
+      if (pri>=hea && pri<stk || (ucell)pri>=(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      switch ((int)offs) {
+      case 1:
+        pri=_R8(data,pri);
+        break;
+      case 2:
+        pri=_R16(data,pri);
+        break;
+      case 4:
+        pri=_R32(data,pri);
+        break;
+      } /* switch */
+      break;
+    case OP_CONST_PRI:
+      GETPARAM(pri);
+      break;
+    case OP_CONST_ALT:
+      GETPARAM(alt);
+      break;
+    case OP_ADDR_PRI:
+      GETPARAM(pri);
+      pri+=frm;
+      break;
+    case OP_ADDR_ALT:
+      GETPARAM(alt);
+      alt+=frm;
+      break;
+    case OP_STOR:
+      GETPARAM(offs);
+      _W(data,offs,pri);
+      break;
+    case OP_STOR_S:
+      GETPARAM(offs);
+      _W(data,frm+offs,pri);
+      break;
+    case OP_SREF_S:
+      GETPARAM(offs);
+      offs=_R(data,frm+offs);
+      _W(data,offs,pri);
+      break;
+    case OP_STOR_I:
+      /* verify address */
+      if (alt>=hea && alt<stk || (ucell)alt>=(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      _W(data,alt,pri);
+      break;
+    case OP_STRB_I:
+      GETPARAM(offs);
+    __strb_i:
+      /* verify address */
+      if (alt>=hea && alt<stk || (ucell)alt>=(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      switch ((int)offs) {
+      case 1:
+        _W8(data,alt,pri);
+        break;
+      case 2:
+        _W16(data,alt,pri);
+        break;
+      case 4:
+        _W32(data,alt,pri);
+        break;
+      } /* switch */
+      break;
+    case OP_ALIGN_PRI:
+      GETPARAM(offs);
+      #if BYTE_ORDER==LITTLE_ENDIAN
+        if ((size_t)offs<sizeof(cell))
+          pri ^= sizeof(cell)-offs;
+      #endif
+      break;
+    case OP_LCTRL:
+      GETPARAM(offs);
+      switch ((int)offs) {
+      case 0:
+        pri=hdr->cod;
+        break;
+      case 1:
+        pri=hdr->dat;
+        break;
+      case 2:
+        pri=hea;
+        break;
+      case 3:
+        pri=amx->stp;
+        break;
+      case 4:
+        pri=stk;
+        break;
+      case 5:
+        pri=frm;
+        break;
+      case 6:
+        pri=(cell)((unsigned char *)cip-amx->code);
+        break;
+      } /* switch */
+      break;
+    case OP_SCTRL:
+      GETPARAM(offs);
+      switch ((int)offs) {
+      case 0:
+      case 1:
+      case 3:
+        /* cannot change these parameters */
+        break;
+      case 2:
+        hea=pri;
+        break;
+      case 4:
+        stk=pri;
+        break;
+      case 5:
+        frm=pri;
+        break;
+      case 6:
+        cip=(cell *)(amx->code + (int)pri);
+        break;
+      } /* switch */
+      break;
+    case OP_XCHG:
+      offs=pri;         /* offs is a temporary variable */
+      pri=alt;
+      alt=offs;
+      break;
+    case OP_PUSH_PRI:
+      PUSH(pri);
+      break;
+    case OP_PUSH_ALT:
+      PUSH(alt);
+      break;
+    case OP_PUSHR_PRI:
+      PUSH((intptr_t)data+pri);
+      break;
+    case OP_POP_PRI:
+      POP(pri);
+      break;
+    case OP_POP_ALT:
+      POP(alt);
+      break;
+    case OP_PICK:
+      GETPARAM(offs);
+      pri=_R(data,stk+offs);
+      break;
+    case OP_STACK:
+      GETPARAM(offs);
+      alt=stk;
+      stk+=offs;
+      CHKMARGIN();
+      CHKSTACK();
+      break;
+    case OP_HEAP:
+      GETPARAM(offs);
+      alt=hea;
+      hea+=offs;
+      CHKMARGIN();
+      CHKHEAP();
+      break;
+    case OP_PROC:
+      PUSH(frm);
+      frm=stk;
+      CHKMARGIN();
+      break;
+    case OP_RET:
+      POP(frm);
+      POP(offs);
+      /* verify the return address */
+      if ((long)offs>=amx->codesize)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      cip=(cell *)(amx->code+(int)offs);
+      break;
+    case OP_RETN:
+      POP(frm);
+      POP(offs);
+      /* verify the return address */
+      if ((long)offs>=amx->codesize)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      cip=(cell *)(amx->code+(int)offs);
+      stk+=_R(data,stk)+sizeof(cell);   /* remove parameters from the stack */
+      break;
+    case OP_CALL:
+      PUSH(((unsigned char *)cip-amx->code)+sizeof(cell));/* skip address */
+      cip=JUMPREL(cip);                 /* jump to the address */
+      break;
+    case OP_JUMP:
+      /* since the GETPARAM() macro modifies cip, you cannot
+       * do GETPARAM(cip) directly */
+      cip=JUMPREL(cip);
+      break;
+    case OP_JZER:
+      if (pri==0)
+        cip=JUMPREL(cip);
+      else
+        SKIPPARAM(1);
+      break;
+    case OP_JNZ:
+      if (pri!=0)
+        cip=JUMPREL(cip);
+      else
+        SKIPPARAM(1);
+      break;
+    case OP_SHL:
+      pri<<=alt;
+      break;
+    case OP_SHR:
+      pri=(ucell)pri >> (int)alt;
+      break;
+    case OP_SSHR:
+      pri>>=alt;
+      break;
+    case OP_SHL_C_PRI:
+      GETPARAM(offs);
+      pri<<=offs;
+      break;
+    case OP_SHL_C_ALT:
+      GETPARAM(offs);
+      alt<<=offs;
+      break;
+    case OP_SMUL:
+      pri*=alt;
+      break;
+    case OP_SDIV:
+      if (pri==0)
+        ABORT(amx,AMX_ERR_DIVIDE);
+      /* use floored division and matching remainder */
+      offs=pri;
+      #if defined TRUNC_SDIV
+        pri=alt/offs;
+        alt=alt%offs;
+      #else
+        val=alt;                /* portable routine for truncated division */
+        pri=IABS(alt)/IABS(offs);
+        if ((cell)(val ^ offs)<0)
+          pri=-pri;
+        alt=val-pri*offs;       /* calculate the matching remainder */
+      #endif
+      /* now "fiddle" with the values to get floored division */
+      if (alt!=0 && (cell)(alt ^ offs)<0) {
+        pri--;
+        alt+=offs;
+      } /* if */
+      break;
+    case OP_ADD:
+      pri+=alt;
+      break;
+    case OP_SUB:
+      pri=alt-pri;
+      break;
+    case OP_AND:
+      pri&=alt;
+      break;
+    case OP_OR:
+      pri|=alt;
+      break;
+    case OP_XOR:
+      pri^=alt;
+      break;
+    case OP_NOT:
+      pri=!pri;
+      break;
+    case OP_NEG:
+      pri=-pri;
+      break;
+    case OP_INVERT:
+      pri=~pri;
+      break;
+    case OP_EQ:
+      pri= pri==alt ? 1 : 0;
+      break;
+    case OP_NEQ:
+      pri= pri!=alt ? 1 : 0;
+      break;
+    case OP_SLESS:
+      pri= pri<alt ? 1 : 0;
+      break;
+    case OP_SLEQ:
+      pri= pri<=alt ? 1 : 0;
+      break;
+    case OP_SGRTR:
+      pri= pri>alt ? 1 : 0;
+      break;
+    case OP_SGEQ:
+      pri= pri>=alt ? 1 : 0;
+      break;
+    case OP_INC_PRI:
+      pri++;
+      break;
+    case OP_INC_ALT:
+      alt++;
+      break;
+    case OP_INC_I:
+      #if defined _R_DEFAULT
+        *(cell *)(data+(int)pri) += 1;
+      #else
+        val=_R(data,pri);
+        _W(data,pri,val+1);
+      #endif
+      break;
+    case OP_DEC_PRI:
+      pri--;
+      break;
+    case OP_DEC_ALT:
+      alt--;
+      break;
+    case OP_DEC_I:
+      #if defined _R_DEFAULT
+        *(cell *)(data+(int)pri) -= 1;
+      #else
+        val=_R(data,pri);
+        _W(data,pri,val-1);
+      #endif
+      break;
+    case OP_MOVS:
+      GETPARAM(offs);
+    __movs:
+      /* verify top & bottom memory addresses, for both source and destination
+       * addresses
+       */
+      if (pri>=hea && pri<stk || (ucell)pri>=(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      if ((pri+offs)>hea && (pri+offs)<stk || (ucell)(pri+offs)>(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      if (alt>=hea && alt<stk || (ucell)alt>=(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      if ((alt+offs)>hea && (alt+offs)<stk || (ucell)(alt+offs)>(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      #if defined _R_DEFAULT
+        memcpy(data+(int)alt, data+(int)pri, (int)offs);
+      #else
+        for (i=0; i+4<offs; i+=4) {
+          val=_R32(data,pri+i);
+          _W32(data,alt+i,val);
+        } /* for */
+        for ( ; i<offs; i++) {
+          val=_R8(data,pri+i);
+          _W8(data,alt+i,val);
+        } /* for */
+      #endif
+      break;
+    case OP_CMPS:
+      GETPARAM(offs);
+    __cmps:
+      /* verify top & bottom memory addresses, for both source and destination
+       * addresses
+       */
+      if (pri>=hea && pri<stk || (ucell)pri>=(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      if ((pri+offs)>hea && (pri+offs)<stk || (ucell)(pri+offs)>(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      if (alt>=hea && alt<stk || (ucell)alt>=(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      if ((alt+offs)>hea && (alt+offs)<stk || (ucell)(alt+offs)>(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      #if defined _R_DEFAULT
+        pri=memcmp(data+(int)alt, data+(int)pri, (int)offs);
+      #else
+        pri=0;
+        for (i=0; i+4<offs && pri==0; i+=4)
+          pri=_R32(data,alt+i)-_R32(data,pri+i);
+        for ( ; i<offs && pri==0; i++)
+          pri=_R8(data,alt+i)-_R8(data,pri+i);
+      #endif
+      break;
+    case OP_FILL:
+      GETPARAM(offs);
+    __fill:
+      /* verify top & bottom memory addresses (destination only) */
+      if (alt>=hea && alt<stk || (ucell)alt>=(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      if ((alt+offs)>hea && (alt+offs)<stk || (ucell)(alt+offs)>(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      for (i=(int)alt; (size_t)offs>=sizeof(cell); i+=sizeof(cell), offs-=sizeof(cell))
+        _W32(data,i,pri);
+      break;
+    case OP_HALT:
+      GETPARAM(offs);
+    __halt:
+      if (retval!=NULL)
+        *retval=pri;
+      /* store complete status (stk and hea are already set in the ABORT macro) */
+      amx->frm=frm;
+      amx->pri=pri;
+      amx->alt=alt;
+      amx->cip=(cell)((unsigned char*)cip-amx->code);
+      if (offs==AMX_ERR_SLEEP) {
+        amx->stk=stk;
+        amx->hea=hea;
+        amx->reset_stk=reset_stk;
+        amx->reset_hea=reset_hea;
+        return (int)offs;
+      } /* if */
+      ABORT(amx,(int)offs);
+    case OP_BOUNDS:
+      GETPARAM(offs);
+      if ((ucell)pri>(ucell)offs) {
+        amx->cip=(cell)((unsigned char *)cip-amx->code);
+        ABORT(amx,AMX_ERR_BOUNDS);
+      } /* if */
+      break;
+    case OP_SYSREQ:
+      GETPARAM(offs);
+      /* save a few registers */
+      amx->cip=(cell)((unsigned char *)cip-amx->code);
+      amx->hea=hea;
+      amx->frm=frm;
+      amx->stk=stk;
+      i=amx->callback(amx,offs,&pri,(cell *)(data+(int)stk));
+      if (i!=AMX_ERR_NONE) {
+        if (i==AMX_ERR_SLEEP) {
+          amx->pri=pri;
+          amx->alt=alt;
+          amx->reset_stk=reset_stk;
+          amx->reset_hea=reset_hea;
+          return i;
+        } /* if */
+        ABORT(amx,i);
+      } /* if */
+      break;
+    case OP_SWITCH: {
+      cell *cptr=JUMPREL(cip)+1;/* +1, to skip the "casetbl" opcode */
+      assert(*JUMPREL(cip)==OP_CASETBL);
+      cip=JUMPREL(cptr+1);      /* preset to "none-matched" case */
+      i=(int)*cptr;             /* number of records in the case table */
+      for (cptr+=2; i>0 && *cptr!=pri; i--,cptr+=2)
+        /* nothing */;
+      if (i>0)
+        cip=JUMPREL(cptr+1);    /* case found */
+      break;
+    } /* case */
+    case OP_SWAP_PRI:
+      offs=_R(data,stk);
+      _W32(data,stk,pri);
+      pri=offs;
+      break;
+    case OP_SWAP_ALT:
+      offs=_R(data,stk);
+      _W32(data,stk,alt);
+      alt=offs;
+      break;
+    case OP_BREAK:
+      assert((amx->flags & AMX_FLAG_VERIFY)==0);
+      if (amx->debug!=NULL) {
+        /* store status */
+        amx->frm=frm;
+        amx->stk=stk;
+        amx->hea=hea;
+        amx->cip=(cell)((unsigned char*)cip-amx->code);
+        i=amx->debug(amx);
+        if (i!=AMX_ERR_NONE) {
+          if (i==AMX_ERR_SLEEP) {
+            amx->pri=pri;
+            amx->alt=alt;
+            amx->reset_stk=reset_stk;
+            amx->reset_hea=reset_hea;
+            return i;
+          } /* if */
+          ABORT(amx,i);
+        } /* if */
+      } /* if */
+      break;
+#if !defined AMX_DONT_RELOCATE
+    case OP_SYSREQ_D:    /* see SYSREQ */
+      GETPARAM(offs);
+      /* save a few registers */
+      amx->cip=(cell)((unsigned char *)cip-amx->code);
+      amx->hea=hea;
+      amx->frm=frm;
+      amx->stk=stk;
+      pri=((AMX_NATIVE)(intptr_t)offs)(amx,(cell*)(data+(int)stk));
+      if (amx->error!=AMX_ERR_NONE) {
+        if (amx->error==AMX_ERR_SLEEP) {
+          amx->pri=pri;
+          amx->alt=alt;
+          amx->reset_stk=reset_stk;
+          amx->reset_hea=reset_hea;
+          return AMX_ERR_SLEEP;
+        } /* if */
+        ABORT(amx,amx->error);
+      } /* if */
+      break;
+#endif
+#if !defined AMX_NO_MACRO_INSTR && !defined AMX_DONT_RELOCATE
+    case OP_SYSREQ_ND:    /* see SYSREQ_N */
+      GETPARAM(offs);
+      GETPARAM(val);
+      PUSH(val);
+      /* save a few registers */
+      amx->cip=(cell)((unsigned char *)cip-amx->code);
+      amx->hea=hea;
+      amx->frm=frm;
+      amx->stk=stk;
+      pri=((AMX_NATIVE)(intptr_t)offs)(amx,(cell*)(data+(int)stk));
+      stk+=val+4;
+      if (amx->error!=AMX_ERR_NONE) {
+        if (amx->error==AMX_ERR_SLEEP) {
+          amx->pri=pri;
+          amx->alt=alt;
+          amx->stk=stk;
+          amx->reset_stk=reset_stk;
+          amx->reset_hea=reset_hea;
+          return AMX_ERR_SLEEP;
+        } /* if */
+        ABORT(amx,amx->error);
+      } /* if */
+      break;
+#endif
+
+    /* overlay instructions */
+#if !defined AMX_NO_OVERLAY
+    case OP_CALL_OVL:
+      offs=(cell)((unsigned char *)cip-amx->code+sizeof(cell)); /* skip address */
+      assert(offs>=0 && offs<(1<<(sizeof(cell)*4)));
+      PUSH((offs<<(sizeof(cell)*4)) | amx->ovl_index);
+      amx->ovl_index=(int)*cip;
+      assert(amx->overlay!=NULL);
+      if ((i=amx->overlay(amx,amx->ovl_index))!=AMX_ERR_NONE)
+        ABORT(amx,i);
+      cip=(cell*)amx->code;
+      break;
+    case OP_RETN_OVL:
+      assert(amx->overlay!=NULL);
+      POP(frm);
+      POP(offs);
+      amx->ovl_index=offs & (((ucell)~0)>>4*sizeof(cell));
+      offs=(ucell)offs >> (sizeof(cell)*4);
+      /* verify the index */
+      stk+=_R(data,stk)+sizeof(cell);   /* remove parameters from the stack */
+      i=amx->overlay(amx,amx->ovl_index); /* reload overlay */
+      if (i!=AMX_ERR_NONE || (long)offs>=amx->codesize)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      cip=(cell *)(amx->code+(int)offs);
+      break;
+    case OP_SWITCH_OVL: {
+      cell *cptr=JUMPREL(cip)+1;  /* +1, to skip the "icasetbl" opcode */
+      assert(*JUMPREL(cip)==OP_CASETBL_OVL);
+      amx->ovl_index=*(cptr+1);   /* preset to "none-matched" case */
+      i=(int)*cptr;               /* number of records in the case table */
+      for (cptr+=2; i>0 && *cptr!=pri; i--,cptr+=2)
+        /* nothing */;
+      if (i>0)
+        amx->ovl_index=*(cptr+1); /* case found */
+      assert(amx->overlay!=NULL);
+      if ((i=amx->overlay(amx,amx->ovl_index))!=AMX_ERR_NONE)
+        ABORT(amx,i);
+      cip=(cell*)amx->code;
+      break;
+    } /* case */
+#endif
+
+    /* supplemental and macro instructions */
+#if !defined AMX_NO_MACRO_INSTR
+    case OP_LIDX:
+      offs=pri*sizeof(cell)+alt;
+      /* verify address */
+      if (offs>=hea && offs<stk || (ucell)offs>=(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      pri=_R(data,offs);
+      break;
+    case OP_LIDX_B:
+      GETPARAM(offs);
+      offs=(pri << (int)offs)+alt;
+      /* verify address */
+      if (offs>=hea && offs<stk || (ucell)offs>=(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      pri=_R(data,offs);
+      break;
+    case OP_IDXADDR:
+      pri=pri*sizeof(cell)+alt;
+      break;
+    case OP_IDXADDR_B:
+      GETPARAM(offs);
+      pri=(pri << (int)offs)+alt;
+      break;
+    case OP_PUSH_C:
+      GETPARAM(offs);
+      PUSH(offs);
+      break;
+    case OP_PUSH:
+      GETPARAM(offs);
+      PUSH(_R(data,offs));
+      break;
+    case OP_PUSH_S:
+      GETPARAM(offs);
+      PUSH(_R(data,frm+offs));
+      break;
+    case OP_PUSH_ADR:
+      GETPARAM(offs);
+      PUSH(frm+offs);
+      break;
+    case OP_PUSHR_C:
+      GETPARAM(offs);
+      PUSH((intptr_t)data+offs);
+      break;
+    case OP_PUSHR_S:
+      GETPARAM(offs);
+      PUSH((intptr_t)data+_R(data,frm+offs));
+      break;
+    case OP_PUSHR_ADR:
+      GETPARAM(offs);
+      PUSH((intptr_t)data+frm+offs);
+      break;
+    case OP_JEQ:
+      if (pri==alt)
+        cip=JUMPREL(cip);
+      else
+        SKIPPARAM(1);
+      break;
+    case OP_JNEQ:
+      if (pri!=alt)
+        cip=JUMPREL(cip);
+      else
+        SKIPPARAM(1);
+      break;
+    case OP_JSLESS:
+      if (pri<alt)
+        cip=JUMPREL(cip);
+      else
+        SKIPPARAM(1);
+      break;
+    case OP_JSLEQ:
+      if (pri<=alt)
+        cip=JUMPREL(cip);
+      else
+        SKIPPARAM(1);
+      break;
+    case OP_JSGRTR:
+      if (pri>alt)
+        cip=JUMPREL(cip);
+      else
+        SKIPPARAM(1);
+      break;
+    case OP_JSGEQ:
+      if (pri>=alt)
+        cip=JUMPREL(cip);
+      else
+        SKIPPARAM(1);
+      break;
+    case OP_SDIV_INV:
+      if (alt==0)
+        ABORT(amx,AMX_ERR_DIVIDE);
+      /* use floored division and matching remainder */
+      offs=alt;
+      #if defined TRUNC_SDIV
+        pri=pri/offs;
+        alt=pri%offs;
+      #else
+        val=pri;                /* portable routine for truncated division */
+        pri=IABS(pri)/IABS(offs);
+        if ((cell)(val ^ offs)<0)
+          pri=-pri;
+        alt=val-pri*offs;       /* calculate the matching remainder */
+      #endif
+      /* now "fiddle" with the values to get floored division */
+      if (alt!=0 && (cell)(alt ^ offs)<0) {
+        pri--;
+        alt+=offs;
+      } /* if */
+      break;
+    case OP_SUB_INV:
+      pri-=alt;
+      break;
+    case OP_ADD_C:
+      GETPARAM(offs);
+      pri+=offs;
+      break;
+    case OP_SMUL_C:
+      GETPARAM(offs);
+      pri*=offs;
+      break;
+    case OP_ZERO_PRI:
+      pri=0;
+      break;
+    case OP_ZERO_ALT:
+      alt=0;
+      break;
+    case OP_ZERO:
+      GETPARAM(offs);
+      _W(data,offs,0);
+      break;
+    case OP_ZERO_S:
+      GETPARAM(offs);
+      _W(data,frm+offs,0);
+      break;
+    case OP_EQ_C_PRI:
+      GETPARAM(offs);
+      pri= pri==offs ? 1 : 0;
+      break;
+    case OP_EQ_C_ALT:
+      GETPARAM(offs);
+      pri= alt==offs ? 1 : 0;
+      break;
+    case OP_INC:
+      GETPARAM(offs);
+      #if defined _R_DEFAULT
+        *(cell *)(data+(int)offs) += 1;
+      #else
+        val=_R(data,offs);
+        _W(data,offs,val+1);
+      #endif
+      break;
+    case OP_INC_S:
+      GETPARAM(offs);
+      #if defined _R_DEFAULT
+        *(cell *)(data+(int)(frm+offs)) += 1;
+      #else
+        val=_R(data,frm+offs);
+        _W(data,frm+offs,val+1);
+      #endif
+      break;
+    case OP_DEC:
+      GETPARAM(offs);
+      #if defined _R_DEFAULT
+        *(cell *)(data+(int)offs) -= 1;
+      #else
+        val=_R(data,offs);
+        _W(data,offs,val-1);
+      #endif
+      break;
+    case OP_DEC_S:
+      GETPARAM(offs);
+      #if defined _R_DEFAULT
+        *(cell *)(data+(int)(frm+offs)) -= 1;
+      #else
+        val=_R(data,frm+offs);
+        _W(data,frm+offs,val-1);
+      #endif
+      break;
+    case OP_SYSREQ_N:
+      GETPARAM(offs);
+      GETPARAM(val);
+      PUSH(val);
+      /* save a few registers */
+      amx->cip=(cell)((unsigned char *)cip-amx->code);
+      amx->hea=hea;
+      amx->frm=frm;
+      amx->stk=stk;
+      i=amx->callback(amx,offs,&pri,(cell *)(data+(int)stk));
+      stk+=val+4;
+      if (i!=AMX_ERR_NONE) {
+        if (i==AMX_ERR_SLEEP) {
+          amx->pri=pri;
+          amx->alt=alt;
+          amx->stk=stk;
+          amx->reset_stk=reset_stk;
+          amx->reset_hea=reset_hea;
+          return i;
+        } /* if */
+        ABORT(amx,i);
+      } /* if */
+      break;
+    case OP_PUSHM_C:
+      GETPARAM(val);
+      while (val--) {
+        GETPARAM(offs);
+        PUSH(offs);
+      } /* while */
+      break;
+    case OP_PUSHM:
+      GETPARAM(val);
+      while (val--) {
+        GETPARAM(offs);
+        PUSH(_R(data,offs));
+      } /* while */
+      break;
+    case OP_PUSHM_S:
+      GETPARAM(val);
+      while (val--) {
+        GETPARAM(offs);
+        PUSH(_R(data,frm+offs));
+      } /* while */
+      break;
+    case OP_PUSHM_ADR:
+      GETPARAM(val);
+      while (val--) {
+        GETPARAM(offs);
+        PUSH(frm+offs);
+      } /* while */
+      break;
+    case OP_PUSHRM_C:
+      GETPARAM(val);
+      while (val--) {
+        GETPARAM(offs);
+        PUSH((intptr_t)data+offs);
+      } /* while */
+      break;
+    case OP_PUSHRM_S:
+      GETPARAM(val);
+      while (val--) {
+        GETPARAM(offs);
+        PUSH((intptr_t)data+_R(data,frm+offs));
+      } /* while */
+      break;
+    case OP_PUSHRM_ADR:
+      GETPARAM(val);
+      while (val--) {
+        GETPARAM(offs);
+        PUSH((intptr_t)data+frm+offs);
+      } /* while */
+      break;
+    case OP_LOAD2:
+      GETPARAM(offs);
+      pri=_R(data,offs);
+      GETPARAM(offs);
+      alt=_R(data,offs);
+      break;
+    case OP_LOAD2_S:
+      GETPARAM(offs);
+      pri=_R(data,frm+offs);
+      GETPARAM(offs);
+      alt=_R(data,frm+offs);
+      break;
+    case OP_CONST:
+      GETPARAM(offs);
+      GETPARAM(val);
+      _W32(data,offs,val);
+      break;
+    case OP_CONST_S:
+      GETPARAM(offs);
+      GETPARAM(val);
+      _W32(data,frm+offs,val);
+      break;
+#endif  /* AMX_NO_MACRO_INSTR */
+
+#if !defined AMX_NO_PACKED_OPC
+    case OP_LOAD_P_PRI:
+      GETPARAM_P(offs,op);
+      pri=_R(data,offs);
+      break;
+    case OP_LOAD_P_ALT:
+      GETPARAM_P(offs,op);
+      alt=_R(data,offs);
+      break;
+    case OP_LOAD_P_S_PRI:
+      GETPARAM_P(offs,op);
+      pri=_R(data,frm+offs);
+      break;
+    case OP_LOAD_P_S_ALT:
+      GETPARAM_P(offs,op);
+      alt=_R(data,frm+offs);
+      break;
+    case OP_LREF_P_S_PRI:
+      GETPARAM_P(offs,op);
+      offs=_R(data,frm+offs);
+      pri=_R(data,offs);
+      break;
+    case OP_LREF_P_S_ALT:
+      GETPARAM_P(offs,op);
+      offs=_R(data,frm+offs);
+      alt=_R(data,offs);
+      break;
+    case OP_LODB_P_I:
+      GETPARAM_P(offs,op);
+      goto __lodb_i;
+    case OP_CONST_P_PRI:
+      GETPARAM_P(pri,op);
+      break;
+    case OP_CONST_P_ALT:
+      GETPARAM_P(alt,op);
+      break;
+    case OP_ADDR_P_PRI:
+      GETPARAM_P(pri,op);
+      pri+=frm;
+      break;
+    case OP_ADDR_P_ALT:
+      GETPARAM_P(alt,op);
+      alt+=frm;
+      break;
+    case OP_STOR_P:
+      GETPARAM_P(offs,op);
+      _W(data,offs,pri);
+      break;
+    case OP_STOR_P_S:
+      GETPARAM_P(offs,op);
+      _W(data,frm+offs,pri);
+      break;
+    case OP_SREF_P_S:
+      GETPARAM_P(offs,op);
+      offs=_R(data,frm+offs);
+      _W(data,offs,pri);
+      break;
+    case OP_STRB_P_I:
+      GETPARAM_P(offs,op);
+      goto __strb_i;
+    case OP_LIDX_P_B:
+      GETPARAM_P(offs,op);
+      offs=(pri << (int)offs)+alt;
+      /* verify address */
+      if (offs>=hea && offs<stk || (ucell)offs>=(ucell)amx->stp)
+        ABORT(amx,AMX_ERR_MEMACCESS);
+      pri=_R(data,offs);
+      break;
+    case OP_IDXADDR_P_B:
+      GETPARAM_P(offs,op);
+      pri=(pri << (int)offs)+alt;
+      break;
+    case OP_ALIGN_P_PRI:
+      GETPARAM_P(offs,op);
+      #if BYTE_ORDER==LITTLE_ENDIAN
+        if ((size_t)offs<sizeof(cell))
+          pri ^= sizeof(cell)-offs;
+      #endif
+      break;
+    case OP_PUSH_P_C:
+      GETPARAM_P(offs,op);
+      PUSH(offs);
+      break;
+    case OP_PUSH_P:
+      GETPARAM_P(offs,op);
+      PUSH(_R(data,offs));
+      break;
+    case OP_PUSH_P_S:
+      GETPARAM_P(offs,op);
+      PUSH(_R(data,frm+offs));
+      break;
+    case OP_PUSH_P_ADR:
+      GETPARAM_P(offs,op);
+      PUSH(frm+offs);
+      break;
+    case OP_PUSHR_P_C:
+      GETPARAM_P(offs,op);
+      PUSH((intptr_t)data+offs);
+      break;
+    case OP_PUSHR_P_S:
+      GETPARAM_P(offs,op);
+      PUSH((intptr_t)data+_R(data,frm+offs));
+      break;
+    case OP_PUSHR_P_ADR:
+      GETPARAM_P(offs,op);
+      PUSH((intptr_t)data+frm+offs);
+      break;
+    case OP_PUSHM_P:
+      GETPARAM_P(val,op);
+      while (val--) {
+        GETPARAM(offs);
+        PUSH(_R(data,offs));
+      } /* while */
+      break;
+    case OP_PUSHM_P_S:
+      GETPARAM_P(val,op);
+      while (val--) {
+        GETPARAM(offs);
+        PUSH(_R(data,frm+offs));
+      } /* while */
+      break;
+    case OP_PUSHM_P_C:
+      GETPARAM_P(val,op);
+      while (val--) {
+        GETPARAM(offs);
+        PUSH(offs);
+      } /* while */
+      break;
+    case OP_PUSHM_P_ADR:
+      GETPARAM_P(val,op);
+      while (val--) {
+        GETPARAM(offs);
+        PUSH(frm+offs);
+      } /* while */
+      break;
+    case OP_PUSHRM_P_C:
+      GETPARAM_P(val,op);
+      while (val--) {
+        GETPARAM(offs);
+        PUSH((intptr_t)data+offs);
+      } /* while */
+      break;
+    case OP_PUSHRM_P_S:
+      GETPARAM_P(val,op);
+      while (val--) {
+        GETPARAM(offs);
+        PUSH((intptr_t)data+_R(data,frm+offs));
+      } /* while */
+      break;
+    case OP_PUSHRM_P_ADR:
+      GETPARAM_P(val,op);
+      while (val--) {
+        GETPARAM(offs);
+        PUSH((intptr_t)data+frm+offs);
+      } /* while */
+      break;
+    case OP_STACK_P:
+      GETPARAM_P(offs,op);
+      alt=stk;
+      stk+=offs;
+      CHKMARGIN();
+      CHKSTACK();
+      break;
+    case OP_HEAP_P:
+      GETPARAM_P(offs,op);
+      alt=hea;
+      hea+=offs;
+      CHKMARGIN();
+      CHKHEAP();
+      break;
+    case OP_SHL_P_C_PRI:
+      GETPARAM_P(offs,op);
+      pri<<=offs;
+      break;
+    case OP_SHL_P_C_ALT:
+      GETPARAM_P(offs,op);
+      alt<<=offs;
+      break;
+    case OP_ADD_P_C:
+      GETPARAM_P(offs,op);
+      pri+=offs;
+      break;
+    case OP_SMUL_P_C:
+      GETPARAM_P(offs,op);
+      pri*=offs;
+      break;
+    case OP_ZERO_P:
+      GETPARAM_P(offs,op);
+      _W(data,offs,0);
+      break;
+    case OP_ZERO_P_S:
+      GETPARAM_P(offs,op);
+      _W(data,frm+offs,0);
+      break;
+    case OP_EQ_P_C_PRI:
+      GETPARAM_P(offs,op);
+      pri= pri==offs ? 1 : 0;
+      break;
+    case OP_EQ_P_C_ALT:
+      GETPARAM_P(offs,op);
+      pri= alt==offs ? 1 : 0;
+      break;
+    case OP_INC_P:
+      GETPARAM_P(offs,op);
+      #if defined _R_DEFAULT
+        *(cell *)(data+(int)offs) += 1;
+      #else
+        val=_R(data,offs);
+        _W(data,offs,val+1);
+      #endif
+      break;
+    case OP_INC_P_S:
+      GETPARAM_P(offs,op);
+      #if defined _R_DEFAULT
+        *(cell *)(data+(int)(frm+offs)) += 1;
+      #else
+        val=_R(data,frm+offs);
+        _W(data,frm+offs,val+1);
+      #endif
+      break;
+    case OP_DEC_P:
+      GETPARAM_P(offs,op);
+      #if defined _R_DEFAULT
+        *(cell *)(data+(int)offs) -= 1;
+      #else
+        val=_R(data,offs);
+        _W(data,offs,val-1);
+      #endif
+      break;
+    case OP_DEC_P_S:
+      GETPARAM_P(offs,op);
+      #if defined _R_DEFAULT
+        *(cell *)(data+(int)(frm+offs)) -= 1;
+      #else
+        val=_R(data,frm+offs);
+        _W(data,frm+offs,val-1);
+      #endif
+      break;
+    case OP_MOVS_P:
+      GETPARAM_P(offs,op);
+      goto __movs;
+    case OP_CMPS_P:
+      GETPARAM_P(offs,op);
+      goto __cmps;
+    case OP_FILL_P:
+      GETPARAM_P(offs,op);
+      goto __fill;
+    case OP_HALT_P:
+      GETPARAM_P(offs,op);
+      goto __halt;
+    case OP_BOUNDS_P:
+      GETPARAM_P(offs,op);
+      if ((ucell)pri>(ucell)offs) {
+        amx->cip=(cell)((unsigned char *)cip-amx->code);
+        ABORT(amx,AMX_ERR_BOUNDS);
+      } /* if */
+      break;
+#endif /* AMX_NO_PACKED_OPC */
+    default:
+      assert(0);  /* invalid instructions should already have been caught in VerifyPcode() */
+      ABORT(amx,AMX_ERR_INVINSTR);
+    } /* switch */
+  } /* for */
+#endif /* AMX_ALTCORE */
+}
+
+#endif /* AMX_EXEC */
+
+#if defined AMX_SETCALLBACK
+int AMXAPI amx_SetCallback(AMX *amx,AMX_CALLBACK callback)
+{
+  assert(amx!=NULL);
+  assert(callback!=NULL);
+  amx->callback=callback;
+  return AMX_ERR_NONE;
+}
+#endif /* AMX_SETCALLBACK */
+
+#if defined AMX_SETDEBUGHOOK
+int AMXAPI amx_SetDebugHook(AMX *amx,AMX_DEBUG debug)
+{
+  assert(amx!=NULL);
+  amx->debug=debug;
+  return AMX_ERR_NONE;
+}
+#endif /* AMX_SETDEBUGHOOK */
+
+#if defined AMX_RAISEERROR
+int AMXAPI amx_RaiseError(AMX *amx, int error)
+{
+  assert(error>0);
+  amx->error=error;
+  return AMX_ERR_NONE;
+}
+#endif /* AMX_RAISEERROR */
+
+#if defined AMX_ALLOT || defined AMX_PUSHXXX
+int AMXAPI amx_Allot(AMX *amx,int cells,cell **address)
+{
+  AMX_HEADER *hdr;
+  unsigned char *data;
+
+  assert(amx!=NULL);
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  data=(amx->data!=NULL) ? amx->data : amx->base+(int)hdr->dat;
+
+  if (amx->stk - amx->hea - cells*sizeof(cell) < STKMARGIN)
+    return AMX_ERR_MEMORY;
+  if (address!=NULL)
+    *address=(cell *)(data+(int)amx->hea);
+  amx->hea+=cells*sizeof(cell);
+  return AMX_ERR_NONE;
+}
+
+int AMXAPI amx_Release(AMX *amx,cell *address)
+{
+  AMX_HEADER *hdr;
+  unsigned char *data;
+  cell amx_addr;
+
+  assert(amx!=NULL);
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  data=(amx->data!=NULL) ? amx->data : amx->base+(int)hdr->dat;
+  amx_addr=(cell)((unsigned char*)address-data);
+  if (amx->hea>amx_addr)
+    amx->hea=amx_addr;
+  return AMX_ERR_NONE;
+}
+#endif /* AMX_ALLOT || AMX_PUSHXXX */
+
+#if defined AMX_XXXSTRING || defined AMX_UTF8XXX
+
+#define CHARBITS        (8*sizeof(char))
+#if PAWN_CELL_SIZE==16
+  #define CHARMASK      (0xffffu << 8*(2-sizeof(char)))
+#elif PAWN_CELL_SIZE==32
+  #define CHARMASK      (0xffffffffuL << 8*(4-sizeof(char)))
+#elif PAWN_CELL_SIZE==64
+  #define CHARMASK      (0xffffffffffffffffuLL << 8*(8-sizeof(char)))
+#else
+  #error Unsupported cell size
+#endif
+
+int AMXAPI amx_StrLen(const cell *cstr, int *length)
+{
+  int len;
+  #if BYTE_ORDER==LITTLE_ENDIAN
+    cell c;
+  #endif
+
+  assert(length!=NULL);
+  if (cstr==NULL) {
+    *length=0;
+    return AMX_ERR_PARAMS;
+  } /* if */
+
+  if ((ucell)*cstr>UNPACKEDMAX) {
+    /* packed string */
+    assert_static(sizeof(char)==1);
+    len=(int)strlen((char *)cstr);      /* find '\0' */
+    assert(check_endian());
+    #if BYTE_ORDER==LITTLE_ENDIAN
+      /* on Little Endian machines, toggle the last bytes */
+      c=cstr[len/sizeof(cell)];         /* get last cell */
+      len=len - len % sizeof(cell);     /* len = multiple of "cell" bytes */
+      while ((c & CHARMASK)!=0) {
+        len++;
+        c <<= 8*sizeof(char);
+      } /* if */
+    #endif
+  } else {
+    for (len=0; cstr[len]!=0; len++)
+      /* nothing */;
+  } /* if */
+  *length = len;
+  return AMX_ERR_NONE;
+}
+#endif
+
+#if defined AMX_XXXSTRING || defined AMX_PUSHXXX
+int AMXAPI amx_SetString(cell *dest,const char *source,int pack,int use_wchar,size_t size)
+{                 /* the memory blocks should not overlap */
+  int i;
+  size_t len;
+
+  assert_static(UNLIMITED>0);
+  #if defined AMX_ANSIONLY
+    (void)use_wchar;
+    len=strlen(source);
+  #else
+    len= use_wchar ? wcslen((const wchar_t*)source) : strlen(source);
+  #endif
+  if (pack) {
+    /* create a packed string */
+    if (size<UNLIMITED/sizeof(cell) && (size_t)len>=size*sizeof(cell))
+      len=size*sizeof(cell)-1;
+    dest[len/sizeof(cell)]=0;   /* clear last bytes of last (semi-filled) cell*/
+    #if defined AMX_ANSIONLY
+      memcpy(dest,source,len);
+    #else
+      if (use_wchar) {
+        for (i=0; i<len; i++)
+          ((char*)dest)[i]=(char)(((wchar_t*)source)[i]);
+      } else {
+        memcpy(dest,source,len);
+      } /* if */
+    #endif
+    /* On Big Endian machines, the characters are well aligned in the
+     * cells; on Little Endian machines, we must swap all cells.
+     */
+    assert(check_endian());
+    #if BYTE_ORDER==LITTLE_ENDIAN
+      for (i=(int)(len/sizeof(cell)); i>=0; i--)
+        amx_SwapCell((ucell *)&dest[i]);
+    #endif
+  } else {
+    /* create an unpacked string */
+    if (size<UNLIMITED && (size_t)len>=size)
+      len=size-1;
+    #if defined AMX_ANSIONLY
+      for (i=0; i<len; i++)
+        dest[i]=(cell)source[i];
+    #else
+      if (use_wchar) {
+        for (i=0; i<len; i++)
+          dest[i]=(cell)(((wchar_t*)source)[i]);
+      } else {
+        for (i=0; i<len; i++)
+          dest[i]=(cell)source[i];
+      } /* if */
+    #endif
+    dest[len]=0;
+  } /* if */
+  return AMX_ERR_NONE;
+}
+#endif
+
+#if defined AMX_XXXSTRING
+int AMXAPI amx_GetString(char *dest,const cell *source,int use_wchar,size_t size)
+{
+  int len=0;
+  #if defined AMX_ANSIONLY
+    (void)use_wchar;    /* unused parameter (if ANSI only) */
+  #endif
+  if ((ucell)*source>UNPACKEDMAX) {
+    /* source string is packed */
+    cell c=0;           /* initialize to 0 to avoid a compiler warning */
+    int i=sizeof(cell)-1;
+    char ch;
+    while ((size_t)len<size) {
+      if (i==sizeof(cell)-1)
+        c=*source++;
+      ch=(char)(c >> i*CHARBITS);
+      if (ch=='\0')
+        break;          /* terminating zero character found */
+      #if defined AMX_ANSIONLY
+        dest[len++]=ch;
+      #else
+        if (use_wchar)
+          ((wchar_t*)dest)[len++]=ch;
+        else
+          dest[len++]=ch;
+      #endif
+      i=(i+sizeof(cell)-1) % sizeof(cell);
+    } /* while */
+  } else {
+    /* source string is unpacked */
+    #if defined AMX_ANSIONLY
+      while (*source!=0 && (size_t)len<size)
+        dest[len++]=(char)*source++;
+    #else
+      if (use_wchar) {
+        while (*source!=0 && (size_t)len<size)
+          ((wchar_t*)dest)[len++]=(wchar_t)*source++;
+      } else {
+        while (*source!=0 && (size_t)len<size)
+          dest[len++]=(char)*source++;
+      } /* if */
+    #endif
+  } /* if */
+  /* store terminator */
+  if ((size_t)len>=size)
+    len=(int)size-1;
+  if (len>=0) {
+    #if defined AMX_ANSIONLY
+      dest[len]='\0';
+    #else
+      if (use_wchar)
+        ((wchar_t*)dest)[len]=0;
+      else
+        dest[len]='\0';
+    #endif
+  } /* IF */
+  return AMX_ERR_NONE;
+}
+#endif /* AMX_XXXSTRING */
+
+#if defined AMX_UTF8XXX
+  #if defined __BORLANDC__
+    #pragma warn -amb -8000     /* ambiguous operators need parentheses */
+  #endif
+/* amx_UTF8Get()
+ * Extract a single UTF-8 encoded character from a string and return a pointer
+ * to the character just behind that UTF-8 character. The parameters "endptr"
+ * and "value" may be NULL.
+ * If the code is not valid UTF-8, "endptr" has the value of the input
+ * parameter "string" and "value" is zero.
+ */
+int AMXAPI amx_UTF8Get(const char *string, const char **endptr, cell *value)
+{
+static const char utf8_count[16]={ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 4 };
+static const long utf8_lowmark[5] = { 0x80, 0x800, 0x10000L, 0x200000L, 0x4000000L };
+  unsigned char c;
+  cell result;
+  int followup;
+
+  assert(string!=NULL);
+  if (value!=NULL)      /* preset, in case of an error */
+    *value=0;
+  if (endptr!=NULL)
+    *endptr=string;
+
+  c = *(const unsigned char*)string++;
+  if (c<0x80) {
+    /* ASCII */
+    result=c;
+  } else {
+    if (c<0xc0 || c>=0xfe)
+      return AMX_ERR_PARAMS;  /* invalid or "follower" code, quit with error */
+    /* At this point we know that the two top bits of c are ones. The two
+     * bottom bits are always part of the code. We only need to consider
+     * the 4 remaining bits; i.e., a 16-byte table. This is "utf8_count[]".
+     * (Actually the utf8_count[] table records the number of follow-up
+     * bytes minus 1. This is just for convenience.)
+     */
+    assert((c & 0xc0)==0xc0);
+    followup=(int)utf8_count[(c >> 2) & 0x0f];
+    /* The mask depends on the code length; this is just a very simple
+     * relation.
+     */
+    #define utf8_mask   (0x1f >> followup)
+    result= c & utf8_mask;
+    /* Collect the follow-up codes using a drop-through switch statement;
+     * this avoids a loop. In each case, verify the two leading bits.
+     */
+    assert(followup>=0 && followup<=4);
+    switch (followup) {
+    case 4:
+      if (((c=*string++) & 0xc0) != 0x80) goto error;
+      result = (result << 6) | c & 0x3f;
+    case 3:
+      if (((c=*string++) & 0xc0) != 0x80) goto error;
+      result = (result << 6) | c & 0x3f;
+    case 2:
+      if (((c=*string++) & 0xc0) != 0x80) goto error;
+      result = (result << 6) | c & 0x3f;
+    case 1:
+      if (((c=*string++) & 0xc0) != 0x80) goto error;
+      result = (result << 6) | c & 0x3f;
+    case 0:
+      if (((c=*string++) & 0xc0) != 0x80) goto error;
+      result = (result << 6) | c & 0x3f;
+    } /* switch */
+    /* Do additional checks: shortest encoding & reserved positions. The
+     * lowmark limits also depends on the code length; it can be read from
+     * a table with 5 elements. This is "utf8_lowmark[]".
+     */
+    if (result<utf8_lowmark[followup])
+      goto error;
+    if (result>=0xd800 && result<=0xdfff || result==0xfffe || result==0xffff)
+      goto error;
+  } /* if */
+
+  if (value!=NULL)
+    *value=result;
+  if (endptr!=NULL)
+    *endptr=string;
+
+  return AMX_ERR_NONE;
+
+error:
+  return AMX_ERR_PARAMS;
+}
+
+/* amx_UTF8Put()
+ * Encode a single character into a byte string. The character may result in
+ * a string of up to 6 bytes. The function returns an error code if "maxchars"
+ * is lower than the required number of characters; in this case nothing is
+ * stored.
+ * The function does not zero-terminate the string.
+ */
+int AMXAPI amx_UTF8Put(char *string, char **endptr, int maxchars, cell value)
+{
+  assert(string!=NULL);
+  if (endptr!=NULL)     /* preset, in case of an error */
+    *endptr=string;
+
+  if (value<0x80) {
+    /* 0xxxxxxx */
+    if (maxchars < 1) goto error;
+    *string++ = (char)value;
+  } else if (value<0x800) {
+    /* 110xxxxx 10xxxxxx */
+    if (maxchars < 2) goto error;
+    *string++ = (char)((value>>6) & 0x1f | 0xc0);
+    *string++ = (char)(value & 0x3f | 0x80);
+  } else if (value<0x10000) {
+    /* 1110xxxx 10xxxxxx 10xxxxxx (16 bits, BMP plane) */
+    if (maxchars < 3) goto error;
+    if (value>=0xd800 && value<=0xdfff || value==0xfffe || value==0xffff)
+      goto error;       /* surrogate pairs and invalid characters */
+    *string++ = (char)((value>>12) & 0x0f | 0xe0);
+    *string++ = (char)((value>>6) & 0x3f | 0x80);
+    *string++ = (char)(value & 0x3f | 0x80);
+  } else if (value<0x200000) {
+    /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
+    if (maxchars < 4) goto error;
+    *string++ = (char)((value>>18) & 0x07 | 0xf0);
+    *string++ = (char)((value>>12) & 0x3f | 0x80);
+    *string++ = (char)((value>>6) & 0x3f | 0x80);
+    *string++ = (char)(value & 0x3f | 0x80);
+  } else if (value<0x4000000) {
+    /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */
+    if (maxchars < 5) goto error;
+    *string++ = (char)((value>>24) & 0x03 | 0xf8);
+    *string++ = (char)((value>>18) & 0x3f | 0x80);
+    *string++ = (char)((value>>12) & 0x3f | 0x80);
+    *string++ = (char)((value>>6) & 0x3f | 0x80);
+    *string++ = (char)(value & 0x3f | 0x80);
+  } else {
+    /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx (31 bits) */
+    if (maxchars < 6) goto error;
+    *string++ = (char)((value>>30) & 0x01 | 0xfc);
+    *string++ = (char)((value>>24) & 0x3f | 0x80);
+    *string++ = (char)((value>>18) & 0x3f | 0x80);
+    *string++ = (char)((value>>12) & 0x3f | 0x80);
+    *string++ = (char)((value>>6) & 0x3f | 0x80);
+    *string++ = (char)(value & 0x3f | 0x80);
+  } /* if */
+
+  if (endptr!=NULL)
+    *endptr=string;
+  return AMX_ERR_NONE;
+
+error:
+  return AMX_ERR_PARAMS;
+}
+
+/* amx_UTF8Check()
+ * Run through a zero-terminated string and check the validity of the UTF-8
+ * encoding. The function returns an error code, it is AMX_ERR_NONE if the
+ * string is valid UTF-8 (or valid ASCII for that matter).
+ */
+int AMXAPI amx_UTF8Check(const char *string, int *length)
+{
+  int err=AMX_ERR_NONE;
+  int len=0;
+  while (err==AMX_ERR_NONE && *string!='\0') {
+    err=amx_UTF8Get(string,&string,NULL);
+    len++;
+  } /* while */
+  if (length!=NULL)
+    *length=len;
+  return err;
+}
+
+/* amx_UTF8Len()
+ * Run through a wide string and return how many 8-bit characters are needed to
+ * store the string in UTF-8 format. The returned cound excludes the terminating
+ * zero byte. The function returns an error code.
+ */
+int AMXAPI amx_UTF8Len(const cell *cstr, int *length)
+{
+  int err;
+
+  assert(length!=NULL);
+  err=amx_StrLen(cstr, length);
+  if (err==AMX_ERR_NONE && (ucell)*cstr<=UNPACKEDMAX) {
+    char buffer[10];  /* maximum UTF-8 code is 6 characters */
+    char *endptr;
+    int len=*length, count=0;
+    while (len-->0) {
+      amx_UTF8Put(buffer, &endptr, sizeof buffer, *cstr++);
+      count+=(int)(endptr-buffer);
+    } /* while */
+    *length=count;
+  } /* while */
+  return err;
+}
+#endif /* AMX_UTF8XXX */
diff --git a/apps/openmw-mp/amx/amx.h b/apps/openmw-mp/amx/amx.h
new file mode 100644
index 000000000..9000f291c
--- /dev/null
+++ b/apps/openmw-mp/amx/amx.h
@@ -0,0 +1,545 @@
+/*  Pawn Abstract Machine (for the Pawn language)
+ *
+ *  Copyright (c) ITB CompuPhase, 1997-2015
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ *  use this file except in compliance with the License. You may obtain a copy
+ *  of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ *
+ *  Version: $Id: amx.h 5181 2015-01-21 09:44:28Z thiadmer $
+ */
+
+#ifndef AMX_H_INCLUDED
+#define AMX_H_INCLUDED
+
+#include <stdlib.h>   /* for size_t */
+#include <limits.h>
+
+#if (defined __linux || defined __linux__) && !defined __LINUX__
+  #define __LINUX__
+#endif
+#if defined FREEBSD && !defined __FreeBSD__
+  #define __FreeBSD__
+#endif
+#if defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
+  #include <sclinux.h>
+#endif
+
+#if defined __GNUC__
+ #define GCC_VERSION (__GNUC__ * 10000 \
+                               + __GNUC_MINOR__ * 100 \
+                               + __GNUC_PATCHLEVEL__)
+#endif
+
+#if !defined HAVE_STDINT_H
+  #if (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) \
+      || defined __GNUC__ || defined __LCC__ || defined __DMC__ \
+      || (defined __WATCOMC__ && __WATCOMC__ >= 1200)
+    #define HAVE_STDINT_H 1
+  #endif
+#endif
+#if !defined HAVE_INTTYPES_H
+  #if defined __FreeBSD__ || defined __APPLE__
+    #define HAVE_INTTYPES_H 1
+  #endif
+#endif
+#if defined HAVE_STDINT_H
+  #include <stdint.h>
+#elif defined HAVE_INTTYPES_H
+  #include <inttypes.h>
+#else
+  #if defined __MACH__
+    #include <ppc/types.h>
+  #endif
+  typedef short int           int16_t;
+  typedef unsigned short int  uint16_t;
+  #if defined SN_TARGET_PS2
+    typedef int               int32_t;
+    typedef unsigned int      uint32_t;
+  #else
+    typedef long int          int32_t;
+    typedef unsigned long int uint32_t;
+  #endif
+  #if defined __WIN32__ || defined _WIN32 || defined WIN32
+    typedef __int64           int64_t;
+    typedef unsigned __int64  uint64_t;
+    #define HAVE_I64
+  #endif
+  #if !defined _INTPTR_T_DEFINED
+    #if defined _LP64 || defined WIN64 || defined _WIN64
+      typedef __int64         intptr_t;
+    #else
+      typedef int32_t         intptr_t;
+    #endif
+  #endif
+#endif
+#if defined _LP64 || defined WIN64 || defined _WIN64
+  #if !defined __64BIT__
+    #define __64BIT__
+  #endif
+#endif
+
+#if !defined HAVE_ALLOCA_H
+  #if defined __GNUC__ || defined __LCC__ || defined __DMC__ || defined __ARMCC_VERSION
+    #define HAVE_ALLOCA_H 1
+  #elif defined __WATCOMC__ && __WATCOMC__ >= 1200
+    #define HAVE_ALLOCA_H 1
+  #endif
+#endif
+#if defined HAVE_ALLOCA_H && HAVE_ALLOCA_H
+  #include <alloca.h>
+#elif defined __BORLANDC__
+  #include <malloc.h>
+#endif
+#if defined __WIN32__ || defined _WIN32 || defined WIN32 /* || defined __MSDOS__ */
+  #if !defined alloca
+    #define alloca(n)   _alloca(n)
+  #endif
+#endif
+
+#if !defined assert_static
+  #if (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112) || GCC_VERSION >= 40600
+    #define assert_static(test) _Static_assert(test, "assert")
+  #else
+    /* see "Compile-Time Assertions" by Greg Miller,
+     * (with modifications to port it to C)
+     */
+    #define _ASSERT_STATIC_SYMBOL_INNER(line) __ASSERT_STATIC_ ## line
+    #define _ASSERT_STATIC_SYMBOL(line) _ASSERT_STATIC_SYMBOL_INNER(line)
+    #define assert_static(test) \
+      do { \
+        typedef char _ASSERT_STATIC_SYMBOL(__LINE__)[ ((test) ? 1 : -1) ]; \
+      } while (0)
+  #endif
+#endif
+
+#if defined  __cplusplus
+extern  "C" {
+#endif
+
+#if defined PAWN_DLL
+  #if !defined AMX_NATIVE_CALL
+    #define AMX_NATIVE_CALL __stdcall
+  #endif
+  #if !defined AMXAPI
+    #define AMXAPI          __stdcall
+  #endif
+  #if !defined AMXEXPORT
+    #define AMXEXPORT       __declspec(dllexport)
+  #endif
+#endif
+
+/* calling convention for native functions */
+#if !defined AMX_NATIVE_CALL
+  #define AMX_NATIVE_CALL
+#endif
+/* calling convention for all interface functions and callback functions */
+#if !defined AMXAPI
+  #if defined STDECL
+    #define AMXAPI      __stdcall
+  #elif defined CDECL
+    #define AMXAPI      __cdecl
+  #elif defined GCC_HASCLASSVISIBILITY
+    #define AMXAPI      __attribute__((visibility("default")))
+  #else
+    #define AMXAPI
+  #endif
+#endif
+#if !defined AMXEXPORT
+  #define AMXEXPORT
+#endif
+
+/* File format version (in CUR_FILE_VERSION)
+ *   0 original version
+ *   1 opcodes JUMP.pri, SWITCH and CASETBL
+ *   2 compressed files
+ *   3 public variables
+ *   4 opcodes SWAP.pri/alt and PUSHADDR
+ *   5 tagnames table
+ *   6 reformatted header
+ *   7 name table, opcodes SYMTAG & SYSREQ.D
+ *   8 opcode BREAK, renewed debug interface
+ *   9 macro opcodes
+ *  10 position-independent code, overlays, packed instructions
+ *  11 relocating instructions for the native interface, reorganized instruction set
+ * MIN_FILE_VERSION is the lowest file version number that the current AMX
+ * implementation supports. If the AMX file header gets new fields, this number
+ * often needs to be incremented. MIN_AMX_VERSION is the lowest AMX version that
+ * is needed to support the current file version. When there are new opcodes,
+ * this number needs to be incremented.
+ * The file version supported by the JIT may run behind MIN_AMX_VERSION. So
+ * there is an extra constant for it: MAX_FILE_VER_JIT.
+ */
+
+#define CUR_FILE_VERSION 11     /* current file version; also the current AMX version */
+#define MIN_FILE_VERSION 11     /* lowest supported file format version for the current AMX version */
+#define MIN_AMX_VERSION  11     /* minimum AMX version needed to support the current file format */
+#define MAX_FILE_VER_JIT 11     /* file version supported by the JIT */
+#define MIN_AMX_VER_JIT  11     /* AMX version supported by the JIT */
+
+#if !defined PAWN_CELL_SIZE
+  #define PAWN_CELL_SIZE 32     /* by default, use 32-bit cells */
+#endif
+#if PAWN_CELL_SIZE==16
+  typedef uint16_t  ucell;
+  typedef int16_t   cell;
+#elif PAWN_CELL_SIZE==32
+  typedef uint32_t  ucell;
+  typedef int32_t   cell;
+#elif PAWN_CELL_SIZE==64
+  typedef uint64_t  ucell;
+  typedef int64_t   cell;
+  #define HAVE_I64
+#else
+  #error Unsupported cell size (PAWN_CELL_SIZE)
+#endif
+
+#define UNPACKEDMAX   (((cell)1 << (sizeof(cell)-1)*8) - 1)
+#define UNLIMITED     (~1u >> 1)
+
+struct tagAMX;
+typedef cell (AMX_NATIVE_CALL *AMX_NATIVE)(struct tagAMX *amx, const cell *params);
+typedef int (AMXAPI *AMX_CALLBACK)(struct tagAMX *amx, cell index,
+                                   cell *result, const cell *params);
+typedef int (AMXAPI *AMX_DEBUG)(struct tagAMX *amx);
+typedef int (AMXAPI *AMX_OVERLAY)(struct tagAMX *amx, int index);
+typedef int (AMXAPI *AMX_IDLE)(struct tagAMX *amx, int AMXAPI Exec(struct tagAMX *, cell *, int));
+#if !defined _FAR
+  #define _FAR
+#endif
+
+#if defined _MSC_VER
+  #pragma warning(disable:4100)  /* "'%$S' : unreferenced formal parameter" */
+  #pragma warning(disable:4103)  /* disable warning message 4103 that complains
+                                  * about pragma pack in a header file */
+  #pragma warning(disable:4127)  /* "conditional expression is constant" (needed for static_assert) */
+  #pragma warning(disable:4996)  /* POSIX name is deprecated */
+#endif
+
+/* Some compilers do not support the #pragma align, which should be fine. Some
+ * compilers give a warning on unknown #pragmas, which is not so fine...
+ */
+#if (defined SN_TARGET_PS2 || defined __GNUC__) && !defined AMX_NO_ALIGN
+  #define AMX_NO_ALIGN
+#endif
+
+#if defined __GNUC__
+  #define PACKED        __attribute__((packed))
+#else
+  #define PACKED
+#endif
+
+#if !defined AMX_NO_ALIGN
+  #if defined __LINUX__ || defined __FreeBSD__ || defined __APPLE__
+    #pragma pack(1)         /* structures must be packed (byte-aligned) */
+  #elif defined MACOS && defined __MWERKS__
+    #pragma options align=mac68k
+  #else
+    #pragma pack(push)
+    #pragma pack(1)         /* structures must be packed (byte-aligned) */
+    #if defined __TURBOC__
+      #pragma option -a-    /* "pack" pragma for older Borland compilers */
+    #endif
+  #endif
+#endif
+
+typedef struct tagAMX_NATIVE_INFO {
+  const char _FAR *name;
+  AMX_NATIVE func;
+} PACKED AMX_NATIVE_INFO;
+
+#if !defined AMX_USERNUM
+#define AMX_USERNUM     4
+#endif
+#define sEXPMAX         19  /* maximum name length for file version <= 6 */
+#define sNAMEMAX        31  /* maximum name length of symbol name */
+
+typedef struct tagFUNCSTUB {
+  uint32_t address;
+  uint32_t nameofs;
+} PACKED AMX_FUNCSTUB;
+
+typedef struct tagOVERLAYINFO {
+  int32_t offset;           /* offset relative to the start of the code block */
+  int32_t size;             /* size in bytes */
+} PACKED AMX_OVERLAYINFO;
+
+/* The AMX structure is the internal structure for many functions. Not all
+ * fields are valid at all times; many fields are cached in local variables.
+ */
+typedef struct tagAMX {
+  unsigned char _FAR *base; /* points to the AMX header, perhaps followed by P-code and data */
+  unsigned char _FAR *code; /* points to P-code block, possibly in ROM or in an overlay pool */
+  unsigned char _FAR *data; /* points to separate data+stack+heap, may be NULL */
+  AMX_CALLBACK callback;    /* native function callback */
+  AMX_DEBUG debug;          /* debug callback */
+  AMX_OVERLAY overlay;      /* overlay reader callback */
+  /* for external functions a few registers must be accessible from the outside */
+  cell cip;                 /* instruction pointer: relative to base + amxhdr->cod */
+  cell frm;                 /* stack frame base: relative to base + amxhdr->dat */
+  cell hea;                 /* top of the heap: relative to base + amxhdr->dat */
+  cell hlw;                 /* bottom of the heap: relative to base + amxhdr->dat */
+  cell stk;                 /* stack pointer: relative to base + amxhdr->dat */
+  cell stp;                 /* top of the stack: relative to base + amxhdr->dat */
+  int flags;                /* current status, see amx_Flags() */
+  /* user data */
+  #if AMX_USERNUM > 0
+    long usertags[AMX_USERNUM];
+    void _FAR *userdata[AMX_USERNUM];
+  #endif
+  /* native functions can raise an error */
+  int error;
+  /* passing parameters requires a "count" field */
+  int paramcount;
+  /* the sleep opcode needs to store the full AMX status */
+  cell pri;
+  cell alt;
+  cell reset_stk;
+  cell reset_hea;
+  /* extra fields for increased performance */
+  cell sysreq_d;            /* relocated address/value for the SYSREQ.D opcode */
+  /* fields for overlay support and JIT support */
+  int ovl_index;            /* current overlay index */
+  long codesize;            /* size of the overlay, or estimated memory footprint of the native code */
+  #if defined AMX_JIT
+    /* support variables for the JIT */
+    int reloc_size;         /* required temporary buffer for relocations */
+  #endif
+} PACKED AMX;
+
+/* The AMX_HEADER structure is both the memory format as the file format. The
+ * structure is used internaly.
+ */
+typedef struct tagAMX_HEADER {
+  int32_t size;             /* size of the "file" */
+  uint16_t magic;           /* signature */
+  char    file_version;     /* file format version */
+  char    amx_version;      /* required version of the AMX */
+  int16_t flags;
+  int16_t defsize;          /* size of a definition record */
+  int32_t cod;              /* initial value of COD - code block */
+  int32_t dat;              /* initial value of DAT - data block */
+  int32_t hea;              /* initial value of HEA - start of the heap */
+  int32_t stp;              /* initial value of STP - stack top */
+  int32_t cip;              /* initial value of CIP - the instruction pointer */
+  int32_t publics;          /* offset to the "public functions" table */
+  int32_t natives;          /* offset to the "native functions" table */
+  int32_t libraries;        /* offset to the table of libraries */
+  int32_t pubvars;          /* offset to the "public variables" table */
+  int32_t tags;             /* offset to the "public tagnames" table */
+  int32_t nametable;        /* offset to the name table */
+  int32_t overlays;         /* offset to the overlay table */
+} PACKED AMX_HEADER;
+
+#define AMX_MAGIC_16    0xf1e2
+#define AMX_MAGIC_32    0xf1e0
+#define AMX_MAGIC_64    0xf1e1
+#if PAWN_CELL_SIZE==16
+  #define AMX_MAGIC     AMX_MAGIC_16
+#elif PAWN_CELL_SIZE==32
+  #define AMX_MAGIC     AMX_MAGIC_32
+#elif PAWN_CELL_SIZE==64
+  #define AMX_MAGIC     AMX_MAGIC_64
+#endif
+
+enum {
+  AMX_ERR_NONE,
+  /* reserve the first 15 error codes for exit codes of the abstract machine */
+  AMX_ERR_EXIT,         /* forced exit */
+  AMX_ERR_ASSERT,       /* assertion failed */
+  AMX_ERR_STACKERR,     /* stack/heap collision */
+  AMX_ERR_BOUNDS,       /* index out of bounds */
+  AMX_ERR_MEMACCESS,    /* invalid memory access */
+  AMX_ERR_INVINSTR,     /* invalid instruction */
+  AMX_ERR_STACKLOW,     /* stack underflow */
+  AMX_ERR_HEAPLOW,      /* heap underflow */
+  AMX_ERR_CALLBACK,     /* no callback, or invalid callback */
+  AMX_ERR_NATIVE,       /* native function failed */
+  AMX_ERR_DIVIDE,       /* divide by zero */
+  AMX_ERR_SLEEP,        /* go into sleepmode - code can be restarted */
+  AMX_ERR_INVSTATE,     /* no implementation for this state, no fall-back */
+
+  AMX_ERR_MEMORY = 16,  /* out of memory */
+  AMX_ERR_FORMAT,       /* invalid file format */
+  AMX_ERR_VERSION,      /* file is for a newer version of the AMX */
+  AMX_ERR_NOTFOUND,     /* function not found */
+  AMX_ERR_INDEX,        /* invalid index parameter (bad entry point) */
+  AMX_ERR_DEBUG,        /* debugger cannot run */
+  AMX_ERR_INIT,         /* AMX not initialized (or doubly initialized) */
+  AMX_ERR_USERDATA,     /* unable to set user data field (table full) */
+  AMX_ERR_INIT_JIT,     /* cannot initialize the JIT */
+  AMX_ERR_PARAMS,       /* parameter error */
+  AMX_ERR_DOMAIN,       /* domain error, expression result does not fit in range */
+  AMX_ERR_GENERAL,      /* general error (unknown or unspecific error) */
+  AMX_ERR_OVERLAY,      /* overlays are unsupported (JIT) or uninitialized */
+};
+
+#define AMX_FLAG_OVERLAY  0x01  /* all function calls use overlays */
+#define AMX_FLAG_DEBUG    0x02  /* symbolic info. available */
+#define AMX_FLAG_NOCHECKS 0x04  /* no array bounds checking; no BREAK opcodes */
+#define AMX_FLAG_SLEEP    0x08  /* script uses the sleep instruction (possible re-entry or power-down mode) */
+#define AMX_FLAG_CRYPT    0x10  /* file is encrypted */
+#define AMX_FLAG_DSEG_INIT 0x20 /* data section is explicitly initialized */
+#define AMX_FLAG_SYSREQN 0x800  /* script uses new (optimized) version of SYSREQ opcode */
+#define AMX_FLAG_NTVREG 0x1000  /* all native functions are registered */
+#define AMX_FLAG_JITC   0x2000  /* abstract machine is JIT compiled */
+#define AMX_FLAG_VERIFY 0x4000  /* busy verifying P-code */
+#define AMX_FLAG_INIT   0x8000  /* AMX has been initialized */
+
+#define AMX_EXEC_MAIN   (-1)    /* start at program entry point */
+#define AMX_EXEC_CONT   (-2)    /* continue from last address */
+
+#define AMX_USERTAG(a,b,c,d)    ((a) | ((b)<<8) | ((long)(c)<<16) | ((long)(d)<<24))
+
+/* for native functions that use floating point parameters, the following
+ * two macros are convenient for casting a "cell" into a "float" type _without_
+ * changing the bit pattern
+ */
+#if PAWN_CELL_SIZE==32
+  #define amx_ftoc(f)   ( * ((cell*)&f) )   /* float to cell */
+  #define amx_ctof(c)   ( * ((float*)&c) )  /* cell to float */
+#elif PAWN_CELL_SIZE==64
+  #define amx_ftoc(f)   ( * ((cell*)&f) )   /* float to cell */
+  #define amx_ctof(c)   ( * ((double*)&c) ) /* cell to float */
+#else
+  // amx_ftoc() and amx_ctof() cannot be used
+#endif
+
+/* when a pointer cannot be stored in a cell, cells that hold relocated
+ * addresses need to be expanded
+ */
+#if defined __64BIT__ && PAWN_CELL_SIZE<64
+  #define CELLMASK      (((int64_t)1 << PAWN_CELL_SIZE) - 1)
+  #define amx_Address(amx,addr) \
+                        (cell*)(((int64_t)((amx)->data ? (amx)->data : (amx)->code) & ~CELLMASK) | ((int64_t)(addr) & CELLMASK))
+#elif defined __32BIT__ && PAWN_CELL_SIZE<32
+  #define CELLMASK      ((1L << PAWN_CELL_SIZE) - 1)
+  #define amx_Address(amx,addr) \
+                        (cell*)(((int32_t)((amx)->data ? (amx)->data : (amx)->code) & ~CELLMASK) | ((int32_t)(addr) & CELLMASK))
+#else
+  #define amx_Address(amx,addr) ((void)(amx),(cell*)(addr))
+#endif
+
+#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+  /* C99: use variable-length arrays */
+  #define amx_StrParam_Type(amx,param,result,type)                          \
+    int result##_length_;                                                   \
+    amx_StrLen(amx_Address(amx,param),&result##_length_);                   \
+    char result##_vla_[(result##_length_+1)*sizeof(*(result))];             \
+    (result)=(type)result##_vla_;                                           \
+    amx_GetString((char*)(result),amx_Address(amx,param),                   \
+                  sizeof(*(result))>1,result##_length_+1)
+  #define amx_StrParam(amx,param,result) \
+    amx_StrParam_Type(amx,param,result,void*)
+#else
+  /* macro using alloca() */
+  #define amx_StrParam_Type(amx,param,result,type)                          \
+    do {                                                                    \
+      int result##_length_;                                                 \
+      amx_StrLen(amx_Address(amx,param),&result##_length_);                 \
+      if (result##_length_>0 &&                                             \
+          ((result)=(type)alloca((result##_length_+1)*sizeof(*(result))))!=NULL) \
+        amx_GetString((char*)(result),amx_Address(amx,param),               \
+                      sizeof(*(result))>1,result##_length_+1);              \
+      else (result) = NULL;                                                 \
+    } while (0)
+  #define amx_StrParam(amx,param,result) \
+    amx_StrParam_Type(amx,param,result,void*)
+#endif
+
+uint16_t * AMXAPI amx_Align16(uint16_t *v);
+uint32_t * AMXAPI amx_Align32(uint32_t *v);
+#if defined _I64_MAX || defined INT64_MAX || defined HAVE_I64
+  uint64_t * AMXAPI amx_Align64(uint64_t *v);
+#endif
+int AMXAPI amx_Allot(AMX *amx, int cells, cell **address);
+int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, const cell *params);
+int AMXAPI amx_Cleanup(AMX *amx);
+int AMXAPI amx_Clone(AMX *amxClone, AMX *amxSource, void *data);
+int AMXAPI amx_Exec(AMX *amx, cell *retval, int index);
+int AMXAPI amx_FindNative(AMX *amx, const char *name, int *index);
+int AMXAPI amx_FindPublic(AMX *amx, const char *name, int *index);
+int AMXAPI amx_FindPubVar(AMX *amx, const char *name, cell **address);
+int AMXAPI amx_FindTagId(AMX *amx, cell tag_id, char *tagname);
+int AMXAPI amx_Flags(AMX *amx,uint16_t *flags);
+int AMXAPI amx_GetNative(AMX *amx, int index, char *name);
+int AMXAPI amx_GetPublic(AMX *amx, int index, char *name, ucell *address);
+int AMXAPI amx_GetPubVar(AMX *amx, int index, char *name, cell **address);
+int AMXAPI amx_GetString(char *dest,const cell *source, int use_wchar, size_t size);
+int AMXAPI amx_GetTag(AMX *amx, int index, char *tagname, cell *tag_id);
+int AMXAPI amx_GetUserData(AMX *amx, long tag, void **ptr);
+int AMXAPI amx_Init(AMX *amx, void *program);
+int AMXAPI amx_InitJIT(AMX *amx, void *reloc_table, void *native_code);
+int AMXAPI amx_MemInfo(AMX *amx, long *codesize, long *datasize, long *stackheap);
+int AMXAPI amx_NameLength(AMX *amx, int *length);
+AMX_NATIVE_INFO * AMXAPI amx_NativeInfo(const char *name, AMX_NATIVE func);
+int AMXAPI amx_NumNatives(AMX *amx, int *number);
+int AMXAPI amx_NumPublics(AMX *amx, int *number);
+int AMXAPI amx_NumPubVars(AMX *amx, int *number);
+int AMXAPI amx_NumTags(AMX *amx, int *number);
+int AMXAPI amx_Push(AMX *amx, cell value);
+int AMXAPI amx_PushAddress(AMX *amx, cell *address);
+int AMXAPI amx_PushArray(AMX *amx, cell **address, const cell array[], int numcells);
+int AMXAPI amx_PushString(AMX *amx, cell **address, const char *string, int pack, int use_wchar);
+int AMXAPI amx_RaiseError(AMX *amx, int error);
+int AMXAPI amx_Register(AMX *amx, const AMX_NATIVE_INFO *nativelist, int number);
+int AMXAPI amx_Release(AMX *amx, cell *address);
+int AMXAPI amx_SetCallback(AMX *amx, AMX_CALLBACK callback);
+int AMXAPI amx_SetDebugHook(AMX *amx, AMX_DEBUG debug);
+int AMXAPI amx_SetString(cell *dest, const char *source, int pack, int use_wchar, size_t size);
+int AMXAPI amx_SetUserData(AMX *amx, long tag, void *ptr);
+int AMXAPI amx_StrLen(const cell *cstring, int *length);
+int AMXAPI amx_UTF8Check(const char *string, int *length);
+int AMXAPI amx_UTF8Get(const char *string, const char **endptr, cell *value);
+int AMXAPI amx_UTF8Len(const cell *cstr, int *length);
+int AMXAPI amx_UTF8Put(char *string, char **endptr, int maxchars, cell value);
+
+#if PAWN_CELL_SIZE==16
+  void amx_Swap16(uint16_t *v);
+#endif
+#if PAWN_CELL_SIZE==32
+  void amx_Swap32(uint32_t *v);
+#endif
+#if PAWN_CELL_SIZE==64 && (defined _I64_MAX || defined INT64_MAX || defined HAVE_I64)
+  void amx_Swap64(uint64_t *v);
+#endif
+
+#if PAWN_CELL_SIZE==16
+  #define amx_AlignCell(v) amx_Align16((uint16_t*)(v))
+  #define amx_SwapCell(v)  amx_Swap16((uint16_t*)(v))
+#elif PAWN_CELL_SIZE==32
+  #define amx_AlignCell(v) amx_Align32((uint32_t*)(v))
+  #define amx_SwapCell(v)  amx_Swap32((uint32_t*)(v))
+#elif PAWN_CELL_SIZE==64 && (defined _I64_MAX || defined INT64_MAX || defined HAVE_I64)
+  #define amx_AlignCell(v) amx_Align64((uint64_t*)(v))
+  #define amx_SwapCell(v)  amx_Swap64((uint64_t*)(v))
+#else
+  #error Unsupported cell size
+#endif
+
+#define amx_RegisterFunc(amx, name, func) \
+  amx_Register((amx), amx_NativeInfo((name),(func)), 1);
+
+#if !defined AMX_NO_ALIGN
+  #if defined __LINUX__ || defined __FreeBSD__ || defined __APPLE__
+    #pragma pack()    /* reset default packing */
+  #elif defined MACOS && defined __MWERKS__
+    #pragma options align=reset
+  #else
+    #pragma pack(pop) /* reset previous packing */
+  #endif
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* AMX_H_INCLUDED */
diff --git a/apps/openmw-mp/amx/amxaux.c b/apps/openmw-mp/amx/amxaux.c
new file mode 100644
index 000000000..f4bebeacc
--- /dev/null
+++ b/apps/openmw-mp/amx/amxaux.c
@@ -0,0 +1,164 @@
+/*  Support routines for the Pawn Abstract Machine
+ *
+ *  Copyright (c) ITB CompuPhase, 2003-2011
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ *  use this file except in compliance with the License. You may obtain a copy
+ *  of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ *
+ *  Version: $Id: amxaux.c 4523 2011-06-21 15:03:47Z thiadmer $
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "amx.h"
+#include "amxaux.h"
+
+size_t AMXAPI aux_ProgramSize(const char *filename)
+{
+  FILE *fp;
+  AMX_HEADER hdr;
+
+  if ((fp=fopen(filename,"rb")) == NULL)
+    return 0;
+  fread(&hdr, sizeof hdr, 1, fp);
+  fclose(fp);
+
+  amx_Align16(&hdr.magic);
+  amx_Align32((uint32_t *)&hdr.stp);
+  return (hdr.magic==AMX_MAGIC) ? (size_t)hdr.stp : 0;
+}
+
+int AMXAPI aux_LoadProgram(AMX *amx, const char *filename, void *memblock)
+{
+  FILE *fp;
+  AMX_HEADER hdr;
+  int result, didalloc;
+
+  /* open the file, read and check the header */
+  if ((fp = fopen(filename, "rb")) == NULL)
+    return AMX_ERR_NOTFOUND;
+  fread(&hdr, sizeof hdr, 1, fp);
+  amx_Align16(&hdr.magic);
+  amx_Align32((uint32_t *)&hdr.size);
+  amx_Align32((uint32_t *)&hdr.stp);
+  if (hdr.magic != AMX_MAGIC) {
+    fclose(fp);
+    return AMX_ERR_FORMAT;
+  } /* if */
+
+  /* allocate the memblock if it is NULL */
+  didalloc = 0;
+  if (memblock == NULL) {
+    if ((memblock = malloc(hdr.stp)) == NULL) {
+      fclose(fp);
+      return AMX_ERR_MEMORY;
+    } /* if */
+    didalloc = 1;
+    /* after amx_Init(), amx->base points to the memory block */
+  } /* if */
+
+  /* read in the file */
+  rewind(fp);
+  fread(memblock, 1, (size_t)hdr.size, fp);
+  fclose(fp);
+
+  /* initialize the abstract machine */
+  memset(amx, 0, sizeof *amx);
+  result = amx_Init(amx, memblock);
+
+  /* free the memory block on error, if it was allocated here */
+  if (result != AMX_ERR_NONE && didalloc) {
+    free(memblock);
+    amx->base = NULL;                   /* avoid a double free */
+  } /* if */
+
+  return result;
+}
+
+int AMXAPI aux_FreeProgram(AMX *amx)
+{
+  if (amx->base!=NULL) {
+    amx_Cleanup(amx);
+    free(amx->base);
+    memset(amx, 0, sizeof(AMX));
+  } /* if */
+  return AMX_ERR_NONE;
+}
+
+char * AMXAPI aux_StrError(int errnum)
+{
+static char *messages[] = {
+      /* AMX_ERR_NONE      */ "(none)",
+      /* AMX_ERR_EXIT      */ "Forced exit",
+      /* AMX_ERR_ASSERT    */ "Assertion failed",
+      /* AMX_ERR_STACKERR  */ "Stack/heap collision (insufficient stack size)",
+      /* AMX_ERR_BOUNDS    */ "Array index out of bounds",
+      /* AMX_ERR_MEMACCESS */ "Invalid memory access",
+      /* AMX_ERR_INVINSTR  */ "Invalid instruction",
+      /* AMX_ERR_STACKLOW  */ "Stack underflow",
+      /* AMX_ERR_HEAPLOW   */ "Heap underflow",
+      /* AMX_ERR_CALLBACK  */ "No (valid) native function callback",
+      /* AMX_ERR_NATIVE    */ "Native function failed",
+      /* AMX_ERR_DIVIDE    */ "Divide by zero",
+      /* AMX_ERR_SLEEP     */ "(sleep mode)",
+      /* AMX_ERR_INVSTATE  */ "Invalid state",
+      /* 14 */                "(reserved)",
+      /* 15 */                "(reserved)",
+      /* AMX_ERR_MEMORY    */ "Out of memory",
+      /* AMX_ERR_FORMAT    */ "Invalid/unsupported P-code file format",
+      /* AMX_ERR_VERSION   */ "File is for a newer version of the AMX",
+      /* AMX_ERR_NOTFOUND  */ "File or function is not found",
+      /* AMX_ERR_INDEX     */ "Invalid index parameter (bad entry point)",
+      /* AMX_ERR_DEBUG     */ "Debugger cannot run",
+      /* AMX_ERR_INIT      */ "AMX not initialized (or doubly initialized)",
+      /* AMX_ERR_USERDATA  */ "Unable to set user data field (table full)",
+      /* AMX_ERR_INIT_JIT  */ "Cannot initialize the JIT",
+      /* AMX_ERR_PARAMS    */ "Parameter error",
+      /* AMX_ERR_DOMAIN    */ "Domain error, expression result does not fit in range",
+      /* AMX_ERR_GENERAL   */ "General error (unknown or unspecific error)",
+      /* AMX_ERR_OVERLAY   */ "Overlays are unsupported (JIT) or uninitialized",
+    };
+  if (errnum < 0 || errnum >= sizeof messages / sizeof messages[0])
+    return "(unknown)";
+  return messages[errnum];
+}
+
+int AMXAPI aux_GetSection(const AMX *amx, int section, cell **start, size_t *size)
+{
+  AMX_HEADER *hdr;
+
+  if (amx == NULL || start == NULL || size == NULL)
+    return AMX_ERR_PARAMS;
+
+  hdr = (AMX_HEADER*)amx->base;
+  switch(section) {
+  case CODE_SECTION:
+    *start = (cell *)(amx->base + hdr->cod);
+    *size = hdr->dat - hdr->cod;
+    break;
+  case DATA_SECTION:
+    *start = (cell *)(amx->data);
+    *size = hdr->hea - hdr->dat;
+    break;
+  case HEAP_SECTION:
+    *start = (cell *)(amx->data + hdr->hea);
+    *size = amx->hea - hdr->hea;
+    break;
+  case STACK_SECTION:
+    *start = (cell *)(amx->data + amx->stk);
+    *size = amx->stp - amx->stk;
+    break;
+  default:
+    return AMX_ERR_PARAMS;
+  } /* switch */
+  return AMX_ERR_NONE;
+}
diff --git a/apps/openmw-mp/amx/amxaux.h b/apps/openmw-mp/amx/amxaux.h
new file mode 100644
index 000000000..093a96fa6
--- /dev/null
+++ b/apps/openmw-mp/amx/amxaux.h
@@ -0,0 +1,50 @@
+/*  Support routines for the Pawn Abstract Machine
+ *
+ *  Copyright (c) ITB CompuPhase, 2003-2011
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ *  use this file except in compliance with the License. You may obtain a copy
+ *  of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ *
+ *  Version: $Id: amxaux.h 4523 2011-06-21 15:03:47Z thiadmer $
+ */
+#ifndef AMXAUX_H_INCLUDED
+#define AMXAUX_H_INCLUDED
+
+#include "amx.h"
+
+#ifdef  __cplusplus
+extern  "C" {
+#endif
+
+/* loading and freeing programs */
+size_t AMXAPI aux_ProgramSize(const char *filename);
+int AMXAPI aux_LoadProgram(AMX *amx, const char *filename, void *memblock);
+int AMXAPI aux_FreeProgram(AMX *amx);
+
+/* a readable error message from an error code */
+char * AMXAPI aux_StrError(int errnum);
+
+enum {
+  CODE_SECTION,
+  DATA_SECTION,
+  HEAP_SECTION,
+  STACK_SECTION,
+  /* ----- */
+  NUM_SECTIONS
+};
+int AMXAPI aux_GetSection(const AMX *amx, int section, cell **start, size_t *size);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* AMXAUX_H_INCLUDED */
diff --git a/apps/openmw-mp/amx/amxcons.c b/apps/openmw-mp/amx/amxcons.c
new file mode 100644
index 000000000..3f2f812a0
--- /dev/null
+++ b/apps/openmw-mp/amx/amxcons.c
@@ -0,0 +1,1448 @@
+/* Console output module (terminal I/O) for the Pawn AMX
+ *
+ *  Since some of these routines go further than those of standard C, they
+ *  cannot always be implemented with portable C functions. In other words,
+ *  these routines must be ported to other environments.
+ *
+ *  Copyright (c) ITB CompuPhase, 1997-2015
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ *  use this file except in compliance with the License. You may obtain a copy
+ *  of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ *
+ *  Version: $Id: amxcons.c 5181 2015-01-21 09:44:28Z thiadmer $
+ */
+
+#if defined _UNICODE || defined __UNICODE__ || defined UNICODE
+# if !defined UNICODE   /* for Windows */
+#   define UNICODE
+# endif
+# if !defined _UNICODE  /* for C library */
+#   define _UNICODE
+# endif
+#endif
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#if defined __WIN32__ || defined _WIN32 || defined WIN32 || defined __MSDOS__
+  #define HAVE_CONIO
+  #include <conio.h>
+  #include <malloc.h>
+#endif
+#if defined USE_CURSES || defined HAVE_CURSES_H
+  #include <curses.h>
+  #if !defined CURSES
+    #define CURSES  1
+  #endif
+#endif
+#include "osdefs.h"
+#if defined __ECOS__
+  /* eCos puts include files in cyg/package_name */
+  #include <cyg/hal/hal_if.h>
+  #include <cyg/infra/diag.h>
+  #include <cyg/hal/hal_diag.h>
+  #include <cyg/pawn/amx.h>
+#else
+  #include "amx.h"
+#endif
+#if defined __WIN32__ || defined _WIN32 || defined WIN32
+  #include <windows.h>
+#endif
+
+#if defined _UNICODE
+# include <tchar.h>
+#elif !defined __T
+  typedef char          TCHAR;
+# define __T(string)    string
+# define _fgetts        fgets
+# define _puttchar      putchar
+# define _stprintf      sprintf
+# define _tcschr        strchr
+# define _tcscpy        strcpy
+# define _tcsdup        strdup
+# define _tcslen        strlen
+# define _tprintf       printf
+#endif
+#include "amxcons.h"
+
+#if defined AMX_TERMINAL
+  #define EOL_CHAR       '\r'
+#endif
+#if defined __WIN32__ || defined _WIN32 || defined WIN32 || defined __MSDOS__
+  #define EOL_CHAR       '\r'
+#endif
+#if !defined EOL_CHAR
+  /* if not a "known" operating system, assume Linux/Unix */
+  #define EOL_CHAR     '\n'
+#endif
+
+#if !defined AMX_STRING_LIB
+
+#if defined AMX_TERMINAL
+  /* required functions are implemented elsewhere */
+  int amx_putstr(const TCHAR *);
+  int amx_putchar(int);
+  int amx_fflush(void);
+  int amx_getch(void);
+  TCHAR *amx_gets(TCHAR *,int);
+  int amx_termctl(int,int);
+  void amx_clrscr(void);
+  void amx_clreol(void);
+  int amx_gotoxy(int x,int y);
+  void amx_wherexy(int *x,int *y);
+  unsigned int amx_setattr(int foregr,int backgr,int highlight);
+  void amx_console(int columns, int lines, int flags);
+  void amx_viewsize(int *width,int *height);
+  int amx_kbhit(void);
+#elif defined CURSES && CURSES != 0
+  /* Use the "curses" library to implement the console */
+  static WINDOW *curseswin;
+  #define amx_putstr(s)       printw("%s",(s))
+  #define amx_putchar(c)      addch(c)
+  #define amx_fflush()        refresh()
+  #define amx_getch()         getch()
+  #define amx_gets(s,n)       getnstr((s),(n))
+  #define amx_clrscr()        clear()
+  #define amx_clreol()        clrtoeol()
+  #define amx_gotoxy(x,y)     move((y)-1,(x)-1)
+  #define amx_console(c,l,f)  ((void)(c),(void)(l),(void)(f))
+  unsigned int amx_setattr(int foregr,int backgr,int highlight)
+  {
+    if (highlight>0)
+      attron(A_STANDOUT);
+    else
+      attroff(A_STANDOUT);
+    //??? in future, also handle colours
+  }
+  void CreateConsole(void);
+  int amx_kbhit(void)
+  {
+    int result;
+    CreateConsole();
+    nodelay(curseswin,TRUE);    /* enter non-blocking state */
+    result=getch();             /* read key (if any) */
+    nodelay(curseswin,FALSE);   /* leave non-blocking state */
+    if (result!=ERR)
+      ungetch(result);          /* a key is waiting, push it back */
+    return (result==ERR) ? 0 : 1;
+  }
+  int amx_termctl(int code,int value)
+  {
+    switch (code) {
+    case 0:           /* query terminal support */
+      return 1;
+    /* case 1: */     /* switch auto-wrap on/off (not supported in curses!) */
+    /* case 2: */     /* create/switch to another console */
+    case 3:           /* set emphasized font */
+      if (value)
+        attron(A_BOLD);
+      else
+        attroff(A_BOLD);
+      return 1;
+    /* case 4: */     /* query whether a terminal is "open" */
+    default:
+      return 0;
+    } /* switch */
+  }
+  void amx_wherexy(int *x,int *y)
+  {
+    int row,col;
+    getyx(curseswin,row,col);
+    if (x!=NULL)
+      *x=col+1;
+    if (y!=NULL)
+      *y=row+1;
+  }
+  void amx_viewsize(int *width,int *height)
+  {
+    int row,col;
+    getmaxyx(curseswin,row,col);
+    if (width!=NULL)
+      *width=col;
+    if (height!=NULL)
+      *height=row;
+  }
+#elif defined VT100 || defined __LINUX__ || defined ANSITERM || defined __ECOS__
+  /* ANSI/VT100 terminal, or shell emulating "xterm" */
+  #if defined __ECOS__
+    #define AMXCONSOLE_NOIDLE
+  #endif
+
+  #if CYGPKG_PAWN_AMXCONSOLE_DIAG==1
+    /* eCos has basically two ways to make simple exchanges with a terminal:
+     * - with the diag_*() functions (no input provided!)
+     * - with f*() functions (fprintf(),fputs(), etc).
+     */
+    #define amx_fflush()
+
+    static int amx_putstr(TCHAR *s)
+    {
+      diag_write_string(s);
+      return 1;
+    }
+    static int amx_putchar(TCHAR c)
+    {
+      diag_write_char(c);
+      return c;
+    }
+    static char amx_getch(void)
+    {
+      char c=-1;
+      HAL_DIAG_READ_CHAR(c);
+      return c;
+    }
+  #else
+
+    #define amx_putstr(s)     fputs((s),stdout)
+    #define amx_putchar(c)    putchar(c)
+    #define amx_fflush()      fflush(stdout)
+    #define amx_getch()       getch()
+    #define amx_gets(s,n)     fgets(s,n,stdin)
+    #define amx_kbhit()       kbhit()
+  #endif
+
+  int amx_termctl(int code,int value)
+  {
+    switch (code) {
+    case 0:             /* query terminal support */
+      return 1;
+
+    case 1:             /* switch "auto-wrap" on or off */
+      if (value)
+        amx_putstr("\033[?7h"); /* enable "auto-wrap" */
+      else
+        amx_putstr("\033[?7l"); /* disable "auto-wrap" */
+      return 1;
+
+    #if 0
+      /* next to swapping buffers, more information should be saved and swapped,
+       * such as the cursor position and the current terminal attributes
+       */
+    case 2:             /* swap console buffers */
+      amx_fflush();
+      if (value==1) {
+        amx_putstr("\033[?47h");
+      } else {
+        amx_putstr("\033[?47l");
+      } /* if */
+      amx_fflush();
+      return 1;
+    #endif
+
+    case 3:             /* set bold/highlighted font */
+      return 0;
+
+    default:
+      return 0;
+    } /* switch */
+  }
+  void amx_clrscr(void)
+  {
+    amx_putstr("\033[2J");
+    amx_fflush();        /* pump through the terminal codes */
+  }
+  void amx_clreol(void)
+  {
+    amx_putstr("\033[K");
+    amx_fflush();        /* pump through the terminal codes */
+  }
+  int amx_gotoxy(int x,int y)
+  {
+    char str[30];
+    _stprintf(str,"\033[%d;%dH",y,x);
+    amx_putstr(str);
+    amx_fflush();        /* pump through the terminal codes */
+    return 1;
+  }
+  void amx_wherexy(int *x,int *y)
+  {
+    int val,i;
+    char str[10];
+
+    assert(x!=NULL && y!=NULL);
+    amx_putstr("\033[6n");
+    amx_fflush();
+    while (amx_getch()!='\033')
+      /* nothing */;
+    val=amx_getch();
+    assert(val=='[');
+    for (i=0; i<8 && (val=amx_getch())!=';'; i++)
+      str[i]=(char)val;
+    str[i]='\0';
+    if (y!=NULL)
+      *y=atoi(str);
+    for (i=0; i<8 && (val=amx_getch())!='R'; i++)
+      str[i]=(char)val;
+    str[i]='\0';
+    if (x!=NULL)
+      *x=atoi(str);
+    #if defined ANSITERM
+      val=amx_getch();
+      assert(val=='\r');    /* ANSI driver adds CR to the end of the command */
+    #endif
+  }
+  unsigned int amx_setattr(int foregr,int backgr,int highlight)
+  {
+    static short current=(0 << 8) | 7;
+    short prev = current;
+    char str[30];
+
+    if (foregr>=0) {
+      _stprintf(str,"\x1b[%dm",foregr+30);
+      amx_putstr(str);
+      current=(current & 0xff00) | (foregr & 0x0f);
+    } /* if */
+    if (backgr>=0) {
+      _stprintf(str,"\x1b[%dm",backgr+40);
+      amx_putstr(str);
+      current=(current & 0x00ff) | ((backgr & 0x0f) << 8);
+    } /* if */
+    if (highlight>=0) {
+      _stprintf(str,"\x1b[%dm",highlight);
+      amx_putstr(str);
+      current=(current & 0x7fff) | ((highlight & 0x01) << 15);
+    } /* if */
+    return prev;
+  }
+  void amx_console(int columns, int lines, int flags)
+  {
+    char str[30];
+
+    (void)flags;
+    /* There is no ANSI code (or VT100/VT220) to set the size of the console
+     * (indeed, the terminal was that of the alphanumeric display). In xterm (a
+     * terminal emulator) we can set the terminal size though, and most
+     * terminals that in use today are in fact emulators.
+     * Putty understands this code too, by many others do not.
+     */
+    sprintf(str,"\033[8;%d;%dt",lines,columns);
+    amx_putstr(str);
+    amx_fflush();
+  }
+  void amx_viewsize(int *width,int *height)
+  {
+    /* a trick to get the size of the terminal is to position the cursor far
+     * away and then read it back
+     */
+    amx_gotoxy(999,999);
+    amx_wherexy(width,height);
+  }
+#elif defined __WIN32__ || defined _WIN32 || defined WIN32
+  /* Win32 console */
+  #define amx_putstr(s)       _tprintf("%s",(s))
+  #define amx_putchar(c)      _puttchar(c)
+  #define amx_fflush()        fflush(stdout)
+  #define amx_gets(s,n)       _fgetts(s,n,stdin)
+
+  int amx_termctl(int code,int value)
+  {
+    switch (code) {
+    case 0:             /* query terminal support */
+      return 1;
+
+    case 1: {           /* switch auto-wrap on/off */
+      /* only works in Windows 2000/XP */
+      HANDLE hConsole=GetStdHandle(STD_OUTPUT_HANDLE);
+      DWORD mode;
+      GetConsoleMode(hConsole,&mode);
+      if (value)
+        mode |= ENABLE_WRAP_AT_EOL_OUTPUT;
+      else
+        mode &= ~ENABLE_WRAP_AT_EOL_OUTPUT;
+      SetConsoleMode(hConsole,mode);
+      return 1;
+    } /* case */
+
+    /* case 2: */     /* create/switch to another console */
+    /* case 3: */     /* set emphasized font */
+    /* case 4: */     /* query whether a terminal is "open" */
+    default:
+      return 0;
+    } /* switch */
+  }
+  void amx_clrscr(void)
+  {
+    COORD coordScreen={0,0};
+    DWORD cCharsWritten;
+    CONSOLE_SCREEN_BUFFER_INFO csbi;
+    DWORD dwConSize;
+    HANDLE hConsole=GetStdHandle(STD_OUTPUT_HANDLE);
+
+    amx_fflush();       /* make sure the I/O buffer is empty */
+    GetConsoleScreenBufferInfo(hConsole,&csbi);
+    dwConSize=csbi.dwSize.X*csbi.dwSize.Y;
+    FillConsoleOutputCharacter(hConsole,' ',dwConSize,coordScreen,&cCharsWritten);
+    FillConsoleOutputAttribute(hConsole,csbi.wAttributes,dwConSize,coordScreen, &cCharsWritten);
+    SetConsoleCursorPosition(hConsole,coordScreen);
+  }
+  void amx_clreol(void)
+  {
+    DWORD cCharsWritten;
+    CONSOLE_SCREEN_BUFFER_INFO csbi;
+    DWORD dwConSize;
+    HANDLE hConsole=GetStdHandle(STD_OUTPUT_HANDLE);
+
+    amx_fflush();       /* make sure all output is written */
+    GetConsoleScreenBufferInfo(hConsole,&csbi);
+    dwConSize=csbi.dwSize.X - csbi.dwCursorPosition.X;
+    FillConsoleOutputCharacter(hConsole,' ',dwConSize,csbi.dwCursorPosition,&cCharsWritten);
+    FillConsoleOutputAttribute(hConsole,csbi.wAttributes,dwConSize,csbi.dwCursorPosition,&cCharsWritten);
+  }
+  int amx_gotoxy(int x,int y)
+  {
+    COORD point;
+    CONSOLE_SCREEN_BUFFER_INFO csbi;
+    HANDLE hConsole=GetStdHandle(STD_OUTPUT_HANDLE);
+
+    GetConsoleScreenBufferInfo(hConsole, &csbi);
+    if (x<=0 || x>csbi.dwSize.X || y<=0 || y>csbi.dwSize.Y)
+      return 0;
+    amx_fflush();       /* make sure all output is written */
+    point.X=(short)(x-1);
+    point.Y=(short)(y-1);
+    SetConsoleCursorPosition(hConsole,point);
+    return 1;
+  }
+  void amx_wherexy(int *x,int *y)
+  {
+    CONSOLE_SCREEN_BUFFER_INFO csbi;
+    amx_fflush();       /* make sure all output is written */
+    GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi);
+    if (x!=NULL)
+      *x=csbi.dwCursorPosition.X+1;
+    if (y!=NULL)
+      *y=csbi.dwCursorPosition.Y+1;
+  }
+  unsigned int amx_setattr(int foregr,int backgr,int highlight)
+  {
+    static int ansi_colours[] = { 0, 4, 2, 6, 1, 5, 3, 7 };
+    CONSOLE_SCREEN_BUFFER_INFO csbi;
+    int f,b,h,prev;
+    HANDLE hConsole=GetStdHandle(STD_OUTPUT_HANDLE);
+
+    amx_fflush();       /* make sure all output is written */
+    GetConsoleScreenBufferInfo(hConsole,&csbi);
+    f=csbi.wAttributes & 0x07;
+    b=(csbi.wAttributes >> 4) & 0x0f;
+    h=(csbi.wAttributes & 0x08) ? 1 : 0;
+    prev=(b << 8) | f | (h << 15);
+    if (foregr>=0 && foregr<8)
+      f=ansi_colours[foregr];
+    if (backgr>=0 && backgr<8)
+      b=ansi_colours[backgr];
+    if (highlight>=0)
+      h=highlight!=0;
+    SetConsoleTextAttribute(hConsole, (WORD)((b << 4) | f | (h << 3)));
+    return prev;
+  }
+  void amx_console(int columns, int lines, int flags)
+  {
+    SMALL_RECT rect;
+    COORD dwSize;
+    HANDLE hConsole;
+    (void)flags;
+    dwSize.X=(short)columns;
+    dwSize.Y=(short)lines;
+    hConsole=GetStdHandle(STD_OUTPUT_HANDLE);
+    SetConsoleScreenBufferSize(hConsole,dwSize);
+    rect.Left=0;
+    rect.Top=0;
+    rect.Right=(short)(columns-1);
+    rect.Bottom=(short)(lines-1);
+    SetConsoleWindowInfo(hConsole,TRUE,&rect);
+  }
+  void amx_viewsize(int *width,int *height)
+  {
+    CONSOLE_SCREEN_BUFFER_INFO csbi;
+    GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE),&csbi);
+    if (width!=NULL)
+      *width=(int)csbi.dwSize.X;
+    if (height!=NULL)
+      *height=(int)(csbi.srWindow.Bottom-csbi.srWindow.Top+1);
+  }
+  int amx_getch(void)
+  {
+    TCHAR ch;
+    DWORD count,mode;
+    HANDLE hConsole=GetStdHandle(STD_INPUT_HANDLE);
+    GetConsoleMode(hConsole,&mode);
+    SetConsoleMode(hConsole,mode & ~(ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT));
+    while (ReadFile(hConsole,&ch,1,&count,NULL) && count==0)
+      /* nothing */;
+    SetConsoleMode(hConsole,mode);
+    if (count>0)
+      return ch;
+    return EOF;
+  }
+  int amx_kbhit(void)
+  {
+    DWORD count=0;
+    HANDLE hConsole;
+    hConsole=GetStdHandle(STD_INPUT_HANDLE);
+    if (GetFileType(hConsole)==FILE_TYPE_PIPE) {
+      PeekNamedPipe(hConsole,NULL,0,NULL,&count,NULL);
+    } else {
+      INPUT_RECORD rec;
+      while (PeekConsoleInput(hConsole,&rec,1,&count)) {
+        if (count==0 || (rec.EventType==KEY_EVENT && rec.Event.KeyEvent.bKeyDown))
+          break;
+        ReadConsoleInput(hConsole,&rec,1,&count);
+      }
+    }
+    return (count>0);
+  }
+#else
+  /* assume a streaming terminal; limited features (no colour, no cursor
+   * control)
+   */
+  #define amx_putstr(s)       printf("%s",(s))
+  #define amx_putchar(c)      putchar(c)
+  #define amx_fflush()        fflush(stdout)
+  #define amx_gets(s,n)       fgets(s,n,stdin)
+  #define amx_clrscr()        (void)(0)
+  #define amx_clreol()        (void)(0)
+  #define amx_gotoxy(x,y)     ((void)(x),(void)(y),(0))
+  #define amx_wherexy(x,y)    (*(x)=*(y)=0)
+  #define amx_setattr(c,b,h)  ((void)(c),(void)(b),(void)(h),(0))
+  #define amx_termctl(c,v)    ((void)(c),(void)(v),(0))
+  #define amx_console(c,l,f)  ((void)(c),(void)(l),(void)(f))
+  #define amx_viewsize        (*(x)=80,*(y)=25)
+  #if defined HAVE_CONIO
+    #define amx_getch()       getch()
+    #define amx_kbhit()       kbhit()
+  #else
+    #define amx_getch()       getchar()
+    #define amx_kbhit()       (0)
+  #endif
+#endif
+
+#if !defined AMX_TERMINAL && (defined __WIN32__ || defined _WIN32 || defined WIN32)
+  void CreateConsole(void)
+  { static int createdconsole=0;
+    if (!createdconsole) {
+      AllocConsole();
+      createdconsole=1;
+    } /* if */
+  }
+#elif defined CURSES && CURSES != 0
+  // The Mac OS X build variant uses curses.
+  void CreateConsole(void)
+  { static int createdconsole=0;
+    if (!createdconsole) {
+      curseswin=initscr();
+      if (has_colors())
+        start_color();
+      cbreak();
+      noecho();
+      nonl();
+      scrollok(curseswin,TRUE);
+      intrflush(curseswin,FALSE);
+      keypad(curseswin,TRUE);
+      createdconsole=1;
+    } /* if */
+  }
+#else
+  #define CreateConsole()
+#endif
+
+static int cons_putstr(void *dest,const TCHAR *str)
+{
+  (void)dest;
+  return amx_putstr(str);
+}
+
+static int cons_putchar(void *dest,TCHAR ch)
+{
+  (void)dest;
+  return amx_putchar(ch);
+}
+
+#endif /* AMX_STRING_LIB */
+
+enum {
+  SV_DECIMAL,
+  SV_HEX
+};
+
+static TCHAR *reverse(TCHAR *string,int stop)
+{
+    int start=0;
+    TCHAR temp;
+
+    /* swap the string */
+    stop--;             /* avoid swapping the '\0' byte to the first position */
+    while (stop - start > 0) {
+        temp = string[start];
+        string[start] = string[stop];
+        string[stop] = temp;
+        start++;
+        stop--;
+    } /* while */
+    return string;
+}
+
+/* Converts an integral value to a string, with optional padding with spaces or
+ * zeros.
+ * The "format" must be decimal or hexadecimal
+ * The number is right-aligned in the field with the size of the absolute value
+ * of the "width" parameter.
+ * If the width value is positive, the string is padded with spaces; if it is
+ * negative, it is padded with zeros.
+ */
+static TCHAR *amx_strval(TCHAR buffer[], long value, int format, int width)
+{
+    int start, stop;
+    TCHAR temp;
+
+    start = stop = 0;
+    if (format == SV_DECIMAL) {
+        if (value < 0) {
+            buffer[0] = __T('-');
+            start = stop = 1;
+            value = -value;
+        } /* if */
+        do {
+            buffer[stop++] = (TCHAR)((value % 10) + __T('0'));
+            value /= 10;
+        } while (value > 0);
+    } else {
+        /* hexadecimal */
+        unsigned long v = (unsigned long)value; /* copy to unsigned value for shifting */
+        do {
+            buffer[stop] = (TCHAR)((v & 0x0f) + __T('0'));
+            if (buffer[stop] > __T('9'))
+                buffer[stop] += (TCHAR)(__T('A') - __T('0') - 10);
+            v >>= 4;
+            stop++;
+        } while (v != 0);
+    } /* if */
+
+    /* pad to given width */
+    if (width < 0) {
+        temp = __T('0');
+        width = -width;
+    } else {
+        temp = __T(' ');
+    } /* if */
+    while (stop < width)
+        buffer[stop++] = temp;
+
+    buffer[stop] = __T('\0');
+
+    /* swap the string, and we are done */
+    reverse(buffer+start,stop-start);
+    return buffer;
+  }
+
+#if defined FIXEDPOINT
+  #define FIXEDMULT     1000
+  #define FIXEDDIGITS   3
+
+static TCHAR *formatfixed(TCHAR *string,cell value,TCHAR align,int width,TCHAR decpoint,int digits,TCHAR filler)
+{
+  int i, len;
+  cell ipart,v;
+  TCHAR vsign=__T('\0');
+
+  /* make the value positive (but keep the sign) */
+  if (value<0) {
+    value=-value;
+    vsign=__T('-');
+  } /* if */
+
+  /* "prepare" the value so that when it is truncated to the requested
+   * number of digits, the result is rounded towards the dropped digits
+   */
+  assert(digits<INT_MAX);
+  v=FIXEDMULT/2;
+  for (i=0; i<digits; i++)
+    v/=10;
+  value+=v;
+
+  /* get the integer part and remove it from the value */
+  ipart=value/FIXEDMULT;
+  value-=FIXEDMULT*ipart;
+  assert(ipart>=0);
+  assert(value>=0);
+
+  /* truncate the fractional part to the requested number of digits */
+  for (i=FIXEDDIGITS; i>digits; i--)
+    value/=10;
+
+  string[0]=__T('\0');
+
+  /* add sign */
+  i=(int)_tcslen(string);
+  string[i]=vsign;
+  string[i+1]=__T('\0');
+
+  /* add integer part */
+  amx_strval(string+_tcslen(string),(long)ipart,SV_DECIMAL,0);
+
+  /* add fractional part */
+  if (digits>0) {
+    i=(int)_tcslen(string);
+    string[i]=decpoint;
+    amx_strval(string+i+1,(long)value,SV_DECIMAL,-digits);
+  } /* if */
+
+  len=(int)_tcslen(string);
+  if (len<width) {
+    /* pad to the requested width */
+    for (i=len; i<width; i++)
+      string[i]=filler;
+    string[i]=__T('\0');
+    /* optionally move the padding to the beginning of the string, using the handwaving algorithm */
+    if (align!=__T('-')) {
+      assert(i==(int)_tcslen(string));
+      assert(i>=len);
+      reverse(string,len);
+      reverse(string+len,i-len);
+      reverse(string,i);
+    } /* if */
+  } /* if */
+
+  return string;
+}
+#endif
+
+
+static int dochar(AMX *amx,TCHAR ch,cell param,TCHAR sign,TCHAR decpoint,int width,int digits,TCHAR filler,
+                  int (*f_putstr)(void*,const TCHAR *),int (*f_putchar)(void*,TCHAR),void *user)
+{
+  cell *cptr;
+  TCHAR buffer[40];
+  #if defined FLOATPOINT
+    TCHAR formatstring[40];
+  #endif
+
+  #if !defined FIXEDPOINT && !defined FLOATPOINT
+    (void)decpoint;
+  #endif
+  assert(f_putstr!=NULL);
+  assert(f_putchar!=NULL);
+
+  switch (ch) {
+  case __T('c'):
+    cptr=amx_Address(amx,param);
+    width--;            /* single character itself has a with of 1 */
+    if (sign!=__T('-'))
+      while (width-->0)
+        f_putchar(user,filler);
+    f_putchar(user,(TCHAR)*cptr);
+    while (width-->0)
+      f_putchar(user,filler);
+    return 1;
+
+  case __T('d'): {
+    cell value;
+    int length=1;
+    cptr=amx_Address(amx,param);
+    value=*cptr;
+    if (value<0 || sign==__T('+'))
+      length++;
+    if (value<0)
+      value=-value;
+    while (value>=10) {
+      length++;
+      value/=10;
+    } /* while */
+    width-=length;
+    if (sign!=__T('-'))
+      while (width-->0)
+        f_putchar(user,filler);
+    amx_strval(buffer,*cptr,SV_DECIMAL,0);
+    if (sign==__T('+') && *cptr>=0)
+      f_putchar(user,sign);
+    f_putstr(user,buffer);
+    while (width-->0)
+      f_putchar(user,filler);
+    return 1;
+  } /* case */
+
+#if defined FLOATPOINT
+  case __T('f'): /* 32-bit floating point number */
+  case __T('r'): /* if floating point is enabled, %r == %f */
+    /* build a format string */
+    if (digits==INT_MAX)
+      digits=5;
+    else if (digits>25)
+      digits=25;
+    _tcscpy(formatstring,__T("%"));
+    if (sign!=__T('\0'))
+      _stprintf(formatstring+_tcslen(formatstring),__T("%c"),sign);
+    if (width>0)
+      _stprintf(formatstring+_tcslen(formatstring),__T("%d"),width);
+    _stprintf(formatstring+_tcslen(formatstring),__T(".%df"),digits);
+    cptr=amx_Address(amx,param);
+    #if PAWN_CELL_SIZE == 64
+      _stprintf(buffer,formatstring,*(double*)cptr);
+    #else
+      _stprintf(buffer,formatstring,*(float*)cptr);
+    #endif
+    if (decpoint==__T(',')) {
+      TCHAR *ptr=_tcschr(buffer,__T('.'));
+      if (ptr!=NULL)
+        *ptr=__T(',');
+    } /* if */
+    f_putstr(user,buffer);
+    return 1;
+#endif
+
+#if defined FIXEDPOINT
+  #define FIXEDMULT 1000
+  case __T('q'): /* 32-bit fixed point number */
+#if !defined FLOATPOINT
+  case __T('r'): /* if fixed point is enabled, and floating point is not, %r == %q */
+#endif
+    cptr=amx_Address(amx,param);
+    /* format the number */
+    if (digits==INT_MAX)
+      digits=3;
+    else if (digits>25)
+      digits=25;
+    formatfixed(buffer,*cptr,sign,width,decpoint,digits,filler);
+    assert(_tcslen(buffer)<sizeof buffer);
+    f_putstr(user,buffer);
+    return 1;
+#endif
+
+#if !defined FLOATPOINT && !defined FIXEDPOINT
+  case __T('f'):
+  case __T('q'):
+  case __T('r'):
+    f_putstr(user,__T("(no rational number support)"));
+    return 0; /* flag this as an error */
+#endif
+
+  case __T('s'): {
+    AMX_FMTINFO info;
+    memset(&info,0,sizeof info);
+    info.length=digits;
+    info.f_putstr=f_putstr;
+    info.f_putchar=f_putchar;
+    info.user=user;
+    cptr=amx_Address(amx,param);
+    amx_printstring(amx,cptr,&info);
+    return 1;
+  } /* case */
+
+  case __T('x'): {
+    ucell value;
+    int length=1;
+    cptr=amx_Address(amx,param);
+    value=*(ucell*)cptr;
+    while (value>=0x10) {
+      length++;
+      value>>=4;
+    } /* while */
+    width-=length;
+    if (sign!=__T('-'))
+      while (width-->0)
+        f_putchar(user,filler);
+    amx_strval(buffer,(long)*cptr,SV_HEX,0);
+    f_putstr(user,buffer);
+    while (width-->0)
+      f_putchar(user,filler);
+    return 1;
+  } /* case */
+
+  } /* switch */
+  /* error in the string format, try to repair */
+  f_putchar(user,ch);
+  return 0;
+}
+
+enum {
+  FMT_NONE,   /* not in format state; accept '%' */
+  FMT_START,  /* found '%', accept '+', '-' (START), '0' (filler; START), digit (WIDTH), '.' (DECIM), or '%' or format letter (done) */
+  FMT_WIDTH,  /* found digit after '%' or sign, accept digit (WIDTH), '.' (DECIM) or format letter (done) */
+  FMT_DECIM,  /* found digit after '.', accept accept digit (DECIM) or format letter (done) */
+};
+
+static int formatstate(TCHAR c,int *state,TCHAR *sign,TCHAR *decpoint,int *width,int *digits,TCHAR *filler)
+{
+  assert(state!=NULL && sign!=NULL && decpoint!=NULL && width!=NULL && digits!=NULL && filler!=NULL);
+  switch (*state) {
+  case FMT_NONE:
+    if (c==__T('%')) {
+      *state=FMT_START;
+      *sign=__T('\0');
+      *decpoint=__T('.');
+      *width=0;
+      *digits=INT_MAX;
+      *filler=__T(' ');
+    } else {
+      return -1;  /* print a single character */
+    } /* if */
+    break;
+  case FMT_START:
+    if (c==__T('+') || c==__T('-')) {
+      *sign=c;
+    } else if (c==__T('0')) {
+      *filler=c;
+    } else if (c>=__T('1') && c<=__T('9')) {
+      *width=(int)(c-__T('0'));
+      *state=FMT_WIDTH;
+    } else if (c==__T('.') || c==__T(',')) {
+      *decpoint=c;
+      *digits=0;
+      *state=FMT_DECIM;
+    } else if (c==__T('%')) {
+      *state=FMT_NONE;
+      return -1;  /* print literal '%' */
+    } else {
+      return 1;   /* print formatted character */
+    } /* if */
+    break;
+  case FMT_WIDTH:
+    if (c>=__T('0') && c<=__T('9')) {
+      *width=*width*10+(int)(c-__T('0'));
+    } else if (c==__T('.') || c==__T(',')) {
+      *decpoint=c;
+      *digits=0;
+      *state=FMT_DECIM;
+    } else {
+      return 1;   /* print formatted character */
+    } /* if */
+    break;
+  case FMT_DECIM:
+    if (c>=__T('0') && c<=__T('9')) {
+      *digits=*digits*10+(int)(c-__T('0'));
+    } else {
+      return 1;   /* print formatted character */
+    } /* if */
+    break;
+  } /* switch */
+
+  return 0;
+}
+
+int amx_printstring(AMX *amx,cell *cstr,AMX_FMTINFO *info)
+{
+  int i,paramidx=0;
+  int fmtstate=FMT_NONE,width,digits;
+  TCHAR sign,decpoint,filler;
+  int (*f_putstr)(void*,const TCHAR *);
+  int (*f_putchar)(void*,TCHAR);
+  void *user;
+  int skip,length;
+
+  if (info!=NULL) {
+    f_putstr=info->f_putstr;
+    f_putchar=info->f_putchar;
+    user=info->user;
+    skip=info->skip;
+    length=info->length;
+  } else {
+    f_putstr=NULL;
+    f_putchar=NULL;
+    user=NULL;
+    skip=0;
+    length=INT_MAX;
+  } /* if */
+  #if !defined AMX_STRING_LIB
+    if (f_putstr==NULL)
+      f_putstr=cons_putstr;
+    if (f_putchar==NULL)
+      f_putchar=cons_putchar;
+  #else
+    assert(f_putstr!=NULL && f_putchar!=NULL);
+  #endif
+
+  /* if no placeholders appear, we can use a quicker routine */
+  if (info==NULL || info->params==NULL) {
+
+    TCHAR cache[100];
+    int idx=0;
+
+    if ((ucell)*cstr>UNPACKEDMAX) {
+      int j=sizeof(cell)-sizeof(char);
+      char c;
+      /* the string is packed */
+      i=0;
+      for ( ; ; ) {
+        c=(char)((ucell)cstr[i] >> 8*j);
+        if (c==0)
+          break;
+        if (skip>0) {
+          skip--;               /* skip a number of characters */
+        } else {
+          if (length--<=0)
+            break;              /* print up to a certain length */
+          assert(idx<sizeof cache);
+          cache[idx++]=c;
+          if (idx==sizeof cache - 1) {
+            cache[idx]=__T('\0');
+            f_putstr(user,cache);
+            idx=0;
+          } /* if */
+        } /* if */
+        if (j==0)
+          i++;
+        j=(j+sizeof(cell)-sizeof(char)) % sizeof(cell);
+      } /* for */
+    } else {
+      /* unpacked string */
+      for (i=0; cstr[i]!=0; i++) {
+        if (skip-->0)
+          continue;
+        assert(idx<sizeof cache);
+        cache[idx++]=(TCHAR)cstr[i];
+        if (idx==sizeof cache - 1) {
+          cache[idx]=__T('\0');
+          f_putstr(user,cache);
+          idx=0;
+        } /* if */
+      } /* for */
+    } /* if */
+    if (idx>0) {
+      cache[idx]=__T('\0');
+      f_putstr(user,cache);
+    } /* if */
+
+  } else {
+
+    /* check whether this is a packed string */
+    if ((ucell)*cstr>UNPACKEDMAX) {
+      int j=sizeof(cell)-sizeof(char);
+      char c;
+      /* the string is packed */
+      i=0;
+      for ( ; ; ) {
+        c=(char)((ucell)cstr[i] >> 8*j);
+        if (c==0)
+          break;
+        switch (formatstate(c,&fmtstate,&sign,&decpoint,&width,&digits,&filler)) {
+        case -1:
+          f_putchar(user,c);
+          break;
+        case 0:
+          break;
+        case 1:
+          assert(info!=NULL && info->params!=NULL);
+          if (paramidx>=info->numparams)  /* insufficient parameters passed */
+            amx_RaiseError(amx, AMX_ERR_NATIVE);
+          else
+            paramidx+=dochar(amx,c,info->params[paramidx],sign,decpoint,width,digits,filler,
+                             f_putstr,f_putchar,user);
+          fmtstate=FMT_NONE;
+          break;
+        default:
+          assert(0);
+        } /* switch */
+        if (j==0)
+          i++;
+        j=(j+sizeof(cell)-sizeof(char)) % sizeof(cell);
+      } /* for */
+    } else {
+      /* the string is unpacked */
+      for (i=0; cstr[i]!=0; i++) {
+        switch (formatstate((TCHAR)cstr[i],&fmtstate,&sign,&decpoint,&width,&digits,&filler)) {
+        case -1:
+          f_putchar(user,(TCHAR)cstr[i]);
+          break;
+        case 0:
+          break;
+        case 1:
+          assert(info!=NULL && info->params!=NULL);
+          if (paramidx>=info->numparams)  /* insufficient parameters passed */
+            amx_RaiseError(amx, AMX_ERR_NATIVE);
+          else
+            paramidx+=dochar(amx,(TCHAR)cstr[i],info->params[paramidx],sign,decpoint,width,digits,filler,
+                             f_putstr,f_putchar,user);
+          fmtstate=FMT_NONE;
+          break;
+        default:
+          assert(0);
+        } /* switch */
+      } /* for */
+    } /* if */
+
+  } /* if (info==NULL || info->params==NULL) */
+
+  return paramidx;
+}
+
+#if !defined AMX_STRING_LIB
+
+#if defined AMX_ALTPRINT
+/* print(const string[], start=0, end=cellmax) */
+static cell AMX_NATIVE_CALL n_print(AMX *amx,const cell *params)
+{
+  cell *cstr;
+  AMX_FMTINFO info;
+
+  memset(&info,0,sizeof info);
+  info.skip= ((size_t)params[0]>=2*sizeof(cell)) ? (int)params[2] : 0;
+  info.length= ((size_t)params[0]>=3*sizeof(cell)) ? (int)(params[3]-info.skip) : INT_MAX;
+
+  CreateConsole();
+  cstr=amx_Address(amx,params[1]);
+  amx_printstring(amx,cstr,&info);
+  amx_fflush();
+  return 0;
+}
+#else
+/* print(const string[], foreground=-1, background=-1, highlight=-1) */
+static cell AMX_NATIVE_CALL n_print(AMX *amx,const cell *params)
+{
+  cell *cstr;
+  int oldcolours;
+
+  CreateConsole();
+
+  /* set the new colours */
+  oldcolours=amx_setattr((int)params[2],(int)params[3],(int)params[4]);
+
+  cstr=amx_Address(amx,params[1]);
+  amx_printstring(amx,cstr,NULL);
+
+  /* reset the colours */
+  (void)amx_setattr(oldcolours & 0xff,(oldcolours >> 8) & 0x7f,(oldcolours >> 15) & 0x01);
+  amx_fflush();
+  return 0;
+}
+#endif
+
+static cell AMX_NATIVE_CALL n_printf(AMX *amx,const cell *params)
+{
+  cell *cstr;
+  AMX_FMTINFO info;
+
+  memset(&info,0,sizeof info);
+  info.params=params+2;
+  info.numparams=(int)(params[0]/sizeof(cell))-1;
+  info.skip=0;
+  info.length=INT_MAX;
+
+  CreateConsole();
+  cstr=amx_Address(amx,params[1]);
+  amx_printstring(amx,cstr,&info);
+  amx_fflush();
+  return 0;
+}
+
+/* getchar(bool:echo=true) */
+static cell AMX_NATIVE_CALL n_getchar(AMX *amx,const cell *params)
+{
+  int c;
+
+  (void)amx;
+  CreateConsole();
+  c=amx_getch();
+  if (params[1]) {
+    #if defined(SUPPRESS_ECHO)
+      /* For Mac OS X, non-Curses, don't echo the character */
+    #else
+      amx_putchar((TCHAR)c);
+      amx_fflush();
+    #endif
+  } /* if */
+  return c;
+}
+
+/* getstring(string[], size=sizeof string, bool:pack=false) */
+static cell AMX_NATIVE_CALL n_getstring(AMX *amx,const cell *params)
+{
+  int c,chars,max;
+  cell *cptr;
+
+  (void)amx;
+  CreateConsole();
+  chars=0;
+  max=(int)params[2];
+  if (max>0) {
+    #if __STDC_VERSION__ >= 199901L
+      TCHAR str[max];   /* use C99 feature if available */
+    #else
+      TCHAR *str=(TCHAR *)alloca(max*sizeof(TCHAR));
+      if (str==NULL)
+        return chars;
+    #endif
+
+    c=amx_getch();
+    while (c!=EOF && c!=EOL_CHAR && chars<max-1) {
+      str[chars++]=(TCHAR)c;
+      #if defined(SUPPRESS_ECHO)
+        /* For Mac OS X, non-Curses, don't echo the character */
+      #else
+        amx_putchar((TCHAR)c);
+        amx_fflush();
+      #endif
+      if (chars<max-1)
+        c=amx_getch();
+    } /* while */
+
+    if (c==EOL_CHAR)
+      amx_putchar('\n');
+    assert(chars<max);
+    str[chars]='\0';
+
+    cptr=amx_Address(amx,params[1]);
+    amx_SetString(cptr,(char*)str,(int)params[3],sizeof(TCHAR)>1,max);
+
+  } /* if */
+  return chars;
+}
+
+static void acceptchar(int c,int *num)
+{
+  switch (c) {
+  case '\b':
+    amx_putchar('\b');
+    *num-=1;
+    #if defined amx_putchar && (defined __BORLANDC__ || defined __WATCOMC__)
+      /* the backspace key does not erase the
+       * character, so do this explicitly */
+      amx_putchar(' ');     /* erase */
+      amx_putchar('\b');    /* go back */
+    #endif
+    break;
+  case EOL_CHAR:
+    amx_putchar('\n');
+    *num+=1;
+    break;
+  default:
+    #if defined(SUPPRESS_ECHO)
+      /* For Mac OS X, non-Curses, don't echo the character */
+    #else
+      amx_putchar((TCHAR)c);
+    #endif
+    *num+=1;
+  } /* switch */
+  amx_fflush();
+}
+
+static int inlist(AMX *amx,int c,const cell *params,int num)
+{
+  int i, key;
+
+  (void)amx;
+  for (i=0; i<num; i++) {
+    if (i==0) {
+      /* first key is passed by value, others are passed by reference */
+      key = (int)params[i];
+    } else {
+      cell *cptr;
+      cptr=amx_Address(amx,params[i]);
+      key=(int)*cptr;
+    } /* if */
+    if (c==key || c==-key)
+      return key;
+  } /* for */
+  return 0;
+}
+
+static cell AMX_NATIVE_CALL n_getvalue(AMX *amx,const cell *params)
+{
+  cell value;
+  int base,sign,c,d;
+  int chars,n;
+
+  CreateConsole();
+  base=(int)params[1];
+  if (base<2 || base>36)
+    return 0;
+
+  chars=0;
+  value=0;
+  sign=1;       /* to avoid a compiler warning (Microsoft Visual C/C++ 6.0) */
+
+  c=amx_getch();
+  while (c!=EOF) {
+    /* check for sign (if any) */
+    if (chars==0) {
+      if (c=='-') {
+        sign=-1;
+        acceptchar(c,&chars);
+        c=amx_getch();
+      } else {
+        sign=1;
+      } /* if */
+    } /* if */
+
+    /* check end of input */
+    #if EOL_CHAR!='\r'
+      if (c==EOL_CHAR && inlist(amx,'\r',params+2,(int)params[0]/sizeof(cell)-1)!=0)
+        c='\r';
+    #endif
+    if ((chars>1 || chars>0 && sign>0)
+        && (n=inlist(amx,c,params+2,(int)params[0]/sizeof(cell)-1))!=0)
+    {
+      if (n>0)
+        acceptchar(c,&chars);
+      break;
+    } /* if */
+    #if EOL_CHAR!='\r'
+      if (c=='\r')
+        c=EOL_CHAR;
+    #endif
+
+    /* get value */
+    d=base;     /* by default, do not accept the character */
+    if (c>='0' && c<='9') {
+      d=c-'0';
+    } else if (c>='a' && c<='z') {
+      d=c-'a'+10;
+    } else if (c>='A' && c<='Z') {
+      d=c-'A'+10;
+    } else if (c=='\b') {
+      if (chars>0) {
+        value/=base;
+        acceptchar(c,&chars);
+      } /* if */
+    } /* if */
+    if (d<base) {
+      acceptchar(c,&chars);
+      value=value*base + d;
+    } /* if */
+    c=amx_getch();
+  } /* while */
+  return sign*value;
+}
+
+static cell AMX_NATIVE_CALL n_clrscr(AMX *amx,const cell *params)
+{
+  (void)amx;
+  (void)params;
+  CreateConsole();
+  amx_clrscr();
+  return 0;
+}
+
+static cell AMX_NATIVE_CALL n_clreol(AMX *amx,const cell *params)
+{
+  (void)amx;
+  (void)params;
+  CreateConsole();
+  amx_clreol();
+  return 0;
+}
+
+static cell AMX_NATIVE_CALL n_gotoxy(AMX *amx,const cell *params)
+{
+  (void)amx;
+  CreateConsole();
+  return amx_gotoxy((int)params[1],(int)params[2]);
+}
+
+static cell AMX_NATIVE_CALL n_wherexy(AMX *amx,const cell *params)
+{
+  cell *px,*py;
+  int x,y;
+
+  (void)amx;
+  CreateConsole();
+  amx_wherexy(&x,&y);
+  px=amx_Address(amx,params[1]);
+  py=amx_Address(amx,params[2]);
+  *px=x;
+  *py=y;
+  return 0;
+}
+
+static cell AMX_NATIVE_CALL n_setattr(AMX *amx,const cell *params)
+{
+  (void)amx;
+  CreateConsole();
+  (void)amx_setattr((int)params[1],(int)params[2],(int)params[3]);
+  return 0;
+}
+
+static cell AMX_NATIVE_CALL n_consctrl(AMX *amx,const cell *params)
+{
+  (void)amx;
+  CreateConsole();
+  (void)amx_termctl((int)params[1],(int)params[2]);
+  return 0;
+}
+
+static cell AMX_NATIVE_CALL n_console(AMX *amx,const cell *params)
+{
+  (void)amx;
+  CreateConsole();
+  amx_console((int)params[1],(int)params[2],(int)params[3]);
+  return 0;
+}
+
+
+#if !defined AMXCONSOLE_NOIDLE
+static AMX_IDLE PrevIdle = NULL;
+static int idxKeyPressed = -1;
+
+static int AMXAPI amx_ConsoleIdle(AMX *amx, int AMXAPI Exec(AMX *, cell *, int))
+{
+  int err=0, key;
+
+  assert(idxKeyPressed >= 0);
+
+  if (PrevIdle != NULL)
+    PrevIdle(amx, Exec);
+
+  if (amx_kbhit()) {
+    key = amx_getch();
+    amx_Push(amx, key);
+    err = Exec(amx, NULL, idxKeyPressed);
+    while (err == AMX_ERR_SLEEP)
+      err = Exec(amx, NULL, AMX_EXEC_CONT);
+  } /* if */
+
+  return err;
+}
+#endif
+
+#if defined __cplusplus
+  extern "C"
+#endif
+const AMX_NATIVE_INFO console_Natives[] = {
+  { "getchar",   n_getchar },
+  { "getstring", n_getstring },
+  { "getvalue",  n_getvalue },
+  { "print",     n_print },
+  { "printf",    n_printf },
+  { "clrscr",    n_clrscr },
+  { "clreol",    n_clreol },
+  { "gotoxy",    n_gotoxy },
+  { "wherexy",   n_wherexy },
+  { "setattr",   n_setattr },
+  { "console",   n_console },
+  { "consctrl",  n_consctrl },
+  { NULL, NULL }        /* terminator */
+};
+
+int AMXEXPORT AMXAPI amx_ConsoleInit(AMX *amx)
+{
+  #if !defined AMXCONSOLE_NOIDLE
+    /* see whether there is an @keypressed() function */
+    if (amx_FindPublic(amx, "@keypressed", &idxKeyPressed) == AMX_ERR_NONE) {
+      if (amx_GetUserData(amx, AMX_USERTAG('I','d','l','e'), (void**)&PrevIdle) != AMX_ERR_NONE)
+        PrevIdle = NULL;
+      amx_SetUserData(amx, AMX_USERTAG('I','d','l','e'), (void*)amx_ConsoleIdle);
+    } /* if */
+  #endif
+
+  return amx_Register(amx, console_Natives, -1);
+}
+
+int AMXEXPORT AMXAPI amx_ConsoleCleanup(AMX *amx)
+{
+  (void)amx;
+  #if !defined AMXCONSOLE_NOIDLE
+    PrevIdle = NULL;
+  #endif
+  return AMX_ERR_NONE;
+}
+
+#endif /* AMX_STRING_LIB */
diff --git a/apps/openmw-mp/amx/amxcons.h b/apps/openmw-mp/amx/amxcons.h
new file mode 100644
index 000000000..44ea18bef
--- /dev/null
+++ b/apps/openmw-mp/amx/amxcons.h
@@ -0,0 +1,18 @@
+#ifndef AMXCONS_H_INCLUDED
+#ifndef AMXCONS_H_INCLUDED
+#define AMXCONS_H_INCLUDED
+
+typedef struct tagFMTINFO {
+  const cell *params;
+  int numparams;
+  int skip;     /* number of characters to skip from the beginning */
+  int length;   /* number of characters to print */
+  /* helper functions */
+  int (*f_putstr)(void *dest,const TCHAR *);
+  int (*f_putchar)(void *dest,TCHAR);
+  void *user;   /* user data */
+} AMX_FMTINFO;
+
+int amx_printstring(AMX *amx,cell *cstr,AMX_FMTINFO *info);
+
+#endif /* AMXCONS_H_INCLUDED */
diff --git a/apps/openmw-mp/amx/amxcore.c b/apps/openmw-mp/amx/amxcore.c
new file mode 100644
index 000000000..4caa72ff1
--- /dev/null
+++ b/apps/openmw-mp/amx/amxcore.c
@@ -0,0 +1,500 @@
+/*  Core module for the Pawn AMX
+ *
+ *  Copyright (c) ITB CompuPhase, 1997-2012
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ *  use this file except in compliance with the License. You may obtain a copy
+ *  of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ *
+ *  Version: $Id: amxcore.c 4708 2012-05-18 12:52:49Z  $
+ */
+#if defined _UNICODE || defined __UNICODE__ || defined UNICODE
+# if !defined UNICODE   /* for Windows */
+#   define UNICODE
+# endif
+# if !defined _UNICODE  /* for C library */
+#   define _UNICODE
+# endif
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <assert.h>
+#include "osdefs.h"
+#if defined __ECOS__
+  /* eCos puts include files in cyg/package_name */
+  #include <cyg/pawn/amx.h>
+  #define  stricmp(a,b) strcasecmp(a,b)
+#else
+  #include "amx.h"
+#endif
+#if defined __WIN32__ || defined _WIN32 || defined WIN32 || defined _Windows
+  #include <windows.h>
+#endif
+
+/* A few compilers do not provide the ANSI C standard "time" functions */
+#if !defined SN_TARGET_PS2 && !defined _WIN32_WCE && !defined __ICC430__
+  #include <time.h>
+#endif
+
+#if defined _UNICODE
+# include <tchar.h>
+#elif !defined __T
+  typedef char          TCHAR;
+# define __T(string)    string
+# define _tcschr        strchr
+# define _tcscpy        strcpy
+# define _tcsdup        strdup
+# define _tcslen        strlen
+#endif
+
+
+#define CHARBITS        (8*sizeof(char))
+typedef unsigned char   uchar;
+
+#if !defined AMX_NOPROPLIST
+typedef struct _property_list {
+  struct _property_list *next;
+  cell id;
+  char *name;
+  cell value;
+} proplist;
+
+static proplist proproot = { NULL, 0, NULL, 0 };
+
+static proplist *list_additem(proplist *root)
+{
+  proplist *item;
+
+  assert(root!=NULL);
+  if ((item=(proplist *)malloc(sizeof(proplist)))==NULL)
+    return NULL;
+  item->name=NULL;
+  item->id=0;
+  item->value=0;
+  item->next=root->next;
+  root->next=item;
+  return item;
+}
+static void list_delete(proplist *pred,proplist *item)
+{
+  assert(pred!=NULL);
+  assert(item!=NULL);
+  pred->next=item->next;
+  assert(item->name!=NULL);
+  free(item->name);
+  free(item);
+}
+static void list_setitem(proplist *item,cell id,char *name,cell value)
+{
+  char *ptr;
+
+  assert(item!=NULL);
+  if ((ptr=(char *)malloc(strlen(name)+1))==NULL)
+    return;
+  if (item->name!=NULL)
+    free(item->name);
+  strcpy(ptr,name);
+  item->name=ptr;
+  item->id=id;
+  item->value=value;
+}
+static proplist *list_finditem(proplist *root,cell id,char *name,cell value,
+                               proplist **pred)
+{
+  proplist *item=root->next;
+  proplist *prev=root;
+
+  /* check whether to find by name or by value */
+  assert(name!=NULL);
+  if (strlen(name)>0) {
+    /* find by name */
+    while (item!=NULL && (item->id!=id || stricmp(item->name,name)!=0)) {
+      prev=item;
+      item=item->next;
+    } /* while */
+  } else {
+    /* find by value */
+    while (item!=NULL && (item->id!=id || item->value!=value)) {
+      prev=item;
+      item=item->next;
+    } /* while */
+  } /* if */
+  if (pred!=NULL)
+    *pred=prev;
+  return item;
+}
+#endif
+
+static cell AMX_NATIVE_CALL numargs(AMX *amx,const cell *params)
+{
+  AMX_HEADER *hdr;
+  uchar *data;
+  cell bytes;
+
+  (void)params;
+  hdr=(AMX_HEADER *)amx->base;
+  data=amx->data ? amx->data : amx->base+(int)hdr->dat;
+  /* the number of bytes is on the stack, at "frm + 2*cell" */
+  bytes= * (cell *)(data+(int)amx->frm+2*sizeof(cell));
+  /* the number of arguments is the number of bytes divided
+   * by the size of a cell */
+  return bytes/sizeof(cell);
+}
+
+static cell AMX_NATIVE_CALL getarg(AMX *amx,const cell *params)
+{
+  AMX_HEADER *hdr;
+  uchar *data;
+  cell value;
+
+  hdr=(AMX_HEADER *)amx->base;
+  data=amx->data ? amx->data : amx->base+(int)hdr->dat;
+  /* get the base value */
+  value= * (cell *)(data+(int)amx->frm+((int)params[1]+3)*sizeof(cell));
+  /* adjust the address in "value" in case of an array access */
+  value+=params[2]*sizeof(cell);
+  /* get the value indirectly */
+  value= * (cell *)(data+(int)value);
+  return value;
+}
+
+static cell AMX_NATIVE_CALL setarg(AMX *amx,const cell *params)
+{
+  AMX_HEADER *hdr;
+  uchar *data;
+  cell value;
+
+  hdr=(AMX_HEADER *)amx->base;
+  data=amx->data ? amx->data : amx->base+(int)hdr->dat;
+  /* get the base value */
+  value= * (cell *)(data+(int)amx->frm+((int)params[1]+3)*sizeof(cell));
+  /* adjust the address in "value" in case of an array access */
+  value+=params[2]*sizeof(cell);
+  /* verify the address */
+  if (value<0 || value>=amx->hea && value<amx->stk)
+    return 0;
+  /* set the value indirectly */
+  * (cell *)(data+(int)value) = params[3];
+  return 1;
+}
+
+static cell AMX_NATIVE_CALL heapspace(AMX *amx,const cell *params)
+{
+  (void)params;
+  return amx->stk - amx->hea;
+}
+
+static cell AMX_NATIVE_CALL funcidx(AMX *amx,const cell *params)
+{
+  char name[64];
+  cell *cstr;
+  int index,err;
+
+  cstr=amx_Address(amx,params[1]);
+  amx_GetString(name,cstr,0,sizeof name);
+  err=amx_FindPublic(amx,name,&index);
+  if (err!=AMX_ERR_NONE)
+    index=-1;   /* this is not considered a fatal error */
+  return index;
+}
+
+void amx_swapcell(cell *pc)
+{
+  union {
+    cell c;
+    #if PAWN_CELL_SIZE==16
+      uchar b[2];
+    #elif PAWN_CELL_SIZE==32
+      uchar b[4];
+    #elif PAWN_CELL_SIZE==64
+      uchar b[8];
+    #else
+      #error Unsupported cell size
+    #endif
+  } value;
+  uchar t;
+
+  assert(pc!=NULL);
+  value.c = *pc;
+  #if PAWN_CELL_SIZE==16
+    t = value.b[0];
+    value.b[0] = value.b[1];
+    value.b[1] = t;
+  #elif PAWN_CELL_SIZE==32
+    t = value.b[0];
+    value.b[0] = value.b[3];
+    value.b[3] = t;
+    t = value.b[1];
+    value.b[1] = value.b[2];
+    value.b[2] = t;
+  #elif PAWN_CELL_SIZE==64
+    t = value.b[0];
+    value.b[0] = value.b[7];
+    value.b[7] = t;
+    t = value.b[1];
+    value.b[1] = value.b[6];
+    value.b[6] = t;
+    t = value.b[2];
+    value.b[2] = value.b[5];
+    value.b[5] = t;
+    t = value.b[3];
+    value.b[3] = value.b[4];
+    value.b[4] = t;
+  #else
+    #error Unsupported cell size
+  #endif
+  *pc = value.c;
+}
+
+static cell AMX_NATIVE_CALL swapchars(AMX *amx,const cell *params)
+{
+  cell c;
+
+  (void)amx;
+  assert((size_t)params[0]==sizeof(cell));
+
+  c=params[1];
+  amx_swapcell(&c);
+  return c;
+}
+
+static cell AMX_NATIVE_CALL core_tolower(AMX *amx,const cell *params)
+{
+  (void)amx;
+  #if defined __WIN32__ || defined _WIN32 || defined WIN32
+    return (cell)CharLower((LPTSTR)params[1]);
+  #elif defined _Windows
+    return (cell)AnsiLower((LPSTR)params[1]);
+  #else
+    if ((unsigned)(params[1]-'A')<26u)
+      return params[1]+'a'-'A';
+    return params[1];
+  #endif
+}
+
+static cell AMX_NATIVE_CALL core_toupper(AMX *amx,const cell *params)
+{
+  (void)amx;
+  #if defined __WIN32__ || defined _WIN32 || defined WIN32
+    return (cell)CharUpper((LPTSTR)params[1]);
+  #elif defined _Windows
+    return (cell)AnsiUpper((LPSTR)params[1]);
+  #else
+    if ((unsigned)(params[1]-'a')<26u)
+      return params[1]+'A'-'a';
+    return params[1];
+  #endif
+}
+
+static cell AMX_NATIVE_CALL core_min(AMX *amx,const cell *params)
+{
+  (void)amx;
+  return params[1] <= params[2] ? params[1] : params[2];
+}
+
+static cell AMX_NATIVE_CALL core_max(AMX *amx,const cell *params)
+{
+  (void)amx;
+  return params[1] >= params[2] ? params[1] : params[2];
+}
+
+static cell AMX_NATIVE_CALL core_clamp(AMX *amx,const cell *params)
+{
+  cell value = params[1];
+  if (params[2] > params[3])  /* minimum value > maximum value ! */
+    amx_RaiseError(amx,AMX_ERR_NATIVE);
+  if (value < params[2])
+    value = params[2];
+  else if (value > params[3])
+    value = params[3];
+  return value;
+}
+
+#if !defined AMX_NOPROPLIST
+static char *MakePackedString(cell *cptr)
+{
+  int len;
+  char *dest;
+
+  amx_StrLen(cptr,&len);
+  dest=(char *)malloc(len+sizeof(cell));
+  amx_GetString(dest,cptr,0,len+sizeof(cell));
+  return dest;
+}
+
+/* getproperty(id=0, const name[]="", value=cellmin, string[]="", size=sizeof string) */
+static cell AMX_NATIVE_CALL getproperty(AMX *amx,const cell *params)
+{
+  cell *cstr;
+  char *name;
+  proplist *item;
+
+  (void)amx;
+  cstr=amx_Address(amx,params[2]);
+  name=MakePackedString(cstr);
+  item=list_finditem(&proproot,params[1],name,params[3],NULL);
+  /* if list_finditem() found the value, store the name */
+  if (item!=NULL && item->value==params[3] && strlen(name)==0) {
+    cstr=amx_Address(amx,params[4]);
+    amx_SetString(cstr,item->name,1,0,params[5]);
+  } /* if */
+  free(name);
+  return (item!=NULL) ? item->value : 0;
+}
+
+/* setproperty(id=0, const name[]="", value=cellmin, const string[]="") */
+static cell AMX_NATIVE_CALL setproperty(AMX *amx,const cell *params)
+{
+  cell prev=0;
+  cell *cstr;
+  char *name;
+  proplist *item;
+
+  cstr=amx_Address(amx,params[2]);
+  name=MakePackedString(cstr);
+  item=list_finditem(&proproot,params[1],name,params[3],NULL);
+  if (item==NULL)
+    item=list_additem(&proproot);
+  if (item==NULL) {
+    amx_RaiseError(amx,AMX_ERR_MEMORY);
+  } else {
+    prev=item->value;
+    if (strlen(name)==0) {
+      free(name);
+      cstr=amx_Address(amx,params[4]);
+      name=MakePackedString(cstr);
+    } /* if */
+    list_setitem(item,params[1],name,params[3]);
+  } /* if */
+  free(name);
+  return prev;
+}
+
+/* deleteproperty(id=0, const name[]="", value=cellmin) */
+static cell AMX_NATIVE_CALL delproperty(AMX *amx,const cell *params)
+{
+  cell prev=0;
+  cell *cstr;
+  char *name;
+  proplist *item,*pred;
+
+  (void)amx;
+  cstr=amx_Address(amx,params[2]);
+  name=MakePackedString(cstr);
+  item=list_finditem(&proproot,params[1],name,params[3],&pred);
+  if (item!=NULL) {
+    prev=item->value;
+    list_delete(pred,item);
+  } /* if */
+  free(name);
+  return prev;
+}
+
+/* existproperty(id=0, const name[]="", value=cellmin) */
+static cell AMX_NATIVE_CALL existproperty(AMX *amx,const cell *params)
+{
+  cell *cstr;
+  char *name;
+  proplist *item;
+
+  (void)amx;
+  cstr=amx_Address(amx,params[2]);
+  name=MakePackedString(cstr);
+  item=list_finditem(&proproot,params[1],name,params[3],NULL);
+  free(name);
+  return (item!=NULL);
+}
+#endif
+
+#if !defined AMX_NORANDOM
+/* This routine comes from the book "Inner Loops" by Rick Booth, Addison-Wesley
+ * (ISBN 0-201-47960-5). This is a "multiplicative congruential random number
+ * generator" that has been extended to 31-bits (the standard C version returns
+ * only 15-bits).
+ */
+#define INITIAL_SEED  0xcaa938dbL
+static unsigned long IL_StandardRandom_seed = INITIAL_SEED; /* always use a non-zero seed */
+#define IL_RMULT 1103515245L
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
+static cell AMX_NATIVE_CALL core_random(AMX *amx,const cell *params)
+{
+    unsigned long lo, hi, ll, lh, hh, hl;
+    unsigned long result;
+
+    /* one-time initialization (or, mostly one-time) */
+    #if !defined SN_TARGET_PS2 && !defined _WIN32_WCE && !defined __ICC430__
+        if (IL_StandardRandom_seed == INITIAL_SEED)
+            IL_StandardRandom_seed=(unsigned long)time(NULL);
+    #endif
+
+    (void)amx;
+
+    lo = IL_StandardRandom_seed & 0xffff;
+    hi = IL_StandardRandom_seed >> 16;
+    IL_StandardRandom_seed = IL_StandardRandom_seed * IL_RMULT + 12345;
+    ll = lo * (IL_RMULT  & 0xffff);
+    lh = lo * (IL_RMULT >> 16    );
+    hl = hi * (IL_RMULT  & 0xffff);
+    hh = hi * (IL_RMULT >> 16    );
+    result = ((ll + 12345) >> 16) + lh + hl + (hh << 16);
+    result &= ~LONG_MIN;        /* remove sign bit */
+    if (params[1]!=0)
+        result %= params[1];
+    return (cell)result;
+}
+#endif
+
+
+#if defined __cplusplus
+  extern "C"
+#endif
+const AMX_NATIVE_INFO core_Natives[] = {
+  { "numargs",       numargs },
+  { "getarg",        getarg },
+  { "setarg",        setarg },
+  { "heapspace",     heapspace },
+  { "funcidx",       funcidx },
+  { "swapchars",     swapchars },
+  { "tolower",       core_tolower },
+  { "toupper",       core_toupper },
+  { "min",           core_min },
+  { "max",           core_max },
+  { "clamp",         core_clamp },
+#if !defined AMX_NORANDOM
+  { "random",        core_random },
+#endif
+#if !defined AMX_NOPROPLIST
+  { "getproperty",   getproperty },
+  { "setproperty",   setproperty },
+  { "deleteproperty",delproperty },
+  { "existproperty", existproperty },
+#endif
+  { NULL, NULL }        /* terminator */
+};
+
+int AMXEXPORT AMXAPI amx_CoreInit(AMX *amx)
+{
+  return amx_Register(amx, core_Natives, -1);
+}
+
+int AMXEXPORT AMXAPI amx_CoreCleanup(AMX *amx)
+{
+  (void)amx;
+  #if !defined AMX_NOPROPLIST
+    while (proproot.next!=NULL)
+      list_delete(&proproot,proproot.next);
+  #endif
+  return AMX_ERR_NONE;
+}
diff --git a/apps/openmw-mp/amx/amxexec_gcc.c b/apps/openmw-mp/amx/amxexec_gcc.c
new file mode 100644
index 000000000..a036dbec9
--- /dev/null
+++ b/apps/openmw-mp/amx/amxexec_gcc.c
@@ -0,0 +1,1361 @@
+/*  Example implementation of an optimized abstract machine.
+ *
+ *  This abstract machine uses the "labels as values" feature of the GNU GCC
+ *  compiler to create a fast "indirect threaded" interpreter. The Intel C/C++
+ *  compiler supports this too.
+ *
+ *  Copyright (c) ITB CompuPhase, 1998-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.
+ *
+ *  Version: $Id: amxcons.c 3821 2007-10-15 16:54:20Z thiadmer $
+ */
+#include <assert.h>
+#include <stddef.h>
+#include <string.h>
+#include "osdefs.h"
+#if defined __ECOS__
+  /* eCos puts include files in cyg/package_name */
+  #include <cyg/pawn/amx.h>
+#else
+  #include "amx.h"
+#endif
+
+#if !(defined __GNUC__ || defined __ICC)
+  #error The GNU GCC or the Intel C/C++ compiler is required for this file.
+#endif
+
+#if !defined sizearray
+  #define sizearray(a)  (sizeof(a)/sizeof((a)[0]))
+#endif
+
+/* It is assumed that the abstract machine can simply access the memory area
+ * for the global data and the stack. If this is not the case, you need to
+ * define the macro sets _R() and _W(), for reading and writing to memory.
+ */
+#if !defined _R
+  #define _R_DEFAULT            /* mark default memory access */
+  #define _R(base,addr)         (* (cell *)((unsigned char*)(base)+(int)(addr)))
+  #define _R8(base,addr)        (* (unsigned char *)((unsigned char*)(base)+(int)(addr)))
+  #define _R16(base,addr)       (* (uint16_t *)((unsigned char*)(base)+(int)(addr)))
+  #define _R32(base,addr)       (* (uint32_t *)((unsigned char*)(base)+(int)(addr)))
+#endif
+#if !defined _W
+  #define _W_DEFAULT            /* mark default memory access */
+  #define _W(base,addr,value)   ((*(cell *)((unsigned char*)(base)+(int)(addr)))=(cell)(value))
+  #define _W8(base,addr,value)  ((*(unsigned char *)((unsigned char*)(base)+(int)(addr)))=(unsigned char)(value))
+  #define _W16(base,addr,value) ((*(uint16_t *)((unsigned char*)(base)+(int)(addr)))=(uint16_t)(value))
+  #define _W32(base,addr,value) ((*(uint32_t *)((unsigned char*)(base)+(int)(addr)))=(uint32_t)(value))
+#endif
+
+#if -8/3==-2 && 8/-3==-2
+  #define TRUNC_SDIV    /* signed divisions are truncated on this platform */
+#else
+  #define IABS(a)       ((a)>=0 ? (a) : (-a))
+#endif
+
+#if !defined GETPARAM
+  #define GETPARAM(v)   ( v=*cip++ )  /* read a parameter from the opcode stream */
+#endif
+#if !defined GETPARAM_P
+  #define GETPARAM_P(v,o) ( v=((cell)(o) >> (int)(sizeof(cell)*4)) )
+#endif
+#if !defined SKIPPARAM
+  #define SKIPPARAM(n)  ( cip=(cell *)cip+(n) ) /* for obsolete opcodes */
+#endif
+
+/* PUSH() and POP() are defined in terms of the _R() and _W() macros */
+#define PUSH(v)         ( stk-=sizeof(cell), _W(data,stk,v) )
+#define POP(v)          ( v=_R(data,stk), stk+=sizeof(cell) )
+
+#define ABORT(amx,v)    { (amx)->stk=reset_stk; (amx)->hea=reset_hea; return v; }
+
+#define STKMARGIN       ((cell)(16*sizeof(cell)))
+#define CHKMARGIN()     if (hea+STKMARGIN>stk) return AMX_ERR_STACKERR
+#define CHKSTACK()      if (stk>amx->stp) return AMX_ERR_STACKLOW
+#define CHKHEAP()       if (hea<amx->hlw) return AMX_ERR_HEAPLOW
+
+#define JUMPREL(ip)     ((cell*)((unsigned long)(ip)+*(cell*)(ip)-sizeof(cell)))
+
+
+#if !defined AMX_NO_PACKED_OPC && !defined AMX_TOKENTHREADING
+  #define AMX_TOKENTHREADING    /* packed opcodes require token threading */
+#endif
+#if defined AMX_TOKENTHREADING
+  #if defined AMX_NO_PACKED_OPC
+    #define NEXT(cip,op) goto *amx_opcodelist[*cip++]
+  #else
+    #define NEXT(cip,op) goto *amx_opcodelist[(op=*cip++) & ((1 << sizeof(cell)*4)-1)]
+  #endif
+#else
+  #if !defined AMX_NO_PACKED_OPC
+    #error Packed opcodes support requires token threading
+  #endif
+  #define NEXT(cip,op)   goto **cip++
+#endif
+
+cell amx_exec_run(AMX *amx,cell *retval,unsigned char *data)
+{
+static const void * const amx_opcodelist[] = {
+        /* core set */
+        &&op_nop,         &&op_load_pri,    &&op_load_alt,    &&op_load_s_pri,
+        &&op_load_s_alt,  &&op_lref_s_pri,  &&op_lref_s_alt,  &&op_load_i,
+        &&op_lodb_i,      &&op_const_pri,   &&op_const_alt,   &&op_addr_pri,
+        &&op_addr_alt,    &&op_stor,        &&op_stor_s,      &&op_sref_s,
+        &&op_stor_i,      &&op_strb_i,      &&op_align_pri,   &&op_lctrl,
+        &&op_sctrl,       &&op_xchg,        &&op_push_pri,    &&op_push_alt,
+        &&op_pushr_pri,   &&op_pop_pri,     &&op_pop_alt,     &&op_pick,
+        &&op_stack,       &&op_heap,        &&op_proc,        &&op_ret,
+        &&op_retn,        &&op_call,        &&op_jump,        &&op_jzer,
+        &&op_jnz,         &&op_shl,         &&op_shr,         &&op_sshr,
+        &&op_shl_c_pri,   &&op_shl_c_alt,   &&op_smul,        &&op_sdiv,
+        &&op_add,         &&op_sub,         &&op_and,         &&op_or,
+        &&op_xor,         &&op_not,         &&op_neg,         &&op_invert,
+        &&op_eq,          &&op_neq,         &&op_sless,       &&op_sleq,
+        &&op_sgrtr,       &&op_sgeq,        &&op_inc_pri,     &&op_inc_alt,
+        &&op_inc_i,       &&op_dec_pri,     &&op_dec_alt,     &&op_dec_i,
+        &&op_movs,        &&op_cmps,        &&op_fill,        &&op_halt,
+        &&op_bounds,      &&op_sysreq,      &&op_switch,      &&op_swap_pri,
+        &&op_swap_alt,    &&op_break,       &&op_casetbl,
+        /* patched instructions */
+        /* if op_sysreq_d and/or op_sysreq_nd are not implemented, their entries
+         * in this table must be NULL
+         */
+        &&op_sysreq_d,    &&op_sysreq_nd,
+        /* overlay instructions */
+        &&op_call_ovl,    &&op_retn_ovl,    &&op_switch_ovl,  &&op_casetbl_ovl,
+        /* supplemental and macro instructions */
+#if !defined AMX_NO_MACRO_INSTR
+        &&op_lidx,        &&op_lidx_b,      &&op_idxaddr,     &&op_idxaddr_b,
+        &&op_push_c,      &&op_push,        &&op_push_s,      &&op_push_adr,
+        &&op_pushr_c,     &&op_pushr_s,     &&op_pushr_adr,   &&op_jeq,
+        &&op_jneq,        &&op_jsless,      &&op_jsleq,       &&op_jsgrtr,
+        &&op_jsgeq,       &&op_sdiv_inv,    &&op_sub_inv,     &&op_add_c,
+        &&op_smul_c,      &&op_zero_pri,    &&op_zero_alt,    &&op_zero,
+        &&op_zero_s,      &&op_eq_c_pri,    &&op_eq_c_alt,    &&op_inc,
+        &&op_inc_s,       &&op_dec,         &&op_dec_s,       &&op_sysreq_n,
+        &&op_pushm_c,     &&op_pushm,       &&op_pushm_s,     &&op_pushm_adr,
+        &&op_pushrm_c,    &&op_pushrm_s,    &&op_pushrm_adr,  &&op_load2,
+        &&op_load2_s,     &&op_const,       &&op_const_s,
+#endif
+#if !defined AMX_NO_PACKED_OPC
+        &&op_load_p_pri,  &&op_load_p_alt,  &&op_load_p_s_pri,&&op_load_p_s_alt,
+        &&op_lref_p_s_pri,&&op_lref_p_s_alt,&&op_lodb_p_i,    &&op_const_p_pri,
+        &&op_const_p_alt, &&op_addr_p_pri,  &&op_addr_p_alt,  &&op_stor_p,
+        &&op_stor_p_s,    &&op_sref_p_s,    &&op_strb_p_i,    &&op_lidx_p_b,
+        &&op_idxaddr_p_b, &&op_align_p_pri, &&op_push_p_c,    &&op_push_p,
+        &&op_push_p_s,    &&op_push_p_adr,  &&op_pushr_p_c,   &&op_pushr_p_s,
+        &&op_pushr_p_adr, &&op_pushm_p_c,   &&op_pushm_p,     &&op_pushm_p_s,
+        &&op_pushm_p_adr, &&op_pushrm_p_c,  &&op_pushrm_p_s,  &&op_pushrm_p_adr,
+        &&op_stack_p,     &&op_heap_p,      &&op_shl_p_c_pri, &&op_shl_p_c_alt,
+        &&op_add_p_c,     &&op_smul_p_c,    &&op_zero_p,      &&op_zero_p_s,
+        &&op_eq_p_c_pri,  &&op_eq_p_c_alt,  &&op_inc_p,       &&op_inc_p_s,
+        &&op_dec_p,       &&op_dec_p_s,     &&op_movs_p,      &&op_cmps_p,
+        &&op_fill_p,      &&op_halt_p,      &&op_bounds_p
+#endif
+};
+  AMX_HEADER *hdr;
+  cell pri,alt,stk,frm,hea;
+  cell reset_stk, reset_hea, *cip;
+  cell offs,val;
+  int num,i;
+  #if !defined AMX_NO_PACKED_OPC
+    int op;
+  #endif
+
+  assert(amx!=NULL);
+  /* HACK: return label table and opcode count (for VerifyPcode()) if amx
+   * structure has the flags set to all ones (see amx_exec_list() above)
+   */
+  if (amx->flags==~0) {
+    assert(sizeof(cell)==sizeof(void *));
+    assert(data==NULL);
+    assert(retval!=NULL);
+    *retval=(cell)amx_opcodelist;
+    return sizearray(amx_opcodelist);
+  } /* if */
+
+  /* set up the registers */
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr->magic==AMX_MAGIC);
+  assert(hdr->file_version>=11);
+  cip=(cell*)amx->cip;
+  hea=amx->hea;
+  stk=amx->stk;
+  reset_stk=stk;
+  reset_hea=hea;
+  alt=frm=pri=0;/* just to avoid compiler warnings */
+  num=0;        /* just to avoid compiler warnings */
+
+  /* start running */
+  assert(amx->code!=NULL);
+  assert(data!=NULL);
+  cip=(cell *)(amx->code+(int)amx->cip);
+  NEXT(cip,op);
+
+  op_nop:
+    NEXT(cip,op);
+  op_load_pri:
+    GETPARAM(offs);
+    pri=_R(data,offs);
+    NEXT(cip,op);
+  op_load_alt:
+    GETPARAM(offs);
+    alt=_R(data,offs);
+    NEXT(cip,op);
+  op_load_s_pri:
+    GETPARAM(offs);
+    pri=_R(data,frm+offs);
+    NEXT(cip,op);
+  op_load_s_alt:
+    GETPARAM(offs);
+    alt=_R(data,frm+offs);
+    NEXT(cip,op);
+  op_lref_s_pri:
+    GETPARAM(offs);
+    offs=_R(data,frm+offs);
+    pri=_R(data,offs);
+    NEXT(cip,op);
+  op_lref_s_alt:
+    GETPARAM(offs);
+    offs=_R(data,frm+offs);
+    alt=_R(data,offs);
+    NEXT(cip,op);
+  op_load_i:
+    /* verify address */
+    if (pri>=hea && pri<stk || (ucell)pri>=(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    pri=_R(data,pri);
+    NEXT(cip,op);
+  op_lodb_i:
+    GETPARAM(offs);
+  __lodb_i:
+    /* verify address */
+    if (pri>=hea && pri<stk || (ucell)pri>=(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    switch (offs) {
+    case 1:
+      pri=_R8(data,pri);
+      break;
+    case 2:
+      pri=_R16(data,pri);
+      break;
+    case 4:
+      pri=_R32(data,pri);
+      break;
+    } /* switch */
+    NEXT(cip,op);
+  op_const_pri:
+    GETPARAM(pri);
+    NEXT(cip,op);
+  op_const_alt:
+    GETPARAM(alt);
+    NEXT(cip,op);
+  op_addr_pri:
+    GETPARAM(pri);
+    pri+=frm;
+    NEXT(cip,op);
+  op_addr_alt:
+    GETPARAM(alt);
+    alt+=frm;
+    NEXT(cip,op);
+  op_stor:
+    GETPARAM(offs);
+    _W(data,offs,pri);
+    NEXT(cip,op);
+  op_stor_s:
+    GETPARAM(offs);
+    _W(data,frm+offs,pri);
+    NEXT(cip,op);
+  op_sref_s:
+    GETPARAM(offs);
+    offs=_R(data,frm+offs);
+    _W(data,offs,pri);
+    NEXT(cip,op);
+  op_stor_i:
+    /* verify address */
+    if (alt>=hea && alt<stk || (ucell)alt>=(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    _W(data,alt,pri);
+    NEXT(cip,op);
+  op_strb_i:
+    GETPARAM(offs);
+  __strb_i:
+    /* verify address */
+    if (alt>=hea && alt<stk || (ucell)alt>=(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    switch (offs) {
+    case 1:
+      _W8(data,alt,pri);
+      break;
+    case 2:
+      _W16(data,alt,pri);
+      break;
+    case 4:
+      _W32(data,alt,pri);
+      break;
+    } /* switch */
+    NEXT(cip,op);
+  op_align_pri:
+    GETPARAM(offs);
+    #if BYTE_ORDER==LITTLE_ENDIAN
+      if (offs<(int)sizeof(cell))
+        pri ^= sizeof(cell)-offs;
+    #endif
+    NEXT(cip,op);
+  op_lctrl:
+    GETPARAM(offs);
+    switch (offs) {
+    case 0:
+      pri=hdr->cod;
+      break;
+    case 1:
+      pri=hdr->dat;
+      break;
+    case 2:
+      pri=hea;
+      break;
+    case 3:
+      pri=amx->stp;
+      break;
+    case 4:
+      pri=stk;
+      break;
+    case 5:
+      pri=frm;
+      break;
+    case 6:
+      pri=(cell)((unsigned char *)cip - amx->code);
+      break;
+    } /* switch */
+    NEXT(cip,op);
+  op_sctrl:
+    GETPARAM(offs);
+    switch (offs) {
+    case 0:
+    case 1:
+    case 3:
+      /* cannot change these parameters */
+      break;
+    case 2:
+      hea=pri;
+      break;
+    case 4:
+      stk=pri;
+      break;
+    case 5:
+      frm=pri;
+      break;
+    case 6:
+      cip=(cell *)(amx->code + (int)pri);
+      break;
+    } /* switch */
+    NEXT(cip,op);
+  op_xchg:
+    offs=pri;         /* offs is a temporary variable */
+    pri=alt;
+    alt=offs;
+    NEXT(cip,op);
+  op_push_pri:
+    PUSH(pri);
+    NEXT(cip,op);
+  op_push_alt:
+    PUSH(alt);
+    NEXT(cip,op);
+  op_pushr_pri:
+    PUSH(data+pri);
+    NEXT(cip,op);
+  op_pop_pri:
+    POP(pri);
+    NEXT(cip,op);
+  op_pop_alt:
+    POP(alt);
+    NEXT(cip,op);
+  op_pick:
+    GETPARAM(offs);
+    pri=_R(data,stk+offs);
+    NEXT(cip,op);
+  op_stack:
+    GETPARAM(offs);
+    alt=stk;
+    stk+=offs;
+    CHKMARGIN();
+    CHKSTACK();
+    NEXT(cip,op);
+  op_heap:
+    GETPARAM(offs);
+    alt=hea;
+    hea+=offs;
+    CHKMARGIN();
+    CHKHEAP();
+    NEXT(cip,op);
+  op_proc:
+    PUSH(frm);
+    frm=stk;
+    CHKMARGIN();
+    NEXT(cip,op);
+  op_ret:
+    POP(frm);
+    POP(offs);
+    /* verify the return address */
+    if ((long)offs>=amx->codesize)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    cip=(cell *)(amx->code+(int)offs);
+    NEXT(cip,op);
+  op_retn:
+    POP(frm);
+    POP(offs);
+    /* verify the return address */
+    if ((long)offs>=amx->codesize)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    cip=(cell *)(amx->code+(int)offs);
+    stk+= _R(data,stk) + sizeof(cell);  /* remove parameters from the stack */
+    NEXT(cip,op);
+  op_call:
+    PUSH(((unsigned char *)cip-amx->code)+sizeof(cell));/* push address behind instruction */
+    cip=JUMPREL(cip);                   /* jump to the address */
+    NEXT(cip,op);
+  op_jump:
+    /* since the GETPARAM() macro modifies cip, you cannot
+     * do GETPARAM(cip) directly */
+    cip=JUMPREL(cip);
+    NEXT(cip,op);
+  op_jzer:
+    if (pri==0)
+      cip=JUMPREL(cip);
+    else
+      SKIPPARAM(1);
+    NEXT(cip,op);
+  op_jnz:
+    if (pri!=0)
+      cip=JUMPREL(cip);
+    else
+      SKIPPARAM(1);
+    NEXT(cip,op);
+  op_shl:
+    pri<<=alt;
+    NEXT(cip,op);
+  op_shr:
+    pri=(ucell)pri >> (ucell)alt;
+    NEXT(cip,op);
+  op_sshr:
+    pri>>=alt;
+    NEXT(cip,op);
+  op_shl_c_pri:
+    GETPARAM(offs);
+    pri<<=offs;
+    NEXT(cip,op);
+  op_shl_c_alt:
+    GETPARAM(offs);
+    alt<<=offs;
+    NEXT(cip,op);
+  op_smul:
+    pri*=alt;
+    NEXT(cip,op);
+  op_sdiv:
+    if (pri==0)
+      ABORT(amx,AMX_ERR_DIVIDE);
+    /* use floored division and matching remainder */
+    offs=pri;
+    #if defined TRUNC_SDIV
+      pri=alt/offs;
+      alt=alt%offs;
+    #else
+      val=alt;                  /* portable routine for truncated division */
+      pri=IABS(alt)/IABS(offs);
+      if ((cell)(val ^ offs)<0)
+        pri=-pri;
+      alt=val-pri*offs;         /* calculate the matching remainder */
+    #endif
+    /* now "fiddle" with the values to get floored division */
+    if (alt!=0 && (cell)(alt ^ offs)<0) {
+      pri--;
+      alt+=offs;
+    } /* if */
+    NEXT(cip,op);
+  op_add:
+    pri+=alt;
+    NEXT(cip,op);
+  op_sub:
+    pri=alt-pri;
+    NEXT(cip,op);
+  op_and:
+    pri&=alt;
+    NEXT(cip,op);
+  op_or:
+    pri|=alt;
+    NEXT(cip,op);
+  op_xor:
+    pri^=alt;
+    NEXT(cip,op);
+  op_not:
+    pri=!pri;
+    NEXT(cip,op);
+  op_neg:
+    pri=-pri;
+    NEXT(cip,op);
+  op_invert:
+    pri=~pri;
+    NEXT(cip,op);
+  op_eq:
+    pri= pri==alt ? 1 : 0;
+    NEXT(cip,op);
+  op_neq:
+    pri= pri!=alt ? 1 : 0;
+    NEXT(cip,op);
+  op_sless:
+    pri= pri<alt ? 1 : 0;
+    NEXT(cip,op);
+  op_sleq:
+    pri= pri<=alt ? 1 : 0;
+    NEXT(cip,op);
+  op_sgrtr:
+    pri= pri>alt ? 1 : 0;
+    NEXT(cip,op);
+  op_sgeq:
+    pri= pri>=alt ? 1 : 0;
+    NEXT(cip,op);
+  op_inc_pri:
+    pri++;
+    NEXT(cip,op);
+  op_inc_alt:
+    alt++;
+    NEXT(cip,op);
+  op_inc_i:
+    #if defined _R_DEFAULT
+      *(cell *)(data+(int)pri) += 1;
+    #else
+      val=_R(data,pri);
+      _W(data,pri,val+1);
+    #endif
+    NEXT(cip,op);
+  op_dec_pri:
+    pri--;
+    NEXT(cip,op);
+  op_dec_alt:
+    alt--;
+    NEXT(cip,op);
+  op_dec_i:
+    #if defined _R_DEFAULT
+      *(cell *)(data+(int)pri) -= 1;
+    #else
+      val=_R(data,pri);
+      _W(data,pri,val-1);
+    #endif
+    NEXT(cip,op);
+  op_movs:
+    GETPARAM(offs);
+  __movs:
+    /* verify top & bottom memory addresses, for both source and destination
+     * addresses
+     */
+    if (pri>=hea && pri<stk || (ucell)pri>=(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    if ((pri+offs)>hea && (pri+offs)<stk || (ucell)(pri+offs)>(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    if (alt>=hea && alt<stk || (ucell)alt>=(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    if ((alt+offs)>hea && (alt+offs)<stk || (ucell)(alt+offs)>(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    #if defined _R_DEFAULT
+      memcpy(data+(int)alt, data+(int)pri, (int)offs);
+    #else
+      for (i=0; i+4<offs; i+=4) {
+        val=_R32(data,pri+i);
+        _W32(data,alt+i,val);
+      } /* for */
+      for ( ; i<offs; i++) {
+        val=_R8(data,pri+i);
+        _W8(data,alt+i,val);
+      } /* for */
+    #endif
+    NEXT(cip,op);
+  op_cmps:
+    GETPARAM(offs);
+  __cmps:
+    /* verify top & bottom memory addresses, for both source and destination
+     * addresses
+     */
+    if (pri>=hea && pri<stk || (ucell)pri>=(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    if ((pri+offs)>hea && (pri+offs)<stk || (ucell)(pri+offs)>(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    if (alt>=hea && alt<stk || (ucell)alt>=(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    if ((alt+offs)>hea && (alt+offs)<stk || (ucell)(alt+offs)>(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    #if defined _R_DEFAULT
+      pri=memcmp(data+(int)alt, data+(int)pri, (int)offs);
+    #else
+      pri=0;
+      for (i=0; i+4<offs && pri==0; i+=4)
+        pri=_R32(data,alt+i)-_R32(data,pri+i);
+      for ( ; i<offs && pri==0; i++)
+        pri=_R8(data,alt+i)-_R8(data,pri+i);
+    #endif
+    NEXT(cip,op);
+  op_fill:
+    GETPARAM(offs);
+  __fill:
+    /* verify top & bottom memory addresses */
+    if (alt>=hea && alt<stk || (ucell)alt>=(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    if ((alt+offs)>hea && (alt+offs)<stk || (ucell)(alt+offs)>(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    for (i=(int)alt; offs>=(int)sizeof(cell); i+=sizeof(cell), offs-=sizeof(cell))
+      _W32(data,i,pri);
+    NEXT(cip,op);
+  op_halt:
+    GETPARAM(offs);
+  __halt:
+    if (retval!=NULL)
+      *retval=pri;
+    /* store complete status (stk and hea are already set in the ABORT macro) */
+    amx->frm=frm;
+    amx->pri=pri;
+    amx->alt=alt;
+    amx->cip=(cell)((unsigned char*)cip-amx->code);
+    if (offs==AMX_ERR_SLEEP) {
+      amx->stk=stk;
+      amx->hea=hea;
+      amx->reset_stk=reset_stk;
+      amx->reset_hea=reset_hea;
+      return (int)offs;
+    } /* if */
+    ABORT(amx,(int)offs);
+  op_bounds:
+    GETPARAM(offs);
+    if ((ucell)pri>(ucell)offs) {
+      amx->cip=(cell)((unsigned char *)cip-amx->code);
+      ABORT(amx,AMX_ERR_BOUNDS);
+    } /* if */
+    NEXT(cip,op);
+  op_sysreq:
+    GETPARAM(offs);
+    /* save a few registers */
+    amx->cip=(cell)((unsigned char *)cip-amx->code);
+    amx->hea=hea;
+    amx->frm=frm;
+    amx->stk=stk;
+    num=amx->callback(amx,offs,&pri,(cell *)(data+(int)stk));
+    if (num!=AMX_ERR_NONE) {
+      if (num==AMX_ERR_SLEEP) {
+        amx->pri=pri;
+        amx->alt=alt;
+        amx->reset_stk=reset_stk;
+        amx->reset_hea=reset_hea;
+        return num;
+      } /* if */
+      ABORT(amx,num);
+    } /* if */
+    NEXT(cip,op);
+  op_switch: {
+    cell *cptr=JUMPREL(cip)+1;  /* +1, to skip the "casetbl" opcode */
+    cip=JUMPREL(cptr+1);        /* preset to "none-matched" case */
+    num=(int)*cptr;             /* number of records in the case table */
+    for (cptr+=2; num>0 && *cptr!=pri; num--,cptr+=2)
+      /* nothing */;
+    if (num>0)
+      cip=JUMPREL(cptr+1);      /* case found */
+    NEXT(cip,op);
+    }
+  op_swap_pri:
+    offs=_R(data,stk);
+    _W(data,stk,pri);
+    pri=offs;
+    NEXT(cip,op);
+  op_swap_alt:
+    offs=_R(data,stk);
+    _W(data,stk,alt);
+    alt=offs;
+    NEXT(cip,op);
+  op_break:
+    assert((amx->flags & AMX_FLAG_VERIFY)==0);
+    if (amx->debug!=NULL) {
+      /* store status */
+      amx->frm=frm;
+      amx->stk=stk;
+      amx->hea=hea;
+      amx->cip=(cell)((unsigned char*)cip-amx->code);
+      num=amx->debug(amx);
+      if (num!=AMX_ERR_NONE) {
+        if (num==AMX_ERR_SLEEP) {
+          amx->pri=pri;
+          amx->alt=alt;
+          amx->reset_stk=reset_stk;
+          amx->reset_hea=reset_hea;
+          return num;
+        } /* if */
+        ABORT(amx,num);
+      } /* if */
+    } /* if */
+    NEXT(cip,op);
+  op_casetbl:
+    assert(0);                  /* this should not occur during execution */
+    ABORT(amx,AMX_ERR_INVINSTR);
+  op_sysreq_d:          /* see op_sysreq */
+    #if !defined AMX_DONT_RELOCATE
+      GETPARAM(offs);
+      /* save a few registers */
+      amx->cip=(cell)((unsigned char *)cip-amx->code);
+      amx->hea=hea;
+      amx->frm=frm;
+      amx->stk=stk;
+      pri=((AMX_NATIVE)offs)(amx,(cell *)(data+(int)stk));
+      if (amx->error!=AMX_ERR_NONE) {
+        if (amx->error==AMX_ERR_SLEEP) {
+          amx->pri=pri;
+          amx->alt=alt;
+          amx->reset_stk=reset_stk;
+          amx->reset_hea=reset_hea;
+          return AMX_ERR_SLEEP;
+        } /* if */
+        ABORT(amx,amx->error);
+      } /* if */
+      NEXT(cip,op);
+    #else
+      ABORT(amx,AMX_ERR_INVINSTR);
+    #endif
+  op_sysreq_nd:    /* see op_sysreq_n */
+    #if !defined AMX_NO_MACRO_INSTR && !defined AMX_DONT_RELOCATE
+      GETPARAM(offs);
+      GETPARAM(val);
+      PUSH(val);
+      /* save a few registers */
+      amx->cip=(cell)((unsigned char *)cip-amx->code);
+      amx->hea=hea;
+      amx->frm=frm;
+      amx->stk=stk;
+      pri=((AMX_NATIVE)offs)(amx,(cell *)(data+(int)stk));
+      stk+=val+4;
+      if (amx->error!=AMX_ERR_NONE) {
+        if (amx->error==AMX_ERR_SLEEP) {
+          amx->pri=pri;
+          amx->alt=alt;
+          amx->stk=stk;
+          amx->reset_stk=reset_stk;
+          amx->reset_hea=reset_hea;
+          return AMX_ERR_SLEEP;
+        } /* if */
+        ABORT(amx,amx->error);
+      } /* if */
+      NEXT(cip,op);
+    #else
+      ABORT(amx,AMX_ERR_INVINSTR);
+    #endif
+
+    /* overlay instructions */
+#if !defined AMX_NO_OVERLAY
+  op_call_ovl:
+    offs=(unsigned char *)cip-amx->code+sizeof(cell); /* skip address */
+    assert(offs>=0 && offs<(1<<(sizeof(cell)*4)));
+    PUSH((offs<<(sizeof(cell)*4)) | amx->ovl_index);
+    amx->ovl_index=(int)*cip;
+    assert(amx->overlay!=NULL);
+    if ((num=amx->overlay(amx,amx->ovl_index))!=AMX_ERR_NONE)
+      ABORT(amx,num);
+    cip=(cell*)amx->code;
+    NEXT(cip,op);
+  op_retn_ovl:
+    assert(amx->overlay!=NULL);
+    POP(frm);
+    POP(offs);
+    amx->ovl_index=offs & (((ucell)~0)>>4*sizeof(cell));
+    offs=(ucell)offs >> (sizeof(cell)*4);
+    /* verify the index */
+    stk+=_R(data,stk)+sizeof(cell);   /* remove parameters from the stack */
+    num=amx->overlay(amx,amx->ovl_index); /* reload overlay */
+    if (num!=AMX_ERR_NONE || (long)offs>=amx->codesize)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    cip=(cell *)(amx->code+(int)offs);
+    NEXT(cip,op);
+  op_switch_ovl: {
+    cell *cptr=JUMPREL(cip)+1;  /* +1, to skip the "icasetbl" opcode */
+    amx->ovl_index=*(cptr+1);   /* preset to "none-matched" case */
+    num=(int)*cptr;             /* number of records in the case table */
+    for (cptr+=2; num>0 && *cptr!=pri; num--,cptr+=2)
+      /* nothing */;
+    if (num>0)
+      amx->ovl_index=*(cptr+1); /* case found */
+    assert(amx->overlay!=NULL);
+    if ((num=amx->overlay(amx,amx->ovl_index))!=AMX_ERR_NONE)
+      ABORT(amx,num);
+    cip=(cell*)amx->code;
+    NEXT(cip,op);
+    }
+#else
+  op_call_ovl:
+  op_retn_ovl:
+  op_switch_ovl:
+    ABORT(amx,AMX_ERR_INVINSTR);
+#endif
+  op_casetbl_ovl:
+    assert(0);                  /* this should not occur during execution */
+    ABORT(amx,AMX_ERR_INVINSTR);
+
+    /* supplemental and macro instructions */
+#if !defined AMX_NO_MACRO_INSTR
+  op_lidx:
+    offs=pri*sizeof(cell)+alt;  /* implicit shift value for a cell */
+    /* verify address */
+    if (offs>=hea && offs<stk || (ucell)offs>=(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    pri=_R(data,offs);
+    NEXT(cip,op);
+  op_lidx_b:
+    GETPARAM(offs);
+    offs=(pri << (int)offs)+alt;
+    /* verify address */
+    if (offs>=hea && offs<stk || (ucell)offs>=(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    pri=_R(data,offs);
+    NEXT(cip,op);
+  op_idxaddr:
+    pri=pri*sizeof(cell)+alt;
+    NEXT(cip,op);
+  op_idxaddr_b:
+    GETPARAM(offs);
+    pri=(pri << (int)offs)+alt;
+    NEXT(cip,op);
+  op_push_c:
+    GETPARAM(offs);
+    PUSH(offs);
+    NEXT(cip,op);
+  op_push:
+    GETPARAM(offs);
+    PUSH(_R(data,offs));
+    NEXT(cip,op);
+  op_push_s:
+    GETPARAM(offs);
+    PUSH(_R(data,frm+offs));
+    NEXT(cip,op);
+  op_push_adr:
+    GETPARAM(offs);
+    PUSH(frm+offs);
+    NEXT(cip,op);
+  op_pushr_c:
+    GETPARAM(offs);
+    PUSH(data+offs);
+    NEXT(cip,op);
+  op_pushr_s:
+    GETPARAM(offs);
+    PUSH(data+_R(data,frm+offs));
+    NEXT(cip,op);
+  op_pushr_adr:
+    GETPARAM(offs);
+    PUSH(data+frm+offs);
+    NEXT(cip,op);
+  op_jeq:
+    if (pri==alt)
+      cip=JUMPREL(cip);
+    else
+      SKIPPARAM(1);
+    NEXT(cip,op);
+  op_jneq:
+    if (pri!=alt)
+      cip=JUMPREL(cip);
+    else
+      SKIPPARAM(1);
+    NEXT(cip,op);
+  op_jsless:
+    if (pri<alt)
+      cip=JUMPREL(cip);
+    else
+      SKIPPARAM(1);
+    NEXT(cip,op);
+  op_jsleq:
+    if (pri<=alt)
+      cip=JUMPREL(cip);
+    else
+      SKIPPARAM(1);
+    NEXT(cip,op);
+  op_jsgrtr:
+    if (pri>alt)
+      cip=JUMPREL(cip);
+    else
+      SKIPPARAM(1);
+    NEXT(cip,op);
+  op_jsgeq:
+    if (pri>=alt)
+      cip=JUMPREL(cip);
+    else
+      SKIPPARAM(1);
+    NEXT(cip,op);
+  op_sdiv_inv:
+    if (alt==0)
+      ABORT(amx,AMX_ERR_DIVIDE);
+    /* use floored division and matching remainder */
+    offs=alt;
+    #if defined TRUNC_SDIV
+      pri=pri/offs;
+      alt=pri%offs;
+    #else
+      val=pri;                  /* portable routine for truncated division */
+      pri=IABS(pri)/IABS(offs);
+      if ((cell)(val ^ offs)<0)
+        pri=-pri;
+      alt=val-pri*offs;         /* calculate the matching remainder */
+    #endif
+    /* now "fiddle" with the values to get floored division */
+    if (alt!=0 && (cell)(alt ^ offs)<0) {
+      pri--;
+      alt+=offs;
+    } /* if */
+    NEXT(cip,op);
+  op_sub_inv:
+    pri-=alt;
+    NEXT(cip,op);
+  op_add_c:
+    GETPARAM(offs);
+    pri+=offs;
+    NEXT(cip,op);
+  op_smul_c:
+    GETPARAM(offs);
+    pri*=offs;
+    NEXT(cip,op);
+  op_zero_pri:
+    pri=0;
+    NEXT(cip,op);
+  op_zero_alt:
+    alt=0;
+    NEXT(cip,op);
+  op_zero:
+    GETPARAM(offs);
+    _W(data,offs,0);
+    NEXT(cip,op);
+  op_zero_s:
+    GETPARAM(offs);
+    _W(data,frm+offs,0);
+    NEXT(cip,op);
+  op_eq_c_pri:
+    GETPARAM(offs);
+    pri= pri==offs ? 1 : 0;
+    NEXT(cip,op);
+  op_eq_c_alt:
+    GETPARAM(offs);
+    pri= alt==offs ? 1 : 0;
+    NEXT(cip,op);
+  op_inc:
+    GETPARAM(offs);
+    #if defined _R_DEFAULT
+      *(cell *)(data+(int)offs) += 1;
+    #else
+      val=_R(data,offs);
+      _W(data,offs,val+1);
+    #endif
+    NEXT(cip,op);
+  op_inc_s:
+    GETPARAM(offs);
+    #if defined _R_DEFAULT
+      *(cell *)(data+(int)(frm+offs)) += 1;
+    #else
+      val=_R(data,frm+offs);
+      _W(data,frm+offs,val+1);
+    #endif
+    NEXT(cip,op);
+  op_dec:
+    GETPARAM(offs);
+    #if defined _R_DEFAULT
+      *(cell *)(data+(int)offs) -= 1;
+    #else
+      val=_R(data,offs);
+      _W(data,offs,val-1);
+    #endif
+    NEXT(cip,op);
+  op_dec_s:
+    GETPARAM(offs);
+    #if defined _R_DEFAULT
+      *(cell *)(data+(int)(frm+offs)) -= 1;
+    #else
+      val=_R(data,frm+offs);
+      _W(data,frm+offs,val-1);
+    #endif
+    NEXT(cip,op);
+  op_sysreq_n:
+    GETPARAM(offs);
+    GETPARAM(val);
+    PUSH(val);
+    /* save a few registers */
+    amx->cip=(cell)((unsigned char *)cip-amx->code);
+    amx->hea=hea;
+    amx->frm=frm;
+    amx->stk=stk;
+    num=amx->callback(amx,offs,&pri,(cell *)(data+(int)stk));
+    stk+=val+4;
+    if (num!=AMX_ERR_NONE) {
+      if (num==AMX_ERR_SLEEP) {
+        amx->pri=pri;
+        amx->alt=alt;
+        amx->stk=stk;
+        amx->reset_stk=reset_stk;
+        amx->reset_hea=reset_hea;
+        return num;
+      } /* if */
+      ABORT(amx,num);
+    } /* if */
+    NEXT(cip,op);
+  op_pushm_c:
+    GETPARAM(val);
+    while (val--) {
+      GETPARAM(offs);
+      PUSH(offs);
+    } /* while */
+    NEXT(cip,op);
+  op_pushm:
+    GETPARAM(val);
+    while (val--) {
+      GETPARAM(offs);
+      PUSH(_R(data,offs));
+    } /* while */
+    NEXT(cip,op);
+  op_pushm_s:
+    GETPARAM(val);
+    while (val--) {
+      GETPARAM(offs);
+      PUSH(_R(data,frm+offs));
+    } /* while */
+    NEXT(cip,op);
+  op_pushm_adr:
+    GETPARAM(val);
+    while (val--) {
+      GETPARAM(offs);
+      PUSH(frm+offs);
+    } /* while */
+    NEXT(cip,op);
+  op_pushrm_c:
+    GETPARAM(val);
+    while (val--) {
+      GETPARAM(offs);
+      PUSH(data+offs);
+    } /* while */
+    NEXT(cip,op);
+  op_pushrm_s:
+    GETPARAM(val);
+    while (val--) {
+      GETPARAM(offs);
+      PUSH(data+_R(data,frm+offs));
+    } /* while */
+    NEXT(cip,op);
+  op_pushrm_adr:
+    GETPARAM(val);
+    while (val--) {
+      GETPARAM(offs);
+      PUSH(data+frm+offs);
+    } /* while */
+    NEXT(cip,op);
+  op_load2:
+    GETPARAM(offs);
+    pri=_R(data,offs);
+    GETPARAM(offs);
+    alt=_R(data,offs);
+    NEXT(cip,op);
+  op_load2_s:
+    GETPARAM(offs);
+    pri=_R(data,frm+offs);
+    GETPARAM(offs);
+    alt=_R(data,frm+offs);
+    NEXT(cip,op);
+  op_const:
+    GETPARAM(offs);
+    GETPARAM(val);
+    _W(data,offs,val);
+    NEXT(cip,op);
+  op_const_s:
+    GETPARAM(offs);
+    GETPARAM(val);
+    _W(data,frm+offs,val);
+    NEXT(cip,op);
+#endif
+
+#if !defined AMX_NO_PACKED_OPC
+  op_load_p_pri:
+    GETPARAM_P(offs,op);
+    pri=_R(data,offs);
+    NEXT(cip,op);
+  op_load_p_alt:
+    GETPARAM_P(offs,op);
+    alt=_R(data,offs);
+    NEXT(cip,op);
+  op_load_p_s_pri:
+    GETPARAM_P(offs,op);
+    pri=_R(data,frm+offs);
+    NEXT(cip,op);
+  op_load_p_s_alt:
+    GETPARAM_P(offs,op);
+    alt=_R(data,frm+offs);
+    NEXT(cip,op);
+  op_lref_p_s_pri:
+    GETPARAM_P(offs,op);
+    offs=_R(data,frm+offs);
+    pri=_R(data,offs);
+    NEXT(cip,op);
+  op_lref_p_s_alt:
+    GETPARAM_P(offs,op);
+    offs=_R(data,frm+offs);
+    alt=_R(data,offs);
+    NEXT(cip,op);
+  op_lodb_p_i:
+    GETPARAM_P(offs,op);
+    goto __lodb_i;
+  op_const_p_pri:
+    GETPARAM_P(pri,op);
+    NEXT(cip,op);
+  op_const_p_alt:
+    GETPARAM_P(alt,op);
+    NEXT(cip,op);
+  op_addr_p_pri:
+    GETPARAM_P(pri,op);
+    pri+=frm;
+    NEXT(cip,op);
+  op_addr_p_alt:
+    GETPARAM_P(alt,op);
+    alt+=frm;
+    NEXT(cip,op);
+  op_stor_p:
+    GETPARAM_P(offs,op);
+    _W(data,offs,pri);
+    NEXT(cip,op);
+  op_stor_p_s:
+    GETPARAM_P(offs,op);
+    _W(data,frm+offs,pri);
+    NEXT(cip,op);
+  op_sref_p_s:
+    GETPARAM_P(offs,op);
+    offs=_R(data,frm+offs);
+    _W(data,offs,pri);
+    NEXT(cip,op);
+  op_strb_p_i:
+    GETPARAM_P(offs,op);
+    goto __strb_i;
+  op_lidx_p_b:
+    GETPARAM_P(offs,op);
+    offs=(pri << (int)offs)+alt;
+    /* verify address */
+    if (offs>=hea && offs<stk || (ucell)offs>=(ucell)amx->stp)
+      ABORT(amx,AMX_ERR_MEMACCESS);
+    pri=_R(data,offs);
+    NEXT(cip,op);
+  op_idxaddr_p_b:
+    GETPARAM_P(offs,op);
+    pri=(pri << (int)offs)+alt;
+    NEXT(cip,op);
+  op_align_p_pri:
+    GETPARAM_P(offs,op);
+    #if BYTE_ORDER==LITTLE_ENDIAN
+      if ((size_t)offs<sizeof(cell))
+        pri ^= sizeof(cell)-offs;
+    #endif
+    NEXT(cip,op);
+  op_push_p_c:
+    GETPARAM_P(offs,op);
+    PUSH(offs);
+    NEXT(cip,op);
+  op_push_p:
+    GETPARAM_P(offs,op);
+    PUSH(_R(data,offs));
+    NEXT(cip,op);
+  op_push_p_s:
+    GETPARAM_P(offs,op);
+    PUSH(_R(data,frm+offs));
+    NEXT(cip,op);
+  op_push_p_adr:
+    GETPARAM_P(offs,op);
+    PUSH(frm+offs);
+    NEXT(cip,op);
+  op_pushr_p_c:
+    GETPARAM_P(offs,op);
+    PUSH(data+offs);
+    NEXT(cip,op);
+  op_pushr_p_s:
+    GETPARAM_P(offs,op);
+    PUSH(data+_R(data,frm+offs));
+    NEXT(cip,op);
+  op_pushr_p_adr:
+    GETPARAM_P(offs,op);
+    PUSH(data+frm+offs);
+    NEXT(cip,op);
+  op_pushm_p_c:
+    GETPARAM_P(val,op);
+    while (val--) {
+      GETPARAM(offs);
+      PUSH(offs);
+    } /* while */
+    NEXT(cip,op);
+  op_pushm_p:
+    GETPARAM_P(val,op);
+    while (val--) {
+      GETPARAM(offs);
+      PUSH(_R(data,offs));
+    } /* while */
+    NEXT(cip,op);
+  op_pushm_p_s:
+    GETPARAM_P(val,op);
+    while (val--) {
+      GETPARAM(offs);
+      PUSH(_R(data,frm+offs));
+    } /* while */
+    NEXT(cip,op);
+  op_pushm_p_adr:
+    GETPARAM_P(val,op);
+    while (val--) {
+      GETPARAM(offs);
+      PUSH(frm+offs);
+    } /* while */
+    NEXT(cip,op);
+  op_pushrm_p_c:
+    GETPARAM_P(val,op);
+    while (val--) {
+      GETPARAM(offs);
+      PUSH(data+offs);
+    } /* while */
+    NEXT(cip,op);
+  op_pushrm_p_s:
+    GETPARAM_P(val,op);
+    while (val--) {
+      GETPARAM(offs);
+      PUSH(data+_R(data,frm+offs));
+    } /* while */
+    NEXT(cip,op);
+  op_pushrm_p_adr:
+    GETPARAM_P(val,op);
+    while (val--) {
+      GETPARAM(offs);
+      PUSH(data+frm+offs);
+    } /* while */
+    NEXT(cip,op);
+  op_stack_p:
+    GETPARAM_P(offs,op);
+    alt=stk;
+    stk+=offs;
+    CHKMARGIN();
+    CHKSTACK();
+    NEXT(cip,op);
+  op_heap_p:
+    GETPARAM_P(offs,op);
+    alt=hea;
+    hea+=offs;
+    CHKMARGIN();
+    CHKHEAP();
+    NEXT(cip,op);
+  op_shl_p_c_pri:
+    GETPARAM_P(offs,op);
+    pri<<=offs;
+    NEXT(cip,op);
+  op_shl_p_c_alt:
+    GETPARAM_P(offs,op);
+    alt<<=offs;
+    NEXT(cip,op);
+  op_add_p_c:
+    GETPARAM_P(offs,op);
+    pri+=offs;
+    NEXT(cip,op);
+  op_smul_p_c:
+    GETPARAM_P(offs,op);
+    pri*=offs;
+    NEXT(cip,op);
+  op_zero_p:
+    GETPARAM_P(offs,op);
+    _W(data,offs,0);
+    NEXT(cip,op);
+  op_zero_p_s:
+    GETPARAM_P(offs,op);
+    _W(data,frm+offs,0);
+    NEXT(cip,op);
+  op_eq_p_c_pri:
+    GETPARAM_P(offs,op);
+    pri= pri==offs ? 1 : 0;
+    NEXT(cip,op);
+  op_eq_p_c_alt:
+    GETPARAM_P(offs,op);
+    pri= alt==offs ? 1 : 0;
+    NEXT(cip,op);
+  op_inc_p:
+    GETPARAM_P(offs,op);
+    #if defined _R_DEFAULT
+      *(cell *)(data+(int)offs) += 1;
+    #else
+      val=_R(data,offs);
+      _W(data,offs,val+1);
+    #endif
+    NEXT(cip,op);
+  op_inc_p_s:
+    GETPARAM_P(offs,op);
+    #if defined _R_DEFAULT
+      *(cell *)(data+(int)(frm+offs)) += 1;
+    #else
+      val=_R(data,frm+offs);
+      _W(data,frm+offs,val+1);
+    #endif
+    NEXT(cip,op);
+  op_dec_p:
+    GETPARAM_P(offs,op);
+    #if defined _R_DEFAULT
+      *(cell *)(data+(int)offs) -= 1;
+    #else
+      val=_R(data,offs);
+      _W(data,offs,val-1);
+    #endif
+    NEXT(cip,op);
+  op_dec_p_s:
+    GETPARAM_P(offs,op);
+    #if defined _R_DEFAULT
+      *(cell *)(data+(int)(frm+offs)) -= 1;
+    #else
+      val=_R(data,frm+offs);
+      _W(data,frm+offs,val-1);
+    #endif
+    NEXT(cip,op);
+  op_movs_p:
+    GETPARAM_P(offs,op);
+    goto __movs;
+  op_cmps_p:
+    GETPARAM_P(offs,op);
+    goto __cmps;
+  op_fill_p:
+    GETPARAM_P(offs,op);
+    goto __fill;
+  op_halt_p:
+    GETPARAM_P(offs,op);
+    goto __halt;
+  op_bounds_p:
+    GETPARAM_P(offs,op);
+    if ((ucell)pri>(ucell)offs) {
+      amx->cip=(cell)((unsigned char *)cip-amx->code);
+      ABORT(amx,AMX_ERR_BOUNDS);
+    } /* if */
+    NEXT(cip,op);
+#endif
+}
+
+void amx_exec_list(const AMX *amx,const cell **opcodelist,int *numopcodes)
+{
+  /* since the opcode list of the GNU GCC version of the abstract machine core
+   * must be a local variable (as it references code labels, which are local
+   * too), we use a trick to get the opcode list: call amx_Exec() while a
+   * special flags value is set in the AMX header.
+   */
+   int orgflags;
+   AMX *amxptr=(AMX*)amx;
+
+   assert(amx!=NULL);
+   assert(opcodelist!=NULL);
+   assert(numopcodes!=NULL);
+   orgflags=amx->flags;
+   amxptr->flags=~0;
+   *numopcodes=amx_exec_run(amxptr, (cell*)opcodelist, NULL);
+   amxptr->flags=orgflags;
+}
diff --git a/apps/openmw-mp/amx/amxfile.c b/apps/openmw-mp/amx/amxfile.c
new file mode 100644
index 000000000..4e0f37818
--- /dev/null
+++ b/apps/openmw-mp/amx/amxfile.c
@@ -0,0 +1,1274 @@
+/* Text file I/O module for the Pawn Abstract Machine
+ *
+ *  Copyright (c) ITB CompuPhase, 2003-2015
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ *  use this file except in compliance with the License. You may obtain a copy
+ *  of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ *
+ *  Version: $Id: amxfile.c 5181 2015-01-21 09:44:28Z thiadmer $
+ */
+#if defined _UNICODE || defined __UNICODE__ || defined UNICODE
+# if !defined UNICODE   /* for Windows */
+#   define UNICODE
+# endif
+# if !defined _UNICODE  /* for C library */
+#   define _UNICODE
+# endif
+#endif
+
+#include <assert.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <sys/stat.h>
+#include "osdefs.h"
+
+#if defined __BORLANDC__
+#include <dir.h>
+#endif
+#if defined __BORLANDC__ || defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined MACOS || defined __APPLE__
+
+#include <utime.h>
+#include <unistd.h>
+
+#else
+#include <sys/utime.h>
+#endif
+#if defined __WIN32__ || defined __MSDOS__
+#include <malloc.h>
+#endif
+#if defined __WATCOMC__ || defined _MSC_VER
+#include <direct.h>
+#endif
+#if defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined MACOS || defined __APPLE__
+
+#include <dirent.h>
+
+#else
+#include <io.h>
+#endif
+
+#include "amx.h"
+
+#if defined __WIN32__ || defined _Windows
+#include <windows.h>
+#endif
+
+#include "fpattern.c"
+
+#if !defined AMXFILE_VAR
+#define AMXFILE_VAR   "AMXFILE"
+#endif
+
+#if !defined sizearray
+#define sizearray(a)  (sizeof(a)/sizeof((a)[0]))
+#endif
+
+#if defined _UNICODE
+#include <tchar.h>
+#elif !defined __T
+typedef char TCHAR;
+#define __T(string)   string
+#define _tchmod       chmod
+#define _tcscat       strcat
+#define _tcschr       strchr
+#define _tcscmp       strcmp
+#define _tcscpy       strcpy
+#define _tcsdup       strdup
+#define _tcslen       strlen
+#define _tcsncpy      strncpy
+#define _tcsnicmp     strnicmp
+#define _tcspbrk      strpbrk
+#define _tcsrchr      strrchr
+#define _tcstol       strtol
+#define _tfopen       fopen
+#define _tfputs       fputs
+#define _tgetenv      getenv
+#define _tremove      remove
+#define _trename      rename
+#if defined __APPLE__
+#define _tmkdir     mkdir
+#define _trmdir     rmdir
+#define _tstat      stat
+#define _tutime     utime
+#else
+#define _tmkdir     mkdir
+#define _trmdir     rmdir
+#define _tstat      stat
+#define _tutime     utime
+#endif
+#endif
+#if !(defined __WIN32__ || defined _WIN32 || defined WIN32)
+#define _stat(n, b)  stat(n,b)
+#endif
+#if !defined S_ISDIR
+#define S_ISDIR(mode) (((mode) & _S_IFDIR) != 0)
+#endif
+
+#include "minIni.h"
+
+enum filemode
+{
+    io_read, /* file must exist */
+            io_write, /* creates a new file */
+            io_readwrite, /* file must exist */
+            io_append,    /* file must exist, opened for writing only and seek to the end */
+};
+
+enum seek_whence
+{
+    seek_start,
+    seek_current,
+    seek_end,
+};
+
+
+/* This function only stores unpacked strings. UTF-8 is used for
+ * Unicode, and packed strings can only store 7-bit and 8-bit
+ * character sets (ASCII, Latin-1).
+ */
+static size_t fgets_cell(FILE *fp, cell *string, size_t max, int utf8mode)
+{
+    size_t index;
+    fpos_t pos;
+    cell c;
+    int follow, lastcr;
+    cell lowmark;
+
+    assert(sizeof(cell) >= 4);
+    assert(fp != NULL);
+    assert(string != NULL);
+    if (max == 0)
+        return 0;
+
+    /* get the position, in case we have to back up */
+    fgetpos(fp, &pos);
+
+    index = 0;
+    follow = 0;
+    lowmark = 0;
+    lastcr = 0;
+    for (; ;)
+    {
+        assert(index < max);
+        if (index == max - 1)
+            break;                    /* string fully filled */
+        if ((c = fgetc(fp)) == EOF)
+        {
+            if (!utf8mode || follow == 0)
+                break;                  /* no more characters */
+            /* If an EOF happened halfway an UTF-8 code, the string cannot be
+             * UTF-8 mode, and we must restart.
+             */
+            index = 0;
+            fsetpos(fp, &pos);
+            continue;
+        } /* if */
+
+        /* 8-bit characters are unsigned */
+        if (c < 0)
+            c = -c;
+
+        if (utf8mode)
+        {
+            if (follow > 0 && (c & 0xc0) == 0x80)
+            {
+                /* leader code is active, combine with earlier code */
+                string[index] = (string[index] << 6) | ((unsigned char) c & 0x3f);
+                if (--follow == 0)
+                {
+                    /* encoding a character in more bytes than is strictly needed,
+                     * is not really valid UTF-8; we are strict here to increase
+                     * the chance of heuristic dectection of non-UTF-8 text
+                     * (JAVA writes zero bytes as a 2-byte code UTF-8, which is invalid)
+                     */
+                    if (string[index] < lowmark)
+                        utf8mode = 0;
+                    /* the code positions 0xd800--0xdfff and 0xfffe & 0xffff do not
+                     * exist in UCS-4 (and hence, they do not exist in Unicode)
+                     */
+                    if (string[index] >= 0xd800 && string[index] <= 0xdfff
+                        || string[index] == 0xfffe || string[index] == 0xffff)
+                        utf8mode = 0;
+                    index++;
+                } /* if */
+            } else if (follow == 0 && (c & 0x80) == 0x80)
+            {
+                /* UTF-8 leader code */
+                if ((c & 0xe0) == 0xc0)
+                {
+                    /* 110xxxxx 10xxxxxx */
+                    follow = 1;
+                    lowmark = 0x80;
+                    string[index] = c & 0x1f;
+                } else if ((c & 0xf0) == 0xe0)
+                {
+                    /* 1110xxxx 10xxxxxx 10xxxxxx (16 bits, BMP plane) */
+                    follow = 2;
+                    lowmark = 0x800;
+                    string[index] = c & 0x0f;
+                } else if ((c & 0xf8) == 0xf0)
+                {
+                    /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
+                    follow = 3;
+                    lowmark = 0x10000;
+                    string[index] = c & 0x07;
+                } else if ((c & 0xfc) == 0xf8)
+                {
+                    /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */
+                    follow = 4;
+                    lowmark = 0x200000;
+                    string[index] = c & 0x03;
+                } else if ((c & 0xfe) == 0xfc)
+                {
+                    /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx (31 bits) */
+                    follow = 5;
+                    lowmark = 0x4000000;
+                    string[index] = c & 0x01;
+                } else
+                {
+                    /* this is invalid UTF-8 */
+                    utf8mode = 0;
+                } /* if */
+            } else if (follow == 0 && (c & 0x80) == 0x00)
+            {
+                /* 0xxxxxxx (US-ASCII) */
+                string[index++] = c;
+                if (c == __T('\n'))
+                    break;        /* read newline, done */
+            } else
+            {
+                /* this is invalid UTF-8 */
+                utf8mode = 0;
+            } /* if */
+            if (!utf8mode)
+            {
+                /* UTF-8 mode was switched just off, which means that non-conforming
+                 * UTF-8 codes were found, which means in turn that the string is
+                 * probably not intended as UTF-8; start over again
+                 */
+                index = 0;
+                fsetpos(fp, &pos);
+            } /* if */
+        } else
+        {
+            string[index++] = c;
+            if (c == __T('\n'))
+            {
+                break;                  /* read newline, done */
+            } else if (lastcr)
+            {
+                ungetc(c, fp);           /* carriage return was read, no newline follows */
+                break;
+            } /* if */
+            lastcr = (c == __T('\r'));
+        } /* if */
+    } /* for */
+    assert(index < max);
+    string[index] = __T('\0');
+
+    return index;
+}
+
+static size_t fputs_cell(FILE *fp, cell *string, int utf8mode)
+{
+    size_t count = 0;
+
+    assert(sizeof(cell) >= 4);
+    assert(fp != NULL);
+    assert(string != NULL);
+
+    while (*string != 0)
+    {
+        if (utf8mode)
+        {
+            cell c = *string;
+            if (c < 0x80)
+            {
+                /* 0xxxxxxx */
+                fputc((unsigned char) c, fp);
+            } else if (c < 0x800)
+            {
+                /* 110xxxxx 10xxxxxx */
+                fputc((unsigned char) ((c >> 6) & 0x1f | 0xc0), fp);
+                fputc((unsigned char) (c & 0x3f | 0x80), fp);
+            } else if (c < 0x10000)
+            {
+                /* 1110xxxx 10xxxxxx 10xxxxxx (16 bits, BMP plane) */
+                fputc((unsigned char) ((c >> 12) & 0x0f | 0xe0), fp);
+                fputc((unsigned char) ((c >> 6) & 0x3f | 0x80), fp);
+                fputc((unsigned char) (c & 0x3f | 0x80), fp);
+            } else if (c < 0x200000)
+            {
+                /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
+                fputc((unsigned char) ((c >> 18) & 0x07 | 0xf0), fp);
+                fputc((unsigned char) ((c >> 12) & 0x3f | 0x80), fp);
+                fputc((unsigned char) ((c >> 6) & 0x3f | 0x80), fp);
+                fputc((unsigned char) (c & 0x3f | 0x80), fp);
+            } else if (c < 0x4000000)
+            {
+                /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */
+                fputc((unsigned char) ((c >> 24) & 0x03 | 0xf8), fp);
+                fputc((unsigned char) ((c >> 18) & 0x3f | 0x80), fp);
+                fputc((unsigned char) ((c >> 12) & 0x3f | 0x80), fp);
+                fputc((unsigned char) ((c >> 6) & 0x3f | 0x80), fp);
+                fputc((unsigned char) (c & 0x3f | 0x80), fp);
+            } else
+            {
+                /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx (31 bits) */
+                fputc((unsigned char) ((c >> 30) & 0x01 | 0xfc), fp);
+                fputc((unsigned char) ((c >> 24) & 0x3f | 0x80), fp);
+                fputc((unsigned char) ((c >> 18) & 0x3f | 0x80), fp);
+                fputc((unsigned char) ((c >> 12) & 0x3f | 0x80), fp);
+                fputc((unsigned char) ((c >> 6) & 0x3f | 0x80), fp);
+                fputc((unsigned char) (c & 0x3f | 0x80), fp);
+            } /* if */
+        } else
+        {
+            /* not UTF-8 mode */
+            fputc((unsigned char) *string, fp);
+        } /* if */
+        string++;
+        count++;
+    } /* while */
+    return count;
+}
+
+static size_t fgets_char(FILE *fp, char *string, size_t max)
+{
+    size_t index;
+    int c, lastcr;
+
+    index = 0;
+    lastcr = 0;
+    for (; ;)
+    {
+        assert(index < max);
+        if (index == max - 1)
+            break;                    /* string fully filled */
+        if ((c = fgetc(fp)) == EOF)
+            break;                    /* no more characters */
+        string[index++] = (char) c;
+        if (c == __T('\n'))
+        {
+            break;                    /* read newline, done */
+        } else if (lastcr)
+        {
+            ungetc(c, fp);             /* carriage return was read, no newline follows */
+            break;
+        } /* if */
+        lastcr = (c == __T('\r'));
+    } /* for */
+    assert(index < max);
+    string[index] = __T('\0');
+
+    return index;
+}
+
+#if (defined __WIN32__ || defined _WIN32 || defined WIN32) && _MSC_VER < 1500
+#if defined _UNICODE
+wchar_t *_wgetenv(wchar_t *name)
+{
+static wchar_t buffer[_MAX_PATH];
+  buffer[0]=L'\0';
+  GetEnvironmentVariable(name,buffer,sizearray(buffer));
+  return buffer[0]!=L'\0' ? buffer : NULL;
+}
+#else
+char *getenv(const char *name)
+{
+static char buffer[_MAX_PATH];
+  buffer[0]='\0';
+  GetEnvironmentVariable(name,buffer,sizearray(buffer));
+  return buffer[0]!='\0' ? buffer : NULL;
+}
+#endif
+#endif
+
+static char *completename(TCHAR *dest, TCHAR *src, size_t size)
+{
+#if defined AMXFILE_VAR
+    TCHAR *prefix, *ptr;
+    size_t len;
+
+    /* only files below a specific path are accessible */
+    prefix = getenv(AMXFILE_VAR);
+
+    /* if no specific path for files is present, use the "temporary" path */
+    if (prefix == NULL)
+        prefix = getenv(__T("tmp"));    /* common under Windows and Unix */
+    if (prefix == NULL)
+        prefix = getenv(__T("temp"));   /* common under Windows */
+    if (prefix == NULL)
+        prefix = getenv(__T("tmpdir")); /* common under Unix */
+
+    /* if no path for files is defined, and no temporary directory exists,
+     * fail the function; this is for security reasons.
+     */
+    if (prefix == NULL)
+        return NULL;
+
+    if (_tcslen(prefix) + 1 >= size) /* +1 because directory separator is appended */
+        return NULL;
+    _tcscpy(dest, prefix);
+    /* append a directory separator (if not already present) */
+    len = _tcslen(dest);
+    if (len == 0)
+        return NULL;              /* empty start directory is not allowed */
+    if (dest[len - 1] != __T(DIRSEP_CHAR) && dest[len - 1] != __T('/') && len + 1 < size)
+    {
+        dest[len] = __T(DIRSEP_CHAR);
+        dest[len + 1] = __T('\0');
+    } /* if */
+    assert(_tcslen(dest) < size);
+
+    /* for DOS/Windows and Unix/Linux, skip everyting up to a comma, because
+     * this is used to indicate a protocol (e.g. file://C:/myfile.txt)
+     */
+#if DIRSEP_CHAR != ':'
+    if ((ptr = _tcsrchr(src, __T(':'))) != NULL)
+    {
+        src = ptr + 1;              /* skip protocol/drive and colon */
+        /* a "drive" specifier is sometimes ended with a vertical bar instead
+         * of a colon in URL specifications
+         */
+        if ((ptr = _tcschr(src, __T('|'))) != NULL)
+            src = ptr + 1;            /* skip drive and vertical bar */
+        while (src[0] == __T(DIRSEP_CHAR) || src[0] == __T('/'))
+            src++;                /* skip slashes behind the protocol/drive letter */
+    } /* if */
+#endif
+
+    /* skip an initial backslash or a drive specifier in the source */
+    if ((src[0] == __T(DIRSEP_CHAR) || src[0] == __T('/')) && (src[1] == __T(DIRSEP_CHAR) || src[1] == __T('/')))
+    {
+        /* UNC path */
+        char separators[] = {__T(DIRSEP_CHAR), __T('/'), __T('\0')};
+        src += 2;
+        ptr = _tcspbrk(src, separators);
+        if (ptr != NULL)
+            src = ptr + 1;
+    } else if (src[0] == __T(DIRSEP_CHAR) || src[0] == __T('/'))
+    {
+        /* simple path starting from the root directory */
+        src++;
+    } /* if */
+
+    /* disallow any "../" specifications in the source path
+     * (the check below should be stricter, but directory names with
+     * trailing periods are rare anyway)
+     */
+    for (ptr = src; *ptr != __T('\0'); ptr++)
+        if (ptr[0] == __T('.') && (ptr[1] == __T(DIRSEP_CHAR) || ptr[1] == __T('/')))
+            return NULL;            /* path name is not allowed */
+
+    /* concatenate the drive letter to the destination path */
+    if (_tcslen(dest) + _tcslen(src) >= size)
+        return NULL;
+    _tcscat(dest, src);
+
+    /* change forward slashes into proper directory separators */
+#if DIRSEP_CHAR != '/'
+    while ((ptr=_tcschr(dest,__T('/')))!=NULL)
+      *ptr=__T(DIRSEP_CHAR);
+#endif
+    return dest;
+
+#else
+    if (_tcslen(src)>=size)
+      return NULL;
+    _tcscpy(dest,src);
+    /* change forward slashes into proper directory separators */
+#if DIRSEP_CHAR!='/'
+      while ((ptr=_tcschr(dest,__T('/')))!=NULL)
+        *ptr=__T(DIRSEP_CHAR);
+#endif
+    return dest;
+#endif
+}
+
+/* File: fopen(const name[], filemode: mode) */
+static cell AMX_NATIVE_CALL n_fopen(AMX *amx, const cell *params)
+{
+    TCHAR *attrib, *altattrib;
+    TCHAR *name, fullname[_MAX_PATH];
+    FILE *f = NULL;
+
+    (void) amx;
+    altattrib = NULL;
+    switch (params[2] & 0x7fff)
+    {
+        case io_read:
+            attrib = __T("rb");
+            break;
+        case io_write:
+            attrib = __T("wb");
+            break;
+        case io_readwrite:
+            attrib = __T("r+b");
+            altattrib = __T("w+b");
+            break;
+        case io_append:
+            attrib = __T("ab");
+            break;
+        default:
+            return 0;
+    } /* switch */
+
+    /* get the filename */
+    amx_StrParam(amx, params[1], name);
+    if (name != NULL && completename(fullname, name, sizearray(fullname)) != NULL)
+    {
+        f = _tfopen(fullname, attrib);
+        if (f == NULL && altattrib != NULL)
+            f = _tfopen(fullname, altattrib);
+    } /* if */
+
+    return (cell) f;
+}
+
+/* fclose(File: handle) */
+static cell AMX_NATIVE_CALL n_fclose(AMX *amx, const cell *params)
+{
+    (void) amx;
+    return fclose((FILE *) params[1]) == 0;
+}
+
+/* fwrite(File: handle, const string[]) */
+static cell AMX_NATIVE_CALL n_fwrite(AMX *amx, const cell *params)
+{
+    size_t r = 0;
+    cell *cptr;
+    char *str;
+    int len;
+
+    (void) amx;
+    cptr = amx_Address(amx, params[2]);
+    amx_StrLen(cptr, &len);
+    if (len == 0)
+        return 0;
+
+    if ((ucell) *cptr > UNPACKEDMAX)
+    {
+        /* the string is packed, write it as an ASCII/ANSI string */
+        if ((str = (char *) alloca(len + 1)) != NULL)
+        {
+            amx_GetString(str, cptr, 0, len);
+            r = fputs(str, (FILE *) params[1]);
+        } /* if */
+    } else
+    {
+        /* the string is unpacked, write it as UTF-8 */
+        r = fputs_cell((FILE *) params[1], cptr, 1);
+    } /* if */
+    return (cell) r;
+}
+
+/* fread(File: handle, string[], size=sizeof string, bool:pack=false) */
+static cell AMX_NATIVE_CALL n_fread(AMX *amx, const cell *params)
+{
+    size_t chars;
+    int max;
+    char *str;
+    cell *cptr;
+
+    max = (int) params[3];
+    if (max <= 0)
+        return 0;
+    if (params[4])
+        max *= sizeof(cell);
+
+    cptr = amx_Address(amx, params[2]);
+    str = (char *) alloca(max);
+    if (str == NULL || cptr == NULL)
+    {
+        amx_RaiseError(amx, AMX_ERR_NATIVE);
+        return 0;
+    } /* if */
+
+    if (params[4])
+    {
+        /* store as packed string, read an ASCII/ANSI string */
+        chars = fgets_char((FILE *) params[1], str, max);
+        assert(chars < max);
+        amx_SetString(cptr, str, 1, 0, max);
+    } else
+    {
+        /* store and unpacked string, interpret UTF-8 */
+        chars = fgets_cell((FILE *) params[1], cptr, max, 1);
+    } /* if */
+
+    assert((int) chars < max);
+    return (cell) chars;
+}
+
+/* fputchar(File: handle, value, bool:utf8 = true) */
+static cell AMX_NATIVE_CALL n_fputchar(AMX *amx, const cell *params)
+{
+    size_t result = 0;
+
+    (void) amx;
+    if (params[3])
+    {
+        cell str[2];
+        str[0] = params[2];
+        str[1] = 0;
+        result = fputs_cell((FILE *) params[1], str, 1);
+    } else
+    {
+        fputc((int) params[2], (FILE *) params[1]);
+    } /* if */
+    assert(result == 0 || result == 1);
+    return (cell) result;
+}
+
+/* fgetchar(File: handle, bool:utf8 = true) */
+static cell AMX_NATIVE_CALL n_fgetchar(AMX *amx, const cell *params)
+{
+    cell str[2];
+    size_t result;
+
+    (void) amx;
+    if (params[2])
+    {
+        result = fgets_cell((FILE *) params[1], str, 2, 1);
+    } else
+    {
+        str[0] = fgetc((FILE *) params[1]);
+        result = (str[0] != EOF);
+    } /* if */
+    assert(result == 0 || result == 1);
+    if (result == 0)
+        return EOF;
+    else
+        return str[0];
+}
+
+#if PAWN_CELL_SIZE == 16
+#define aligncell amx_Align16
+#elif PAWN_CELL_SIZE == 32
+#define aligncell amx_Align32
+#elif PAWN_CELL_SIZE == 64 && (defined _I64_MAX || defined HAVE_I64)
+#define aligncell amx_Align64
+#else
+#error Unsupported cell size
+#endif
+
+/* fblockwrite(File: handle, buffer[], size=sizeof buffer) */
+static cell AMX_NATIVE_CALL n_fblockwrite(AMX *amx, const cell *params)
+{
+    cell *cptr;
+    cell count = 0;
+
+    (void) amx;
+    cptr = amx_Address(amx, params[2]);
+    if (cptr != NULL)
+    {
+        cell max = params[3];
+        ucell v;
+        for (count = 0; count < max; count++)
+        {
+            v = (ucell) *cptr++;
+            if (fwrite(aligncell(&v), sizeof(cell), 1, (FILE *) params[1]) != 1)
+                break;          /* write error */
+        } /* for */
+    } /* if */
+    return count;
+}
+
+/* fblockread(File: handle, buffer[], size=sizeof buffer) */
+static cell AMX_NATIVE_CALL n_fblockread(AMX *amx, const cell *params)
+{
+    cell *cptr;
+    cell count = 0;
+
+    (void) amx;
+    cptr = amx_Address(amx, params[2]);
+    if (cptr != NULL)
+    {
+        cell max = params[3];
+        ucell v;
+        for (count = 0; count < max; count++)
+        {
+            if (fread(&v, sizeof(cell), 1, (FILE *) params[1]) != 1)
+                break;          /* write error */
+            *cptr++ = (cell) *aligncell(&v);
+        } /* for */
+    } /* if */
+    return count;
+}
+
+/* File: ftemp() */
+static cell AMX_NATIVE_CALL n_ftemp(AMX *amx, const cell *params)
+{
+    (void) amx;
+    (void) params;
+    return (cell) tmpfile();
+}
+
+/* fseek(File: handle, position, seek_whence: whence=seek_start) */
+static cell AMX_NATIVE_CALL n_fseek(AMX *amx, const cell *params)
+{
+    int whence;
+    (void) amx;
+    switch (params[3])
+    {
+        case seek_start:
+            whence = SEEK_SET;
+            break;
+        case seek_current:
+            whence = SEEK_CUR;
+            break;
+        case seek_end:
+            whence = SEEK_END;
+            //if (params[2]>0)
+            //  params[2]=-params[2];
+            break;
+        default:
+            return 0;
+    } /* switch */
+    return lseek(fileno((FILE *) params[1]), params[2], whence);
+}
+
+/* bool: fremove(const name[]) */
+static cell AMX_NATIVE_CALL n_fremove(AMX *amx, const cell *params)
+{
+    int r = 1;
+    TCHAR *name, fullname[_MAX_PATH];
+
+    (void) amx;
+    amx_StrParam(amx, params[1], name);
+    if (name != NULL && completename(fullname, name, sizearray(fullname)) != NULL)
+    {
+        /* if this is a directory, try _trmdir() */
+        struct stat stbuf;
+        _tstat(fullname, &stbuf);
+        if (S_ISDIR(stbuf.st_mode))
+            r = _trmdir(fullname);
+        else
+            r = _tremove(fullname);
+    } /* if */
+    return r == 0;
+}
+
+/* bool: fcopy(const source[], const target[]) */
+static cell AMX_NATIVE_CALL n_fcopy(AMX *amx, const cell *params)
+{
+    int r = 1;
+    TCHAR *name, oldname[_MAX_PATH], newname[_MAX_PATH];
+
+    (void) amx;
+    amx_StrParam(amx, params[1], name);
+    if (name != NULL && completename(oldname, name, sizearray(oldname)) != NULL)
+    {
+        amx_StrParam(amx, params[2], name);
+        if (name != NULL && completename(newname, name, sizearray(newname)) != NULL)
+        {
+#if defined __WIN32__
+            r= CopyFile(oldname,newname,FALSE)==FALSE;
+#else
+            TCHAR cmd[2 * _MAX_PATH + 10];
+            sprintf(cmd, "cp %s %s", oldname, newname);
+            r = system(cmd) < 0;
+#endif
+        } /* if */
+    } /* if */
+    return r == 0;
+}
+
+/* bool: frename(const oldname[], const newname[]) */
+static cell AMX_NATIVE_CALL n_frename(AMX *amx, const cell *params)
+{
+    int r = 1;
+    TCHAR *name, oldname[_MAX_PATH], newname[_MAX_PATH];
+
+    (void) amx;
+    amx_StrParam(amx, params[1], name);
+    if (name != NULL && completename(oldname, name, sizearray(oldname)) != NULL)
+    {
+        amx_StrParam(amx, params[2], name);
+        if (name != NULL && completename(newname, name, sizearray(newname)) != NULL)
+            r = _trename(oldname, newname);
+    } /* if */
+    return r == 0;
+}
+
+/* flength(File: handle) */
+static cell AMX_NATIVE_CALL n_flength(AMX *amx, const cell *params)
+{
+    long l, c;
+    int fn = fileno((FILE *) params[1]);
+    c = lseek(fn, 0, SEEK_CUR); /* save the current position */
+    l = lseek(fn, 0, SEEK_END); /* return the file position at its end */
+    lseek(fn, c, SEEK_SET);   /* restore the file pointer */
+    (void) amx;
+    return l;
+}
+
+static int match_optcopy(TCHAR *out, int outlen, const TCHAR *in, int skip)
+{
+    if (out == NULL || skip != 0 || outlen <= 0)
+        return 0;
+    _tcsncpy(out, in, outlen);
+    out[outlen - 1] = '\0';
+    return 1;
+}
+
+static int matchfiles(const TCHAR *path, int skip, TCHAR *out, int outlen)
+{
+    int count = 0;
+    const TCHAR *basename;
+#if DIRSEP_CHAR != '/'
+    TCHAR *ptr;
+#endif
+#if defined __WIN32__
+    HANDLE hfind;
+    WIN32_FIND_DATA fd;
+#else
+    /* assume LINUX, FreeBSD, OpenBSD, or some other variant */
+    DIR *dir;
+    struct dirent *entry;
+    TCHAR dirname[_MAX_PATH];
+#endif
+
+    basename = _tcsrchr(path, DIRSEP_CHAR);
+    basename = (basename == NULL) ? path : basename + 1;
+#if DIRSEP_CHAR != '/'
+    ptr=_tcsrchr(basename,DIRSEP_CHAR);
+    basename=(ptr==NULL) ? basename : ptr+1;
+#endif
+
+#if defined __WIN32__
+    if ((hfind=FindFirstFile(path,&fd))!=INVALID_HANDLE_VALUE) {
+      do {
+        if (fpattern_match(basename,fd.cFileName,-1,FALSE)) {
+          count++;
+          if (match_optcopy(out,outlen,fd.cFileName,skip--))
+            break;
+        } /* if */
+      } while (FindNextFile(hfind,&fd));
+      FindClose(hfind);
+    } /* if */
+#else
+    /* copy directory part only (zero-terminate) */
+    if (basename == path)
+    {
+        _tcscpy(dirname, ".");
+    } else
+    {
+        _tcsncpy(dirname, path, (int) (basename - path));
+        dirname[(int) (basename - path)] = __T('\0');
+    } /* if */
+    if ((dir = opendir(dirname)) != NULL)
+    {
+        while ((entry = readdir(dir)) != NULL)
+        {
+            if (fpattern_match(basename, entry->d_name, -1, TRUE))
+            {
+                count++;
+                if (match_optcopy(out, outlen, entry->d_name, skip--))
+                    break;
+            } /* if */
+        } /* while */
+        closedir(dir);
+    } /* if */
+#endif
+    return count;
+}
+
+/* fexist(const pattern[]) */
+static cell AMX_NATIVE_CALL n_fexist(AMX *amx, const cell *params)
+{
+    int r = 0;
+    TCHAR *name, fullname[_MAX_PATH];
+
+    (void) amx;
+    amx_StrParam(amx, params[1], name);
+    if (name != NULL && completename(fullname, name, sizearray(fullname)) != NULL)
+        r = matchfiles(fullname, 0, NULL, 0);
+    return r;
+}
+
+/* bool: fmatch(filename[], const pattern[], index=0, maxlength=sizeof filename) */
+static cell AMX_NATIVE_CALL n_fmatch(AMX *amx, const cell *params)
+{
+    TCHAR *name, fullname[_MAX_PATH] = "";
+    cell *cptr;
+
+    (void) amx;
+    amx_StrParam(amx, params[2], name);
+    if (name != NULL && completename(fullname, name, sizearray(fullname)) != NULL)
+    {
+        if (!matchfiles(fullname, params[3], fullname, sizearray(fullname)))
+        {
+            fullname[0] = '\0';
+        } else
+        {
+            /* copy the string into the destination */
+            cptr = amx_Address(amx, params[1]);
+            amx_SetString(cptr, fullname, 1, 0, params[4]);
+        } /* if */
+    } /* if */
+    return fullname[0] != '\0';
+}
+
+/* bool: fstat(const name[], &size = 0, &timestamp = 0, &attrib = 0, &inode = 0) */
+static cell AMX_NATIVE_CALL n_fstat(AMX *amx, const cell *params)
+{
+    TCHAR *name, fullname[_MAX_PATH] = "";
+    cell *cptr;
+    int result = 0;
+
+    (void) amx;
+    amx_StrParam(amx, params[1], name);
+    if (name != NULL && completename(fullname, name, sizearray(fullname)) != NULL)
+    {
+        struct stat stbuf;
+        if (_tstat(name, &stbuf) == 0)
+        {
+            cptr = amx_Address(amx, params[2]);
+            *cptr = stbuf.st_size;
+            cptr = amx_Address(amx, params[3]);
+            *cptr = (cell) stbuf.st_mtime;
+            cptr = amx_Address(amx, params[4]);
+            *cptr = stbuf.st_mode;  /* mode/protection bits */
+            cptr = amx_Address(amx, params[5]);
+            *cptr = stbuf.st_ino;   /* inode number, unique id for a file */
+            result = 1;
+        } /* if */
+    } /* if */
+    return result;
+}
+
+/* bool: fattrib(const name[], timestamp=0, attrib=0x0f) */
+static cell AMX_NATIVE_CALL n_fattrib(AMX *amx, const cell *params)
+{
+#if !(defined __WIN32__ || defined _WIN32 || defined WIN32)
+#define _utime(n, t)  utime(n,t)
+#define _utimbuf     utimbuf
+#endif
+    TCHAR *name, fullname[_MAX_PATH] = "";
+    int result = 0;
+
+    (void) amx;
+    amx_StrParam(amx, params[1], name);
+    if (name != NULL && completename(fullname, name, sizearray(fullname)) != NULL)
+    {
+        result = 1;
+        if (params[2] != 0)
+        {
+            struct _utimbuf times;
+            times.actime = (unsigned long) params[2];
+            times.modtime = (unsigned long) params[2];
+            result = result && (_tutime(name, &times) == 0);
+        } /* if */
+        if (params[3] != 0x0f)
+            result = result && (_tchmod(name, (int) params[3]) == 0);
+    } /* if */
+    return result;
+}
+
+/* bool: fcreatedir(const name[]) */
+static cell AMX_NATIVE_CALL n_fcreatedir(AMX *amx, const cell *params)
+{
+    TCHAR *name, fullname[_MAX_PATH] = "";
+    int r = 1;
+
+    (void) amx;
+    amx_StrParam(amx, params[1], name);
+    if (name != NULL && completename(fullname, name, sizearray(fullname)) != NULL)
+    {
+#if defined __WIN32__ || defined __DOS__
+        r=_tmkdir(fullname);
+#else
+        r = _tmkdir(fullname, 0755);
+#endif
+    } /* if */
+    return r == 0;
+}
+
+/* CRC32 functions are adapted from source code from www.networkdls.com
+ * The table generation routines are replaced by a hard-coded table, which
+ * can be stored in Flash ROM.
+ */
+const unsigned long ulCRCTable[256] = // CRC Lookup Table Array
+        {
+                0x00000000Lu, 0x77073096Lu, 0xee0e612cLu, 0x990951baLu,
+                0x076dc419Lu, 0x706af48fLu, 0xe963a535Lu, 0x9e6495a3Lu,
+                0x0edb8832Lu, 0x79dcb8a4Lu, 0xe0d5e91eLu, 0x97d2d988Lu,
+                0x09b64c2bLu, 0x7eb17cbdLu, 0xe7b82d07Lu, 0x90bf1d91Lu,
+                0x1db71064Lu, 0x6ab020f2Lu, 0xf3b97148Lu, 0x84be41deLu,
+                0x1adad47dLu, 0x6ddde4ebLu, 0xf4d4b551Lu, 0x83d385c7Lu,
+                0x136c9856Lu, 0x646ba8c0Lu, 0xfd62f97aLu, 0x8a65c9ecLu,
+                0x14015c4fLu, 0x63066cd9Lu, 0xfa0f3d63Lu, 0x8d080df5Lu,
+                0x3b6e20c8Lu, 0x4c69105eLu, 0xd56041e4Lu, 0xa2677172Lu,
+                0x3c03e4d1Lu, 0x4b04d447Lu, 0xd20d85fdLu, 0xa50ab56bLu,
+                0x35b5a8faLu, 0x42b2986cLu, 0xdbbbc9d6Lu, 0xacbcf940Lu,
+                0x32d86ce3Lu, 0x45df5c75Lu, 0xdcd60dcfLu, 0xabd13d59Lu,
+                0x26d930acLu, 0x51de003aLu, 0xc8d75180Lu, 0xbfd06116Lu,
+                0x21b4f4b5Lu, 0x56b3c423Lu, 0xcfba9599Lu, 0xb8bda50fLu,
+                0x2802b89eLu, 0x5f058808Lu, 0xc60cd9b2Lu, 0xb10be924Lu,
+                0x2f6f7c87Lu, 0x58684c11Lu, 0xc1611dabLu, 0xb6662d3dLu,
+                0x76dc4190Lu, 0x01db7106Lu, 0x98d220bcLu, 0xefd5102aLu,
+                0x71b18589Lu, 0x06b6b51fLu, 0x9fbfe4a5Lu, 0xe8b8d433Lu,
+                0x7807c9a2Lu, 0x0f00f934Lu, 0x9609a88eLu, 0xe10e9818Lu,
+                0x7f6a0dbbLu, 0x086d3d2dLu, 0x91646c97Lu, 0xe6635c01Lu,
+                0x6b6b51f4Lu, 0x1c6c6162Lu, 0x856530d8Lu, 0xf262004eLu,
+                0x6c0695edLu, 0x1b01a57bLu, 0x8208f4c1Lu, 0xf50fc457Lu,
+                0x65b0d9c6Lu, 0x12b7e950Lu, 0x8bbeb8eaLu, 0xfcb9887cLu,
+                0x62dd1ddfLu, 0x15da2d49Lu, 0x8cd37cf3Lu, 0xfbd44c65Lu,
+                0x4db26158Lu, 0x3ab551ceLu, 0xa3bc0074Lu, 0xd4bb30e2Lu,
+                0x4adfa541Lu, 0x3dd895d7Lu, 0xa4d1c46dLu, 0xd3d6f4fbLu,
+                0x4369e96aLu, 0x346ed9fcLu, 0xad678846Lu, 0xda60b8d0Lu,
+                0x44042d73Lu, 0x33031de5Lu, 0xaa0a4c5fLu, 0xdd0d7cc9Lu,
+                0x5005713cLu, 0x270241aaLu, 0xbe0b1010Lu, 0xc90c2086Lu,
+                0x5768b525Lu, 0x206f85b3Lu, 0xb966d409Lu, 0xce61e49fLu,
+                0x5edef90eLu, 0x29d9c998Lu, 0xb0d09822Lu, 0xc7d7a8b4Lu,
+                0x59b33d17Lu, 0x2eb40d81Lu, 0xb7bd5c3bLu, 0xc0ba6cadLu,
+                0xedb88320Lu, 0x9abfb3b6Lu, 0x03b6e20cLu, 0x74b1d29aLu,
+                0xead54739Lu, 0x9dd277afLu, 0x04db2615Lu, 0x73dc1683Lu,
+                0xe3630b12Lu, 0x94643b84Lu, 0x0d6d6a3eLu, 0x7a6a5aa8Lu,
+                0xe40ecf0bLu, 0x9309ff9dLu, 0x0a00ae27Lu, 0x7d079eb1Lu,
+                0xf00f9344Lu, 0x8708a3d2Lu, 0x1e01f268Lu, 0x6906c2feLu,
+                0xf762575dLu, 0x806567cbLu, 0x196c3671Lu, 0x6e6b06e7Lu,
+                0xfed41b76Lu, 0x89d32be0Lu, 0x10da7a5aLu, 0x67dd4accLu,
+                0xf9b9df6fLu, 0x8ebeeff9Lu, 0x17b7be43Lu, 0x60b08ed5Lu,
+                0xd6d6a3e8Lu, 0xa1d1937eLu, 0x38d8c2c4Lu, 0x4fdff252Lu,
+                0xd1bb67f1Lu, 0xa6bc5767Lu, 0x3fb506ddLu, 0x48b2364bLu,
+                0xd80d2bdaLu, 0xaf0a1b4cLu, 0x36034af6Lu, 0x41047a60Lu,
+                0xdf60efc3Lu, 0xa867df55Lu, 0x316e8eefLu, 0x4669be79Lu,
+                0xcb61b38cLu, 0xbc66831aLu, 0x256fd2a0Lu, 0x5268e236Lu,
+                0xcc0c7795Lu, 0xbb0b4703Lu, 0x220216b9Lu, 0x5505262fLu,
+                0xc5ba3bbeLu, 0xb2bd0b28Lu, 0x2bb45a92Lu, 0x5cb36a04Lu,
+                0xc2d7ffa7Lu, 0xb5d0cf31Lu, 0x2cd99e8bLu, 0x5bdeae1dLu,
+                0x9b64c2b0Lu, 0xec63f226Lu, 0x756aa39cLu, 0x026d930aLu,
+                0x9c0906a9Lu, 0xeb0e363fLu, 0x72076785Lu, 0x05005713Lu,
+                0x95bf4a82Lu, 0xe2b87a14Lu, 0x7bb12baeLu, 0x0cb61b38Lu,
+                0x92d28e9bLu, 0xe5d5be0dLu, 0x7cdcefb7Lu, 0x0bdbdf21Lu,
+                0x86d3d2d4Lu, 0xf1d4e242Lu, 0x68ddb3f8Lu, 0x1fda836eLu,
+                0x81be16cdLu, 0xf6b9265bLu, 0x6fb077e1Lu, 0x18b74777Lu,
+                0x88085ae6Lu, 0xff0f6a70Lu, 0x66063bcaLu, 0x11010b5cLu,
+                0x8f659effLu, 0xf862ae69Lu, 0x616bffd3Lu, 0x166ccf45Lu,
+                0xa00ae278Lu, 0xd70dd2eeLu, 0x4e048354Lu, 0x3903b3c2Lu,
+                0xa7672661Lu, 0xd06016f7Lu, 0x4969474dLu, 0x3e6e77dbLu,
+                0xaed16a4aLu, 0xd9d65adcLu, 0x40df0b66Lu, 0x37d83bf0Lu,
+                0xa9bcae53Lu, 0xdebb9ec5Lu, 0x47b2cf7fLu, 0x30b5ffe9Lu,
+                0xbdbdf21cLu, 0xcabac28aLu, 0x53b39330Lu, 0x24b4a3a6Lu,
+                0xbad03605Lu, 0xcdd70693Lu, 0x54de5729Lu, 0x23d967bfLu,
+                0xb3667a2eLu, 0xc4614ab8Lu, 0x5d681b02Lu, 0x2a6f2b94Lu,
+                0xb40bbe37Lu, 0xc30c8ea1Lu, 0x5a05df1bLu, 0x2d02ef8dLu
+        };
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// This function uses the ulCRCTable lookup table to generate a CRC for xData
+
+static unsigned long PartialCRC(unsigned long ulCRC, unsigned char *sBuf, unsigned long lBufSz)
+{
+    while (lBufSz--)
+        ulCRC = (ulCRC >> 8) ^ ulCRCTable[(ulCRC & 0xFF) ^ *sBuf++];
+
+    return ulCRC;
+}
+
+/* filecrc(const name[]) */
+static cell AMX_NATIVE_CALL n_filecrc(AMX *amx, const cell *params)
+{
+    TCHAR *name, fullname[_MAX_PATH] = "";
+    FILE *fp;
+    unsigned char buffer[256];
+    unsigned long ulCRC = 0xffffffff;
+    size_t numread;
+
+    (void) amx;
+    amx_StrParam(amx, params[1], name);
+    if (name != NULL && completename(fullname, name, sizearray(fullname)) != NULL
+        && (fp = _tfopen(fullname, "rb")) != NULL)
+    {
+        do
+        {
+            numread = fread(buffer, sizeof(unsigned char), sizeof buffer, fp);
+            ulCRC = PartialCRC(ulCRC, buffer, (unsigned long) numread);
+        } while (numread == sizeof buffer);
+        fclose(fp);
+    } /* if */
+    return (ulCRC ^ 0xffffffff);
+}
+
+
+const TCHAR default_ini_name[] = "config.ini";
+
+/* readcfg(const filename[]="", const section[]="", const key[], value[], size=sizeof value, const defvalue[]="", bool:packed=false) */
+static cell AMX_NATIVE_CALL n_readcfg(AMX *amx, const cell *params)
+{
+    TCHAR *name, fullname[_MAX_PATH] = "";
+    TCHAR *section, *key, *defvalue;
+    TCHAR *buffer;
+    int size, result = 0;
+    cell *cptr;
+
+    size = (int) params[5];
+    if (size <= 0)
+        return 0;
+    if (params[7])
+        size *= sizeof(cell);
+
+    amx_StrParam(amx, params[1], name);
+    if (name != NULL && *name == '\0')
+        name = (TCHAR *) default_ini_name;
+    if (name != NULL && completename(fullname, name, sizearray(fullname)) != NULL)
+    {
+        amx_StrParam(amx, params[2], section);
+        amx_StrParam(amx, params[3], key);
+        amx_StrParam(amx, params[6], defvalue);
+
+        cptr = amx_Address(amx, params[4]);
+        buffer = (char *) alloca(size);
+        if (buffer == NULL || cptr == NULL)
+        {
+            amx_RaiseError(amx, AMX_ERR_NATIVE);
+            return 0;
+        } /* if */
+        result = ini_gets(section, key, defvalue, buffer, size, fullname);
+        amx_SetString(cptr, buffer, params[7], 0, size);
+    } /* if */
+    return result;
+}
+
+/* readcfgvalue(const filename[]="", const section[]="", const key[], defvalue=0) */
+static cell AMX_NATIVE_CALL n_readcfgvalue(AMX *amx, const cell *params)
+{
+    TCHAR *name, fullname[_MAX_PATH] = "";
+    TCHAR *section, *key;
+    long result = 0;
+
+    (void) amx;
+    amx_StrParam(amx, params[1], name);
+    if (name != NULL && *name == '\0')
+        name = (TCHAR *) default_ini_name;
+    if (name != NULL && completename(fullname, name, sizearray(fullname)) != NULL)
+    {
+        amx_StrParam(amx, params[2], section);
+        amx_StrParam(amx, params[3], key);
+        result = ini_getl(section, key, (long) params[4], fullname);
+    } /* if */
+    return result;
+}
+
+/* writecfg(const filename[]="", const section[]="", const key[], const value[]) */
+static cell AMX_NATIVE_CALL n_writecfg(AMX *amx, const cell *params)
+{
+    TCHAR *name, fullname[_MAX_PATH] = "";
+    TCHAR *section, *key, *value;
+    int result = 0;
+
+    (void) amx;
+    amx_StrParam(amx, params[1], name);
+    if (name != NULL && *name == '\0')
+        name = (TCHAR *) default_ini_name;
+    if (name != NULL && completename(fullname, name, sizearray(fullname)) != NULL)
+    {
+        amx_StrParam(amx, params[2], section);
+        amx_StrParam(amx, params[3], key);
+        amx_StrParam(amx, params[4], value);
+        result = ini_puts(section, key, value, fullname);
+    } /* if */
+    return result;
+}
+
+/* writecfgvalue(const filename[]="", const section[]="", const key[], value) */
+static cell AMX_NATIVE_CALL n_writecfgvalue(AMX *amx, const cell *params)
+{
+    TCHAR *name, fullname[_MAX_PATH] = "";
+    TCHAR *section, *key;
+    int result = 0;
+
+    (void) amx;
+    amx_StrParam(amx, params[1], name);
+    if (name != NULL && *name == '\0')
+        name = (TCHAR *) default_ini_name;
+    if (name != NULL && completename(fullname, name, sizearray(fullname)) != NULL)
+    {
+        amx_StrParam(amx, params[2], section);
+        amx_StrParam(amx, params[3], key);
+        result = ini_putl(section, key, (long) params[4], fullname);
+    } /* if */
+    return result;
+}
+
+/* deletecfg(const filename[]="", const section[]="", const key[]="") */
+static cell AMX_NATIVE_CALL n_deletecfg(AMX *amx, const cell *params)
+{
+    TCHAR *name, fullname[_MAX_PATH] = "";
+    TCHAR *section, *key;
+    int result = 0;
+
+    (void) amx;
+    amx_StrParam(amx, params[1], name);
+    if (name != NULL && *name == '\0')
+        name = (TCHAR *) default_ini_name;
+    if (name != NULL && completename(fullname, name, sizearray(fullname)) != NULL)
+    {
+        amx_StrParam(amx, params[2], section);
+        if (*section == '\0')
+            section = NULL;
+        amx_StrParam(amx, params[3], key);
+        if (*key == '\0')
+            key = NULL;
+        result = ini_puts(section, key, NULL, fullname);
+    } /* if */
+    return result;
+}
+
+#if defined __cplusplus
+extern "C"
+#endif
+AMX_NATIVE_INFO file_Natives[] = {
+        {"fopen",         n_fopen},
+        {"fclose",        n_fclose},
+        {"fwrite",        n_fwrite},
+        {"fread",         n_fread},
+        {"fputchar",      n_fputchar},
+        {"fgetchar",      n_fgetchar},
+        {"fblockwrite",   n_fblockwrite},
+        {"fblockread",    n_fblockread},
+        {"ftemp",         n_ftemp},
+        {"fseek",         n_fseek},
+        {"flength",       n_flength},
+        {"fremove",       n_fremove},
+        {"fcopy",         n_fcopy},
+        {"frename",       n_frename},
+        {"fexist",        n_fexist},
+        {"fmatch",        n_fmatch},
+        {"fstat",         n_fstat},
+        {"fattrib",       n_fattrib},
+        {"filecrc",       n_filecrc},
+        {"fcreatedir",    n_fcreatedir},
+        {"readcfg",       n_readcfg},
+        {"readcfgvalue",  n_readcfgvalue},
+        {"writecfg",      n_writecfg},
+        {"writecfgvalue", n_writecfgvalue},
+        {"deletecfg",     n_deletecfg},
+        {NULL, NULL}        /* terminator */
+};
+
+int AMXEXPORT AMXAPI amx_FileInit(AMX *amx)
+{
+    return amx_Register(amx, file_Natives, -1);
+}
+
+int AMXEXPORT AMXAPI amx_FileCleanup(AMX *amx)
+{
+    (void) amx;
+    return AMX_ERR_NONE;
+}
diff --git a/apps/openmw-mp/amx/amxfloat.c b/apps/openmw-mp/amx/amxfloat.c
new file mode 100644
index 000000000..48aa21b19
--- /dev/null
+++ b/apps/openmw-mp/amx/amxfloat.c
@@ -0,0 +1,379 @@
+/*  Float arithmetic for the Pawn Abstract Machine
+ *
+ *  Copyright (c) Artran, Inc. 1999
+ *  Written by Greg Garner (gmg@artran.com)
+ *  This file may be freely used. No warranties of any kind.
+ *
+ * CHANGES -
+ * 2002-08-27: Basic conversion of source from C++ to C by Adam D. Moss
+ *             <adam@gimp.org> <aspirin@icculus.org>
+ * 2003-08-29: Removal of the dynamic memory allocation and replacing two
+ *             type conversion functions by macros, by Thiadmer Riemersma
+ * 2003-09-22: Moved the type conversion macros to AMX.H, and simplifications
+ *             of some routines, by Thiadmer Riemersma
+ * 2003-11-24: A few more native functions (geometry), plus minor modifications,
+ *             mostly to be compatible with dynamically loadable extension
+ *             modules, by Thiadmer Riemersma
+ * 2004-01-09: Adaptions for 64-bit cells (using "double precision"), by
+ *             Thiadmer Riemersma
+ */
+#include <stdlib.h>     /* for atof() */
+#include <stdio.h>      /* for NULL */
+#include <assert.h>
+#include <math.h>
+#include "amx.h"
+
+/*
+  #if defined __BORLANDC__
+    #pragma resource "amxFloat.res"
+  #endif
+*/
+
+#if PAWN_CELL_SIZE==32
+  #define REAL          float
+#elif PAWN_CELL_SIZE==64
+  #define REAL          double
+#else
+  #error Unsupported cell size
+#endif
+
+#define PI  3.1415926535897932384626433832795
+
+/******************************************************************/
+static cell AMX_NATIVE_CALL n_float(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = integer value to convert to a float
+    */
+    REAL fValue;
+
+    (void)amx;
+    /* Convert to a float. Calls the compilers long to float conversion. */
+    fValue = (REAL) params[1];
+
+    /* Return the cell. */
+    return amx_ftoc(fValue);
+}
+
+/******************************************************************/
+static cell AMX_NATIVE_CALL n_strfloat(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = virtual string address to convert to a float
+    */
+    char szSource[60];
+    cell *pString;
+    REAL fNum;
+    int nLen;
+
+    (void)amx;
+    /* They should have sent us 1 cell. */
+    assert(params[0]/sizeof(cell)==1);
+
+    /* Get the real address of the string. */
+    pString=amx_Address(amx,params[1]);
+
+    /* Find out how long the string is in characters. */
+    amx_StrLen(pString, &nLen);
+    if (nLen == 0 || nLen >= sizeof szSource)
+        return 0;
+
+    /* Now convert the Pawn string into a C type null terminated string */
+    amx_GetString(szSource, pString, 0, sizeof szSource);
+
+    /* Now convert this to a float. */
+    fNum = (REAL)atof(szSource);
+
+    return amx_ftoc(fNum);
+}
+
+/******************************************************************/
+static cell AMX_NATIVE_CALL n_floatmul(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = float operand 1
+    *   params[2] = float operand 2
+    */
+    REAL fRes = amx_ctof(params[1]) * amx_ctof(params[2]);
+    (void)amx;
+    return amx_ftoc(fRes);
+}
+
+/******************************************************************/
+static cell AMX_NATIVE_CALL n_floatdiv(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = float dividend (top)
+    *   params[2] = float divisor (bottom)
+    */
+    REAL fRes = amx_ctof(params[1]) / amx_ctof(params[2]);
+    (void)amx;
+    return amx_ftoc(fRes);
+}
+
+/******************************************************************/
+static cell AMX_NATIVE_CALL n_floatadd(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = float operand 1
+    *   params[2] = float operand 2
+    */
+    REAL fRes = amx_ctof(params[1]) + amx_ctof(params[2]);
+    (void)amx;
+    return amx_ftoc(fRes);
+}
+
+/******************************************************************/
+static cell AMX_NATIVE_CALL n_floatsub(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = float operand 1
+    *   params[2] = float operand 2
+    */
+    REAL fRes = amx_ctof(params[1]) - amx_ctof(params[2]);
+    (void)amx;
+    return amx_ftoc(fRes);
+}
+
+/******************************************************************/
+/* Return fractional part of float */
+static cell AMX_NATIVE_CALL n_floatfract(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = float operand
+    */
+    REAL fA = amx_ctof(params[1]);
+    fA = fA - (REAL)(floor((double)fA));
+    (void)amx;
+    return amx_ftoc(fA);
+}
+
+/******************************************************************/
+/* Return integer part of float, rounded */
+static cell AMX_NATIVE_CALL n_floatround(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = float operand
+    *   params[2] = Type of rounding (integer)
+    */
+    REAL fA = amx_ctof(params[1]);
+
+    (void)amx;
+    switch (params[2])
+    {
+        case 1:       /* round downwards */
+            fA = (REAL)(floor((double)fA));
+            break;
+        case 2:       /* round upwards */
+            fA = (REAL)(ceil((double)fA));
+            break;
+        case 3:       /* round towards zero (truncate) */
+            if ( fA>=0.0 )
+                fA = (REAL)(floor((double)fA));
+            else
+                fA = (REAL)(ceil((double)fA));
+            break;
+        default:      /* standard, round to nearest */
+            fA = (REAL)(floor((double)fA+.5));
+            break;
+    }
+
+    return (cell)fA;
+}
+
+/******************************************************************/
+static cell AMX_NATIVE_CALL n_floatcmp(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = float operand 1
+    *   params[2] = float operand 2
+    */
+    REAL fA, fB;
+
+    (void)amx;
+    fA = amx_ctof(params[1]);
+    fB = amx_ctof(params[2]);
+    if (fA == fB)
+        return 0;
+    else if (fA>fB)
+        return 1;
+    else
+        return -1;
+
+}
+
+/******************************************************************/
+static cell AMX_NATIVE_CALL n_floatsqroot(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = float operand
+    */
+    REAL fA = amx_ctof(params[1]);
+    fA = (REAL)sqrt(fA);
+    if (fA < 0)
+        return amx_RaiseError(amx, AMX_ERR_DOMAIN);
+    return amx_ftoc(fA);
+}
+
+/******************************************************************/
+static cell AMX_NATIVE_CALL n_floatpower(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = float operand 1 (base)
+    *   params[2] = float operand 2 (exponent)
+    */
+    REAL fA = amx_ctof(params[1]);
+    REAL fB = amx_ctof(params[2]);
+    fA = (REAL)pow(fA, fB);
+    (void)amx;
+    return amx_ftoc(fA);
+}
+
+/******************************************************************/
+static cell AMX_NATIVE_CALL n_floatlog(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = float operand 1 (value)
+    *   params[2] = float operand 2 (base)
+    */
+    REAL fValue = amx_ctof(params[1]);
+    REAL fBase = amx_ctof(params[2]);
+    (void)amx;
+    if (fValue <= 0.0 || fBase <= 0)
+        return amx_RaiseError(amx, AMX_ERR_DOMAIN);
+    if (fBase == 10.0) // ??? epsilon
+        fValue = (REAL)log10(fValue);
+    else
+        fValue = (REAL)(log(fValue) / log(fBase));
+    return amx_ftoc(fValue);
+}
+
+static REAL ToRadians(REAL angle, int radix)
+{
+    switch (radix)
+    {
+        case 1:         /* degrees, sexagesimal system (technically: degrees/minutes/seconds) */
+            return (REAL)(angle * PI / 180.0);
+        case 2:         /* grades, centesimal system */
+            return (REAL)(angle * PI / 200.0);
+        default:        /* assume already radian */
+            return angle;
+    } /* switch */
+}
+
+/******************************************************************/
+static cell AMX_NATIVE_CALL n_floatsin(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = float operand 1 (angle)
+    *   params[2] = float operand 2 (radix)
+    */
+    REAL fA = amx_ctof(params[1]);
+    fA = ToRadians(fA, params[2]);
+    fA = (float)sin(fA);
+    (void)amx;
+    return amx_ftoc(fA);
+}
+
+/******************************************************************/
+static cell AMX_NATIVE_CALL n_floatcos(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = float operand 1 (angle)
+    *   params[2] = float operand 2 (radix)
+    */
+    REAL fA = amx_ctof(params[1]);
+    fA = ToRadians(fA, params[2]);
+    fA = (float)cos(fA);
+    (void)amx;
+    return amx_ftoc(fA);
+}
+
+/******************************************************************/
+static cell AMX_NATIVE_CALL n_floattan(AMX *amx,const cell *params)
+{
+    /*
+    *   params[0] = number of bytes
+    *   params[1] = float operand 1 (angle)
+    *   params[2] = float operand 2 (radix)
+    */
+    REAL fA = amx_ctof(params[1]);
+    fA = ToRadians(fA, params[2]);
+    fA = (float)tan(fA);
+    (void)amx;
+    return amx_ftoc(fA);
+}
+
+/******************************************************************/
+static cell AMX_NATIVE_CALL n_floatabs(AMX *amx,const cell *params)
+{
+    REAL fA = amx_ctof(params[1]);
+    fA = (fA >= 0) ? fA : -fA;
+    (void)amx;
+    return amx_ftoc(fA);
+}
+
+/******************************************************************/
+/* return the integer part of a real value, truncated
+/* Return integer part of float, truncated (same as floatround
+ * with mode 3)
+ */
+static cell AMX_NATIVE_CALL n_floatint(AMX *amx,const cell *params)
+{
+    REAL fA = amx_ctof(params[1]);
+    if ( fA>=0.0 )
+        fA = (REAL)(floor((double)fA));
+    else
+        fA = (REAL)(ceil((double)fA));
+    (void)amx;
+    return (cell)fA;
+}
+
+#if defined __cplusplus
+  extern "C"
+#endif
+const AMX_NATIVE_INFO float_Natives[] = {
+  { "float",       n_float      },
+  { "strfloat",    n_strfloat   },
+  { "floatmul",    n_floatmul   },
+  { "floatdiv",    n_floatdiv   },
+  { "floatadd",    n_floatadd   },
+  { "floatsub",    n_floatsub   },
+  { "floatfract",  n_floatfract },
+  { "floatround",  n_floatround },
+  { "floatcmp",    n_floatcmp   },
+  { "floatsqroot", n_floatsqroot},
+  { "floatpower",  n_floatpower },
+  { "floatlog",    n_floatlog   },
+  { "floatsin",    n_floatsin   },
+  { "floatcos",    n_floatcos   },
+  { "floattan",    n_floattan   },
+  { "floatabs",    n_floatabs   },
+  { "floatint",    n_floatint   },  // also add user-defined operator "="
+  { NULL, NULL }        /* terminator */
+};
+
+int AMXEXPORT AMXAPI amx_FloatInit(AMX *amx)
+{
+  return amx_Register(amx,float_Natives,-1);
+}
+
+int AMXEXPORT AMXAPI amx_FloatCleanup(AMX *amx)
+{
+  (void)amx;
+  return AMX_ERR_NONE;
+}
diff --git a/apps/openmw-mp/amx/amxstring.c b/apps/openmw-mp/amx/amxstring.c
new file mode 100644
index 000000000..300ec3b80
--- /dev/null
+++ b/apps/openmw-mp/amx/amxstring.c
@@ -0,0 +1,1012 @@
+/*  String functions for the Pawn Abstract Machine
+ *
+ *  Copyright (c) ITB CompuPhase, 2005-2015
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ *  use this file except in compliance with the License. You may obtain a copy
+ *  of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ *
+ *  Version: $Id: amxstring.c 5181 2015-01-21 09:44:28Z thiadmer $
+ */
+#include <limits.h>
+#include <string.h>
+#include <assert.h>
+#if defined __WIN32__ || defined _WIN32 || defined WIN32 || defined __MSDOS__
+  #include <malloc.h>
+#endif
+#include "osdefs.h"
+#include "amx.h"
+#if defined __WIN32__ || defined _WIN32 || defined WIN32 || defined _Windows
+  #include <windows.h>
+#endif
+
+#define MAX_FORMATSTR   256
+
+#define CHARBITS        (8*sizeof(char))
+
+#if defined _UNICODE
+# include <tchar.h>
+#elif !defined __T
+  typedef char          TCHAR;
+# define __T(string)    string
+# define _tcscat        strcat
+# define _tcschr        strchr
+# define _tcscpy        strcpy
+# define _tcslen        strlen
+#endif
+#include "amxcons.h"
+
+#if !defined isdigit
+# define isdigit(c)     ((unsigned)((c)-'0')<10u)
+#endif
+#if !defined sizearray
+# define sizearray(a)   (sizeof(a) / sizeof((a)[0]))
+#endif
+
+
+/* dest     the destination buffer; the buffer must point to the start of a cell
+ * source   the source buffer, this must be aligned to a cell edge
+ * len      the number of characters (bytes) to copy
+ * offs     the offset in dest, in characters (bytes)
+ */
+static int amx_StrPack(cell *dest,cell *source,int len,int offs)
+{
+  int i;
+
+  if ((ucell)*source>UNPACKEDMAX && offs%sizeof(cell)==0) {
+    /* source string is already packed and the destination is cell-aligned */
+    unsigned char* pdest=(unsigned char*)dest+offs;
+    i=(len+sizeof(cell)-1)/sizeof(cell);
+    memmove(pdest,source,i*sizeof(cell));
+    /* zero-terminate */
+    #if BYTE_ORDER==BIG_ENDIAN
+      pdest+=len;
+      for (i=len; i==len || i%sizeof(cell)!=0; i++)
+        *pdest++='\0';
+    #else
+      i=(len/sizeof(cell))*sizeof(cell);
+      pdest+=i;
+      len=(len==i) ? sizeof(cell) : sizeof(cell)-(len-i);
+      assert(len>0 && len<=sizeof(cell));
+      for (i=0; i<len; i++)
+        *pdest++='\0';
+    #endif
+  } else if ((ucell)*source>UNPACKEDMAX) {
+    /* source string is packed, destination is not aligned */
+    cell mask,c;
+    dest+=offs/sizeof(cell);    /* increment whole number of cells */
+    offs%=sizeof(cell);         /* get remainder */
+    mask=(~(ucell)0) >> (offs*CHARBITS);
+    c=*dest & ~mask;
+    for (i=0; i<len+offs+1; i+=sizeof(cell)) {
+      *dest=c | ((*source >> (offs*CHARBITS)) & mask);
+      c=(*source << ((sizeof(cell)-offs)*CHARBITS)) & ~mask;
+      dest++;
+      source++;
+    } /* for */
+    /* set the zero byte in the last cell */
+    mask=(~(ucell)0) >> (((offs+len)%sizeof(cell))*CHARBITS);
+    *(dest-1) &= ~mask;
+  } else {
+    /* source string is unpacked: pack string, from top-down */
+    cell c=0;
+    if (offs!=0) {
+      /* get the last cell in "dest" and mask of the characters that must be changed */
+      cell mask;
+      dest+=offs/sizeof(cell);  /* increment whole number of cells */
+      offs%=sizeof(cell);       /* get remainder */
+      mask=(~(ucell)0) >> (offs*CHARBITS);
+      c=(*dest & ~mask) >> ((sizeof(cell)-offs)*CHARBITS);
+    } /* if */
+    /* for proper alignement, add the offset to both the starting and the ending
+     * criterion (so that the number of iterations stays the same)
+     */
+    assert(offs>=0 && offs<sizeof(cell));
+    for (i=offs; i<len+offs; i++) {
+      c=(c<<CHARBITS) | (*source++ & 0xff);
+      if (i%sizeof(cell)==sizeof(cell)-1) {
+        *dest++=c;
+        c=0;
+      } /* if */
+    } /* for */
+    if (i%sizeof(cell) != 0)    /* store remaining packed characters */
+      *dest=c << (sizeof(cell)-i%sizeof(cell))*CHARBITS;
+    else
+      *dest=0;                  /* store full cell of zeros */
+  } /* if */
+  return AMX_ERR_NONE;
+}
+
+static int amx_StrUnpack(cell *dest,cell *source,int len)
+{
+  /* len excludes the terminating '\0' byte */
+  if ((ucell)*source>UNPACKEDMAX) {
+    /* unpack string, from bottom up (so string can be unpacked in place) */
+    cell c;
+    int i;
+    for (i=len-1; i>=0; i--) {
+      c=source[i/sizeof(cell)] >> (sizeof(cell)-i%sizeof(cell)-1)*CHARBITS;
+      dest[i]=c & UCHAR_MAX;
+    } /* for */
+    dest[len]=0;        /* zero-terminate */
+  } else {
+    /* source string is already unpacked */
+    while (len-->0)
+      *dest++=*source++;
+    *dest=0;
+  } /* if */
+  return AMX_ERR_NONE;
+}
+
+static unsigned char *packedptr(cell *string,int index)
+{
+  unsigned char *ptr=(unsigned char *)(string+index/sizeof(cell));
+  #if BYTE_ORDER==BIG_ENDIAN
+    ptr+=index & (sizeof(cell)-1);
+  #else
+    ptr+=(sizeof(cell)-1) - (index & (sizeof(cell)-1));
+  #endif
+  return ptr;
+}
+
+static cell extractchar(cell *string,int index,int mklower)
+{
+  cell c;
+
+  if ((ucell)*string>UNPACKEDMAX)
+    c=*packedptr(string,index);
+  else
+    c=string[index];
+  if (mklower) {
+    #if defined __WIN32__ || defined _WIN32 || defined WIN32
+      c=(cell)CharLower((LPTSTR)c);
+    #elif defined _Windows
+      c=(cell)AnsiLower((LPSTR)c);
+    #else
+      if ((unsigned int)(c-'A')<26u)
+        c+='a'-'A';
+    #endif
+  } /* if */
+  return c;
+}
+
+/* strlen(const string[])
+ */
+static cell AMX_NATIVE_CALL n_strlen(AMX *amx,const cell *params)
+{
+  cell *cptr;
+  int len = 0;
+
+  (void)(amx);
+  cptr=amx_Address(amx,params[1]);
+  amx_StrLen(cptr,&len);
+  return len;
+}
+
+/* strpack(dest[], const source[], maxlength=sizeof dest)
+ */
+static cell AMX_NATIVE_CALL n_strpack(AMX *amx,const cell *params)
+{
+  cell *cdest,*csrc;
+  int len,err;
+
+  csrc=amx_Address(amx,params[2]);
+  amx_StrLen(csrc,&len);
+  if ((unsigned)len>params[3]*sizeof(cell)-1)
+    len=params[3]*sizeof(cell)-1;
+
+  cdest=amx_Address(amx,params[1]);
+  err=amx_StrPack(cdest,csrc,len,0);
+  if (err!=AMX_ERR_NONE)
+    return amx_RaiseError(amx,err);
+
+  return len;
+}
+
+/* strunpack(dest[], const source[], maxlength=sizeof dest)
+ */
+static cell AMX_NATIVE_CALL n_strunpack(AMX *amx,const cell *params)
+{
+  cell *cdest,*csrc;
+  int len,err;
+
+  csrc=amx_Address(amx,params[2]);
+  amx_StrLen(csrc,&len);
+  assert(len>=0);
+  if (len>=params[3])
+    len=params[3]-1;
+
+  cdest=amx_Address(amx,params[1]);
+  err=amx_StrUnpack(cdest,csrc,len);
+  if (err!=AMX_ERR_NONE)
+    return amx_RaiseError(amx,err);
+
+  return len;
+}
+
+/* strcat(dest[], const source[], maxlength=sizeof dest)
+ * packed/unpacked attribute is taken from dest[], or from source[] if dest[]
+ * is an empty string.
+ */
+static cell AMX_NATIVE_CALL n_strcat(AMX *amx,const cell *params)
+{
+  cell *cdest,*csrc;
+  int len,len2;
+  int packed,err;
+
+  /* calculate number of cells needed for (packed) destination */
+  csrc=amx_Address(amx,params[2]);
+  cdest=amx_Address(amx,params[1]);
+  amx_StrLen(csrc,&len);
+  amx_StrLen(cdest,&len2);
+  packed=(*cdest==0) ? ((ucell)*csrc>UNPACKEDMAX) : ((ucell)*cdest>UNPACKEDMAX);
+  if (packed) {
+    if ((unsigned)(len+len2)>params[3]*sizeof(cell)-1)
+      len=params[3]*sizeof(cell)-len2-1;
+  } else {
+    if (len+len2>params[3]-1)
+      len=params[3]-len2-1;
+  } /* if */
+
+  if (packed) {
+    err=amx_StrPack(cdest,csrc,len,len2);
+  } else {
+    /* destination string must either be unpacked, or empty */
+    assert((ucell)*cdest<=UNPACKEDMAX || len2==0);
+    err=amx_StrUnpack(cdest+len2,csrc,len);
+  } /* if */
+  if (err!=AMX_ERR_NONE)
+    return amx_RaiseError(amx,err);
+
+  return len;
+}
+
+/* strcopy(dest[], const source[], maxlength=sizeof dest)
+ * packed/unpacked attribute from source[]
+ */
+static cell AMX_NATIVE_CALL n_strcopy(AMX *amx,const cell *params)
+{
+  cell *cdest,*csrc;
+  int len,packed,err;
+
+  /* calculate number of cells needed for (packed) destination */
+  csrc=amx_Address(amx,params[2]);
+  cdest=amx_Address(amx,params[1]);
+  amx_StrLen(csrc,&len);
+  packed=(ucell)*csrc>UNPACKEDMAX;
+  if (packed) {
+    if ((unsigned)len>params[3]*sizeof(cell)-1)
+      len=params[3]*sizeof(cell)-1;
+  } else {
+    if (len>params[3]-1)
+      len=params[3]-1;
+  } /* if */
+
+  if (packed)
+    err=amx_StrPack(cdest,csrc,len,0);
+  else
+    err=amx_StrUnpack(cdest,csrc,len);
+  if (err!=AMX_ERR_NONE)
+    return amx_RaiseError(amx,err);
+
+  return len;
+}
+
+static int compare(cell *cstr1,cell *cstr2,int ignorecase,int length,int offs1)
+{
+  int index;
+  cell c1=0,c2=0;
+
+  for (index=0; index<length; index++) {
+    c1=extractchar(cstr1,index+offs1,ignorecase);
+    c2=extractchar(cstr2,index,ignorecase);
+    assert(c1!=0 && c2!=0); /* string lengths are already checked, so zero-bytes should not occur */
+    if (c1!=c2)
+      break;
+  } /* for */
+
+  if (c1<c2)
+    return -1;
+  if (c1>c2)
+    return 1;
+  return 0;
+}
+
+/* strcmp(const string1[], const string2[], bool:ignorecase=false, length=cellmax)
+ */
+static cell AMX_NATIVE_CALL n_strcmp(AMX *amx,const cell *params)
+{
+  cell *cstr1,*cstr2;
+  int len1,len2,len;
+  cell result;
+
+  (void)(amx);
+  cstr1=amx_Address(amx,params[1]);
+  cstr2=amx_Address(amx,params[2]);
+
+  /* get the maximum length to compare */
+  amx_StrLen(cstr1,&len1);
+  amx_StrLen(cstr2,&len2);
+  len=len1;
+  if (len>len2)
+    len=len2;
+  if (len>params[4])
+    len=params[4];
+  if (len==0)
+    return (params[4]==0) ? 0 : len1-len2;
+
+  result=compare(cstr1,cstr2,params[3],len,0);
+  if (result==0 && len!=params[4])
+    result=len1-len2;
+  return result;
+}
+
+/* strfind(const string[], const sub[], bool:ignorecase=false, offset=0)
+ */
+static cell AMX_NATIVE_CALL n_strfind(AMX *amx,const cell *params)
+{
+  cell *cstr,*csub;
+  int lenstr,lensub,offs;
+  cell c,f;
+
+  (void)(amx);
+  cstr=amx_Address(amx,params[1]);
+  csub=amx_Address(amx,params[2]);
+
+  /* get the maximum length to compare */
+  amx_StrLen(cstr,&lenstr);
+  amx_StrLen(csub,&lensub);
+  if (lensub==0)
+    return -1;
+
+  /* get the start character of the substring, for quicker searching */
+  f=extractchar(csub,0,params[3]);
+  assert(f!=0);         /* string length is already checked */
+
+  for (offs=(int)params[4]; offs+lensub<=lenstr; offs++) {
+    /* find the initial character */
+    c=extractchar(csub,0,params[3]);
+    assert(c!=0);      /* string length is already checked */
+    if (c!=f)
+      continue;
+    if (compare(cstr,csub,params[3],lensub,offs)==0)
+      return offs;
+  } /* for */
+  return -1;
+}
+
+/* strmid(dest[], const source[], start, end, maxlength=sizeof dest)
+ * packed/unpacked attribute is taken from source[]
+ */
+static cell AMX_NATIVE_CALL n_strmid(AMX *amx,const cell *params)
+{
+  cell *cdest,*csrc;
+  int len,err;
+  int soffs,doffs;
+  unsigned char *ptr;
+  unsigned char c;
+  int start=params[3];
+  int end=params[4];
+
+  /* calculate number of cells needed for (packed) destination */
+  csrc=amx_Address(amx,params[2]);
+  cdest=amx_Address(amx,params[1]);
+  amx_StrLen(csrc,&len);
+
+  /* clamp the start/end parameters */
+  if (start<0)
+    start=0;
+  else if (start>len)
+    start=len;
+  if (end<start)
+    end=start;
+  else if (end>len)
+    end=len;
+
+  len=end-start;
+  if ((ucell)*csrc>UNPACKEDMAX) {
+    if ((unsigned)len>params[5]*sizeof(cell)-1)
+      len=params[5]*sizeof(cell)-1;
+  } else {
+    if (len>params[5]-1)
+      len=params[5]-1;
+  } /* if */
+
+  if ((ucell)*csrc>UNPACKEDMAX) {
+    /* first align the source to a cell boundary */
+    for (doffs=0,soffs=start; (soffs & (sizeof(cell)-1))!=0 && len>0; soffs++,doffs++,len--) {
+      ptr=packedptr(csrc,soffs);
+      c=*ptr;
+      ptr=packedptr(cdest,doffs);
+      *ptr=c;
+    } /* for */
+    if (len==0) {
+      /* nothing left to do, zero-terminate */
+      ptr=packedptr(cdest,doffs);
+      *ptr='\0';
+      err=AMX_ERR_NONE;
+    } else {
+      err=amx_StrPack(cdest,csrc+soffs/sizeof(cell),len,doffs);
+    } /* if */
+  } else {
+    err=amx_StrUnpack(cdest,csrc+start,len);
+  } /* if */
+  if (err!=AMX_ERR_NONE)
+    return amx_RaiseError(amx,err);
+
+  return len;
+}
+
+/* strdel(string[], start, end)
+ */
+static cell AMX_NATIVE_CALL n_strdel(AMX *amx,const cell *params)
+{
+  cell *cstr;
+  int index,offs,length;
+  unsigned char *ptr;
+  unsigned char c;
+
+  (void)(amx);
+  /* calculate number of cells needed for (packed) destination */
+  cstr=amx_Address(amx,params[1]);
+  amx_StrLen(cstr,&length);
+  index=(int)params[2];
+  offs=(int)params[3]-index;
+  if (index>=length || offs<=0)
+    return 0;
+  if (index+offs>length)
+    offs=length-index;
+
+  index--;  /* prepare for increment in the top of the loop */
+  if (((ucell)*cstr>UNPACKEDMAX)) {
+    do {
+      index++;
+      ptr=packedptr(cstr,index+offs);
+      c=*ptr;
+      ptr=packedptr(cstr,index);
+      *ptr=c;
+    } while (c!='\0');
+    if (index==0)
+      *cstr=0;
+  } else {
+    do {
+      index++;
+      cstr[index]=cstr[index+offs];
+    } while (cstr[index]!=0);
+  } /* if */
+
+  return 1;
+}
+
+/* strins(string[], const substr[], offset, maxlength=sizeof string)
+ */
+static cell AMX_NATIVE_CALL n_strins(AMX *amx,const cell *params)
+{
+  cell *cstr,*csub;
+  int index,lenstr,lensub,count;
+  unsigned char *ptr;
+  cell c;
+
+  /* calculate number of cells needed for (packed) destination */
+  cstr=amx_Address(amx,params[1]);
+  csub=amx_Address(amx,params[2]);
+  amx_StrLen(cstr,&lenstr);
+  amx_StrLen(csub,&lensub);
+  index=(int)params[3];
+  if (index>lenstr)
+    return amx_RaiseError(amx,AMX_ERR_NATIVE);
+
+  if (*cstr==0) {
+    /* current string is empty (and the insertion point is zero), just make a copy */
+    assert(index==0);
+    if ((ucell)*csub>UNPACKEDMAX)
+      amx_StrPack(cstr,csub,lensub,0);
+    else
+      amx_StrUnpack(cstr,csub,lensub);
+    return 1;
+  } /* if */
+
+  if (((ucell)*cstr>UNPACKEDMAX)) {
+    /* make room for the new characters */
+    for (count=lenstr+lensub; count>index; count--) {
+      ptr=packedptr(cstr,count-lensub);
+      c=*ptr;
+      ptr=packedptr(cstr,count);
+      *ptr=(unsigned char)c;
+    } /* for */
+    /* copy in the new characters */
+    for (count=0; count<lensub; count++) {
+      c=extractchar(csub,count,0);
+      ptr=packedptr(cstr,index+count);
+      *ptr=(unsigned char)c;
+    } /* for */
+  } else {
+    /* make room for the new characters */
+    for (count=lenstr+lensub; count>index; count--)
+      cstr[count]=cstr[count-lensub];
+    /* copy in the new characters */
+    for (count=0; count<lensub; count++) {
+      c=extractchar(csub,count,0);
+      cstr[index+count]=c;
+    } /* for */
+  } /* if */
+
+  return 1;
+}
+
+/* strval(const string[], index=0)
+ */
+static cell AMX_NATIVE_CALL n_strval(AMX *amx,const cell *params)
+{
+  TCHAR str[50],*ptr;
+  cell *cstr,result;
+  int len,negate=0;
+  int offset=0;
+
+  (void)(amx);
+  /* get parameters */
+  cstr=amx_Address(amx,params[1]);
+  amx_StrLen(cstr,&len);
+  if ((unsigned)params[0]>=2*sizeof(cell))
+    offset=params[2];
+  if (offset<0)
+    offset=0;
+  else if (offset>=len)
+    offset=len-1;
+
+  /* skip a number of cells */
+  if ((ucell)*cstr>UNPACKEDMAX) {
+    /* packed string */
+    while (offset>=(int)sizeof(cell)) {
+      cstr++;
+      offset-=sizeof(cell);
+      len-=sizeof(cell);
+    } /* while */
+  } else {
+    /* unpacked string, one character per cell */
+    while (offset>0) {
+      cstr++;
+      offset--;
+      len--;
+    } /* while */
+  } /* if */
+
+  amx_GetString(str,cstr,sizeof(TCHAR)>1,sizeof str);
+  assert(offset<(int)sizeof(cell) && offset>=0);
+  ptr=str+offset;
+  result=0;
+  while (*ptr!='\0' && *ptr<=' ')
+    ptr++;              /* skip whitespace */
+  if (*ptr=='-') {      /* handle sign */
+    negate=1;
+    ptr++;
+  } else if (*ptr=='+') {
+    ptr++;
+  } /* if */
+  while (isdigit(*ptr)) {
+    result=result*10 + (*ptr-'0');
+    ptr++;
+  } /* while */
+  if (negate)
+    result=-result;
+  return result;
+}
+
+/* valstr(dest[], value, bool:pack=false) */
+static cell AMX_NATIVE_CALL n_valstr(AMX *amx,const cell *params)
+{
+  TCHAR str[50];
+  cell value,temp;
+  cell *cstr;
+  int len,result,negate=0;
+
+  (void)(amx);
+  /* find out how many digits are needed */
+  len=1;
+  value=params[2];
+  if (value<0) {
+    negate=1;
+    len++;
+    value=-value;
+  } /* if */
+  for (temp=value; temp>=10; temp/=10)
+    len++;
+  assert(len<=sizearray(str));
+
+  /* put in the string */
+  result=len;
+  str[len--]='\0';
+  while (len>=negate) {
+    str[len--]=(char)((value % 10)+'0');
+    value/=10;
+  } /* while */
+  if (negate)
+    str[0]='-';
+  cstr=amx_Address(amx,params[1]);
+  amx_SetString(cstr,str,params[3],sizeof(TCHAR)>1,sizearray(str));
+  return result;
+}
+
+/* ispacked(const string[]) */
+static cell AMX_NATIVE_CALL n_ispacked(AMX *amx,const cell *params)
+{
+  cell *cstr=amx_Address(amx,params[1]);
+  (void)(amx);
+  return *cstr>=UNPACKEDMAX;
+}
+
+
+/* single character decode and encode */
+#define BITMASK 0x3f
+#define DEC(c)  (((c) - ' ') & BITMASK)
+#define ENC(c)  (char)(((c) & BITMASK) == 0 ? 0x60 : ((c) & BITMASK) + ' ')
+
+static int uudecode(unsigned char *target, char *source)
+{
+  int len, retval;
+
+  len = DEC(*source++);
+  retval = len;
+  while (len > 0) {
+    if (len-- > 0)
+      *target++ = (unsigned char)(( DEC(source[0]) << 2 ) | ( DEC(source[1]) >> 4 ));
+    if (len-- > 0)
+      *target++ = (unsigned char)(( DEC(source[1]) << 4 ) | ( DEC(source[2]) >> 2 ));
+    if (len-- > 0)
+      *target++ = (unsigned char)(( DEC(source[2]) << 6 ) | DEC(source[3]) );
+    source += 4;
+  } /* while */
+  return retval;
+}
+
+static int uuencode(char *target, unsigned char *source, int length)
+{
+  int split[4]={0,0,0,0};
+
+  if (length > BITMASK)
+    return 0;                           /* can encode up to 64 bytes */
+
+  *target++ = ENC(length);
+  while (length > 0) {
+    split[0] = source[0] >> 2;          /* split first byte to char. 0 & 1 */
+    split[1] = source[0] << 4;
+    if (length > 1) {
+      split[1] |= source[1] >> 4;       /* split 2nd byte to char. 1 & 2 */
+      split[2] = source[1] << 2;
+      if (length > 2) {
+        split[2] |= source[2] >> 6;     /* split 3th byte to char. 2 & 3 */
+        split[3] = source[2];
+      } /* if */
+    } /* if */
+
+    *target++ = ENC(split[0]);
+    *target++ = ENC(split[1]);
+    if (length > 1)
+      *target++ = ENC(split[2]);
+    if (length > 2)
+      *target++ = ENC(split[3]);
+    source += 3;
+    length -= 3;
+  } /* while */
+
+  *target = '\0';                       /* end string */
+  return 1;
+}
+
+/* uudecode(dest[], const source[], maxlength=sizeof dest)
+ * Returns the number of bytes (not cells) decoded; if the dest buffer is
+ * too small, not all bytes are stored.
+ * Always creates a (packed) array (not a string; the array is not
+ * zero-terminated).
+ * A buffer may be decoded "in-place"; the destination size is always smaller
+ * than the source size.
+ * Endian issues (for multi-byte values in the data stream) are not handled.
+ */
+static cell AMX_NATIVE_CALL n_uudecode(AMX *amx,const cell *params)
+{
+  cell *cstr;
+  unsigned char dst[BITMASK+2];
+  char src[BITMASK+BITMASK/3+2];
+  int len;
+  size_t size;
+
+  (void)(amx);
+  /* get the source */
+  cstr=amx_Address(amx,params[2]);
+  amx_GetString(src,cstr,0,sizeof src);
+  /* decode */
+  len=uudecode(dst,src);
+  /* store */
+  cstr=amx_Address(amx,params[1]);
+  size=len;
+  if (size>params[3]*sizeof(cell))
+    size=params[3]*sizeof(cell);
+  memcpy(cstr,dst,size);
+  return len;
+}
+
+/* uuencode(dest[], const source[], numbytes, maxlength=sizeof dest)
+ * Returns the number of characters encoded, excluding the zero string
+ * terminator; if the dest buffer is too small, not all bytes are stored.
+ * Always creates a packed string. This string has a newline character at the
+ * end. A buffer may be encoded "in-place" if the destination is large enough.
+ * Endian issues (for multi-byte values in the data stream) are not handled.
+ */
+static cell AMX_NATIVE_CALL n_uuencode(AMX *amx,const cell *params)
+{
+  cell *cstr;
+  unsigned char src[BITMASK+2];
+  char dst[BITMASK+BITMASK/3+2];
+
+  (void)(amx);
+  /* get the source */
+  cstr=amx_Address(amx,params[2]);
+  amx_GetString((char *)src,cstr,0,sizeof src);
+  /* encode (and check for errors) */
+  if (uuencode(dst,src,params[3])) {
+    if (params[4]>0) {
+      cstr=amx_Address(amx,params[1]);
+      *cstr=0;
+    } /* if */
+    return 0;
+  } /* if */
+  /* always add a \n */
+  assert(strlen(dst)+1<sizeof dst);
+  strcat(dst,"\n");
+  /* store */
+  cstr=amx_Address(amx,params[1]);
+  amx_SetString(cstr,dst,1,0,params[4]);
+  return (((params[3]+2)/3) << 2)+2;
+}
+
+/* urldecode(dest[], const source[], maxlength=sizeof dest, bool:pack=false)
+ * Returns the number of characters decoded; if the dest buffer is
+ * too small, not all bytes are stored.
+ * A buffer may be decoded "in-place"; the destination size is always
+ * smaller than the source size.
+ */
+static cell AMX_NATIVE_CALL n_urldecode(AMX *amx,const cell *params)
+{
+  cell *cstr;
+  TCHAR *str;
+  int idx_src=0,idx_dst=0;
+
+  /* get the source */
+  (void)(amx);
+  amx_StrParam(amx,params[2],str);
+
+  /* decode */
+  while (idx_src!='\0') {
+    assert(idx_dst<=idx_src);
+    if (str[idx_src]=='%') {
+      int p,q;
+      if (str[idx_src+1]>='0' && str[idx_src+1]<='9')
+        p=str[idx_src+1]-'0';
+      else if (str[idx_src+1]>='A' && str[idx_src+1]<='F')
+        p=str[idx_src+1]-'A'+10;
+      else if (str[idx_src+1]>='a' && str[idx_src+1]<='f')
+        p=str[idx_src+1]-'a'+10;
+      else
+        p=-1;
+      if (p>=0) {
+        if (str[idx_src+2]>='0' && str[idx_src+2]<='9')
+          q=str[idx_src+2]-'0';
+        else if (str[idx_src+2]>='A' && str[idx_src+2]<='F')
+          q=str[idx_src+2]-'A'+10;
+        else if (str[idx_src+2]>='a' && str[idx_src+2]<='f')
+          q=str[idx_src+2]-'a'+10;
+        else
+          q=-1;
+      } /* if */
+      if (p>=0 && q >=0) {
+        assert(p<=15 && q<=15);
+        str[idx_dst]=(TCHAR)((p<<4) | q);
+        idx_src+=3;
+      } else {
+        /* invalid '%xx' syntax, copy literal '%' */
+        str[idx_dst]=str[idx_src++];
+      } /* if */
+    } else {
+      str[idx_dst]=str[idx_src++];
+    } /* if */
+    idx_dst++;
+  } /* while */
+  str[idx_dst]='\0';
+
+  /* store */
+  cstr=amx_Address(amx,params[1]);
+  amx_SetString(cstr,str,1,0,params[4]); /* store as packed ot unpacked */
+
+  return idx_dst;
+}
+
+#define INVALIDURI(c) ((c)<','               \
+                       || (c)>'9' && (c)<'A' \
+                       || (c)>'Z' && (c)<'_' \
+                       || (c)>'_' && (c)<'a' \
+                       || (c)>'z' && (unsigned)(c)<0xa1)
+
+#define TOHEX(c)      (TCHAR)((c)<10 ? '0'+(c) : 'A'-10+(c))
+
+/* urlencode(dest[], const source[], maxlength=sizeof dest, bool:pack=false)
+ * Returns the number of characters encoded, excluding the zero string
+ * terminator; if the dest buffer is too small, not all bytes are stored.
+ * Always creates a packed string. This string has a newline character at the
+ * end. A buffer may be encoded "in-place" if the destination is large enough.
+ * Endian issues (for multi-byte values in the data stream) are not handled.
+ */
+static cell AMX_NATIVE_CALL n_urlencode(AMX *amx,const cell *params)
+{
+  cell *cstr;
+  int length,destlen,count,lastwidth;
+  TCHAR *str;
+
+  /* allocate memory and get the source */
+  (void)(amx);
+  if ((length=(int)params[3])==0)
+    return 0;
+  if ((str = (TCHAR*)alloca(length * sizeof(TCHAR)))==NULL)
+    return 0;
+  cstr=amx_Address(amx,params[2]);
+  amx_GetString((char*)str, cstr, sizeof(TCHAR)>1, length);
+
+  /* run through the string and determine the new length */
+  destlen=1;  /* space for the '\0' terminator */
+  lastwidth=0;
+  for (count=0; str[count]!='\0' && destlen<length; count++) {
+    if (INVALIDURI(str[count]))
+      lastwidth=3;
+    else
+      lastwidth=1;
+    destlen+=lastwidth;
+  } /* for */
+  if (destlen>length) {   /* correct for overrun */
+    destlen-=lastwidth;
+    count--;
+  } /* if */
+  assert(destlen<=length);
+  assert(count>=0);
+
+  /* store string terminator */
+  assert(destlen>0);
+  str[--destlen]='\0';
+  /* convert string from end to start */
+  while (--count>=0) {
+    assert(destlen>count);
+    if (INVALIDURI(str[count])) {
+      str[--destlen]=TOHEX(str[count] & 0x0f);
+      str[--destlen]=TOHEX((str[count] >> 4) & 0x0f);
+      str[--destlen]='%';
+    } else {
+      str[--destlen]=str[count];
+    } /* if */
+  } /* while */
+  assert(destlen==0);
+
+  /* store the result */
+  cstr=amx_Address(amx,params[1]);
+  amx_SetString(cstr,str,1,0,params[4]); /* store as packed ot unpacked */
+
+  return (cell)strlen(str);
+}
+
+/* memcpy(dest[], const source[], index=0, numbytes, maxlength=sizeof dest)
+ * This function can align byte strings in cell arrays, or concatenate two
+ * byte strings in two arrays. The parameter "index" is a byte offset; "numbytes"
+ * is the number of bytes to copy. Parameter "maxlength", however, is in cells.
+ * This function allows copying in-place, for aligning memory buffers.
+ * Endian issues (for multi-byte values in the data stream) are not handled.
+ */
+static cell AMX_NATIVE_CALL n_memcpy(AMX *amx,const cell *params)
+{
+  cell *cdest,*csrc;
+  unsigned char *pdest,*psrc;
+
+  (void)(amx);
+  if (params[3]<0 || params[4]<0 || (params[3]+params[4])>params[5]*(int)sizeof(cell))
+    return 0;
+  cdest=amx_Address(amx,params[1]);
+  csrc=amx_Address(amx,params[2]);
+  pdest=(unsigned char*)cdest+params[3];
+  psrc=(unsigned char*)csrc;
+  memmove(pdest,psrc,params[4]);
+  return 1;
+}
+
+#if !defined AMX_NOSTRFMT
+  static int str_putstr(void *dest,const TCHAR *str)
+  {
+    if (_tcslen((TCHAR*)dest)+_tcslen(str)<MAX_FORMATSTR)
+      _tcscat((TCHAR*)dest,str);
+    return 0;
+  }
+
+  static int str_putchar(void *dest,TCHAR ch)
+  {
+    int len=(int)_tcslen((TCHAR*)dest);
+    if (len<MAX_FORMATSTR-1) {
+      ((TCHAR*)dest)[len]=ch;
+      ((TCHAR*)dest)[len+1]='\0';
+    } /* if */
+    return 0;
+  }
+#endif
+
+/* strformat(dest[], size=sizeof dest, bool:pack=false, const format[], {Fixed,_}:...)
+ */
+static cell AMX_NATIVE_CALL n_strformat(AMX *amx,const cell *params)
+{
+  #if defined AMX_NOSTRFMT
+    (void)amx;
+    (void)params;
+    return 0;
+  #else
+    cell *cstr;
+    AMX_FMTINFO info;
+    TCHAR output[MAX_FORMATSTR];
+
+    memset(&info,0,sizeof info);
+    info.params=params+5;
+    info.numparams=(int)(params[0]/sizeof(cell))-4;
+    info.skip=0;
+    info.length=MAX_FORMATSTR;  /* max. length of the string */
+    info.f_putstr=str_putstr;
+    info.f_putchar=str_putchar;
+    info.user=output;
+    output[0] = __T('\0');
+
+    cstr=amx_Address(amx,params[4]);
+    amx_printstring(amx,cstr,&info);
+
+    /* store the output string */
+    cstr=amx_Address(amx,params[1]);
+    amx_SetString(cstr,(char*)output,(int)params[3],sizeof(TCHAR)>1,(int)params[2]);
+    return 1;
+  #endif
+}
+
+
+#if defined __cplusplus
+  extern "C"
+#endif
+const AMX_NATIVE_INFO string_Natives[] = {
+  { "ispacked",  n_ispacked },
+  { "memcpy",    n_memcpy },
+  { "strcat",    n_strcat },
+  { "strcmp",    n_strcmp },
+  { "strcopy",   n_strcopy },
+  { "strdel",    n_strdel },
+  { "strfind",   n_strfind },
+  { "strformat", n_strformat },
+  { "strins",    n_strins },
+  { "strlen",    n_strlen },
+  { "strmid",    n_strmid },
+  { "strpack",   n_strpack },
+  { "strunpack", n_strunpack },
+  { "strval",    n_strval },
+  { "uudecode",  n_uudecode },
+  { "uuencode",  n_uuencode },
+  { "urldecode", n_urldecode },
+  { "urlencode", n_urlencode },
+  { "valstr",    n_valstr },
+  { NULL, NULL }        /* terminator */
+};
+
+int AMXEXPORT AMXAPI amx_StringInit(AMX *amx)
+{
+  return amx_Register(amx, string_Natives, -1);
+}
+
+int AMXEXPORT AMXAPI amx_StringCleanup(AMX *amx)
+{
+  (void)amx;
+  return AMX_ERR_NONE;
+}
diff --git a/apps/openmw-mp/amx/amxtime.c b/apps/openmw-mp/amx/amxtime.c
new file mode 100644
index 000000000..f4969d2d1
--- /dev/null
+++ b/apps/openmw-mp/amx/amxtime.c
@@ -0,0 +1,480 @@
+/*  Date/time module for the Pawn Abstract Machine
+ *
+ *  Copyright (c) ITB CompuPhase, 2001-2013
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ *  use this file except in compliance with the License. You may obtain a copy
+ *  of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ *
+ *  Version: $Id: amxtime.c 4983 2013-10-21 07:32:57Z  $
+ */
+#include <time.h>
+#include <assert.h>
+#include "amx.h"
+#if defined __WIN32__ || defined _WIN32 || defined _Windows
+  #include <windows.h>
+  #include <mmsystem.h>
+#endif
+
+#define CELLMIN   (-1 << (8*sizeof(cell) - 1))
+
+#define SECONDS_PER_MINUTE  60
+#define SECONDS_PER_HOUR    3600
+#define SECONDS_PER_DAY     86400
+#define SECONDS_PER_YEAR    31556952    /* based on 365.2425 days per year */
+
+#if !defined CLOCKS_PER_SEC
+  #define CLOCKS_PER_SEC CLK_TCK
+#endif
+#if defined __WIN32__ || defined _WIN32 || defined WIN32
+  static int timerset = 0;
+  /* timeGetTime() is more accurate on WindowsNT if timeBeginPeriod(1) is set */
+  #define INIT_TIMER()    \
+    if (!timerset) {      \
+      timeBeginPeriod(1); \
+      timerset=1;         \
+    }
+#else
+  #define INIT_TIMER()
+#endif
+static unsigned long timestamp;
+static unsigned long timelimit;
+static int timerepeat;
+
+static const unsigned char monthdays[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+
+static int wrap(int value, int min, int max)
+{
+  if (value<min)
+    value=max;
+  else if (value>max)
+    value=min;
+  return value;
+}
+
+static unsigned long gettimestamp(void)
+{
+  unsigned long value;
+
+  #if defined __WIN32__ || defined _WIN32 || defined WIN32
+    value=timeGetTime();        /* this value is already in milliseconds */
+  #elif defined __linux || defined __linux__ || defined __LINUX__ || defined __APPLE__
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    value = ((tv.tv_sec * 1000) + (tv.tv_usec / 1000));
+  #else
+    value=clock();
+    #if CLOCKS_PER_SEC<1000
+      /* convert to milliseconds */
+      value=(cell)((1000L * value) / CLOCKS_PER_SEC);
+    #elif CLOCKS_PER_SEC>1000
+      /* convert to milliseconds */
+      value=(cell)(value/(CLOCKS_PER_SEC/1000));
+    #endif
+  #endif
+  return value;
+}
+
+void stamp2datetime(unsigned long sec1970,
+                    int *year, int *month, int *day,
+                    int *hour, int *minute, int *second)
+{
+  int days, seconds;
+
+  /* find the year */
+  assert(year!=NULL);
+  for (*year = 1970; ; *year += 1) {
+    days = 365 + ((*year & 0x03) == 0); /* clumsy "leap-year" routine, fails for 2100 */
+    seconds = days * SECONDS_PER_DAY;
+    if ((unsigned long)seconds > sec1970)
+      break;
+    sec1970 -= seconds;
+  } /* if */
+
+  /* find the month */
+  assert(month!=NULL);
+  for (*month = 1; ; *month += 1) {
+    days = monthdays[*month - 1];
+    seconds = days * SECONDS_PER_DAY;
+    if ((unsigned long)seconds > sec1970)
+      break;
+    sec1970 -= seconds;
+  } /* if */
+
+  /* find the day */
+  assert(day!=NULL);
+  for (*day = 1; sec1970 >= SECONDS_PER_DAY; *day += 1)
+    sec1970 -= SECONDS_PER_DAY;
+
+  /* find the hour */
+  assert(hour!=NULL);
+  for (*hour = 0; sec1970 >= SECONDS_PER_HOUR; *hour += 1)
+    sec1970 -= SECONDS_PER_HOUR;
+
+  /* find the minute */
+  assert(minute!=NULL);
+  for (*minute = 0; sec1970 >= SECONDS_PER_MINUTE; *minute += 1)
+    sec1970 -= SECONDS_PER_MINUTE;
+
+  /* remainder is the number of seconds */
+  assert(second!=NULL);
+  *second = (int)sec1970;
+}
+
+static void settime(cell hour,cell minute,cell second)
+{
+  #if defined __WIN32__ || defined _WIN32 || defined WIN32
+    SYSTEMTIME systim;
+
+    GetLocalTime(&systim);
+    if (hour!=CELLMIN)
+      systim.wHour=(WORD)wrap((int)hour,0,23);
+    if (minute!=CELLMIN)
+      systim.wMinute=(WORD)wrap((int)minute,0,59);
+    if (second!=CELLMIN)
+      systim.wSecond=(WORD)wrap((int)second,0,59);
+    SetLocalTime(&systim);
+  #else
+    /* Linux/Unix (and some DOS compilers) have stime(); on Linux/Unix, you
+     * must have "root" permission to call stime(); many POSIX systems will
+     * have settimeofday() instead
+     */
+    time_t sec1970;
+    struct tm gtm;
+    #if defined __APPLE__ /* also valid for other POSIX systems */
+      struct timeval tv;
+    #endif
+
+    time(&sec1970);
+    gtm=*localtime(&sec1970);
+    if (hour!=CELLMIN)
+      gtm.tm_hour=wrap((int)hour,0,23);
+    if (minute!=CELLMIN)
+      gtm.tm_min=wrap((int)minute,0,59);
+    if (second!=CELLMIN)
+      gtm.tm_sec=wrap((int)second,0,59);
+    sec1970=mktime(&gtm);
+    #if defined __APPLE__ /* also valid for other POSIX systems */
+      tv.tv_sec = sec1970;
+      tv.tv_usec = 0;
+      settimeofday(&tv, 0);
+    #else
+      stime(&sec1970);
+    #endif
+  #endif
+}
+
+static void setdate(cell year,cell month,cell day)
+{
+  int maxday;
+
+  #if defined __WIN32__ || defined _WIN32 || defined WIN32
+    SYSTEMTIME systim;
+
+    GetLocalTime(&systim);
+    if (year!=CELLMIN)
+      systim.wYear=(WORD)wrap((int)year,1970,2099);
+    if (month!=CELLMIN)
+      systim.wMonth=(WORD)wrap((int)month,1,12);
+    maxday=monthdays[systim.wMonth - 1];
+    if (systim.wMonth==2 && ((systim.wYear % 4)==0 && ((systim.wYear % 100)!=0 || (systim.wYear % 400)==0)))
+      maxday++;
+    if (day!=CELLMIN)
+      systim.wDay=(WORD)wrap((int)day,1,maxday);
+    SetLocalTime(&systim);
+  #else
+    /* Linux/Unix (and some DOS compilers) have stime(); on Linux/Unix, you
+     * must have "root" permission to call stime(); many POSIX systems will
+     * have settimeofday() instead
+     */
+    time_t sec1970;
+    struct tm gtm;
+    #if defined __APPLE__ /* also valid for other POSIX systems */
+      struct timeval tv;
+    #endif
+
+    time(&sec1970);
+    gtm=*localtime(&sec1970);
+    if (year!=CELLMIN)
+      gtm.tm_year=year-1900;
+    if (month!=CELLMIN)
+      gtm.tm_mon=month-1;
+    if (day!=CELLMIN)
+      gtm.tm_mday=day;
+    sec1970=mktime(&gtm);
+    #if defined __APPLE__ /* also valid for other POSIX systems */
+      tv.tv_sec = sec1970;
+      tv.tv_usec = 0;
+      settimeofday(&tv, 0);
+    #else
+      stime(&sec1970);
+    #endif
+  #endif
+}
+
+
+/* settime(hour, minute, second)
+ * Always returns 0
+ */
+static cell AMX_NATIVE_CALL n_settime(AMX *amx, const cell *params)
+{
+  (void)amx;
+  settime(params[1],params[2],params[3]);
+  return 0;
+}
+
+/* gettime(&hour, &minute, &second)
+ * The return value is the number of seconds since 1 January 1970 (Unix system
+ * time).
+ */
+static cell AMX_NATIVE_CALL n_gettime(AMX *amx, const cell *params)
+{
+  time_t sec1970;
+  struct tm gtm;
+  cell *cptr;
+
+  assert(params[0]==(int)(3*sizeof(cell)));
+
+  time(&sec1970);
+
+  /* on DOS/Windows, the timezone is usually not set for the C run-time
+   * library; in that case gmtime() and localtime() return the same value
+   */
+  gtm=*localtime(&sec1970);
+  cptr=amx_Address(amx,params[1]);
+  *cptr=gtm.tm_hour;
+  cptr=amx_Address(amx,params[2]);
+  *cptr=gtm.tm_min;
+  cptr=amx_Address(amx,params[3]);
+  *cptr=gtm.tm_sec;
+
+  /* the time() function returns the number of seconds since January 1 1970
+   * in Universal Coordinated Time (the successor to Greenwich Mean Time)
+   */
+  return (cell)sec1970;
+}
+
+/* setdate(year, month, day)
+ * Always returns 0
+ */
+static cell AMX_NATIVE_CALL n_setdate(AMX *amx, const cell *params)
+{
+  (void)amx;
+  setdate(params[1],params[2],params[3]);
+  return 0;
+}
+
+/* getdate(&year, &month, &day)
+ * The return value is the number of days since the start of the year. January
+ * 1 is day 1 of the year.
+ */
+static cell AMX_NATIVE_CALL n_getdate(AMX *amx, const cell *params)
+{
+  time_t sec1970;
+  struct tm gtm;
+  cell *cptr;
+
+  assert(params[0]==(int)(3*sizeof(cell)));
+
+  time(&sec1970);
+
+  gtm=*localtime(&sec1970);
+  cptr=amx_Address(amx,params[1]);
+  *cptr=gtm.tm_year+1900;
+  cptr=amx_Address(amx,params[2]);
+  *cptr=gtm.tm_mon+1;
+  cptr=amx_Address(amx,params[3]);
+  *cptr=gtm.tm_mday;
+
+  return gtm.tm_yday+1;
+}
+
+/* tickcount(&granularity)
+ * Returns the number of milliseconds since start-up. For a 32-bit cell, this
+ * count overflows after approximately 24 days of continuous operation.
+ */
+static cell AMX_NATIVE_CALL n_tickcount(AMX *amx, const cell *params)
+{
+  cell *cptr;
+
+  assert(params[0]==(int)sizeof(cell));
+
+  INIT_TIMER();
+  cptr=amx_Address(amx,params[1]);
+  #if defined __WIN32__ || defined _WIN32 || defined WIN32
+    *cptr=1000;                 /* granularity = 1 ms */
+  #else
+    *cptr=(cell)CLOCKS_PER_SEC; /* in Unix/Linux, this is often 100 */
+  #endif
+  return gettimestamp() & 0x7fffffff;
+}
+
+/* delay(milliseconds)
+ * Pauses for (at least) the requested number of milliseconds.
+ */
+static cell AMX_NATIVE_CALL n_delay(AMX *amx, const cell *params)
+{
+  unsigned long stamp;
+
+  (void)amx;
+  assert(params[0]==(int)sizeof(cell));
+
+  INIT_TIMER();
+  stamp=gettimestamp();
+  while (gettimestamp()-stamp < (unsigned long)params[1])
+    /* nothing */;
+  return 0;
+}
+
+/* settimer(milliseconds, bool: singleshot = false)
+ * Sets the delay until the @timer() callback is called. The timer may either
+ * be single-shot or repetitive.
+ */
+static cell AMX_NATIVE_CALL n_settimer(AMX *amx, const cell *params)
+{
+  (void)amx;
+  assert(params[0]==(int)(2*sizeof(cell)));
+  timestamp=gettimestamp();
+  timelimit=params[1];
+  timerepeat=(int)(params[2]==0);
+  return 0;
+}
+
+/* bool: gettimer(&milliseconds, bool: &singleshot = false)
+ * Retrieves the timer set with settimer(); returns true if a timer
+ * was set up, or false otherwise.
+ */
+static cell AMX_NATIVE_CALL n_gettimer(AMX *amx, const cell *params)
+{
+  cell *cptr;
+
+  assert(params[0]==(int)(2*sizeof(cell)));
+  cptr=amx_Address(amx,params[1]);
+  *cptr=timelimit;
+  cptr=amx_Address(amx,params[2]);
+  *cptr=timerepeat;
+  return timelimit>0;
+}
+
+/* settimestamp(seconds1970) sets the date and time from a single parameter: the
+ * number of seconds since 1 January 1970.
+ */
+static cell AMX_NATIVE_CALL n_settimestamp(AMX *amx, const cell *params)
+{
+  #if defined __WIN32__ || defined _WIN32 || defined WIN32
+    int year, month, day, hour, minute, second;
+
+    stamp2datetime(params[1],
+                   &year, &month, &day,
+                   &hour, &minute, &second);
+    setdate(year, month, day);
+    settime(hour, minute, second);
+  #else
+    /* Linux/Unix (and some DOS compilers) have stime(); on Linux/Unix, you
+     * must have "root" permission to call stime(); many POSIX systems will
+     * have settimeofday() instead
+     */
+    #if defined __APPLE__ /* also valid for other POSIX systems */
+      struct timeval tv;
+      tv.tv_sec = params[1];
+      tv.tv_usec = 0;
+      settimeofday(&tv, 0);
+    #else
+      time_t sec1970=(time_t)params[1];
+      stime(&sec1970);
+    #endif
+  #endif
+  (void)amx;
+
+  return 0;
+}
+
+/* cvttimestamp(seconds1970, &year, &month, &day, &hour, &minute, &second)
+ */
+static cell AMX_NATIVE_CALL n_cvttimestamp(AMX *amx, const cell *params)
+{
+  int year, month, day, hour, minute, second;
+
+  (void)amx;
+  stamp2datetime(params[1],
+                 &year, &month, &day,
+                 &hour, &minute, &second);
+  return 0;
+}
+
+
+#if !defined AMXTIME_NOIDLE
+static AMX_IDLE PrevIdle = NULL;
+static int idxTimer = -1;
+
+static int AMXAPI amx_TimeIdle(AMX *amx, int AMXAPI Exec(AMX *, cell *, int))
+{
+  int err=0;
+
+  assert(idxTimer >= 0);
+
+  if (PrevIdle != NULL)
+    PrevIdle(amx, Exec);
+
+  if (timelimit>0 && (gettimestamp()-timestamp)>=timelimit) {
+    if (timerepeat)
+      timestamp+=timelimit;
+    else
+      timelimit=0;      /* do not repeat single-shot timer */
+    err = Exec(amx, NULL, idxTimer);
+    while (err == AMX_ERR_SLEEP)
+      err = Exec(amx, NULL, AMX_EXEC_CONT);
+  } /* if */
+
+  return err;
+}
+#endif
+
+
+#if defined __cplusplus
+  extern "C"
+#endif
+const AMX_NATIVE_INFO time_Natives[] = {
+  { "gettime",      n_gettime },
+  { "settime",      n_settime },
+  { "getdate",      n_getdate },
+  { "setdate",      n_setdate },
+  { "tickcount",    n_tickcount },
+  { "settimer",     n_settimer },
+  { "gettimer",     n_gettimer },
+  { "delay",        n_delay },
+  { "settimestamp", n_settimestamp },
+  { "cvttimestamp", n_cvttimestamp },
+  { NULL, NULL }        /* terminator */
+};
+
+int AMXEXPORT AMXAPI amx_TimeInit(AMX *amx)
+{
+  #if !defined AMXTIME_NOIDLE
+    /* see whether there is a @timer() function */
+    if (amx_FindPublic(amx,"@timer",&idxTimer) == AMX_ERR_NONE) {
+      if (amx_GetUserData(amx, AMX_USERTAG('I','d','l','e'), (void**)&PrevIdle) != AMX_ERR_NONE)
+        PrevIdle = NULL;
+      amx_SetUserData(amx, AMX_USERTAG('I','d','l','e'), amx_TimeIdle);
+    } /* if */
+  #endif
+
+  return amx_Register(amx, time_Natives, -1);
+}
+
+int AMXEXPORT AMXAPI amx_TimeCleanup(AMX *amx)
+{
+  (void)amx;
+  #if !defined AMXTIME_NOIDLE
+    PrevIdle = NULL;
+  #endif
+  return AMX_ERR_NONE;
+}
diff --git a/apps/openmw-mp/amx/fpattern.c b/apps/openmw-mp/amx/fpattern.c
new file mode 100644
index 000000000..9ba3c08d4
--- /dev/null
+++ b/apps/openmw-mp/amx/fpattern.c
@@ -0,0 +1,1334 @@
+/*
+ from http://home.flash.net/~dtribble/text/fpattern.htm
+ 2000/12/12
+ by Perry
+ License statement is in comments below
+*/
+
+/******************************************************************************
+* fpattern.c
+*   Functions for matching filename patterns to filenames.
+*
+* Usage
+*   (See "fpattern.h".)
+*
+* Notes
+*   These pattern matching capabilities are modeled after those found in
+*   the UNIX command shells.
+*
+*   'FPAT_DELIM' must be #define'd if pathname separators are to be handled
+*   explicitly.
+*
+* History
+*   1.00 1997-01-03 David Tribble.
+*       First cut.
+*   1.01 1997-01-03 David Tribble.
+*       Added SUB pattern character.
+*       Added fpattern_matchn().
+*   1.02 1997-01-12 David Tribble.
+*       Fixed missing lowercase matching cases.
+*   1.03 1997-01-13 David Tribble.
+*       Pathname separator code is now controlled by FPAT_DELIM macro.
+*   1.04 1997-01-14 David Tribble.
+*       Added QUOTE macro.
+*   1.05 1997-01-15 David Tribble.
+*       Handles special case of empty pattern and empty filename.
+*   1.06 1997-01-26 David Tribble.
+*       Changed range negation character from '^' to '!', ala Unix.
+*   1.07 1997-08-02 David Tribble.
+*       Uses the 'FPAT_XXX' constants.
+*   1.08 1998-06-28 David Tribble.
+*       Minor fixed for MS-VC++ (5.0).
+*
+*   Modifications by Thiadmer Riemersma (optional case-sensitive matching,
+*   optional explicit array length, repeated set syntax), 2005-11-27.
+*
+* Limitations
+*   This code is copyrighted by the author, but permission is hereby
+*   granted for its unlimited use provided that the original copyright
+*   and authorship notices are retained intact.
+*
+*   Other queries can be sent to:
+*       dtribble@technologist.com
+*       david.tribble@beasys.com
+*       dtribble@flash.net
+*
+* Copyright 1997-1998 by David R. Tribble, all rights reserved.
+* Copyright (c) 2005-2015, ITB CompuPhase, all rights reserved.
+* www.compuphase.com
+*
+* Version: $Id: fpattern.c 5181 2015-01-21 09:44:28Z thiadmer $
+*/
+
+
+
+/* System includes */
+#if defined TEST
+    #include <assert.h>
+#elif !defined assert
+    #define assert(e)
+#endif
+#include <string.h>
+
+#include "fpattern.h"
+
+
+/* Local constants */
+
+#ifndef NULL
+# define NULL       ((void *) 0)
+#endif
+
+#ifndef FALSE
+# define FALSE      0
+#endif
+
+#ifndef TRUE
+# define TRUE       1
+#endif
+
+#ifdef FPAT_SUBCLOS
+# if TEST
+#   undef           FPAT_CLOSP
+#   define FPAT_CLOSP  '~'
+# endif
+#endif
+
+
+#define ishexdigit(c)   ( ((c)>='0' && (c)<='9') || ((c)>='a' && (c)<='f') || ((c)>='A' && (c)<='F') )
+#define hexdigit(c)     ( ((c)>='0' && (c)<='9') ? (c) - '0' : 10 + \
+                        ( ((c)>='a' && (c)<='f') ? (c) - 'a' : (c) - 'A' ) )
+#if !defined tolower
+# define tolower(c)     ( (c)>='A' && (c)<='Z' ? (c) - 'A' + 'a' : (c) )
+#endif
+
+#define BITSET(set,idx) ( (set)[(idx)/8] |= (unsigned char)(1 << ((idx) & 7)) )
+#define BITGET(set,idx) ( (set)[(idx)/8] & (1 << ((idx) & 7)) )
+
+/*-----------------------------------------------------------------------------
+* fpattern_isvalid()
+*   Checks that filename pattern 'pat' is a well-formed pattern.
+*
+* Returns
+*   0 (FPAT_INVALID) if 'pat' is an INVALID pattern, 1 or 2 for VALID patterns
+*   (FPAT_CLOSED and FPAT_OPEN respectively).
+*   A valid pattern may be "closed" (with a non-repeating terminator) or
+*   "open-ended" (where the last character in the pattern may be repeated 0 or
+*   more times).
+*
+* Caveats
+*   If 'pat' is NULL, 0 (FPAT_INVALID) is returned.
+*
+*   If 'pat' is empty (""), 1 (FPAT_CLOSED) is returned, and it is considered a
+*   valid (but degenerate) pattern (the only filename it matches is the
+*   empty ("") string).
+*/
+
+int fpattern_isvalid(const char *pat)
+{
+    static const char specialchars[] = { FPAT_QUOTE, FPAT_SET_THRU, FPAT_SET_L,
+                                         FPAT_SET_R, FPAT_MSET_L, FPAT_MSET_R,
+                                         FPAT_ANY, FPAT_NOT, FPAT_CLOS, FPAT_CLOSP,
+                                         '\0' };
+    int     len, open;
+    char    close, pch, pch2;
+    unsigned char mask[256/sizeof(unsigned char)];
+
+    /* Check args */
+    if (pat == NULL)
+        return (FPAT_INVALID);
+
+    open = FALSE;   /* pattern is not open-ended */
+
+    /* Verify that the pattern is valid */
+    for (len = 0;  pat[len] != '\0';  len++)
+    {
+        switch (pat[len])
+        {
+        case FPAT_SET_L:
+#if defined FPAT_MSET_ENABLED
+        case FPAT_MSET_L:
+#endif
+            /* Char set */
+            if (pat[len] == FPAT_SET_L)
+            {
+                open = FALSE;
+                close = FPAT_SET_R;
+            }
+            else
+            {
+                open = TRUE;
+                close = FPAT_MSET_R;
+            }
+            len++;
+            if (pat[len] == FPAT_NOT)
+                len++;          /* Set negation */
+
+            memset(mask,0,sizeof mask);
+            while (pat[len] != close)
+            {
+                pch = pat[len];
+                if (pat[len] == FPAT_QUOTE) {
+                    len++;      /* Quoted char */
+                    pch = pat[len];
+                    if (ishexdigit(pch)) {
+                        len++;  /* Hex digits should come in pairs */
+                        if (!ishexdigit(pat[len]))
+                            return (FPAT_INVALID);
+                        pch2 = pat[len];
+                        pch = (hexdigit(pch) << 4) | hexdigit(pch2);
+                    } else if (strchr(specialchars,pat[len])==NULL) {
+                        return (FPAT_INVALID); /* escaped char should be special char */
+                    } /* if */
+                } /* if */
+                if (pat[len] == '\0')
+                    return (FPAT_INVALID); /* Missing closing bracket */
+                if (BITGET(mask,pch))
+                    return (FPAT_INVALID);
+                BITSET(mask,pch);
+                len++;
+
+                if (pat[len] == FPAT_SET_THRU && (pat[len+1] != FPAT_SET_THRU || pch == FPAT_SET_THRU))
+                {
+                    /* Char range */
+                    len++;
+                    if (pat[len] == FPAT_QUOTE) {
+                        len++;      /* Quoted char */
+                        if (ishexdigit(pat[len])) {
+                            len++;  /* Hex digits should come in pairs */
+                            if (!ishexdigit(pat[len]))
+                                return (FPAT_INVALID);
+                        } else if (strchr(specialchars,pat[len])==NULL) {
+                            return (FPAT_INVALID); /* escaped char should be special char */
+                        } /* if */
+                    } /* if */
+
+                    if (pat[len] == '\0')
+                        return (FPAT_INVALID); /* Missing closing bracket */
+                    if (len<2 || (unsigned char)pat[len-2]>(unsigned char)pat[len]
+                        || (pat[len-2]==pat[len] && pat[len]!=FPAT_SET_THRU))
+                        return (FPAT_INVALID);  /* invalid range (decrementing) */
+                    //??? also set bits of characters in range?
+                    len++;
+                }
+
+                if (pat[len] == '\0')
+                    return (FPAT_INVALID); /* Missing closing bracket */
+            }
+            break;
+
+        case FPAT_QUOTE:
+            /* Quoted char */
+            len++;
+            open = FALSE;
+            if (ishexdigit(pat[len])) {
+                len++;                    /* Hex digits should come in pairs */
+                if (!ishexdigit(pat[len]))
+                    return (FPAT_INVALID);
+            } else if (strchr(specialchars,pat[len])==NULL) {
+                return (FPAT_INVALID);    /* escaped char should be special char */
+            } /* if */
+            if (pat[len] == '\0')
+                return (FPAT_INVALID);    /* Missing quoted char */
+            break;
+
+#if defined FPAT_NOT_ENABLED
+        case FPAT_NOT:
+            /* Negated pattern */
+            len++;
+            open = FALSE;
+            if (pat[len] == '\0')
+                return (FPAT_INVALID);     /* Missing subpattern */
+            break;
+#endif
+
+        case FPAT_CLOS:
+            open = TRUE;
+            break;
+
+        default:
+            /* Valid character */
+            open = FALSE;
+            break;
+        }
+    }
+
+    return (open ? FPAT_OPEN : FPAT_CLOSED);
+}
+
+
+/* NOTA BENE
+ * =========
+ * To modify the pattern matcher, modify the case-insensitive version and
+ * copy it to the case-sensitive version. In steps:
+ * - modify the function fpatter_submatch_tolower(), here below
+ * - make a copy of the entire function
+ * - erase all references to "tolower" in the copy
+ */
+
+/*-----------------------------------------------------------------------------
+* fpattern_submatch_tolower()
+*   Attempts to match subpattern 'pat' to subfilename 'fname'.
+*
+* Returns
+*   1 (true) if the subfilename matches, otherwise 0 (false).
+*
+* Caveats
+*   This does not assume that 'pat' is well-formed.
+*
+*   If 'pat' is empty (""), the only filename it matches is the empty ("")
+*   string.
+*
+*   Some non-empty patterns (e.g., "") will match an empty filename ("").
+*/
+
+static int fpattern_submatch_tolower(const char *pat, const char *fname, int flength)
+{
+    int     fch;
+    int     pch, pch2;
+    int     i;
+    int     yes, match;
+    int     lo, hi;
+
+    /* Attempt to match subpattern against subfilename */
+    while (*pat != '\0')
+    {
+        fch = (unsigned char)*fname;
+        pch = (unsigned char)*pat;
+        pat++;
+
+        switch (pch)
+        {
+        case FPAT_ANY:
+            /* Match a single char */
+        #if defined FPAT_DELIM
+            if (fch == FPAT_DEL  ||  fch == FPAT_DEL2  ||  fch == '\0')
+                return (FALSE);
+        #else
+            if (flength == 0)
+                return (FALSE);
+        #endif
+            fname++;
+            flength--;
+            break;
+
+        case FPAT_CLOS:
+            /* Match zero or more chars */
+        #if defined FPAT_DELIM
+            i = 0;
+            while (fname[i] != '\0'  &&
+                    fname[i] != FPAT_DEL  &&  fname[i] != FPAT_DEL2)
+                i++;
+        #else
+            i = flength;
+        #endif
+            while (i >= 0)
+            {
+                if (fpattern_submatch_tolower(pat, fname+i, flength-i))
+                    return (TRUE);
+                i--;
+            }
+            return (FALSE);
+
+    #ifdef FPAT_SUBCLOS
+        case FPAT_CLOSP:
+            /* Match zero or more chars */
+            i = 0;
+            while (i < flength  &&
+        #if defined FPAT_DELIM
+                    fname[i] != FPAT_DEL  &&  fname[i] != FPAT_DEL2  &&
+        #endif
+                    fname[i] != '.')
+                i++;
+            while (i >= 0)
+            {
+                if (fpattern_submatch_tolower(pat, fname+i, flength-i))
+                    return (TRUE);
+                i--;
+            }
+            return (FALSE);
+    #endif
+
+        case FPAT_QUOTE:
+            /* Match a quoted char */
+            assert(*pat != '\0');
+            pch = (unsigned char)*pat;
+            if (ishexdigit(pch)) {
+                pch2 = *++pat;
+                pch = (hexdigit(pch) << 4) | hexdigit(pch2);
+            } /* if */
+            if (tolower(fch) != tolower(pch))
+                return (FALSE);
+            fname++;
+            flength--;
+            pat++;
+            break;
+
+        case FPAT_SET_L:
+            /* Match char set/range */
+            yes = TRUE;
+            if (*pat == FPAT_NOT) {
+               pat++;
+               yes = FALSE; /* Set negation */
+            } /* if */
+
+            /* Look for [s], [-], [abc], [a-c] */
+            match = !yes;
+            while (*pat != FPAT_SET_R) {
+                assert(*pat != '\0');
+                pch = (unsigned char)*pat++;
+                if (pch == FPAT_QUOTE) {
+                    assert(*pat != '\0');
+                    pch = (unsigned char)*pat++;
+                    if (ishexdigit(pch)) {
+                        pch2 = *pat++;
+                        lo = (hexdigit(pch) << 4) | hexdigit(pch2);
+                    } else {
+                        lo = pch;
+                    } /* if */
+                } else {
+                    lo = pch;
+                } /* if */
+
+                if (*pat == FPAT_SET_THRU) {
+                    /* Range */
+                    pat++;
+                    pch = (unsigned char)*pat++;
+
+                    if (pch == FPAT_QUOTE) {
+                        assert(*pat != '\0');
+                        pch = (unsigned char)*pat++;
+                        if (ishexdigit(pch)) {
+                            pch2 = *pat++;
+                            hi = (hexdigit(pch) << 4) | hexdigit(pch2);
+                        } else {
+                            hi = pch;
+                        } /* if */
+                    } else {
+                      hi = pch;
+                    } /* if */
+
+                    /* Compare character to set range */
+                    if (tolower(fch) >= tolower(lo) && tolower(fch) <= tolower(hi)) {
+                        match = yes;
+                        /* skip to the end of the set in the pattern (no need to
+                         * search further once a match is found)
+                         */
+                        while (*pat != FPAT_SET_R) {
+                            assert(*pat != '\0');
+                            pat++;
+                        } /* while */
+                        break;
+                    } /* if */
+                } else {
+                    /* Compare character to single char from set */
+                    if (tolower(fch) == tolower(lo)) {
+                        match = yes;
+                        /* skip to the end of the set in the pattern (no need to
+                         * search further once a match is found)
+                         */
+                        while (*pat != FPAT_SET_R) {
+                            assert(*pat != '\0');
+                            pat++;
+                        } /* while */
+                        break;
+                    } /* if */
+                } /* if */
+
+                assert(*pat != '\0');
+            } /* while */
+
+            if (!match)
+                return (FALSE);
+
+            fname++;
+            flength--;
+            assert(*pat == FPAT_SET_R);
+            pat++;
+            break;
+
+#if defined FPAT_MSET_ENABLED
+        case FPAT_MSET_L:
+            /* Match zero or more characters in a char set/range */
+            yes = TRUE;
+            if (*pat == FPAT_NOT) {
+               pat++;
+               yes = FALSE; /* Set negation */
+            } /* if */
+
+            do {
+                const char *org_pat = pat;
+                /* Look for [s], [-], [abc], [a-c] */
+                match = !yes;
+                while (*pat != FPAT_MSET_R) {
+                    assert(*pat != '\0');
+                    pch = (unsigned char)*pat++;
+                    if (pch == FPAT_QUOTE) {
+                        assert(*pat != '\0');
+                        pch = (unsigned char)*pat++;
+                        if (ishexdigit(pch)) {
+                            pch2 = *pat++;
+                            lo = (hexdigit(pch) << 4) | hexdigit(pch2);
+                        } else {
+                            lo = pch;
+                        } /* if */
+                    } else {
+                        lo = pch;
+                    } /* if */
+
+                    if (*pat == FPAT_SET_THRU) {
+                        /* Range */
+                        pat++;
+                        pch = (unsigned char)*pat++;
+
+                        if (pch == FPAT_QUOTE) {
+                            assert(*pat != '\0');
+                            pch = (unsigned char)*pat++;
+                            if (ishexdigit(pch)) {
+                                pch2 = *pat++;
+                                hi = (hexdigit(pch) << 4) | hexdigit(pch2);
+                            } else {
+                                hi = pch;
+                            } /* if */
+                        } else {
+                            hi = pch;
+                        } /* if */
+
+                        /* Compare character to set range */
+                        if (tolower(fch) >= tolower(lo) && tolower(fch) <= tolower(hi)) {
+                            match = yes;
+                            /* skip to the end of the set in the pattern (no
+                             * need to search further once a match is found)
+                             */
+                            while (*pat != FPAT_MSET_R) {
+                                assert(*pat != '\0');
+                                pat++;
+                            } /* while */
+                            break;
+                        } /* if */
+                    } else {
+                        /* Compare character to single char from the set */
+                        if (tolower(fch) == tolower(lo)) {
+                            match = yes;
+                            /* skip to the end of the set in the pattern (no
+                             * need to search further once a match is found)
+                             */
+                            while (*pat != FPAT_MSET_R) {
+                                assert(*pat != '\0');
+                                pat++;
+                            } /* while */
+                            break;
+                        } /* if */
+                    } /* if */
+
+                    assert(*pat != '\0');
+                } /* while */
+
+                assert(*pat == FPAT_MSET_R);
+
+                if (match) {
+                    fname++;
+                    flength--;
+                    fch = *fname;
+                    if (flength > 0)
+                        pat = org_pat;
+                } /* if */
+
+            } while (match && flength > 0);
+
+            pat++;
+            break;
+#endif /* FPAT_MSET_ENABLED */
+
+#if defined FPAT_NOT_ENABLED
+        case FPAT_NOT:
+            /* Match only if rest of pattern does not match */
+            assert(*pat != '\0');
+            i = fpattern_submatch_tolower(pat, fname, flength);
+            return !i;
+#endif
+
+#if defined FPAT_DELIM
+        case FPAT_DEL:
+    #if FPAT_DEL2 != FPAT_DEL
+        case FPAT_DEL2:
+    #endif
+            /* Match path delimiter char */
+            if (fch != FPAT_DEL  &&  fch != FPAT_DEL2)
+                return (FALSE);
+            fname++;
+            flength--;
+            break;
+#endif
+
+        default:
+            /* Match a (non-null) char exactly */
+            if (tolower(fch) != tolower(pch))
+                return (FALSE);
+            fname++;
+            flength--;
+            break;
+        }
+    }
+
+    /* Check for complete match */
+    if (flength != 0)
+        return (FALSE);
+
+    /* Successful match */
+    return (TRUE);
+}
+
+/*
+* fpattern_submatch()
+*   See fpattern_submatch_tolower()
+*/
+
+static int fpattern_submatch(const char *pat, const char *fname, int flength)
+{
+    int     fch;
+    int     pch, pch2;
+    int     i;
+    int     yes, match;
+    int     lo, hi;
+
+    /* Attempt to match subpattern against subfilename */
+    while (*pat != '\0')
+    {
+        fch = (unsigned char)*fname;
+        pch = (unsigned char)*pat;
+        pat++;
+
+        switch (pch)
+        {
+        case FPAT_ANY:
+            /* Match a single char */
+        #if defined FPAT_DELIM
+            if (fch == FPAT_DEL  ||  fch == FPAT_DEL2  ||  fch == '\0')
+                return (FALSE);
+        #else
+            if (flength == 0)
+                return (FALSE);
+        #endif
+            fname++;
+            flength--;
+            break;
+
+        case FPAT_CLOS:
+            /* Match zero or more chars */
+        #if defined FPAT_DELIM
+            i = 0;
+            while (fname[i] != '\0'  &&
+                    fname[i] != FPAT_DEL  &&  fname[i] != FPAT_DEL2)
+                i++;
+        #else
+            i = flength;
+        #endif
+            while (i >= 0)
+            {
+                if (fpattern_submatch(pat, fname+i, flength-i))
+                    return (TRUE);
+                i--;
+            }
+            return (FALSE);
+
+    #ifdef FPAT_SUBCLOS
+        case FPAT_CLOSP:
+            /* Match zero or more chars */
+            i = 0;
+            while (i < flength  &&
+        #if defined FPAT_DELIM
+                    fname[i] != FPAT_DEL  &&  fname[i] != FPAT_DEL2  &&
+        #endif
+                    fname[i] != '.')
+                i++;
+            while (i >= 0)
+            {
+                if (fpattern_submatch(pat, fname+i, flength-i))
+                    return (TRUE);
+                i--;
+            }
+            return (FALSE);
+    #endif
+
+        case FPAT_QUOTE:
+            /* Match a quoted char */
+            assert(*pat != '\0');
+            pch = (unsigned char)*pat;
+            if (ishexdigit(pch)) {
+                pch2 = *++pat;
+                pch = (hexdigit(pch) << 4) | hexdigit(pch2);
+            } /* if */
+            if ((fch) != (pch))
+                return (FALSE);
+            fname++;
+            flength--;
+            pat++;
+            break;
+
+        case FPAT_SET_L:
+            /* Match char set/range */
+            yes = TRUE;
+            if (*pat == FPAT_NOT) {
+               pat++;
+               yes = FALSE; /* Set negation */
+            } /* if */
+
+            /* Look for [s], [-], [abc], [a-c] */
+            match = !yes;
+            while (*pat != FPAT_SET_R) {
+                assert(*pat != '\0');
+                pch = (unsigned char)*pat++;
+                if (pch == FPAT_QUOTE) {
+                    assert(*pat != '\0');
+                    pch = (unsigned char)*pat++;
+                    if (ishexdigit(pch)) {
+                        pch2 = *pat++;
+                        lo = (hexdigit(pch) << 4) | hexdigit(pch2);
+                    } else {
+                        lo = pch;
+                    } /* if */
+                } else {
+                    lo = pch;
+                } /* if */
+
+                if (*pat == FPAT_SET_THRU) {
+                    /* Range */
+                    pat++;
+                    pch = (unsigned char)*pat++;
+
+                    if (pch == FPAT_QUOTE) {
+                        assert(*pat != '\0');
+                        pch = (unsigned char)*pat++;
+                        if (ishexdigit(pch)) {
+                            pch2 = *pat++;
+                            hi = (hexdigit(pch) << 4) | hexdigit(pch2);
+                        } else {
+                            hi = pch;
+                        } /* if */
+                    } else {
+                      hi = pch;
+                    } /* if */
+
+                    /* Compare character to set range */
+                    if ((fch) >= (lo) && (fch) <= (hi)) {
+                        match = yes;
+                        /* skip to the end of the set in the pattern (no need to
+                         * search further once a match is found)
+                         */
+                        while (*pat != FPAT_SET_R) {
+                            assert(*pat != '\0');
+                            pat++;
+                        } /* while */
+                        break;
+                    } /* if */
+                } else {
+                    /* Compare character to single char from set */
+                    if ((fch) == (lo)) {
+                        match = yes;
+                        /* skip to the end of the set in the pattern (no need to
+                         * search further once a match is found)
+                         */
+                        while (*pat != FPAT_SET_R) {
+                            assert(*pat != '\0');
+                            pat++;
+                        } /* while */
+                        break;
+                    } /* if */
+                } /* if */
+
+                assert(*pat != '\0');
+            } /* while */
+
+            if (!match)
+                return (FALSE);
+
+            fname++;
+            flength--;
+            assert(*pat == FPAT_SET_R);
+            pat++;
+            break;
+
+#if defined FPAT_MSET_ENABLED
+        case FPAT_MSET_L:
+            /* Match zero or more characters in a char set/range */
+            yes = TRUE;
+            if (*pat == FPAT_NOT) {
+               pat++;
+               yes = FALSE; /* Set negation */
+            } /* if */
+
+            do {
+                const char *org_pat = pat;
+                /* Look for [s], [-], [abc], [a-c] */
+                match = !yes;
+                while (*pat != FPAT_MSET_R) {
+                    assert(*pat != '\0');
+                    pch = (unsigned char)*pat++;
+                    if (pch == FPAT_QUOTE) {
+                        assert(*pat != '\0');
+                        pch = (unsigned char)*pat++;
+                        if (ishexdigit(pch)) {
+                            pch2 = *pat++;
+                            lo = (hexdigit(pch) << 4) | hexdigit(pch2);
+                        } else {
+                            lo = pch;
+                        } /* if */
+                    } else {
+                        lo = pch;
+                    } /* if */
+
+                    if (*pat == FPAT_SET_THRU) {
+                        /* Range */
+                        pat++;
+                        pch = (unsigned char)*pat++;
+
+                        if (pch == FPAT_QUOTE) {
+                            assert(*pat != '\0');
+                            pch = (unsigned char)*pat++;
+                            if (ishexdigit(pch)) {
+                                pch2 = *pat++;
+                                hi = (hexdigit(pch) << 4) | hexdigit(pch2);
+                            } else {
+                                hi = pch;
+                            } /* if */
+                        } else {
+                            hi = pch;
+                        } /* if */
+
+                        /* Compare character to set range */
+                        if ((fch) >= (lo) && (fch) <= (hi)) {
+                            match = yes;
+                            /* skip to the end of the set in the pattern (no
+                             * need to search further once a match is found)
+                             */
+                            while (*pat != FPAT_MSET_R) {
+                                assert(*pat != '\0');
+                                pat++;
+                            } /* while */
+                            break;
+                        } /* if */
+                    } else {
+                        /* Compare character to single char from the set */
+                        if ((fch) == (lo)) {
+                            match = yes;
+                            /* skip to the end of the set in the pattern (no
+                             * need to search further once a match is found)
+                             */
+                            while (*pat != FPAT_MSET_R) {
+                                assert(*pat != '\0');
+                                pat++;
+                            } /* while */
+                            break;
+                        } /* if */
+                    } /* if */
+
+                    assert(*pat != '\0');
+                } /* while */
+
+                assert(*pat == FPAT_MSET_R);
+
+                if (match) {
+                    fname++;
+                    flength--;
+                    fch = *fname;
+                    if (flength > 0)
+                        pat = org_pat;
+                } /* if */
+
+            } while (match && flength > 0);
+
+            pat++;
+            break;
+#endif  /* FPAT_MSET_ENABLED */
+
+#if defined FPAT_NOT_ENABLED
+        case FPAT_NOT:
+            /* Match only if rest of pattern does not match */
+            assert(*pat != '\0');
+            i = fpattern_submatch(pat, fname, flength);
+            return !i;
+#endif
+
+#if defined FPAT_DELIM
+        case FPAT_DEL:
+    #if FPAT_DEL2 != FPAT_DEL
+        case FPAT_DEL2:
+    #endif
+            /* Match path delimiter char */
+            if (fch != FPAT_DEL  &&  fch != FPAT_DEL2)
+                return (FALSE);
+            fname++;
+            flength--;
+            break;
+#endif
+
+        default:
+            /* Match a (non-null) char exactly */
+            if ((fch) != (pch))
+                return (FALSE);
+            fname++;
+            flength--;
+            break;
+        }
+    }
+
+    /* Check for complete match */
+    if (flength != 0)
+        return (FALSE);
+
+    /* Successful match */
+    return (TRUE);
+}
+
+
+/*-----------------------------------------------------------------------------
+* fpattern_match()
+*   Attempts to match pattern 'pat' to filename 'fname'. The comparison is case
+* sensitive if 'keepcase' is true, and case insensitive otherwise. The 'flength'
+* parameter allows to check partial strings, or to check strings with embedded
+* zero bytes. When 'flength' is -1, it is set to the string length.
+*
+* Returns
+*   1 (true) if the filename matches, otherwise 0 (false).
+*
+* Caveats
+*   If 'fname' is null, zero (false) is returned.
+*
+*   If 'pat' is null, zero (false) is returned.
+*
+*   If 'pat' is empty (""), the only filename it matches is the empty
+*   string ("").
+*
+*   If 'fname' is empty, the only pattern that will match it is the empty
+*   string ("").
+*
+*   If 'pat' is not a well-formed pattern, zero (false) is returned.
+*
+*   Upper and lower case letters are treated the same; alphabetic
+*   characters are converted to lower case before matching occurs.
+*   Conversion to lower case is dependent upon the current locale setting.
+*/
+
+int fpattern_match(const char *pat, const char *fname, int flength, int keepcase)
+{
+    int     rc;
+
+    /* Check args */
+    if (fname == NULL)
+        return (FALSE);
+
+    if (pat == NULL)
+        return (FALSE);
+
+    /* Verify that the pattern is valid, and get its length */
+    if (!fpattern_isvalid(pat))
+        return (FALSE);
+
+    /* Attempt to match pattern against filename */
+    if (flength < 0)
+        flength = (int)strlen(fname);
+    if (flength == 0)
+        return (pat[0] == '\0');    /* Special case */
+    if (keepcase)
+        rc = fpattern_submatch(pat, fname, flength);
+    else
+        rc = fpattern_submatch_tolower(pat, fname, flength);
+
+    return (rc);
+}
+
+
+/*-----------------------------------------------------------------------------
+* fpattern_matchn()
+*   Attempts to match pattern 'pat' to filename 'fname'.
+*   This operates like fpattern_match() except that it does not verify that
+*   pattern 'pat' is well-formed, assuming that it has been checked by a
+*   prior call to fpattern_isvalid().
+*
+*   NOTA BENE: this function may crash on invalid patterns!
+*   =======================================================
+*
+* Returns
+*   1 (true) if the filename matches, otherwise 0 (false).
+*
+* Caveats
+*   If 'fname' is null, zero (false) is returned.
+*
+*   If 'pat' is null, zero (false) is returned.
+*
+*   If 'pat' is empty (""), the only filename it matches is the empty ("")
+*   string.
+*
+*   If 'pat' is not a well-formed pattern, unpredictable results may occur.
+*
+*   Upper and lower case letters are treated the same; alphabetic
+*   characters are converted to lower case before matching occurs.
+*   Conversion to lower case is dependent upon the current locale setting.
+*
+* See also
+*   fpattern_match().
+*/
+
+int fpattern_matchn(const char *pat, const char *fname, int flength, int keepcase)
+{
+    int     rc;
+
+    /* Check args */
+    if (fname == NULL)
+        return (FALSE);
+
+    if (pat == NULL)
+        return (FALSE);
+
+    /* Assume that pattern is well-formed
+     * NOTA BENE: this function may crash on invalid patterns!
+     */
+    assert(fpattern_isvalid(pat));
+
+    /* Attempt to match pattern against filename */
+    if (flength < 0)
+        flength = (int)strlen(fname);
+    if (keepcase)
+        rc = fpattern_submatch(pat, fname, flength);
+    else
+        rc = fpattern_submatch_tolower(pat, fname, flength);
+
+    return (rc);
+}
+
+/* returns the largest packet that matches the pattern */
+int fpattern_matchcount(const char *pat, const char *fname, int flength, int minlength, int keepcase)
+{
+    int len;
+
+    if (fname == NULL)
+        return (FALSE);
+
+    if (pat == NULL)
+        return (FALSE);
+
+    /* Assume that pattern is well-formed */
+
+    /* Attempt to match pattern against filename */
+    if (flength < 0)
+        flength = (int)strlen(fname);
+
+    if (keepcase) {
+        for (len = flength; len > minlength; len--)
+            if (fpattern_submatch(pat, fname, len))
+                break;
+    } else {
+        for (len = flength; len > minlength; len--)
+            if (fpattern_submatch_tolower(pat, fname, len))
+                break;
+    } /* if */
+
+    return (len > minlength) ? len : 0;
+}
+
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+
+#ifdef TEST
+
+#include <locale.h>
+#include <stdio.h>
+#if defined _WIN32 || defined __WIN32__ || defined WIN32
+# include <stdlib.h>
+# define sleep(q) Sleep(q*1000)
+# include <windows.h>
+#endif
+
+/* Local variables */
+
+static int  count = 0;
+static int  fails = 0;
+static int  stop_on_fail = FALSE;
+
+
+/*-----------------------------------------------------------------------------
+* test()
+*/
+
+static void test(int expect, const char *fname, const char *pat)
+{
+    int     failed;
+    int     result;
+    char    fbuf[80+1];
+    char    pbuf[80+1];
+
+    count++;
+    printf("%3d. ", count);
+
+    if (fname == NULL)
+    {
+        printf("<null>\n");
+    }
+    else
+    {
+        strcpy(fbuf, fname);
+        printf("\"%s\"\n", fbuf);
+    }
+
+    if (pat == NULL)
+    {
+        printf("     <null>\n");
+    }
+    else
+    {
+        strcpy(pbuf, pat);
+        printf("     \"%s\"\n", pbuf);
+    }
+
+    result = fpattern_match(pat == NULL ? NULL : pbuf,
+                            fname == NULL ? NULL : fbuf,
+                            -1, FALSE);
+
+    failed = (result != expect);
+    printf("    -> %c, expected %c: %s\n",
+        "FT"[!!result], "FT"[!!expect], failed ? "FAIL ***" : "pass");
+
+    if (failed)
+    {
+        fails++;
+
+        if (stop_on_fail)
+            exit(1);
+        sleep(1);
+    }
+
+    printf("\n");
+}
+
+
+/*-----------------------------------------------------------------------------
+* main()
+*   Test driver.
+*/
+
+int main(int argc, char **argv)
+{
+    (void) argc;    /* Shut up lint */
+    (void) argv;    /* Shut up lint */
+
+#if DEBUG
+    dbg_f = stdout;
+#endif
+
+    printf("==========================================\n");
+
+    setlocale(LC_CTYPE, "");
+
+#if 1   /* Set to nonzero to stop on first failure */
+    stop_on_fail = TRUE;
+#endif
+
+    test(0, NULL,   NULL);
+    test(0, NULL,   "");
+    test(0, NULL,   "abc");
+    test(0, "", NULL);
+    test(0, "abc",  NULL);
+
+    test(1, "abc",      "abc");
+    test(0, "ab",       "abc");
+    test(0, "abcd",     "abc");
+    test(0, "Foo.txt",  "Foo.x");
+    test(1, "Foo.txt",  "Foo.txt");
+    test(1, "Foo.txt",  "foo.txt");
+    test(1, "FOO.txt",  "foo.TXT");
+
+    test(1, "a",        "?");
+    test(1, "foo.txt",  "f??.txt");
+    test(1, "foo.txt",  "???????");
+    test(0, "foo.txt",  "??????");
+    test(0, "foo.txt",  "????????");
+
+    test(1, "*",        "`*");
+    test(1, "A[",       "a`[");
+    test(1, "a`x",      "a``x");
+    test(1, "*`?",      "`*```?");
+    test(1, "a*x",      "a`*x");
+    test(1, "a�",       "a`80");
+    test(0, "a�",       "a`8");
+
+#if defined FPAT_DELIM
+    test(0, "",         "/");
+    test(0, "",         "\\");
+    test(1, "/",        "/");
+    test(1, "/",        "\\");
+    test(1, "\\",       "/");
+    test(1, "\\",       "\\");
+
+    test(1, "a/b",      "a/b");
+    test(1, "a/b",      "a\\b");
+
+    test(1, "/",        "*/*");
+    test(1, "foo/a.c",  "f*/*.?");
+    test(1, "foo/a.c",  "*/*");
+    test(0, "foo/a.c",  "/*/*");
+    test(0, "foo/a.c",  "*/*/");
+
+    test(1, "/",        "~/~");
+    test(1, "foo/a.c",  "f~/~.?");
+    test(0, "foo/a.c",  "~/~");
+    test(1, "foo/abc",  "~/~");
+    test(0, "foo/a.c",  "/~/~");
+    test(0, "foo/a.c",  "~/~/");
+#endif
+
+    test(0, "",         "*");
+    test(1, "a",        "*");
+    test(1, "ab",       "*");
+    test(1, "abc",      "**");
+    test(1, "ab.c",     "*.?");
+    test(1, "ab.c",     "*.*");
+    test(1, "ab.c",     "*?");
+    test(1, "ab.c",     "?*");
+    test(1, "ab.c",     "?*?");
+    test(1, "ab.c",     "?*?*");
+    test(1, "ac",       "a*c");
+    test(1, "axc",      "a*c");
+    test(1, "ax-yyy.c", "a*c");
+    test(1, "ax-yyy.c", "a*x-yyy.c");
+    test(1, "axx/yyy.c",    "a*x/*c");
+
+#ifdef FPAT_SUBCLOS
+    test(0, "",         "~");
+    test(1, "a",        "~");
+    test(1, "ab",       "~");
+    test(1, "abc",      "~~");
+    test(1, "ab.c",     "~.?");
+    test(1, "ab.c",     "~.~");
+    test(0, "ab.c",     "~?");
+    test(0, "ab.c",     "?~");
+    test(0, "ab.c",     "?~?");
+    test(1, "ab.c",     "?~.?");
+    test(1, "ab.c",     "?~?~");
+    test(1, "ac",       "a~c");
+    test(1, "axc",      "a~c");
+    test(0, "ax-yyy.c", "a~c");
+    test(1, "ax-yyyvc", "a~c");
+    test(1, "ax-yyy.c", "a~x-yyy.c");
+    test(0, "axx/yyy.c","a~x/~c");
+    test(1, "axx/yyyvc","a~x/~c");
+#endif
+
+#if defined FPAT_NOT_ENABLED
+    test(0, "a",        "!");
+    test(0, "a",        "!a");
+    test(1, "a",        "!b");
+    test(1, "abc",      "!abb");
+    test(0, "a",        "!*");
+    test(1, "abc",      "!*.?");
+    test(1, "abc",      "!*.*");
+    test(0, "",         "!*");      /*!*/
+    test(0, "",         "!*?");     /*!*/
+    test(0, "a",        "!*?");
+    test(0, "a",        "a!*");
+    test(1, "a",        "a!?");
+    test(1, "a",        "a!*?");
+    test(1, "ab",       "*!?");
+    test(1, "abc",      "*!?");
+    test(0, "ab",       "?!?");
+    test(1, "abc",      "?!?");
+    test(0, "a-b",      "!a[-]b");
+    test(0, "a-b",      "!a[x-]b");
+    test(0, "a=b",      "!a[x-]b");
+    test(0, "a-b",      "!a[x`-]b");
+    test(1, "a=b",      "!a[x`-]b");
+    test(0, "a-b",      "!a[x---]b");
+    test(1, "a=b",      "!a[x---]b");
+#endif
+
+    test(1, "abc",      "a[b]c");
+    test(1, "aBc",      "a[b]c");
+    test(1, "abc",      "a[bB]c");
+    test(1, "abc",      "a[bcz]c");
+    test(1, "azc",      "a[bcz]c");
+    test(0, "ab",       "a[b]c");
+    test(0, "ac",       "a[b]c");
+    test(0, "axc",      "a[b]c");
+
+    test(0, "abc",      "a[!b]c");
+    test(0, "abc",      "a[!bcz]c");
+    test(0, "azc",      "a[!bcz]c");
+    test(0, "ab",       "a[!b]c");
+    test(0, "ac",       "a[!b]c");
+    test(1, "axc",      "a[!b]c");
+    test(1, "axc",      "a[!bcz]c");
+
+    test(1, "a1z",      "a[0-9]z");
+    test(0, "a1",       "a[0-9]z");
+    test(0, "az",       "a[0-9]z");
+    test(0, "axz",      "a[0-9]z");
+    test(1, "a2z",      "a[-0-9]z");
+    test(1, "a-z",      "a[-0-9]z");
+    test(1, "a-b",      "a[-]b");
+    test(0, "a-b",      "a[x-]b");
+    test(0, "a=b",      "a[x-]b");
+    test(1, "a-b",      "a[x`-]b");
+    test(0, "a=b",      "a[x`-]b");
+    test(1, "a-b",      "a[x---]b");
+    test(0, "a=b",      "a[x---]b");
+
+    test(0, "a0z",      "a[!0-9]z");
+    test(1, "aoz",      "a[!0-9]z");
+    test(0, "a1",       "a[!0-9]z");
+    test(0, "az",       "a[!0-9]z");
+    test(0, "a9Z",      "a[!0-9]z");
+    test(1, "acz",      "a[!-0-9]z");
+    test(0, "a7z",      "a[!-0-9]z");
+    test(0, "a-z",      "a[!-0-9]z");
+    test(0, "a-b",      "a[!-]b");
+    test(0, "a-b",      "a[!x-]b");
+    test(0, "a=b",      "a[!x-]b");
+    test(0, "a-b",      "a[!x`-]b");
+    test(1, "a=b",      "a[!x`-]b");
+    test(0, "a-b",      "a[!x---]b");
+    test(1, "a=b",      "a[!x---]b");
+
+    test(1, "a!z",      "a[`!0-9]z");
+    test(1, "a3Z",      "a[`!0-9]z");
+    test(0, "A3Z",      "a[`!0`-9]z");
+    test(1, "a9z",      "a[`!0`-9]z");
+    test(1, "a-z",      "a[`!0`-9]z");
+
+    test(1, "ac",       "a{b}c");
+    test(1, "abc",      "a{b}c");
+    test(1, "abbc",     "a{b}c");
+    test(1, "aBbBc",    "a{b}c");
+    test(1, "abc",      "a{bB}c");
+    test(1, "abc",      "a{bpz}c");
+    test(1, "azc",      "a{bcz}");
+    test(0, "ab",       "a{b}c");
+    test(0, "axc",      "a{b}c");
+
+    assert(fpattern_isvalid("a[`[`]]") == 1);
+    assert(fpattern_isvalid("a{`{`}}") == 2);
+    assert(fpattern_isvalid("a[b-z]") == 1);
+    assert(fpattern_isvalid("a?") == 1);
+    assert(fpattern_isvalid("a{b-z}") == 2);
+    assert(fpattern_isvalid("a*") == 2);
+    assert(fpattern_isvalid("a[aba]") == FPAT_INVALID);
+    assert(fpattern_isvalid("a[z-b]") == FPAT_INVALID);
+    assert(fpattern_isvalid("a[b c ]") == FPAT_INVALID);
+    assert(fpattern_isvalid("a[`a]") == FPAT_INVALID);
+
+    assert(fpattern_isvalid("[`80-`ff]") == FPAT_CLOSED);
+    assert(fpattern_isvalid("[`80-`ff]{`00-`7f}") == FPAT_OPEN);
+    assert(fpattern_isvalid("???") == FPAT_CLOSED);
+    test(1, "\x90\x40\x4f", "[`80-`ff]{`00-`7f}");
+    test(0, "\x90\x40\x4f\x90", "[`80-`ff]{`00-`7f}");
+    test(1, "\x90\x40\x4f", "[`80`90]*");
+
+    printf("%d tests, %d failures\n", count, fails);
+    return (fails == 0 ? 0 : 1);
+}
+
+
+#endif /* TEST */
+
+/* End fpattern.c */
diff --git a/apps/openmw-mp/amx/fpattern.h b/apps/openmw-mp/amx/fpattern.h
new file mode 100644
index 000000000..42f116b73
--- /dev/null
+++ b/apps/openmw-mp/amx/fpattern.h
@@ -0,0 +1,184 @@
+/******************************************************************************
+* fpattern.h
+*   Functions for matching filename patterns to filenames.
+*
+* Usage
+*   Filename patterns are composed of regular (printable) characters which
+*   may comprise a filename as well as special pattern matching characters:
+*
+*       .       Matches a period (.).
+*           Note that a period in a filename is not treated any
+*            differently than any other character.
+*
+*        ?      Any.
+*           Matches any single character except '/' or '\'.
+*
+*       *       Closure.
+*           Matches zero or more occurences of any characters other
+*           than '/' or '\'.
+*           Leading '*' characters are allowed.
+*
+*       SUB     Substitute (^Z); optionally supported.
+*           Similar to '*', this matches zero or more occurences of
+*           any characters other than '/', '\', or '.'.
+*           Leading '^Z' characters are allowed.
+*
+*       [ab]    Set.
+*           Matches the single character 'a' or 'b'.
+*           If the dash '-' character is to be included, it must
+*           immediately follow the opening bracket '['.
+*           If the closing bracket ']' character is to be included,
+*           it must be preceded by a quote '`'.
+*
+*       [a-z]   Range.
+*           Matches a single character in the range 'a' to 'z'.
+*           Ranges and sets may be combined within the same set of
+*           brackets.
+*
+*       [!R]    Exclusive range.
+*           Matches a single character not in the range 'R'.
+*           If range 'R' includes the dash '-' character, the dash
+*           must immediately follow the caret '!'.
+*
+*       !       Not; optionally supported.
+*           Makes the following pattern (up to the next '/') match
+*           any filename except those what it would normally match.
+*
+*       /       Path separator (UNIX and DOS).
+*           Matches a '/' or '\' pathname (directory) separator.
+*           Multiple separators are treated like a single
+*           separator.
+*           A leading separator indicates an absolute pathname.
+*
+*       \       Path separator (DOS).
+*           Same as the '/' character.
+*           Note that this character must be escaped if used within
+*           string constants ("\\").
+*
+*       \       Quote (UNIX).
+*           Makes the next character a regular (nonspecial)
+*           character.
+*           Note that to match the quote character itself, it must
+*           be quoted.
+*           Note that this character must be escaped if used within
+*           string constants ("\\").
+*
+*       `       Quote (DOS).
+*           Makes the next character a regular (nonspecial)
+*           character.
+*           Note that to match the quote character itself, it must
+*           be quoted.
+*
+*   Upper and lower case alphabetic characters are considered identical,
+*   i.e., 'a' and 'A' match each other.
+*   (What constitutes a lowercase letter depends on the current locale
+*   settings.)
+*
+*   Spaces and control characters are treated as normal characters.
+*
+* Examples
+*   The following patterns in the left column will match the filenames in
+*   the middle column and will not match filenames in the right column:
+*
+*       Pattern Will Match           Will Not Match
+*       ------- ----------           --------------
+*       a       a (only)            (anything else)
+*       a.      a. (only)           (anything else)
+*       a?c     abc, acc, arc, a.c      a, ac, abbc
+*       a*c     ac, abc, abbc, acc, a.c     a, ab, acb, bac
+*       a*      a, ab, abb, a., a.b     b, ba
+*       *       a, ab, abb, a., .foo, a.foo (nothing)
+*       *.      a., ab., abb., a.foo.       a, ab, a.foo, .foo
+*       *.*     a., a.b, ah.bc.foo      a
+*       ^Z      a, ab, abb          a., .foo, a.foo
+*       ^Z.     a., ab., abb.       a, .foo, a.foo
+*       ^Z.*    a, a., .foo, a.foo      ab, abb
+*       *2.c    2.c, 12.c, foo2.c, foo.12.c 2x.c
+*       a[b-z]c abc, acc, azc (only)        (anything else)
+*       [ab0-9]x    ax, bx, 0x, 9x          zx
+*       a[-.]b  a-b, a.b (only)         (anything else)
+*       a[!a-z]b    a0b, a.b, a@b       aab, azb, aa0b
+*       a[!-b]x a0x, a+x, acx           a-x, abx, axxx
+*       a[-!b]x a-x, a!x, abx (only)        (anything else)
+*       a[`]]x  a]x (only)          (anything else)
+*       a``x    a`x (only)          (anything else)
+*       oh`!    oh! (only)          (anything else)
+*       is`?it  is?it (only)        (anything else)
+*       !a?c    a, ac, ab, abb, acb, a.foo      abc, a.c, azc
+*
+* History
+*   1.00 1997-01-03 David Tribble.
+*       First cut.
+*   1.01 1997-01-03 David Tribble.
+*       Added '^Z' pattern character.
+*       Added fpattern_matchn().
+*   1.02 1997-01-26 David Tribble.
+*       Changed range negation character from '^' to '!', ala Unix.
+*   1.03 1997-08-02 David Tribble.
+*       Added 'FPAT_XXX' macro constants.
+*
+* Limitations
+*   This code is copyrighted by the author, but permission is hereby
+*   granted for its unlimited use provided that the original copyright
+*   and authorship notices are retained intact.
+*
+*   Other queries can be sent to:
+*       dtribble@technologist.com
+*       david.tribble@beasys.com
+*       dtribble@flash.net
+*
+* Copyright �1997 by David R. Tribble, all rights reserved.
+*/
+
+
+#ifndef fpattern_h
+#define fpattern_h    1
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+/* Options */
+
+//#define FPAT_DELIM        /* handle path delimiters in a special way */
+//#define FPAT_SUBCLOS      /* support alternative closure */
+//#define FPAT_NOT_ENABLED  /* !pattern is enabled */
+#define FPAT_MSET_ENABLED   /* multi-set/range is enabled */
+
+
+/* Manifest constants */
+
+#define FPAT_QUOTE      '`'   /* Quotes a special char */
+#define FPAT_DEL       '/'    /* Path delimiter (used only when FPAT_DELIM is true) */
+#define FPAT_DEL2      '\\'   /* Path delimiter (used only when FPAT_DELIM is true) */
+#define FPAT_DOT       '.'    /* Dot char */
+#define FPAT_NOT       '!'    /* Exclusion (also used for sets) */
+#define FPAT_ANY       '?'    /* Any one char */
+#define FPAT_CLOS      '*'    /* Zero or more chars */
+#define FPAT_CLOSP     '\x1A' /* Zero or more nondelimiters (used only when FPAT_SUBCLOS is true) */
+#define FPAT_SET_L     '['    /* Set/range open bracket */
+#define FPAT_SET_R     ']'    /* Set/range close bracket */
+#define FPAT_MSET_L    '{'    /* Multi-set/range open bracket */
+#define FPAT_MSET_R    '}'    /* Multi-set/range close bracket*/
+#define FPAT_SET_THRU  '-'    /* Set range of chars */
+
+
+#define FPAT_INVALID    0    /* invalid pattern */
+#define FPAT_CLOSED     1    /* valid pattern */
+#define FPAT_OPEN       2    /* valid pattern */
+
+
+/* Public functions */
+
+extern int fpattern_isvalid(const char *pat);
+extern int fpattern_match(const char *pat, const char *fname, int flength, int keepcase);
+extern int fpattern_matchn(const char *pat, const char *fname, int flength, int keepcase);
+extern int fpattern_matchcount(const char *pat, const char *fname, int flength, int minlength, int keepcase);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* fpattern_h */
diff --git a/apps/openmw-mp/amx/linux/binreloc.c b/apps/openmw-mp/amx/linux/binreloc.c
new file mode 100644
index 000000000..1f6b3587d
--- /dev/null
+++ b/apps/openmw-mp/amx/linux/binreloc.c
@@ -0,0 +1,778 @@
+/*
+ * BinReloc - a library for creating relocatable executables
+ * Written by: Hongli Lai <h.lai@chello.nl>
+ * http://autopackage.org/
+ *
+ * This source code is public domain. You can relicense this code
+ * under whatever license you want.
+ *
+ * See http://autopackage.org/docs/binreloc/ for
+ * more information and how to use this.
+ */
+
+#ifndef __BINRELOC_C__
+#define __BINRELOC_C__
+
+#ifdef ENABLE_BINRELOC
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#endif /* ENABLE_BINRELOC */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <string.h>
+#include "binreloc.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/** @internal
+ * Find the canonical filename of the executable. Returns the filename
+ * (which must be freed) or NULL on error. If the parameter 'error' is
+ * not NULL, the error code will be stored there, if an error occured.
+ */
+static char *
+_br_find_exe(BrInitError *error)
+{
+#ifndef ENABLE_BINRELOC
+    if (error)
+        *error = BR_INIT_ERROR_DISABLED;
+    return NULL;
+#else
+    char *path, *path2, *line, *result;
+    size_t buf_size;
+    ssize_t size;
+    struct stat stat_buf;
+    FILE *f;
+
+    /* Read from /proc/self/exe (symlink) */
+    if (sizeof (path) > SSIZE_MAX)
+        buf_size = SSIZE_MAX - 1;
+    else
+        buf_size = PATH_MAX - 1;
+    path = (char *) malloc (buf_size);
+    if (path == NULL) {
+        /* Cannot allocate memory. */
+        if (error)
+            *error = BR_INIT_ERROR_NOMEM;
+        return NULL;
+    }
+    path2 = (char *) malloc (buf_size);
+    if (path2 == NULL) {
+        /* Cannot allocate memory. */
+        if (error)
+            *error = BR_INIT_ERROR_NOMEM;
+        free (path);
+        return NULL;
+    }
+
+    strncpy (path2, "/proc/self/exe", buf_size - 1);
+
+    while (1) {
+        int i;
+
+        size = readlink (path2, path, buf_size - 1);
+        if (size == -1) {
+            /* Error. */
+            free (path2);
+            break;
+        }
+
+        /* readlink() success. */
+        path[size] = '\0';
+
+        /* Check whether the symlink's target is also a symlink.
+         * We want to get the final target. */
+        i = stat (path, &stat_buf);
+        if (i == -1) {
+            /* Error. */
+            free (path2);
+            break;
+        }
+
+        /* stat() success. */
+        if (!S_ISLNK (stat_buf.st_mode)) {
+            /* path is not a symlink. Done. */
+            free (path2);
+            return path;
+        }
+
+        /* path is a symlink. Continue loop and resolve this. */
+        strncpy (path, path2, buf_size - 1);
+    }
+
+
+    /* readlink() or stat() failed; this can happen when the program is
+     * running in Valgrind 2.2. Read from /proc/self/maps as fallback. */
+
+    buf_size = PATH_MAX + 128;
+    line = (char *) realloc (path, buf_size);
+    if (line == NULL) {
+        /* Cannot allocate memory. */
+        free (path);
+        if (error)
+            *error = BR_INIT_ERROR_NOMEM;
+        return NULL;
+    }
+
+    f = fopen ("/proc/self/maps", "r");
+    if (f == NULL) {
+        free (line);
+        if (error)
+            *error = BR_INIT_ERROR_OPEN_MAPS;
+        return NULL;
+    }
+
+    /* The first entry should be the executable name. */
+    result = fgets (line, (int) buf_size, f);
+    if (result == NULL) {
+        fclose (f);
+        free (line);
+        if (error)
+            *error = BR_INIT_ERROR_READ_MAPS;
+        return NULL;
+    }
+
+    /* Get rid of newline character. */
+    buf_size = strlen (line);
+    if (buf_size <= 0) {
+        /* Huh? An empty string? */
+        fclose (f);
+        free (line);
+        if (error)
+            *error = BR_INIT_ERROR_INVALID_MAPS;
+        return NULL;
+    }
+    if (line[buf_size - 1] == 10)
+        line[buf_size - 1] = 0;
+
+    /* Extract the filename; it is always an absolute path. */
+    path = strchr (line, '/');
+
+    /* Sanity check. */
+    if (strstr (line, " r-xp ") == NULL || path == NULL) {
+        fclose (f);
+        free (line);
+        if (error)
+            *error = BR_INIT_ERROR_INVALID_MAPS;
+        return NULL;
+    }
+
+    path = strdup (path);
+    free (line);
+    fclose (f);
+    return path;
+#endif /* ENABLE_BINRELOC */
+}
+
+
+/** @internal
+ * Find the canonical filename of the executable which owns symbol.
+ * Returns a filename which must be freed, or NULL on error.
+ */
+static char *
+_br_find_exe_for_symbol(const void *symbol, BrInitError *error)
+{
+#ifndef ENABLE_BINRELOC
+    if (error)
+        *error = BR_INIT_ERROR_DISABLED;
+    return (char *) NULL;
+#else
+#define SIZE PATH_MAX + 100
+    FILE *f;
+    size_t address_string_len;
+    char *address_string, line[SIZE], *found;
+
+    if (symbol == NULL)
+        return (char *) NULL;
+
+    f = fopen ("/proc/self/maps", "r");
+    if (f == NULL)
+        return (char *) NULL;
+
+    address_string_len = 4;
+    address_string = (char *) malloc (address_string_len);
+    found = (char *) NULL;
+
+    while (!feof (f)) {
+        char *start_addr, *end_addr, *end_addr_end, *file;
+        void *start_addr_p, *end_addr_p;
+        size_t len;
+
+        if (fgets (line, SIZE, f) == NULL)
+            break;
+
+        /* Sanity check. */
+        if (strstr (line, " r-xp ") == NULL || strchr (line, '/') == NULL)
+            continue;
+
+        /* Parse line. */
+        start_addr = line;
+        end_addr = strchr (line, '-');
+        file = strchr (line, '/');
+
+        /* More sanity check. */
+        if (!(file > end_addr && end_addr != NULL && end_addr[0] == '-'))
+            continue;
+
+        end_addr[0] = '\0';
+        end_addr++;
+        end_addr_end = strchr (end_addr, ' ');
+        if (end_addr_end == NULL)
+            continue;
+
+        end_addr_end[0] = '\0';
+        len = strlen (file);
+        if (len == 0)
+            continue;
+        if (file[len - 1] == '\n')
+            file[len - 1] = '\0';
+
+        /* Get rid of "(deleted)" from the filename. */
+        len = strlen (file);
+        if (len > 10 && strcmp (file + len - 10, " (deleted)") == 0)
+            file[len - 10] = '\0';
+
+        /* I don't know whether this can happen but better safe than sorry. */
+        len = strlen (start_addr);
+        if (len != strlen (end_addr))
+            continue;
+
+
+        /* Transform the addresses into a string in the form of 0xdeadbeef,
+         * then transform that into a pointer. */
+        if (address_string_len < len + 3) {
+            address_string_len = len + 3;
+            address_string = (char *) realloc (address_string, address_string_len);
+        }
+
+        memcpy (address_string, "0x", 2);
+        memcpy (address_string + 2, start_addr, len);
+        address_string[2 + len] = '\0';
+        sscanf (address_string, "%p", &start_addr_p);
+
+        memcpy (address_string, "0x", 2);
+        memcpy (address_string + 2, end_addr, len);
+        address_string[2 + len] = '\0';
+        sscanf (address_string, "%p", &end_addr_p);
+
+
+        if (symbol >= start_addr_p && symbol < end_addr_p) {
+            found = file;
+            break;
+        }
+    }
+
+    free (address_string);
+    fclose (f);
+
+    if (found == NULL)
+        return (char *) NULL;
+    else
+        return strdup (found);
+#endif /* ENABLE_BINRELOC */
+}
+
+
+#ifndef BINRELOC_RUNNING_DOXYGEN
+#undef NULL
+#define NULL ((void *) 0) /* typecasted as char* for C++ type safeness */
+#endif
+
+static char *exe = (char *) NULL;
+
+
+/** Initialize the BinReloc library (for applications).
+ *
+ * This function must be called before using any other BinReloc functions.
+ * It attempts to locate the application's canonical filename.
+ *
+ * @note If you want to use BinReloc for a library, then you should call
+ *       br_init_lib() instead.
+ *
+ * @param error  If BinReloc failed to initialize, then the error code will
+ *               be stored in this variable. Set to NULL if you want to
+ *               ignore this. See #BrInitError for a list of error codes.
+ *
+ * @returns 1 on success, 0 if BinReloc failed to initialize.
+ */
+int
+br_init(BrInitError *error)
+{
+    exe = _br_find_exe(error);
+    return exe != NULL;
+}
+
+
+/** Initialize the BinReloc library (for libraries).
+ *
+ * This function must be called before using any other BinReloc functions.
+ * It attempts to locate the calling library's canonical filename.
+ *
+ * @note The BinReloc source code MUST be included in your library, or this
+ *       function won't work correctly.
+ *
+ * @param error  If BinReloc failed to initialize, then the error code will
+ *               be stored in this variable. Set to NULL if you want to
+ *               ignore this. See #BrInitError for a list of error codes.
+ *
+ * @returns 1 on success, 0 if a filename cannot be found.
+ */
+int
+br_init_lib(BrInitError *error)
+{
+    exe = _br_find_exe_for_symbol((const void *) "", error);
+    return exe != NULL;
+}
+
+
+/** Find the canonical filename of the current application.
+ *
+ * @param default_exe  A default filename which will be used as fallback.
+ * @returns A string containing the application's canonical filename,
+ *          which must be freed when no longer necessary. If BinReloc is
+ *          not initialized, or if br_init() failed, then a copy of
+ *          default_exe will be returned. If default_exe is NULL, then
+ *          NULL will be returned.
+ */
+char *
+br_find_exe(const char *default_exe)
+{
+    if (exe == (char *) NULL)
+    {
+        /* BinReloc is not initialized. */
+        if (default_exe != (const char *) NULL)
+            return strdup(default_exe);
+        else
+            return (char *) NULL;
+    }
+    return strdup(exe);
+}
+
+
+/** Locate the directory in which the current application is installed.
+ *
+ * The prefix is generated by the following pseudo-code evaluation:
+ * \code
+ * dirname(exename)
+ * \endcode
+ *
+ * @param default_dir  A default directory which will used as fallback.
+ * @return A string containing the directory, which must be freed when no
+ *         longer necessary. If BinReloc is not initialized, or if the
+ *         initialization function failed, then a copy of default_dir
+ *         will be returned. If default_dir is NULL, then NULL will be
+ *         returned.
+ */
+char *
+br_find_exe_dir(const char *default_dir)
+{
+    if (exe == NULL)
+    {
+        /* BinReloc not initialized. */
+        if (default_dir != NULL)
+            return strdup(default_dir);
+        else
+            return NULL;
+    }
+
+    return br_dirname(exe);
+}
+
+
+/** Locate the prefix in which the current application is installed.
+ *
+ * The prefix is generated by the following pseudo-code evaluation:
+ * \code
+ * dirname(dirname(exename))
+ * \endcode
+ *
+ * @param default_prefix  A default prefix which will used as fallback.
+ * @return A string containing the prefix, which must be freed when no
+ *         longer necessary. If BinReloc is not initialized, or if
+ *         the initialization function failed, then a copy of default_prefix
+ *         will be returned. If default_prefix is NULL, then NULL will be returned.
+ */
+char *
+br_find_prefix(const char *default_prefix)
+{
+    char *dir1, *dir2;
+
+    if (exe == (char *) NULL)
+    {
+        /* BinReloc not initialized. */
+        if (default_prefix != (const char *) NULL)
+            return strdup(default_prefix);
+        else
+            return (char *) NULL;
+    }
+
+    dir1 = br_dirname(exe);
+    dir2 = br_dirname(dir1);
+    free(dir1);
+    return dir2;
+}
+
+
+/** Locate the application's binary folder.
+ *
+ * The path is generated by the following pseudo-code evaluation:
+ * \code
+ * prefix + "/bin"
+ * \endcode
+ *
+ * @param default_bin_dir  A default path which will used as fallback.
+ * @return A string containing the bin folder's path, which must be freed when
+ *         no longer necessary. If BinReloc is not initialized, or if
+ *         the initialization function failed, then a copy of default_bin_dir will
+ *         be returned. If default_bin_dir is NULL, then NULL will be returned.
+ */
+char *
+br_find_bin_dir(const char *default_bin_dir)
+{
+    char *prefix, *dir;
+
+    prefix = br_find_prefix((const char *) NULL);
+    if (prefix == (char *) NULL)
+    {
+        /* BinReloc not initialized. */
+        if (default_bin_dir != (const char *) NULL)
+            return strdup(default_bin_dir);
+        else
+            return (char *) NULL;
+    }
+
+    dir = br_build_path(prefix, "bin");
+    free(prefix);
+    return dir;
+}
+
+
+/** Locate the application's superuser binary folder.
+ *
+ * The path is generated by the following pseudo-code evaluation:
+ * \code
+ * prefix + "/sbin"
+ * \endcode
+ *
+ * @param default_sbin_dir  A default path which will used as fallback.
+ * @return A string containing the sbin folder's path, which must be freed when
+ *         no longer necessary. If BinReloc is not initialized, or if the
+ *         initialization function failed, then a copy of default_sbin_dir will
+ *         be returned. If default_bin_dir is NULL, then NULL will be returned.
+ */
+char *
+br_find_sbin_dir(const char *default_sbin_dir)
+{
+    char *prefix, *dir;
+
+    prefix = br_find_prefix((const char *) NULL);
+    if (prefix == (char *) NULL)
+    {
+        /* BinReloc not initialized. */
+        if (default_sbin_dir != (const char *) NULL)
+            return strdup(default_sbin_dir);
+        else
+            return (char *) NULL;
+    }
+
+    dir = br_build_path(prefix, "sbin");
+    free(prefix);
+    return dir;
+}
+
+
+/** Locate the application's data folder.
+ *
+ * The path is generated by the following pseudo-code evaluation:
+ * \code
+ * prefix + "/share"
+ * \endcode
+ *
+ * @param default_data_dir  A default path which will used as fallback.
+ * @return A string containing the data folder's path, which must be freed when
+ *         no longer necessary. If BinReloc is not initialized, or if the
+ *         initialization function failed, then a copy of default_data_dir
+ *         will be returned. If default_data_dir is NULL, then NULL will be
+ *         returned.
+ */
+char *
+br_find_data_dir(const char *default_data_dir)
+{
+    char *prefix, *dir;
+
+    prefix = br_find_prefix((const char *) NULL);
+    if (prefix == (char *) NULL)
+    {
+        /* BinReloc not initialized. */
+        if (default_data_dir != (const char *) NULL)
+            return strdup(default_data_dir);
+        else
+            return (char *) NULL;
+    }
+
+    dir = br_build_path(prefix, "share");
+    free(prefix);
+    return dir;
+}
+
+
+/** Locate the application's localization folder.
+ *
+ * The path is generated by the following pseudo-code evaluation:
+ * \code
+ * prefix + "/share/locale"
+ * \endcode
+ *
+ * @param default_locale_dir  A default path which will used as fallback.
+ * @return A string containing the localization folder's path, which must be freed when
+ *         no longer necessary. If BinReloc is not initialized, or if the
+ *         initialization function failed, then a copy of default_locale_dir will be returned.
+ *         If default_locale_dir is NULL, then NULL will be returned.
+ */
+char *
+br_find_locale_dir(const char *default_locale_dir)
+{
+    char *data_dir, *dir;
+
+    data_dir = br_find_data_dir((const char *) NULL);
+    if (data_dir == (char *) NULL)
+    {
+        /* BinReloc not initialized. */
+        if (default_locale_dir != (const char *) NULL)
+            return strdup(default_locale_dir);
+        else
+            return (char *) NULL;
+    }
+
+    dir = br_build_path(data_dir, "locale");
+    free(data_dir);
+    return dir;
+}
+
+
+/** Locate the application's library folder.
+ *
+ * The path is generated by the following pseudo-code evaluation:
+ * \code
+ * prefix + "/lib"
+ * \endcode
+ *
+ * @param default_lib_dir  A default path which will used as fallback.
+ * @return A string containing the library folder's path, which must be freed when
+ *         no longer necessary. If BinReloc is not initialized, or if the initialization
+ *         function failed, then a copy of default_lib_dir will be returned.
+ *         If default_lib_dir is NULL, then NULL will be returned.
+ */
+char *
+br_find_lib_dir(const char *default_lib_dir)
+{
+    char *prefix, *dir;
+
+    prefix = br_find_prefix((const char *) NULL);
+    if (prefix == (char *) NULL)
+    {
+        /* BinReloc not initialized. */
+        if (default_lib_dir != (const char *) NULL)
+            return strdup(default_lib_dir);
+        else
+            return (char *) NULL;
+    }
+
+    dir = br_build_path(prefix, "lib");
+    free(prefix);
+    return dir;
+}
+
+
+/** Locate the application's libexec folder.
+ *
+ * The path is generated by the following pseudo-code evaluation:
+ * \code
+ * prefix + "/libexec"
+ * \endcode
+ *
+ * @param default_libexec_dir  A default path which will used as fallback.
+ * @return A string containing the libexec folder's path, which must be freed when
+ *         no longer necessary. If BinReloc is not initialized, or if the initialization
+ *         function failed, then a copy of default_libexec_dir will be returned.
+ *         If default_libexec_dir is NULL, then NULL will be returned.
+ */
+char *
+br_find_libexec_dir(const char *default_libexec_dir)
+{
+    char *prefix, *dir;
+
+    prefix = br_find_prefix((const char *) NULL);
+    if (prefix == (char *) NULL)
+    {
+        /* BinReloc not initialized. */
+        if (default_libexec_dir != (const char *) NULL)
+            return strdup(default_libexec_dir);
+        else
+            return (char *) NULL;
+    }
+
+    dir = br_build_path(prefix, "libexec");
+    free(prefix);
+    return dir;
+}
+
+
+/** Locate the application's configuration files folder.
+ *
+ * The path is generated by the following pseudo-code evaluation:
+ * \code
+ * prefix + "/etc"
+ * \endcode
+ *
+ * @param default_etc_dir  A default path which will used as fallback.
+ * @return A string containing the etc folder's path, which must be freed when
+ *         no longer necessary. If BinReloc is not initialized, or if the initialization
+ *         function failed, then a copy of default_etc_dir will be returned.
+ *         If default_etc_dir is NULL, then NULL will be returned.
+ */
+char *
+br_find_etc_dir(const char *default_etc_dir)
+{
+    char *prefix, *dir;
+
+    prefix = br_find_prefix((const char *) NULL);
+    if (prefix == (char *) NULL)
+    {
+        /* BinReloc not initialized. */
+        if (default_etc_dir != (const char *) NULL)
+            return strdup(default_etc_dir);
+        else
+            return (char *) NULL;
+    }
+
+    dir = br_build_path(prefix, "etc");
+    free(prefix);
+    return dir;
+}
+
+
+/***********************
+ * Utility functions
+ ***********************/
+
+/** Concatenate str1 and str2 to a newly allocated string.
+ *
+ * @param str1 A string.
+ * @param str2 Another string.
+ * @returns A newly-allocated string. This string should be freed when no longer needed.
+ */
+char *
+br_strcat(const char *str1, const char *str2)
+{
+    char *result;
+    size_t len1, len2;
+
+    if (str1 == NULL)
+        str1 = "";
+    if (str2 == NULL)
+        str2 = "";
+
+    len1 = strlen(str1);
+    len2 = strlen(str2);
+
+    result = (char *) malloc(len1 + len2 + 1);
+    memcpy(result, str1, len1);
+    memcpy(result + len1, str2, len2);
+    result[len1 + len2] = '\0';
+
+    return result;
+}
+
+
+char *
+br_build_path(const char *dir, const char *file)
+{
+    char *dir2, *result;
+    size_t len;
+    int must_free = 0;
+
+    len = strlen(dir);
+    if (len > 0 && dir[len - 1] != '/')
+    {
+        dir2 = br_strcat(dir, "/");
+        must_free = 1;
+    } else
+        dir2 = (char *) dir;
+
+    result = br_strcat(dir2, file);
+    if (must_free)
+        free(dir2);
+    return result;
+}
+
+
+/* Emulates glibc's strndup() */
+static char *
+br_strndup(const char *str, size_t size)
+{
+    char *result = (char *) NULL;
+    size_t len;
+
+    if (str == (const char *) NULL)
+        return (char *) NULL;
+
+    len = strlen(str);
+    if (len == 0)
+        return strdup("");
+    if (size > len)
+        size = len;
+
+    result = (char *) malloc(len + 1);
+    memcpy(result, str, size);
+    result[size] = '\0';
+    return result;
+}
+
+
+/** Extracts the directory component of a path.
+ *
+ * Similar to g_dirname() or the dirname commandline application.
+ *
+ * Example:
+ * \code
+ * br_dirname ("/usr/local/foobar");  --> Returns: "/usr/local"
+ * \endcode
+ *
+ * @param path  A path.
+ * @returns     A directory name. This string should be freed when no longer needed.
+ */
+char *
+br_dirname(const char *path)
+{
+    char *end, *result;
+
+    if (path == (const char *) NULL)
+        return (char *) NULL;
+
+    end = strrchr(path, '/');
+    if (end == (const char *) NULL)
+        return strdup(".");
+
+    while (end > path && *end == '/')
+        end--;
+    result = br_strndup(path, end - path + 1);
+    if (result[0] == 0)
+    {
+        free(result);
+        return strdup("/");
+    } else
+        return result;
+}
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __BINRELOC_C__ */
diff --git a/apps/openmw-mp/amx/linux/binreloc.h b/apps/openmw-mp/amx/linux/binreloc.h
new file mode 100644
index 000000000..d849d392f
--- /dev/null
+++ b/apps/openmw-mp/amx/linux/binreloc.h
@@ -0,0 +1,80 @@
+/*
+ * BinReloc - a library for creating relocatable executables
+ * Written by: Hongli Lai <h.lai@chello.nl>
+ * http://autopackage.org/
+ *
+ * This source code is public domain. You can relicense this code
+ * under whatever license you want.
+ *
+ * See http://autopackage.org/docs/binreloc/ for
+ * more information and how to use this.
+ */
+
+#ifndef __BINRELOC_H__
+#define __BINRELOC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/** These error codes can be returned by br_init(), br_init_lib(), gbr_init() or gbr_init_lib(). */
+typedef enum {
+    /** Cannot allocate memory. */
+    BR_INIT_ERROR_NOMEM,
+    /** Unable to open /proc/self/maps; see errno for details. */
+    BR_INIT_ERROR_OPEN_MAPS,
+    /** Unable to read from /proc/self/maps; see errno for details. */
+    BR_INIT_ERROR_READ_MAPS,
+    /** The file format of /proc/self/maps is invalid; kernel bug? */
+    BR_INIT_ERROR_INVALID_MAPS,
+    /** BinReloc is disabled (the ENABLE_BINRELOC macro is not defined). */
+    BR_INIT_ERROR_DISABLED
+} BrInitError;
+
+
+#ifndef BINRELOC_RUNNING_DOXYGEN
+/* Mangle symbol names to avoid symbol collisions with other ELF objects. */
+    #define br_init             SbCJ22537442193159_br_init
+    #define br_init_lib         SbCJ22537442193159_br_init_lib
+    #define br_find_exe         SbCJ22537442193159_br_find_exe
+    #define br_find_exe_dir     SbCJ22537442193159_br_find_exe_dir
+    #define br_find_prefix      SbCJ22537442193159_br_find_prefix
+    #define br_find_bin_dir     SbCJ22537442193159_br_find_bin_dir
+    #define br_find_sbin_dir    SbCJ22537442193159_br_find_sbin_dir
+    #define br_find_data_dir    SbCJ22537442193159_br_find_data_dir
+    #define br_find_locale_dir  SbCJ22537442193159_br_find_locale_dir
+    #define br_find_lib_dir     SbCJ22537442193159_br_find_lib_dir
+    #define br_find_libexec_dir SbCJ22537442193159_br_find_libexec_dir
+    #define br_find_etc_dir     SbCJ22537442193159_br_find_etc_dir
+    #define br_strcat           SbCJ22537442193159_br_strcat
+    #define br_build_path       SbCJ22537442193159_br_build_path
+    #define br_dirname          SbCJ22537442193159_br_dirname
+
+
+#endif
+int   br_init             (BrInitError *error);
+int   br_init_lib         (BrInitError *error);
+
+char *br_find_exe         (const char *default_exe);
+char *br_find_exe_dir     (const char *default_dir);
+char *br_find_prefix      (const char *default_prefix);
+char *br_find_bin_dir     (const char *default_bin_dir);
+char *br_find_sbin_dir    (const char *default_sbin_dir);
+char *br_find_data_dir    (const char *default_data_dir);
+char *br_find_locale_dir  (const char *default_locale_dir);
+char *br_find_lib_dir     (const char *default_lib_dir);
+char *br_find_libexec_dir (const char *default_libexec_dir);
+char *br_find_etc_dir     (const char *default_etc_dir);
+
+/* Utility functions */
+char *br_strcat  (const char *str1, const char *str2);
+char *br_build_path (const char *dir, const char *file);
+char *br_dirname (const char *path);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __BINRELOC_H__ */
diff --git a/apps/openmw-mp/amx/linux/getch.c b/apps/openmw-mp/amx/linux/getch.c
new file mode 100644
index 000000000..6dd3959c2
--- /dev/null
+++ b/apps/openmw-mp/amx/linux/getch.c
@@ -0,0 +1,104 @@
+/* Extremely inefficient but portable POSIX getch() */
+
+#include <stdio.h>
+#include <string.h>
+#include <termios.h>    /* for tcgetattr() and tcsetattr() */
+#include <unistd.h>     /* for read() */
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include "getch.h"
+
+#ifndef STDIN_FILENO
+# define STDIN_FILENO 0
+#endif
+
+int
+getch (void)
+{
+  struct termios save_termios;
+  struct termios ios;
+  unsigned char b;
+  int c = 0;
+
+  if (!isatty (STDIN_FILENO))
+    return EOF;
+
+  if (tcgetattr (STDIN_FILENO, &save_termios) < 0)
+    return EOF;
+
+  ios = save_termios;
+  ios.c_lflag &= ~(ICANON | ECHO | ISIG);
+  ios.c_cc[VMIN] = 1;           /* read() will return with one char */
+  ios.c_cc[VTIME] = 0;          /* read() blocks forever */
+
+  if (tcsetattr (STDIN_FILENO, TCSANOW, &ios) < 0)
+    return EOF;
+
+  if (read (STDIN_FILENO, &b, 1) == 1)
+    c = (int)(0xff & b);
+  else
+    c = EOF;
+
+  tcsetattr (STDIN_FILENO, TCSANOW, &save_termios);
+
+  return c;
+}
+
+int
+kbhit (void)
+{
+  struct termios save_termios;
+  struct termios ios;
+  fd_set inp;
+  struct timeval timeout = {0, 0};
+  int result;
+
+  if (!isatty (STDIN_FILENO))
+    return 0;
+
+  if (tcgetattr (STDIN_FILENO, &save_termios) < 0)
+    return 0;
+
+  ios = save_termios;
+  ios.c_lflag &= ~(ICANON | ECHO | ISIG);
+  ios.c_cc[VMIN] = 1;           /* read() will return with one char */
+  ios.c_cc[VTIME] = 0;          /* read() blocks forever */
+
+  if (tcsetattr (STDIN_FILENO, TCSANOW, &ios) < 0)
+    return 0;
+
+  /* set up select() args */
+  FD_ZERO(&inp);
+  FD_SET(STDIN_FILENO, &inp);
+
+  result = select (STDIN_FILENO+1, &inp, NULL, NULL, &timeout) == 1;
+
+  tcsetattr (STDIN_FILENO, TCSANOW, &save_termios);
+
+  return result;
+}
+
+#if defined TEST_GETCH
+int
+main ()
+{
+  int i;
+  char c[4];
+
+  printf("Enter %d keys to continue: ", sizeof c - 1);
+  fflush (stdout);
+
+  memset(c, 0, sizeof c);
+  for (i=0; i<sizeof c - 1; i++)
+    c[i] = getch ();
+
+  printf("Your input: [%s]\n", c);
+
+  printf("Now hit any key to abort: ");
+  while (!kbhit())
+    printf(".");
+
+  return 0;
+}
+#endif
diff --git a/apps/openmw-mp/amx/linux/getch.h b/apps/openmw-mp/amx/linux/getch.h
new file mode 100644
index 000000000..71cdd83b9
--- /dev/null
+++ b/apps/openmw-mp/amx/linux/getch.h
@@ -0,0 +1,15 @@
+/* Extremely inefficient but portable POSIX getch(), see getch.c */
+#ifndef GETCH_H
+#define GETCH_H
+
+#if defined __cplusplus
+  extern "C" {
+#endif
+int getch(void);
+int kbhit(void);
+
+#if defined __cplusplus
+}
+#endif
+
+#endif /* GETCH_H */
diff --git a/apps/openmw-mp/amx/linux/sclinux.h b/apps/openmw-mp/amx/linux/sclinux.h
new file mode 100644
index 000000000..a513745a4
--- /dev/null
+++ b/apps/openmw-mp/amx/linux/sclinux.h
@@ -0,0 +1,49 @@
+/*
+ * Things needed to compile under linux.
+ *
+ * Should be reworked totally to use GNU's 'configure'
+ */
+#ifndef SCLINUX_H
+#define SCLINUX_H
+
+/* getchar() is not a 'cool' replacement for MSDOS getch: Linux/unix depends on the features activated or not about the
+ * controlling terminal's tty. This means that ioctl(2) calls must be performed, for instance to have the controlling
+ * terminal tty's in 'raw' mode, if we want to be able to fetch a single character. This also means that everything must
+ * be put back correctly when the function ends. See GETCH.C for an implementation.
+ *
+ * For interactive use of PawnRun/PawnDbg if would be much better to use GNU's readline package: the user would be able to
+ * have a complete emacs/vi like line editing system.
+ */
+#if !defined getch && !defined kbhit
+  #include "getch.h"
+#endif
+
+#define stricmp(a,b)    strcasecmp(a,b)
+#define strnicmp(a,b,c) strncasecmp(a,b,c)
+
+/*
+ * WinWorld wants '\'. Unices do not.
+ */
+#define DIRECTORY_SEP_CHAR      '/'
+#define DIRECTORY_SEP_STR       "/"
+
+/*
+ * SC assumes that a computer is Little Endian unless told otherwise. It uses
+ * (and defines) the macros BYTE_ORDER and BIG_ENDIAN.
+ * For Linux, we must overrule these settings with those defined in glibc.
+ */
+#if !defined __BYTE_ORDER
+# include <stdlib.h>
+#endif
+
+#if defined __OpenBSD__ || defined __FreeBSD__ || defined __APPLE__
+# define __BYTE_ORDER    BYTE_ORDER
+# define __LITTLE_ENDIAN LITTLE_ENDIAN
+# define __BIG_ENDIAN    BIG_ENDIAN
+#endif
+
+#if !defined __BYTE_ORDER
+# error "Can't figure computer byte order (__BYTE_ORDER macro not found)"
+#endif
+
+#endif /* SCLINUX_H */
diff --git a/apps/openmw-mp/amx/minGlue.h b/apps/openmw-mp/amx/minGlue.h
new file mode 100644
index 000000000..2d47d90e0
--- /dev/null
+++ b/apps/openmw-mp/amx/minGlue.h
@@ -0,0 +1,31 @@
+/*  Glue functions for the minIni library, based on the C/C++ stdio library
+ *
+ *  Or better said: this file contains macros that maps the function interface
+ *  used by minIni to the standard C/C++ file I/O functions.
+ *
+ *  By CompuPhase, 2008-2014
+ *  This "glue file" is in the public domain. It is distributed without
+ *  warranties or conditions of any kind, either express or implied.
+ */
+
+/* map required file I/O types and functions to the standard C library */
+#include <stdio.h>
+
+#define INI_FILETYPE                    FILE*
+#define ini_openread(filename,file)     ((*(file) = fopen((filename),"rb")) != NULL)
+#define ini_openwrite(filename,file)    ((*(file) = fopen((filename),"wb")) != NULL)
+#define ini_openrewrite(filename,file)  ((*(file) = fopen((filename),"r+b")) != NULL)
+#define ini_close(file)                 (fclose(*(file)) == 0)
+#define ini_read(buffer,size,file)      (fgets((buffer),(size),*(file)) != NULL)
+#define ini_write(buffer,file)          (fputs((buffer),*(file)) >= 0)
+#define ini_rename(source,dest)         (rename((source), (dest)) == 0)
+#define ini_remove(filename)            (remove(filename) == 0)
+
+#define INI_FILEPOS                     long int
+#define ini_tell(file,pos)              (*(pos) = ftell(*(file)))
+#define ini_seek(file,pos)              (fseek(*(file), *(pos), SEEK_SET) == 0)
+
+/* for floating-point support, define additional types and functions */
+#define INI_REAL                        float
+#define ini_ftoa(string,value)          sprintf((string),"%f",(value))
+#define ini_atof(string)                (INI_REAL)strtod((string),NULL)
diff --git a/apps/openmw-mp/amx/minIni.c b/apps/openmw-mp/amx/minIni.c
new file mode 100644
index 000000000..acd778f0f
--- /dev/null
+++ b/apps/openmw-mp/amx/minIni.c
@@ -0,0 +1,877 @@
+/*  minIni - Multi-Platform INI file parser, suitable for embedded systems
+ *
+ *  These routines are in part based on the article "Multiplatform .INI Files"
+ *  by Joseph J. Graf in the March 1994 issue of Dr. Dobb's Journal.
+ *
+ *  Copyright (c) CompuPhase, 2008-2015
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ *  use this file except in compliance with the License. You may obtain a copy
+ *  of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ *
+ *  Version: $Id: minIni.c 5181 2015-01-21 09:44:28Z thiadmer $
+ */
+
+#if (defined _UNICODE || defined __UNICODE__ || defined UNICODE) && !defined INI_ANSIONLY
+# if !defined UNICODE   /* for Windows */
+#   define UNICODE
+# endif
+# if !defined _UNICODE  /* for C library */
+#   define _UNICODE
+# endif
+#endif
+
+#define MININI_IMPLEMENTATION
+#include "minIni.h"
+#if defined NDEBUG
+  #define assert(e)
+#else
+  #include <assert.h>
+#endif
+
+#if !defined __T || defined INI_ANSIONLY
+  #include <ctype.h>
+  #include <string.h>
+  #include <stdlib.h>
+  #define TCHAR     char
+  #define __T(s)    s
+  #define _tcscat   strcat
+  #define _tcschr   strchr
+  #define _tcscmp   strcmp
+  #define _tcscpy   strcpy
+  #define _tcsicmp  stricmp
+  #define _tcslen   strlen
+  #define _tcsncmp  strncmp
+  #define _tcsnicmp strnicmp
+  #define _tcsrchr  strrchr
+  #define _tcstol   strtol
+  #define _tcstod   strtod
+  #define _totupper toupper
+  #define _stprintf sprintf
+  #define _tfgets   fgets
+  #define _tfputs   fputs
+  #define _tfopen   fopen
+  #define _tremove  remove
+  #define _trename  rename
+#endif
+
+#if defined __linux || defined __linux__
+  #define __LINUX__
+#elif defined FREEBSD && !defined __FreeBSD__
+  #define __FreeBSD__
+#elif defined(_MSC_VER)
+  #pragma warning(disable: 4996)  /* for Microsoft Visual C/C++ */
+#endif
+#if !defined strnicmp && !defined PORTABLE_STRNICMP
+  #if defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
+    #define strnicmp  strncasecmp
+  #endif
+#endif
+#if !defined _totupper
+  #define _totupper toupper
+#endif
+
+#if !defined INI_LINETERM
+  #if defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
+    #define INI_LINETERM    __T("\n")
+  #else
+    #define INI_LINETERM    __T("\r\n")
+  #endif
+#endif
+#if !defined INI_FILETYPE
+  #error Missing definition for INI_FILETYPE.
+#endif
+
+#if !defined sizearray
+  #define sizearray(a)    (sizeof(a) / sizeof((a)[0]))
+#endif
+
+enum quote_option {
+  QUOTE_NONE,
+  QUOTE_ENQUOTE,
+  QUOTE_DEQUOTE,
+};
+
+#if defined PORTABLE_STRNICMP
+int strnicmp(const TCHAR *s1, const TCHAR *s2, size_t n)
+{
+  register int c1, c2;
+
+  while (n-- != 0 && (*s1 || *s2)) {
+    c1 = *s1++;
+    if ('a' <= c1 && c1 <= 'z')
+      c1 += ('A' - 'a');
+    c2 = *s2++;
+    if ('a' <= c2 && c2 <= 'z')
+      c2 += ('A' - 'a');
+    if (c1 != c2)
+      return c1 - c2;
+  } /* while */
+  return 0;
+}
+#endif /* PORTABLE_STRNICMP */
+
+static TCHAR *skipleading(const TCHAR *str)
+{
+  assert(str != NULL);
+  while ('\0' < *str && *str <= ' ')
+    str++;
+  return (TCHAR *)str;
+}
+
+static TCHAR *skiptrailing(const TCHAR *str, const TCHAR *base)
+{
+  assert(str != NULL);
+  assert(base != NULL);
+  while (str > base && '\0' < *(str-1) && *(str-1) <= ' ')
+    str--;
+  return (TCHAR *)str;
+}
+
+static TCHAR *striptrailing(TCHAR *str)
+{
+  TCHAR *ptr = skiptrailing(_tcschr(str, '\0'), str);
+  assert(ptr != NULL);
+  *ptr = '\0';
+  return str;
+}
+
+static TCHAR *save_strncpy(TCHAR *dest, const TCHAR *source, size_t maxlen, enum quote_option option)
+{
+  size_t d, s;
+
+  assert(maxlen>0);
+  assert(dest <= source || dest >= source + maxlen);
+  if (option == QUOTE_ENQUOTE && maxlen < 3)
+    option = QUOTE_NONE;  /* cannot store two quotes and a terminating zero in less than 3 characters */
+
+  switch (option) {
+  case QUOTE_NONE:
+    for (d = 0; d < maxlen - 1 && source[d] != '\0'; d++)
+      dest[d] = source[d];
+    assert(d < maxlen);
+    dest[d] = '\0';
+    break;
+  case QUOTE_ENQUOTE:
+    d = 0;
+    dest[d++] = '"';
+    for (s = 0; source[s] != '\0' && d < maxlen - 2; s++, d++) {
+      if (source[s] == '"') {
+        if (d >= maxlen - 3)
+          break;  /* no space to store the escape character plus the one that follows it */
+        dest[d++] = '\\';
+      } /* if */
+      dest[d] = source[s];
+    } /* for */
+    dest[d++] = '"';
+    dest[d] = '\0';
+    break;
+  case QUOTE_DEQUOTE:
+    for (d = s = 0; source[s] != '\0' && d < maxlen - 1; s++, d++) {
+      if ((source[s] == '"' || source[s] == '\\') && source[s + 1] == '"')
+        s++;
+      dest[d] = source[s];
+    } /* for */
+    dest[d] = '\0';
+    break;
+  default:
+    assert(0);
+  } /* switch */
+
+  return dest;
+}
+
+static TCHAR *cleanstring(TCHAR *string, enum quote_option *quotes)
+{
+  int isstring;
+  TCHAR *ep;
+
+  assert(string != NULL);
+  assert(quotes != NULL);
+
+  /* Remove a trailing comment */
+  isstring = 0;
+  for (ep = string; *ep != '\0' && ((*ep != ';' && *ep != '#') || isstring); ep++) {
+    if (*ep == '"') {
+      if (*(ep + 1) == '"')
+        ep++;                 /* skip "" (both quotes) */
+      else
+        isstring = !isstring; /* single quote, toggle isstring */
+    } else if (*ep == '\\' && *(ep + 1) == '"') {
+      ep++;                   /* skip \" (both quotes */
+    } /* if */
+  } /* for */
+  assert(ep != NULL && (*ep == '\0' || *ep == ';' || *ep == '#'));
+  *ep = '\0';                 /* terminate at a comment */
+  striptrailing(string);
+  /* Remove double quotes surrounding a value */
+  *quotes = QUOTE_NONE;
+  if (*string == '"' && (ep = _tcschr(string, '\0')) != NULL && *(ep - 1) == '"') {
+    string++;
+    *--ep = '\0';
+    *quotes = QUOTE_DEQUOTE;  /* this is a string, so remove escaped characters */
+  } /* if */
+  return string;
+}
+
+static int getkeystring(INI_FILETYPE *fp, const TCHAR *Section, const TCHAR *Key,
+                        int idxSection, int idxKey, TCHAR *Buffer, int BufferSize,
+                        INI_FILEPOS *mark)
+{
+  TCHAR *sp, *ep;
+  int len, idx;
+  enum quote_option quotes;
+  TCHAR LocalBuffer[INI_BUFFERSIZE];
+
+  assert(fp != NULL);
+  /* Move through file 1 line at a time until a section is matched or EOF. If
+   * parameter Section is NULL, only look at keys above the first section. If
+   * idxSection is postive, copy the relevant section name.
+   */
+  len = (Section != NULL) ? (int)_tcslen(Section) : 0;
+  if (len > 0 || idxSection >= 0) {
+    idx = -1;
+    do {
+      if (!ini_read(LocalBuffer, INI_BUFFERSIZE, fp))
+        return 0;
+      sp = skipleading(LocalBuffer);
+      ep = _tcschr(sp, ']');
+    } while (*sp != '[' || ep == NULL || (((int)(ep-sp-1) != len || _tcsnicmp(sp+1,Section,len) != 0) && ++idx != idxSection));
+    if (idxSection >= 0) {
+      if (idx == idxSection) {
+        assert(ep != NULL);
+        assert(*ep == ']');
+        *ep = '\0';
+        save_strncpy(Buffer, sp + 1, BufferSize, QUOTE_NONE);
+        return 1;
+      } /* if */
+      return 0; /* no more section found */
+    } /* if */
+  } /* if */
+
+  /* Now that the section has been found, find the entry.
+   * Stop searching upon leaving the section's area.
+   */
+  assert(Key != NULL || idxKey >= 0);
+  len = (Key != NULL) ? (int)_tcslen(Key) : 0;
+  idx = -1;
+  do {
+    if (mark != NULL)
+      ini_tell(fp, mark);   /* optionally keep the mark to the start of the line */
+    if (!ini_read(LocalBuffer,INI_BUFFERSIZE,fp) || *(sp = skipleading(LocalBuffer)) == '[')
+      return 0;
+    sp = skipleading(LocalBuffer);
+    ep = _tcschr(sp, '=');  /* Parse out the equal sign */
+    if (ep == NULL)
+      ep = _tcschr(sp, ':');
+  } while (*sp == ';' || *sp == '#' || ep == NULL
+           || ((len == 0 || (int)(skiptrailing(ep,sp)-sp) != len || _tcsnicmp(sp,Key,len) != 0) && ++idx != idxKey));
+  if (idxKey >= 0) {
+    if (idx == idxKey) {
+      assert(ep != NULL);
+      assert(*ep == '=' || *ep == ':');
+      *ep = '\0';
+      striptrailing(sp);
+      save_strncpy(Buffer, sp, BufferSize, QUOTE_NONE);
+      return 1;
+    } /* if */
+    return 0;   /* no more key found (in this section) */
+  } /* if */
+
+  /* Copy up to BufferSize chars to buffer */
+  assert(ep != NULL);
+  assert(*ep == '=' || *ep == ':');
+  sp = skipleading(ep + 1);
+  sp = cleanstring(sp, &quotes);  /* Remove a trailing comment */
+  save_strncpy(Buffer, sp, BufferSize, quotes);
+  return 1;
+}
+
+/** ini_gets()
+ * \param Section     the name of the section to search for
+ * \param Key         the name of the entry to find the value of
+ * \param DefValue    default string in the event of a failed read
+ * \param Buffer      a pointer to the buffer to copy into
+ * \param BufferSize  the maximum number of characters to copy
+ * \param Filename    the name and full path of the .ini file to read from
+ *
+ * \return            the number of characters copied into the supplied buffer
+ */
+int ini_gets(const TCHAR *Section, const TCHAR *Key, const TCHAR *DefValue,
+             TCHAR *Buffer, int BufferSize, const TCHAR *Filename)
+{
+  INI_FILETYPE fp;
+  int ok = 0;
+
+  if (Buffer == NULL || BufferSize <= 0 || Key == NULL)
+    return 0;
+  if (ini_openread(Filename, &fp)) {
+    ok = getkeystring(&fp, Section, Key, -1, -1, Buffer, BufferSize, NULL);
+    (void)ini_close(&fp);
+  } /* if */
+  if (!ok)
+    save_strncpy(Buffer, (DefValue != NULL) ? DefValue : __T(""), BufferSize, QUOTE_NONE);
+  return (int)_tcslen(Buffer);
+}
+
+/** ini_getl()
+ * \param Section     the name of the section to search for
+ * \param Key         the name of the entry to find the value of
+ * \param DefValue    the default value in the event of a failed read
+ * \param Filename    the name of the .ini file to read from
+ *
+ * \return            the value located at Key
+ */
+long ini_getl(const TCHAR *Section, const TCHAR *Key, long DefValue, const TCHAR *Filename)
+{
+  TCHAR LocalBuffer[64];
+  int len = ini_gets(Section, Key, __T(""), LocalBuffer, sizearray(LocalBuffer), Filename);
+  return (len == 0) ? DefValue
+                    : ((len >= 2 && _totupper((int)LocalBuffer[1]) == 'X') ? _tcstol(LocalBuffer, NULL, 16)
+                                                                           : _tcstol(LocalBuffer, NULL, 10));
+}
+
+#if defined INI_REAL
+/** ini_getf()
+ * \param Section     the name of the section to search for
+ * \param Key         the name of the entry to find the value of
+ * \param DefValue    the default value in the event of a failed read
+ * \param Filename    the name of the .ini file to read from
+ *
+ * \return            the value located at Key
+ */
+INI_REAL ini_getf(const TCHAR *Section, const TCHAR *Key, INI_REAL DefValue, const TCHAR *Filename)
+{
+  TCHAR LocalBuffer[64];
+  int len = ini_gets(Section, Key, __T(""), LocalBuffer, sizearray(LocalBuffer), Filename);
+  return (len == 0) ? DefValue : ini_atof(LocalBuffer);
+}
+#endif
+
+/** ini_getbool()
+ * \param Section     the name of the section to search for
+ * \param Key         the name of the entry to find the value of
+ * \param DefValue    default value in the event of a failed read; it should
+ *                    zero (0) or one (1).
+ * \param Buffer      a pointer to the buffer to copy into
+ * \param BufferSize  the maximum number of characters to copy
+ * \param Filename    the name and full path of the .ini file to read from
+ *
+ * A true boolean is found if one of the following is matched:
+ * - A string starting with 'y' or 'Y'
+ * - A string starting with 't' or 'T'
+ * - A string starting with '1'
+ *
+ * A false boolean is found if one of the following is matched:
+ * - A string starting with 'n' or 'N'
+ * - A string starting with 'f' or 'F'
+ * - A string starting with '0'
+ *
+ * \return            the true/false flag as interpreted at Key
+ */
+int ini_getbool(const TCHAR *Section, const TCHAR *Key, int DefValue, const TCHAR *Filename)
+{
+  TCHAR LocalBuffer[2] = __T("");
+  int ret;
+
+  ini_gets(Section, Key, __T(""), LocalBuffer, sizearray(LocalBuffer), Filename);
+  LocalBuffer[0] = (TCHAR)_totupper((int)LocalBuffer[0]);
+  if (LocalBuffer[0] == 'Y' || LocalBuffer[0] == '1' || LocalBuffer[0] == 'T')
+    ret = 1;
+  else if (LocalBuffer[0] == 'N' || LocalBuffer[0] == '0' || LocalBuffer[0] == 'F')
+    ret = 0;
+  else
+    ret = DefValue;
+
+  return(ret);
+}
+
+/** ini_getsection()
+ * \param idx         the zero-based sequence number of the section to return
+ * \param Buffer      a pointer to the buffer to copy into
+ * \param BufferSize  the maximum number of characters to copy
+ * \param Filename    the name and full path of the .ini file to read from
+ *
+ * \return            the number of characters copied into the supplied buffer
+ */
+int  ini_getsection(int idx, TCHAR *Buffer, int BufferSize, const TCHAR *Filename)
+{
+  INI_FILETYPE fp;
+  int ok = 0;
+
+  if (Buffer == NULL || BufferSize <= 0 || idx < 0)
+    return 0;
+  if (ini_openread(Filename, &fp)) {
+    ok = getkeystring(&fp, NULL, NULL, idx, -1, Buffer, BufferSize, NULL);
+    (void)ini_close(&fp);
+  } /* if */
+  if (!ok)
+    *Buffer = '\0';
+  return (int)_tcslen(Buffer);
+}
+
+/** ini_getkey()
+ * \param Section     the name of the section to browse through, or NULL to
+ *                    browse through the keys outside any section
+ * \param idx         the zero-based sequence number of the key to return
+ * \param Buffer      a pointer to the buffer to copy into
+ * \param BufferSize  the maximum number of characters to copy
+ * \param Filename    the name and full path of the .ini file to read from
+ *
+ * \return            the number of characters copied into the supplied buffer
+ */
+int  ini_getkey(const TCHAR *Section, int idx, TCHAR *Buffer, int BufferSize, const TCHAR *Filename)
+{
+  INI_FILETYPE fp;
+  int ok = 0;
+
+  if (Buffer == NULL || BufferSize <= 0 || idx < 0)
+    return 0;
+  if (ini_openread(Filename, &fp)) {
+    ok = getkeystring(&fp, Section, NULL, -1, idx, Buffer, BufferSize, NULL);
+    (void)ini_close(&fp);
+  } /* if */
+  if (!ok)
+    *Buffer = '\0';
+  return (int)_tcslen(Buffer);
+}
+
+
+#if !defined INI_NOBROWSE
+/** ini_browse()
+ * \param Callback    a pointer to a function that will be called for every
+ *                    setting in the INI file.
+ * \param UserData    arbitrary data, which the function passes on the the
+ *                    \c Callback function
+ * \param Filename    the name and full path of the .ini file to read from
+ *
+ * \return            1 on success, 0 on failure (INI file not found)
+ *
+ * \note              The \c Callback function must return 1 to continue
+ *                    browsing through the INI file, or 0 to stop. Even when the
+ *                    callback stops the browsing, this function will return 1
+ *                    (for success).
+ */
+int  ini_browse(INI_CALLBACK Callback, const void *UserData, const TCHAR *Filename)
+{
+  TCHAR LocalBuffer[INI_BUFFERSIZE];
+  int lenSec, lenKey;
+  enum quote_option quotes;
+  INI_FILETYPE fp;
+
+  if (Callback == NULL)
+    return 0;
+  if (!ini_openread(Filename, &fp))
+    return 0;
+
+  LocalBuffer[0] = '\0';   /* copy an empty section in the buffer */
+  lenSec = (int)_tcslen(LocalBuffer) + 1;
+  for ( ;; ) {
+    TCHAR *sp, *ep;
+    if (!ini_read(LocalBuffer + lenSec, INI_BUFFERSIZE - lenSec, &fp))
+      break;
+    sp = skipleading(LocalBuffer + lenSec);
+    /* ignore empty strings and comments */
+    if (*sp == '\0' || *sp == ';' || *sp == '#')
+      continue;
+    /* see whether we reached a new section */
+    ep = _tcschr(sp, ']');
+    if (*sp == '[' && ep != NULL) {
+      *ep = '\0';
+      save_strncpy(LocalBuffer, sp + 1, INI_BUFFERSIZE, QUOTE_NONE);
+      lenSec = (int)_tcslen(LocalBuffer) + 1;
+      continue;
+    } /* if */
+    /* not a new section, test for a key/value pair */
+    ep = _tcschr(sp, '=');    /* test for the equal sign or colon */
+    if (ep == NULL)
+      ep = _tcschr(sp, ':');
+    if (ep == NULL)
+      continue;               /* invalid line, ignore */
+    *ep++ = '\0';             /* split the key from the value */
+    striptrailing(sp);
+    save_strncpy(LocalBuffer + lenSec, sp, INI_BUFFERSIZE - lenSec, QUOTE_NONE);
+    lenKey = (int)_tcslen(LocalBuffer + lenSec) + 1;
+    /* clean up the value */
+    sp = skipleading(ep);
+    sp = cleanstring(sp, &quotes);  /* Remove a trailing comment */
+    save_strncpy(LocalBuffer + lenSec + lenKey, sp, INI_BUFFERSIZE - lenSec - lenKey, quotes);
+    /* call the callback */
+    if (!Callback(LocalBuffer, LocalBuffer + lenSec, LocalBuffer + lenSec + lenKey, UserData))
+      break;
+  } /* for */
+
+  (void)ini_close(&fp);
+  return 1;
+}
+#endif /* INI_NOBROWSE */
+
+#if ! defined INI_READONLY
+static void ini_tempname(TCHAR *dest, const TCHAR *source, int maxlength)
+{
+  TCHAR *p;
+
+  save_strncpy(dest, source, maxlength, QUOTE_NONE);
+  p = _tcsrchr(dest, '\0');
+  assert(p != NULL);
+  *(p - 1) = '~';
+}
+
+static enum quote_option check_enquote(const TCHAR *Value)
+{
+  const TCHAR *p;
+
+  /* run through the value, if it has trailing spaces, or '"', ';' or '#'
+   * characters, enquote it
+   */
+  assert(Value != NULL);
+  for (p = Value; *p != '\0' && *p != '"' && *p != ';' && *p != '#'; p++)
+    /* nothing */;
+  return (*p != '\0' || (p > Value && *(p - 1) == ' ')) ? QUOTE_ENQUOTE : QUOTE_NONE;
+}
+
+static void writesection(TCHAR *LocalBuffer, const TCHAR *Section, INI_FILETYPE *fp)
+{
+  if (Section != NULL && _tcslen(Section) > 0) {
+    TCHAR *p;
+    LocalBuffer[0] = '[';
+    save_strncpy(LocalBuffer + 1, Section, INI_BUFFERSIZE - 4, QUOTE_NONE);  /* -1 for '[', -1 for ']', -2 for '\r\n' */
+    p = _tcsrchr(LocalBuffer, '\0');
+    assert(p != NULL);
+    *p++ = ']';
+    _tcscpy(p, INI_LINETERM); /* copy line terminator (typically "\n") */
+    if (fp != NULL)
+      (void)ini_write(LocalBuffer, fp);
+  } /* if */
+}
+
+static void writekey(TCHAR *LocalBuffer, const TCHAR *Key, const TCHAR *Value, INI_FILETYPE *fp)
+{
+  TCHAR *p;
+  enum quote_option option = check_enquote(Value);
+  save_strncpy(LocalBuffer, Key, INI_BUFFERSIZE - 3, QUOTE_NONE);  /* -1 for '=', -2 for '\r\n' */
+  p = _tcsrchr(LocalBuffer, '\0');
+  assert(p != NULL);
+  *p++ = '=';
+  save_strncpy(p, Value, INI_BUFFERSIZE - (p - LocalBuffer) - 2, option); /* -2 for '\r\n' */
+  p = _tcsrchr(LocalBuffer, '\0');
+  assert(p != NULL);
+  _tcscpy(p, INI_LINETERM); /* copy line terminator (typically "\n") */
+  if (fp != NULL)
+    (void)ini_write(LocalBuffer, fp);
+}
+
+static int cache_accum(const TCHAR *string, int *size, int max)
+{
+  int len = (int)_tcslen(string);
+  if (*size + len >= max)
+    return 0;
+  *size += len;
+  return 1;
+}
+
+static int cache_flush(TCHAR *buffer, int *size,
+                      INI_FILETYPE *rfp, INI_FILETYPE *wfp, INI_FILEPOS *mark)
+{
+  int terminator_len = (int)_tcslen(INI_LINETERM);
+  int pos = 0;
+
+  (void)ini_seek(rfp, mark);
+  assert(buffer != NULL);
+  buffer[0] = '\0';
+  assert(size != NULL);
+  assert(*size <= INI_BUFFERSIZE);
+  while (pos < *size) {
+    (void)ini_read(buffer + pos, INI_BUFFERSIZE - pos, rfp);
+    while (pos < *size && buffer[pos] != '\0')
+      pos++;            /* cannot use _tcslen() because buffer may not be zero-terminated */
+  } /* while */
+  if (buffer[0] != '\0') {
+    assert(pos > 0 && pos <= INI_BUFFERSIZE);
+    if (pos == INI_BUFFERSIZE)
+      pos--;
+    buffer[pos] = '\0'; /* force zero-termination (may be left unterminated in the above while loop) */
+    (void)ini_write(buffer, wfp);
+  }
+  ini_tell(rfp, mark);  /* update mark */
+  *size = 0;
+  /* return whether the buffer ended with a line termination */
+  return (pos > terminator_len) && (_tcscmp(buffer + pos - terminator_len, INI_LINETERM) == 0);
+}
+
+static int close_rename(INI_FILETYPE *rfp, INI_FILETYPE *wfp, const TCHAR *filename, TCHAR *buffer)
+{
+  (void)ini_close(rfp);
+  (void)ini_close(wfp);
+  (void)ini_remove(filename);
+  (void)ini_tempname(buffer, filename, INI_BUFFERSIZE);
+  (void)ini_rename(buffer, filename);
+  return 1;
+}
+
+/** ini_puts()
+ * \param Section     the name of the section to write the string in
+ * \param Key         the name of the entry to write, or NULL to erase all keys in the section
+ * \param Value       a pointer to the buffer the string, or NULL to erase the key
+ * \param Filename    the name and full path of the .ini file to write to
+ *
+ * \return            1 if successful, otherwise 0
+ */
+int ini_puts(const TCHAR *Section, const TCHAR *Key, const TCHAR *Value, const TCHAR *Filename)
+{
+  INI_FILETYPE rfp;
+  INI_FILETYPE wfp;
+  INI_FILEPOS mark;
+  INI_FILEPOS head, tail;
+  TCHAR *sp, *ep;
+  TCHAR LocalBuffer[INI_BUFFERSIZE];
+  int len, match, flag, cachelen;
+
+  assert(Filename != NULL);
+  if (!ini_openread(Filename, &rfp)) {
+    /* If the .ini file doesn't exist, make a new file */
+    if (Key != NULL && Value != NULL) {
+      if (!ini_openwrite(Filename, &wfp))
+        return 0;
+      writesection(LocalBuffer, Section, &wfp);
+      writekey(LocalBuffer, Key, Value, &wfp);
+      (void)ini_close(&wfp);
+    } /* if */
+    return 1;
+  } /* if */
+
+  /* If parameters Key and Value are valid (so this is not an "erase" request)
+   * and the setting already exists, there are two short-cuts to avoid rewriting
+   * the INI file.
+   */
+  if (Key != NULL && Value != NULL) {
+    ini_tell(&rfp, &mark);
+    match = getkeystring(&rfp, Section, Key, -1, -1, LocalBuffer, sizearray(LocalBuffer), &head);
+    if (match) {
+      /* if the current setting is identical to the one to write, there is
+       * nothing to do.
+       */
+      if (_tcscmp(LocalBuffer,Value) == 0) {
+        (void)ini_close(&rfp);
+        return 1;
+      } /* if */
+      /* if the new setting has the same length as the current setting, and the
+       * glue file permits file read/write access, we can modify in place.
+       */
+      #if defined ini_openrewrite
+        /* we already have the start of the (raw) line, get the end too */
+        ini_tell(&rfp, &tail);
+        /* create new buffer (without writing it to file) */
+        writekey(LocalBuffer, Key, Value, NULL);
+        if (_tcslen(LocalBuffer) == (size_t)(tail - head)) {
+          /* length matches, close the file & re-open for read/write, then
+           * write at the correct position
+           */
+          (void)ini_close(&rfp);
+          if (!ini_openrewrite(Filename, &wfp))
+            return 0;
+          (void)ini_seek(&wfp, &head);
+          (void)ini_write(LocalBuffer, &wfp);
+          (void)ini_close(&wfp);
+          return 1;
+        } /* if */
+      #endif
+    } /* if */
+    /* key not found, or different value & length -> proceed (but rewind the
+     * input file first)
+     */
+    (void)ini_seek(&rfp, &mark);
+  } /* if */
+
+  /* Get a temporary file name to copy to. Use the existing name, but with
+   * the last character set to a '~'.
+   */
+  ini_tempname(LocalBuffer, Filename, INI_BUFFERSIZE);
+  if (!ini_openwrite(LocalBuffer, &wfp)) {
+    (void)ini_close(&rfp);
+    return 0;
+  } /* if */
+  ini_tell(&rfp, &mark);
+  cachelen = 0;
+
+  /* Move through the file one line at a time until a section is
+   * matched or until EOF. Copy to temp file as it is read.
+   */
+  len = (Section != NULL) ? (int)_tcslen(Section) : 0;
+  if (len > 0) {
+    do {
+      if (!ini_read(LocalBuffer, INI_BUFFERSIZE, &rfp)) {
+        /* Failed to find section, so add one to the end */
+        flag = cache_flush(LocalBuffer, &cachelen, &rfp, &wfp, &mark);
+        if (Key!=NULL && Value!=NULL) {
+          if (!flag)
+            (void)ini_write(INI_LINETERM, &wfp);  /* force a new line behind the last line of the INI file */
+          writesection(LocalBuffer, Section, &wfp);
+          writekey(LocalBuffer, Key, Value, &wfp);
+        } /* if */
+        return close_rename(&rfp, &wfp, Filename, LocalBuffer);  /* clean up and rename */
+      } /* if */
+      /* Copy the line from source to dest, but not if this is the section that
+       * we are looking for and this section must be removed
+       */
+      sp = skipleading(LocalBuffer);
+      ep = _tcschr(sp, ']');
+      match = (*sp == '[' && ep != NULL && (int)(ep-sp-1) == len && _tcsnicmp(sp + 1,Section,len) == 0);
+      if (!match || Key != NULL) {
+        if (!cache_accum(LocalBuffer, &cachelen, INI_BUFFERSIZE)) {
+          cache_flush(LocalBuffer, &cachelen, &rfp, &wfp, &mark);
+          (void)ini_read(LocalBuffer, INI_BUFFERSIZE, &rfp);
+          cache_accum(LocalBuffer, &cachelen, INI_BUFFERSIZE);
+        } /* if */
+      } /* if */
+    } while (!match);
+  } /* if */
+  cache_flush(LocalBuffer, &cachelen, &rfp, &wfp, &mark);
+  /* when deleting a section, the section head that was just found has not been
+   * copied to the output file, but because this line was not "accumulated" in
+   * the cache, the position in the input file was reset to the point just
+   * before the section; this must now be skipped (again)
+   */
+  if (Key == NULL) {
+    (void)ini_read(LocalBuffer, INI_BUFFERSIZE, &rfp);
+    ini_tell(&rfp, &mark);
+  } /* if */
+
+  /* Now that the section has been found, find the entry. Stop searching
+   * upon leaving the section's area. Copy the file as it is read
+   * and create an entry if one is not found.
+   */
+  len = (Key != NULL) ? (int)_tcslen(Key) : 0;
+  for( ;; ) {
+    if (!ini_read(LocalBuffer, INI_BUFFERSIZE, &rfp)) {
+      /* EOF without an entry so make one */
+      flag = cache_flush(LocalBuffer, &cachelen, &rfp, &wfp, &mark);
+      if (Key!=NULL && Value!=NULL) {
+        if (!flag)
+          (void)ini_write(INI_LINETERM, &wfp);  /* force a new line behind the last line of the INI file */
+        writekey(LocalBuffer, Key, Value, &wfp);
+      } /* if */
+      return close_rename(&rfp, &wfp, Filename, LocalBuffer);  /* clean up and rename */
+    } /* if */
+    sp = skipleading(LocalBuffer);
+    ep = _tcschr(sp, '='); /* Parse out the equal sign */
+    if (ep == NULL)
+      ep = _tcschr(sp, ':');
+    match = (ep != NULL && len > 0 && (int)(skiptrailing(ep,sp)-sp) == len && _tcsnicmp(sp,Key,len) == 0);
+    if ((Key != NULL && match) || *sp == '[')
+      break;  /* found the key, or found a new section */
+    /* copy other keys in the section */
+    if (Key == NULL) {
+      ini_tell(&rfp, &mark);  /* we are deleting the entire section, so update the read position */
+    } else {
+      if (!cache_accum(LocalBuffer, &cachelen, INI_BUFFERSIZE)) {
+        cache_flush(LocalBuffer, &cachelen, &rfp, &wfp, &mark);
+        (void)ini_read(LocalBuffer, INI_BUFFERSIZE, &rfp);
+        cache_accum(LocalBuffer, &cachelen, INI_BUFFERSIZE);
+      } /* if */
+    } /* if */
+  } /* for */
+  /* the key was found, or we just dropped on the next section (meaning that it
+   * wasn't found); in both cases we need to write the key, but in the latter
+   * case, we also need to write the line starting the new section after writing
+   * the key
+   */
+  flag = (*sp == '[');
+  cache_flush(LocalBuffer, &cachelen, &rfp, &wfp, &mark);
+  if (Key != NULL && Value != NULL)
+    writekey(LocalBuffer, Key, Value, &wfp);
+  /* cache_flush() reset the "read pointer" to the start of the line with the
+   * previous key or the new section; read it again (because writekey() destroyed
+   * the buffer)
+   */
+  (void)ini_read(LocalBuffer, INI_BUFFERSIZE, &rfp);
+  if (flag) {
+    /* the new section heading needs to be copied to the output file */
+    cache_accum(LocalBuffer, &cachelen, INI_BUFFERSIZE);
+  } else {
+    /* forget the old key line */
+    ini_tell(&rfp, &mark);
+  } /* if */
+  /* Copy the rest of the INI file */
+  while (ini_read(LocalBuffer, INI_BUFFERSIZE, &rfp)) {
+    if (!cache_accum(LocalBuffer, &cachelen, INI_BUFFERSIZE)) {
+      cache_flush(LocalBuffer, &cachelen, &rfp, &wfp, &mark);
+      (void)ini_read(LocalBuffer, INI_BUFFERSIZE, &rfp);
+      cache_accum(LocalBuffer, &cachelen, INI_BUFFERSIZE);
+    } /* if */
+  } /* while */
+  cache_flush(LocalBuffer, &cachelen, &rfp, &wfp, &mark);
+  return close_rename(&rfp, &wfp, Filename, LocalBuffer);  /* clean up and rename */
+}
+
+/* Ansi C "itoa" based on Kernighan & Ritchie's "Ansi C" book. */
+#define ABS(v)  ((v) < 0 ? -(v) : (v))
+
+static void strreverse(TCHAR *str)
+{
+  int i, j;
+  for (i = 0, j = (int)_tcslen(str) - 1; i < j; i++, j--) {
+    TCHAR t = str[i];
+    str[i] = str[j];
+    str[j] = t;
+  } /* for */
+}
+
+static void long2str(long value, TCHAR *str)
+{
+  int i = 0;
+  long sign = value;
+  int n;
+
+  /* generate digits in reverse order */
+  do {
+    n = (int)(value % 10);              /* get next lowest digit */
+    str[i++] = (TCHAR)(ABS(n) + '0');   /* handle case of negative digit */
+  } while (value /= 10);                /* delete the lowest digit */
+  if (sign < 0)
+    str[i++] = '-';
+  str[i] = '\0';
+
+  strreverse(str);
+}
+
+/** ini_putl()
+ * \param Section     the name of the section to write the value in
+ * \param Key         the name of the entry to write
+ * \param Value       the value to write
+ * \param Filename    the name and full path of the .ini file to write to
+ *
+ * \return            1 if successful, otherwise 0
+ */
+int ini_putl(const TCHAR *Section, const TCHAR *Key, long Value, const TCHAR *Filename)
+{
+  TCHAR LocalBuffer[32];
+  long2str(Value, LocalBuffer);
+  return ini_puts(Section, Key, LocalBuffer, Filename);
+}
+
+#if defined INI_REAL
+/** ini_putf()
+ * \param Section     the name of the section to write the value in
+ * \param Key         the name of the entry to write
+ * \param Value       the value to write
+ * \param Filename    the name and full path of the .ini file to write to
+ *
+ * \return            1 if successful, otherwise 0
+ */
+int ini_putf(const TCHAR *Section, const TCHAR *Key, INI_REAL Value, const TCHAR *Filename)
+{
+  TCHAR LocalBuffer[64];
+  ini_ftoa(LocalBuffer, Value);
+  return ini_puts(Section, Key, LocalBuffer, Filename);
+}
+#endif /* INI_REAL */
+#endif /* !INI_READONLY */
diff --git a/apps/openmw-mp/amx/minIni.h b/apps/openmw-mp/amx/minIni.h
new file mode 100644
index 000000000..b4860d5f8
--- /dev/null
+++ b/apps/openmw-mp/amx/minIni.h
@@ -0,0 +1,152 @@
+/*  minIni - Multi-Platform INI file parser, suitable for embedded systems
+ *
+ *  Copyright (c) CompuPhase, 2008-2012
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ *  use this file except in compliance with the License. You may obtain a copy
+ *  of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ *
+ *  Version: $Id: minIni.h 5181 2015-01-21 09:44:28Z thiadmer $
+ */
+#ifndef MININI_H
+#define MININI_H
+
+#include "minGlue.h"
+
+#if (defined _UNICODE || defined __UNICODE__ || defined UNICODE) && !defined INI_ANSIONLY
+  #include <tchar.h>
+  #define mTCHAR TCHAR
+#else
+  /* force TCHAR to be "char", but only for minIni */
+  #define mTCHAR char
+#endif
+
+#if !defined INI_BUFFERSIZE
+  #define INI_BUFFERSIZE  512
+#endif
+
+#if defined __cplusplus
+  extern "C" {
+#endif
+
+int   ini_getbool(const mTCHAR *Section, const mTCHAR *Key, int DefValue, const mTCHAR *Filename);
+long  ini_getl(const mTCHAR *Section, const mTCHAR *Key, long DefValue, const mTCHAR *Filename);
+int   ini_gets(const mTCHAR *Section, const mTCHAR *Key, const mTCHAR *DefValue, mTCHAR *Buffer, int BufferSize, const mTCHAR *Filename);
+int   ini_getsection(int idx, mTCHAR *Buffer, int BufferSize, const mTCHAR *Filename);
+int   ini_getkey(const mTCHAR *Section, int idx, mTCHAR *Buffer, int BufferSize, const mTCHAR *Filename);
+
+#if defined INI_REAL
+INI_REAL ini_getf(const mTCHAR *Section, const mTCHAR *Key, INI_REAL DefValue, const mTCHAR *Filename);
+#endif
+
+#if !defined INI_READONLY
+int   ini_putl(const mTCHAR *Section, const mTCHAR *Key, long Value, const mTCHAR *Filename);
+int   ini_puts(const mTCHAR *Section, const mTCHAR *Key, const mTCHAR *Value, const mTCHAR *Filename);
+#if defined INI_REAL
+int   ini_putf(const mTCHAR *Section, const mTCHAR *Key, INI_REAL Value, const mTCHAR *Filename);
+#endif
+#endif /* INI_READONLY */
+
+#if !defined INI_NOBROWSE
+typedef int (*INI_CALLBACK)(const mTCHAR *Section, const mTCHAR *Key, const mTCHAR *Value, const void *UserData);
+int  ini_browse(INI_CALLBACK Callback, const void *UserData, const mTCHAR *Filename);
+#endif /* INI_NOBROWSE */
+
+#if defined __cplusplus
+  }
+#endif
+
+
+#if defined __cplusplus
+
+#if defined __WXWINDOWS__
+    #include "wxMinIni.h"
+#else
+  #include <string>
+
+  /* The C++ class in minIni.h was contributed by Steven Van Ingelgem. */
+  class minIni
+  {
+  public:
+    minIni(const std::string& filename) : iniFilename(filename)
+      { }
+
+    bool getbool(const std::string& Section, const std::string& Key, bool DefValue=false) const
+      { return ini_getbool(Section.c_str(), Key.c_str(), int(DefValue), iniFilename.c_str()) != 0; }
+
+    long getl(const std::string& Section, const std::string& Key, long DefValue=0) const
+      { return ini_getl(Section.c_str(), Key.c_str(), DefValue, iniFilename.c_str()); }
+
+    int geti(const std::string& Section, const std::string& Key, int DefValue=0) const
+      { return static_cast<int>(this->getl(Section, Key, long(DefValue))); }
+
+    std::string gets(const std::string& Section, const std::string& Key, const std::string& DefValue="") const
+      {
+        char buffer[INI_BUFFERSIZE];
+        ini_gets(Section.c_str(), Key.c_str(), DefValue.c_str(), buffer, INI_BUFFERSIZE, iniFilename.c_str());
+        return buffer;
+      }
+
+    std::string getsection(int idx) const
+      {
+        char buffer[INI_BUFFERSIZE];
+        ini_getsection(idx, buffer, INI_BUFFERSIZE, iniFilename.c_str());
+        return buffer;
+      }
+
+    std::string getkey(const std::string& Section, int idx) const
+      {
+        char buffer[INI_BUFFERSIZE];
+        ini_getkey(Section.c_str(), idx, buffer, INI_BUFFERSIZE, iniFilename.c_str());
+        return buffer;
+      }
+
+#if defined INI_REAL
+    INI_REAL getf(const std::string& Section, const std::string& Key, INI_REAL DefValue=0) const
+      { return ini_getf(Section.c_str(), Key.c_str(), DefValue, iniFilename.c_str()); }
+#endif
+
+#if ! defined INI_READONLY
+    bool put(const std::string& Section, const std::string& Key, long Value) const
+      { return ini_putl(Section.c_str(), Key.c_str(), Value, iniFilename.c_str()) != 0; }
+
+    bool put(const std::string& Section, const std::string& Key, int Value) const
+      { return ini_putl(Section.c_str(), Key.c_str(), (long)Value, iniFilename.c_str()) != 0; }
+
+    bool put(const std::string& Section, const std::string& Key, bool Value) const
+      { return ini_putl(Section.c_str(), Key.c_str(), (long)Value, iniFilename.c_str()) != 0; }
+
+    bool put(const std::string& Section, const std::string& Key, const std::string& Value) const
+      { return ini_puts(Section.c_str(), Key.c_str(), Value.c_str(), iniFilename.c_str()) != 0; }
+
+    bool put(const std::string& Section, const std::string& Key, const char* Value) const
+      { return ini_puts(Section.c_str(), Key.c_str(), Value, iniFilename.c_str()) != 0; }
+
+#if defined INI_REAL
+    bool put(const std::string& Section, const std::string& Key, INI_REAL Value) const
+      { return ini_putf(Section.c_str(), Key.c_str(), Value, iniFilename.c_str()) != 0; }
+#endif
+
+    bool del(const std::string& Section, const std::string& Key) const
+      { return ini_puts(Section.c_str(), Key.c_str(), 0, iniFilename.c_str()) != 0; }
+
+    bool del(const std::string& Section) const
+      { return ini_puts(Section.c_str(), 0, 0, iniFilename.c_str()) != 0; }
+#endif
+
+  private:
+    std::string iniFilename;
+  };
+
+#endif /* __WXWINDOWS__ */
+#endif /* __cplusplus */
+
+#endif /* MININI_H */
diff --git a/apps/openmw-mp/amx/osdefs.h b/apps/openmw-mp/amx/osdefs.h
new file mode 100644
index 000000000..5e07cd349
--- /dev/null
+++ b/apps/openmw-mp/amx/osdefs.h
@@ -0,0 +1,159 @@
+/*
+ * Platform
+ *   __MSDOS__    set when compiling for DOS (not Windows)
+ *   _Windows     set when compiling for any version of Microsoft Windows
+ *   __WIN32__    set when compiling for Windows95 or WindowsNT (32 bit mode)
+ *   __32BIT__    set when compiling in 32-bit "flat" mode (DOS, Windows, ARM)
+ *   __64BIT__    set when compiling in 64-bit mode
+ *   __ECOS__     set if Pawn was included with the eCos with configtool
+ *   __LINUX__    set when compiling for Linux
+ *
+ * Copyright 1998-2011, ITB CompuPhase, The Netherlands.
+ * No usage restrictions, no warranties.
+ */
+
+#ifndef _OSDEFS_H
+#define _OSDEFS_H
+
+/* Every compiler uses different "default" macros to indicate the mode
+ * it is in. Throughout the source, we use the Borland C++ macros, so
+ * the macros of Watcom C/C++ and Microsoft Visual C/C++ are mapped to
+ * those of Borland C++.
+ */
+#if defined(__WATCOMC__)
+  #if defined(__WINDOWS__) || defined(__NT__)
+    #define _Windows    1
+  #endif
+  #if defined(__386__) || defined(__NT__)
+    #define __32BIT__   1
+  #endif
+  #if defined(_Windows) && defined(__32BIT__)
+    #define __WIN32__   1
+  #endif
+#elif defined(_MSC_VER)
+  #if defined(_WINDOWS) || defined(_WIN32)
+    #define _Windows    1
+  #endif
+  #if defined(_WIN32)
+    #define __WIN32__   1
+    #define __32BIT__   1
+  #endif
+#elif defined __arm__
+  #define __32BIT__     1
+#elif defined __AVR__
+  #define __16BIT__     1
+#endif
+#if !defined __16BIT__ && !defined __32BIT__ && !defined __64BIT__
+  #define __32BIT__     1
+#endif
+
+
+#if (defined __linux || defined __linux__) && !defined __LINUX__
+  #define __LINUX__
+#endif
+/* To be able to eventually set __ECOS__, we have to find a symbol
+ * defined in a common place (so including the header file won't break
+ * anything for other platforms). <sys/types.h> includes
+ * <pkgconf/system.h> and in this later file we can find CYGPKG_PAWN
+ * if the Pawn package was included with configtool and so we know
+ * that we are compiling for eCos.
+ */
+#if defined CCSINFO
+  #include <sys/types.h>
+#endif
+#if defined CYGPKG_PAWN
+  #define __ECOS__      1
+  #define HAVE_ALLOCA_H 0
+#endif
+
+
+#if defined __FreeBSD__
+  #include <sys/endian.h>
+#elif defined __LINUX__
+  #include <endian.h>
+#elif defined __ECOS__
+  #include <cyg/hal/hal_endian.h>
+  #define BIG_ENDIAN    4321
+  #define LITTLE_ENDIAN 1234
+  #if (CYG_BYTEORDER == CYG_LSBFIRST)
+  #define BYTE_ORDER  LITTLE_ENDIAN
+  #else
+    #define BYTE_ORDER  BIG_ENDIAN
+  #endif
+   /*
+    * eCos option management.
+    */
+  #include <pkgconf/pawn.h>
+  #if CYGPKG_PAWN_AMX_ANSIONLY==1
+    #define AMX_ANSIONLY
+  #endif
+  #define PAWN_CELL_SIZE CYGPKG_PAWN_AMX_CELLSIZE
+  #if CYGPKG_PAWN_CORE_RANDOM==0
+    #define AMX_NORANDOM
+  #endif
+  #if CYGPKG_PAWN_CORE_PROPERTY==0
+    #define AMX_NOPROPLIST
+  #endif
+  #if CYGPKG_PAWN_AMX_CONS_FIXEDPOINT==1
+    #define FIXEDPOINT
+  #endif
+  #if CYGPKG_PAWN_AMX_CONS_FLOATPOINT==1
+    #define FLOATPOINT
+  #endif
+#endif
+
+/* Linux now has these */
+#if !defined BIG_ENDIAN
+  #define BIG_ENDIAN    4321
+#endif
+#if !defined LITTLE_ENDIAN
+  #define LITTLE_ENDIAN 1234
+#endif
+
+/* educated guess, BYTE_ORDER is undefined, i386 is common => little endian */
+#if !defined BYTE_ORDER
+  #if defined UCLINUX
+    #define BYTE_ORDER BIG_ENDIAN
+  #else
+    #define BYTE_ORDER LITTLE_ENDIAN
+  #endif
+#endif
+
+#if defined __MSDOS__ || defined __WIN32__ || defined _Windows
+  #define DIRSEP_CHAR '\\'
+#elif defined macintosh /* only the original Macintosh uses ':', OSX uses the '/' */
+  #define DIRSEP_CHAR ':'
+#else
+  #define DIRSEP_CHAR '/'
+#endif
+
+/* _MAX_PATH is sometimes called differently and it may be in limits.h or
+ * stdlib.h instead of stdio.h.
+ */
+#if !defined _MAX_PATH
+  /* not defined, perhaps stdio.h was not included */
+  #if !defined PATH_MAX
+    #include <stdio.h>
+  #endif
+  #if !defined _MAX_PATH && !defined PATH_MAX
+    /* no _MAX_PATH and no MAX_PATH, perhaps it is in limits.h */
+    #include <limits.h>
+  #endif
+  #if !defined _MAX_PATH && !defined PATH_MAX
+    /* no _MAX_PATH and no MAX_PATH, perhaps it is in stdlib.h */
+    #include <stdlib.h>
+  #endif
+  /* if _MAX_PATH is undefined, try common alternative names */
+  #if !defined _MAX_PATH
+    #if defined MAX_PATH
+      #define _MAX_PATH    MAX_PATH
+    #elif defined _POSIX_PATH_MAX
+      #define _MAX_PATH  _POSIX_PATH_MAX
+    #else
+      /* everything failed, actually we have a problem here... */
+      #define _MAX_PATH  1024
+    #endif
+  #endif
+#endif
+
+#endif  /* _OSDEFS_H */
diff --git a/apps/openmw-mp/main.cpp b/apps/openmw-mp/main.cpp
new file mode 100644
index 000000000..a0b127e45
--- /dev/null
+++ b/apps/openmw-mp/main.cpp
@@ -0,0 +1,268 @@
+#include <RakPeerInterface.h>
+#include <BitStream.h>
+#include "Player.hpp"
+#include "Networking.hpp"
+#include "MasterClient.hpp"
+#include <RakPeer.h>
+#include <MessageIdentifiers.h>
+#include <components/openmw-mp/Log.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <apps/openmw-mp/Script/Script.hpp>
+#include <iostream>
+#include <components/files/configurationmanager.hpp>
+#include <components/settings/settings.hpp>
+#include <boost/iostreams/concepts.hpp>
+#include <boost/iostreams/stream_buffer.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include <components/openmw-mp/Version.hpp>
+
+#include "MasterClient.hpp"
+
+#ifdef ENABLE_BREAKPAD
+#include <handler/exception_handler.h>
+#endif
+
+using namespace std;
+using namespace mwmp;
+
+void printVersion(string version, int protocol)
+{
+    cout << "TES3:MP dedicated server " << version;
+    cout << " (";
+#if defined(_WIN32)
+    cout << "Windows";
+#elif defined(__linux)
+    cout << "Linux";
+#elif defined(__APPLE__)
+    cout << "OS X";
+#else
+    cout << "Unknown OS";
+#endif
+    cout << " ";
+#ifdef __x86_64__
+    cout << "64-bit";
+#elif defined(__i386__) || defined(_M_I86)
+    cout << "32-bit";
+#elif defined(__arm__)
+    cout << "ARMv" << __ARM_ARCH << " ";
+    #ifdef __aarch64__
+        cout << "64-bit";
+    #else
+        cout << "32-bit";
+    #endif
+#else
+    cout << "Unknown architecture";
+#endif
+    cout << ")" << endl;
+    cout << "Protocol version: " << protocol << endl;
+
+    cout << "------------------------------------------------------------" << endl;
+}
+
+#ifdef ENABLE_BREAKPAD
+google_breakpad::ExceptionHandler *pHandler = 0;
+#if defined(_WIN32)
+bool DumpCallback(const wchar_t* _dump_dir,const wchar_t* _minidump_id,void* context,EXCEPTION_POINTERS* exinfo,MDRawAssertionInfo* assertion,bool success)
+#elif defined(__linux)
+bool DumpCallback(const google_breakpad::MinidumpDescriptor &md, void *context, bool success)
+#endif
+{
+    // NO STACK USE, NO HEAP USE THERE !!!
+    return success;
+}
+
+void breakpad(std::string pathToDump)
+{
+#ifdef _WIN32
+    pHandler = new google_breakpad::ExceptionHandler(
+            L"crashdumps\\",
+            /*FilterCallback*/ 0,
+            DumpCallback,
+            0,
+            google_breakpad::ExceptionHandler::HANDLER_ALL);
+#else
+    google_breakpad::MinidumpDescriptor md(pathToDump);
+    pHandler = new google_breakpad::ExceptionHandler(
+            md,
+            /*FilterCallback*/ 0,
+            DumpCallback,
+            /*context*/ 0,
+            true,
+            -1
+    );
+#endif
+}
+
+void breakpad_close()
+{
+    delete pHandler;
+}
+#else
+void breakpad(std::string pathToDump){}
+void breakpad_close(){}
+#endif
+
+std::string loadSettings (Settings::Manager & settings)
+{
+    Files::ConfigurationManager mCfgMgr;
+    // Create the settings manager and load default settings file
+    const std::string localdefault = (mCfgMgr.getLocalPath() / "tes3mp-server-default.cfg").string();
+    const std::string globaldefault = (mCfgMgr.getGlobalPath() / "tes3mp-server-default.cfg").string();
+
+    // prefer local
+    if (boost::filesystem::exists(localdefault))
+        settings.loadDefault(localdefault);
+    else if (boost::filesystem::exists(globaldefault))
+        settings.loadDefault(globaldefault);
+    else
+        throw std::runtime_error ("No default settings file found! Make sure the file \"tes3mp-server-default.cfg\" was properly installed.");
+
+    // load user settings if they exist
+    const std::string settingspath = (mCfgMgr.getUserConfigPath() / "tes3mp-server.cfg").string();
+    if (boost::filesystem::exists(settingspath))
+        settings.loadUser(settingspath);
+
+    return settingspath;
+}
+
+class Tee : public boost::iostreams::sink
+{
+public:
+    Tee(std::ostream &stream, std::ostream &stream2)
+            : out(stream), out2(stream2)
+    {
+    }
+
+    std::streamsize write(const char *str, std::streamsize size)
+    {
+        out.write (str, size);
+        out.flush();
+        out2.write (str, size);
+        out2.flush();
+        return size;
+    }
+
+private:
+    std::ostream &out;
+    std::ostream &out2;
+};
+
+int main(int argc, char *argv[])
+{
+    Settings::Manager mgr;
+    Files::ConfigurationManager cfgMgr;
+
+    breakpad(boost::filesystem::path(cfgMgr.getLogPath()).string());
+
+    loadSettings(mgr);
+
+    int logLevel = mgr.getInt("loglevel", "General");
+    if (logLevel < Log::LOG_VERBOSE || logLevel > Log::LOG_FATAL)
+        logLevel = Log::LOG_VERBOSE;
+
+    // Some objects used to redirect cout and cerr
+    // Scope must be here, so this still works inside the catch block for logging exceptions
+    std::streambuf* cout_rdbuf = std::cout.rdbuf ();
+    std::streambuf* cerr_rdbuf = std::cerr.rdbuf ();
+
+    boost::iostreams::stream_buffer<Tee> coutsb;
+    boost::iostreams::stream_buffer<Tee> cerrsb;
+
+    std::ostream oldcout(cout_rdbuf);
+    std::ostream oldcerr(cerr_rdbuf);
+
+    boost::filesystem::ofstream logfile;
+
+    // Redirect cout and cerr to tes3mp server log
+    logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / "/tes3mp-server-" += Log::getFilenameTimestamp() += ".log"));
+
+    coutsb.open (Tee(logfile, oldcout));
+    cerrsb.open (Tee(logfile, oldcerr));
+
+    std::cout.rdbuf (&coutsb);
+    std::cerr.rdbuf (&cerrsb);
+
+    LOG_INIT(logLevel);
+
+    int players = mgr.getInt("players", "General");
+    string addr = mgr.getString("address", "General");
+    int port = mgr.getInt("port", "General");
+
+    string passw = mgr.getString("password", "General");
+
+    string plugin_home = mgr.getString("home", "Plugins");
+    string moddir = Utils::convertPath(plugin_home + "/data");
+
+    vector<string> plugins (Utils::split(mgr.getString("plugins", "Plugins"), ','));
+
+    printVersion(TES3MP_VERSION, TES3MP_PROTO_VERSION);
+
+
+    setenv("AMXFILE", moddir.c_str(), 1);
+    setenv("MOD_DIR", moddir.c_str(), 1); // hack for lua
+
+    setenv("LUA_PATH", Utils::convertPath(plugin_home + "/scripts/?.lua" + ";"
+                                          + plugin_home + "/scripts/?.t" + ";"
+                                          + plugin_home + "/lib/lua/?.lua" + ";"
+                                          + plugin_home + "/lib/lua/?.t").c_str(), 1);
+#ifdef _WIN32
+    setenv("LUA_CPATH", Utils::convertPath(plugin_home + "/lib/?.dll").c_str(), 1);
+#else
+    setenv("LUA_CPATH", Utils::convertPath(plugin_home + "/lib/?.so").c_str(), 1);
+#endif
+
+    for (auto plugin : plugins)
+        Script::LoadScript(plugin.c_str(), plugin_home.c_str());
+
+    RakNet::RakPeerInterface *peer = RakNet::RakPeerInterface::GetInstance();
+
+    stringstream sstr(TES3MP_VERSION);
+    sstr << TES3MP_PROTO_VERSION;
+
+    peer->SetIncomingPassword(sstr.str().c_str(), (int)sstr.str().size());
+
+    if (RakNet::NonNumericHostString(addr.c_str()))
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "You cannot use non-numeric addresses for the server.");
+        return 1;
+    }
+
+    RakNet::SocketDescriptor sd((unsigned short)port, addr.c_str());
+    if (peer->Startup((unsigned)players, &sd, 1) != RakNet::RAKNET_STARTED)
+        return 1;
+
+    peer->SetMaximumIncomingConnections((unsigned short)(players));
+
+    Networking networking(peer);
+    networking.setServerPassword(passw);
+
+    if ( mgr.getBool("enabled", "MasterServer"))
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sharing server query info to master enabled.");
+        string masterAddr = mgr.getString("address", "MasterServer");
+        int masterPort = mgr.getInt("port", "MasterServer");
+
+        networking.InitQuery(masterAddr, (unsigned short) masterPort, addr, (unsigned short) port);
+        networking.getMasterClient()->SetMaxPlayers((unsigned)players);
+        string hostname = mgr.getString("hostname", "General");
+        networking.getMasterClient()->SetHostname(hostname);
+
+        networking.getMasterClient()->Start();
+    }
+
+    int code = networking.mainLoop();
+
+    RakNet::RakPeerInterface::DestroyInstance(peer);
+
+    networking.getMasterClient()->Stop();
+
+    if (code == 0)
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Quitting peacefully.");
+
+    // Restore cout and cerr
+    std::cout.rdbuf(cout_rdbuf);
+    std::cerr.rdbuf(cerr_rdbuf);
+
+    breakpad_close();
+    return code;
+}
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index f2540c739..2e90a5a7a 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -3,7 +3,7 @@ set(GAME
     main.cpp
     engine.cpp
 
-    ${CMAKE_SOURCE_DIR}/files/windows/openmw.rc
+    ${CMAKE_SOURCE_DIR}/files/tes3mp/tes3mp.rc
 )
 
 if (ANDROID)
@@ -23,7 +23,7 @@ add_openmw_dir (mwrender
     actors objects renderingmanager animation rotatecontroller sky npcanimation vismask
     creatureanimation effectmanager util renderinginterface pathgrid rendermode weaponanimation
     bulletdebugdraw globalmap characterpreview camera localmap water terrainstorage ripplesimulation
-    renderbin
+    renderbin actoranimation
     )
 
 add_openmw_dir (mwinput
@@ -42,7 +42,7 @@ add_openmw_dir (mwgui
     itemmodel containeritemmodel inventoryitemmodel sortfilteritemmodel itemview
     tradeitemmodel companionitemmodel pickpocketitemmodel controllers savegamedialog
     recharge mode videowidget backgroundimage itemwidget screenfader debugwindow spellmodel spellview
-    draganddrop timeadvancer jailscreen
+    draganddrop timeadvancer jailscreen itemchargeview
     )
 
 add_openmw_dir (mwdialogue
@@ -84,7 +84,7 @@ add_openmw_dir (mwmechanics
     drawstate spells activespells npcstats aipackage aisequence aipursue alchemy aiwander aitravel aifollow aiavoiddoor
     aiescort aiactivate aicombat repair enchanting pathfinding pathgrid security spellsuccess spellcasting
     disease pickpocket levelledlist combat steering obstacle autocalcspell difficultyscaling aicombataction actor summoning
-    character actors objects aistate coordinateconverter
+    character actors objects aistate coordinateconverter trading aiface
     )
 
 add_openmw_dir (mwstate
@@ -96,16 +96,18 @@ add_openmw_dir (mwbase
     inputmanager windowmanager statemanager
     )
 
+add_openmw_dir (mwmp DedicatedPlayer WorldEvent LocalPlayer Networking Main GUIChat GUILogin GUIController PlayerMarkerCollection GUIDialogList WorldController)
+
 # Main executable
 
 if (NOT ANDROID)
-    add_executable(openmw
+    add_executable(tes3mp
         ${OPENMW_FILES}
         ${GAME} ${GAME_HEADER}
         ${APPLE_BUNDLE_RESOURCES}
     )
 else ()
-    add_library(openmw
+    add_library(tes3mp
         SHARED
         ${OPENMW_FILES}
         ${GAME} ${GAME_HEADER}
@@ -115,10 +117,10 @@ endif ()
 # Sound stuff - here so CMake doesn't stupidly recompile EVERYTHING
 # when we change the backend.
 include_directories(
-    ${FFMPEG_INCLUDE_DIRS}
+    ${FFmpeg_INCLUDE_DIRS}
 )
 
-target_link_libraries(openmw
+target_link_libraries(tes3mp
     ${OSG_LIBRARIES}
     ${OPENTHREADS_LIBRARIES}
     ${OSGPARTICLE_LIBRARIES}
@@ -131,27 +133,28 @@ target_link_libraries(openmw
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
     ${OPENAL_LIBRARY}
-    ${FFMPEG_LIBRARIES}
-    ${BULLET_LIBRARIES}
-    ${MYGUI_LIBRARIES}
+    ${FFmpeg_LIBRARIES}
+    ${MyGUI_LIBRARIES}
     ${SDL2_LIBRARY}
     "osg-ffmpeg-videoplayer"
     "oics"
     components
+    ${RakNet_LIBRARY}
 )
 
 if (ANDROID)
     set (OSG_PLUGINS
         -Wl,--whole-archive
-        ${OSG_PLUGINS_DIR}/libosgdb_dds.a
-        ${OSG_PLUGINS_DIR}/libosgdb_bmp.a
-        ${OSG_PLUGINS_DIR}/libosgdb_tga.a
-        ${OSG_PLUGINS_DIR}/libosgdb_gif.a
-        ${OSG_PLUGINS_DIR}/libosgdb_jpeg.a
-        ${OSG_PLUGINS_DIR}/libosgdb_png.a
-        -Wl,--no-whole-archive
-    )
-    target_link_libraries(openmw
+    )
+    foreach(PLUGIN_NAME ${USED_OSG_PLUGINS})
+        set(OSG_PLUGINS ${OSG_PLUGINS} ${OSG_PLUGINS_DIR}/lib${PLUGIN_NAME}.a)
+    endforeach()
+
+    set (OSG_PLUGINS
+        ${OSG_PLUGINS} -Wl,--no-whole-archive
+    )
+
+    target_link_libraries(tes3mp
         EGL
         android
         log
@@ -161,38 +164,53 @@ if (ANDROID)
         ${OSG_PLUGINS}
         jpeg
         gif
-    	png
+        png
     )
 endif (ANDROID)
 
 if (USE_SYSTEM_TINYXML)
-    target_link_libraries(openmw ${TINYXML_LIBRARIES})
+    target_link_libraries(tes3mp ${TinyXML_LIBRARIES})
 endif()
 
 if (NOT UNIX)
-target_link_libraries(openmw ${SDL2MAIN_LIBRARY})
+target_link_libraries(tes3mp ${SDL2MAIN_LIBRARY})
 endif()
 
 # Fix for not visible pthreads functions for linker with glibc 2.15
 if (UNIX AND NOT APPLE)
-target_link_libraries(openmw ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(tes3mp ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
 if(APPLE)
+    set(BUNDLE_RESOURCES_DIR "${APP_BUNDLE_DIR}/Contents/Resources")
+
+    set(OPENMW_MYGUI_FILES_ROOT ${BUNDLE_RESOURCES_DIR})
+    set(OPENMW_SHADERS_ROOT ${BUNDLE_RESOURCES_DIR})
+
+    add_subdirectory(../../files/ ${CMAKE_CURRENT_BINARY_DIR}/files)
+
+    configure_file("${OpenMW_BINARY_DIR}/settings-default.cfg" ${BUNDLE_RESOURCES_DIR} COPYONLY)
+    configure_file("${OpenMW_BINARY_DIR}/openmw.cfg" ${BUNDLE_RESOURCES_DIR} COPYONLY)
+    configure_file("${OpenMW_BINARY_DIR}/gamecontrollerdb.txt" ${BUNDLE_RESOURCES_DIR} COPYONLY)
+
+    add_custom_command(TARGET openmw
+        POST_BUILD
+        COMMAND cp "${OpenMW_BINARY_DIR}/resources/version" "${BUNDLE_RESOURCES_DIR}/resources")
+
     find_library(COCOA_FRAMEWORK Cocoa)
     find_library(IOKIT_FRAMEWORK IOKit)
-    target_link_libraries(openmw ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK})
+    target_link_libraries(tes3mp ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK})
 
-    if (FFMPEG_FOUND)
+    if (FFmpeg_FOUND)
         find_library(COREVIDEO_FRAMEWORK CoreVideo)
         find_library(VDA_FRAMEWORK VideoDecodeAcceleration)
-        target_link_libraries(openmw ${COREVIDEO_FRAMEWORK} ${VDA_FRAMEWORK})
+        target_link_libraries(tes3mp z ${COREVIDEO_FRAMEWORK} ${VDA_FRAMEWORK})
     endif()
 endif(APPLE)
 
 if (BUILD_WITH_CODE_COVERAGE)
   add_definitions (--coverage)
-  target_link_libraries(openmw gcov)
+  target_link_libraries(tes3mp gcov)
 endif()
 
 if (MSVC)
@@ -200,5 +218,9 @@ if (MSVC)
     if (CMAKE_CL_64)
         set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
     endif (CMAKE_CL_64)
-    add_definitions("-D_USE_MATH_DEFINES")
 endif (MSVC)
+
+if (WIN32)
+    INSTALL(TARGETS tes3mp RUNTIME DESTINATION ".")
+endif (WIN32)
+
diff --git a/apps/openmw/crashcatcher.cpp b/apps/openmw/crashcatcher.cpp
index cafd0e08a..0078ef169 100644
--- a/apps/openmw/crashcatcher.cpp
+++ b/apps/openmw/crashcatcher.cpp
@@ -5,7 +5,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/param.h>
-#include <sys/ucontext.h>
 #include <sys/utsname.h>
 #include <string.h>
 #include <errno.h>
@@ -21,10 +20,11 @@
 
 #ifdef __linux__
 #include <sys/prctl.h>
+#include <sys/ucontext.h>
 #ifndef PR_SET_PTRACER
 #define PR_SET_PTRACER 0x59616d61
 #endif
-#elif defined (__APPLE__) || defined (__FreeBSD__)
+#elif defined (__APPLE__) || defined (__FreeBSD__) || defined(__OpenBSD__)
 #include <signal.h>
 #endif
 
@@ -149,7 +149,7 @@ static void gdb_info(pid_t pid)
                 "info registers\n"
                 "shell echo \"\"\n"
                 "shell echo \"* Backtrace\"\n"
-                "thread apply all backtrace full\n"
+                "thread apply all backtrace full 1000\n"
                 "detach\n"
                 "quit\n", pid);
         fclose(f);
@@ -160,11 +160,12 @@ static void gdb_info(pid_t pid)
         printf("Executing: %s\n", cmd_buf);
         fflush(stdout);
 
-        {   /* another special exception for "ignoring return value..." */
-            int unused;
-            unused = system(cmd_buf);
-            UNUSED(unused);
-        }
+        int ret = system(cmd_buf);
+
+        if (ret != 0)
+            printf("\nFailed to create a crash report. Please install 'gdb' and crash again!\n");
+        fflush(stdout);
+
         /* Clean up */
         remove(respfile);
     }
diff --git a/apps/openmw/doc.hpp b/apps/openmw/doc.hpp
index ffeef94e1..5f9065013 100644
--- a/apps/openmw/doc.hpp
+++ b/apps/openmw/doc.hpp
@@ -41,4 +41,4 @@
 
 /// \namespace MWScript
 /// \ingroup openmw
-/// \brief MW-specific script extentions and integration of the script system into OpenMW
+/// \brief MW-specific script extensions and integration of the script system into OpenMW
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index b3a58d18e..40e81c7e6 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -21,13 +21,17 @@
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/resource/stats.hpp>
 
 #include <components/compiler/extensions0.hpp>
 
+#include <components/sceneutil/workqueue.hpp>
+
 #include <components/files/configurationmanager.hpp>
 #include <components/translation/translation.hpp>
 
 #include <components/version/version.hpp>
+#include <components/openmw-mp/Log.hpp>
 
 #include "mwinput/inputmanagerimp.hpp"
 
@@ -55,6 +59,9 @@
 
 #include "mwstate/statemanagerimp.hpp"
 
+#include "mwmp/Main.hpp"
+#include "mwmp/GUIController.hpp"
+
 namespace
 {
     void checkSDLError(int ret)
@@ -74,10 +81,15 @@ void OMW::Engine::executeLocalScripts()
     {
         MWScript::InterpreterContext interpreterContext (
             &script.second.getRefData().getLocals(), script.second);
+
+        // Added by tes3mp to check and set whether packets should be sent about this script
+        if (mwmp::Main::isValidPacketScript(script.first))
+        {
+            interpreterContext.sendPackets = true;
+        }
+
         mEnvironment.getScriptManager()->run (script.first, interpreterContext);
     }
-
-    localScripts.setIgnore (MWWorld::Ptr());
 }
 
 void OMW::Engine::frame(float frametime)
@@ -100,13 +112,17 @@ void OMW::Engine::frame(float frametime)
         if (mUseSound)
             mEnvironment.getSoundManager()->update(frametime);
 
+        mwmp::Main::frame(frametime);
+
         // Main menu opened? Then scripts are also paused.
-        bool paused = mEnvironment.getWindowManager()->containsMode(MWGui::GM_MainMenu);
+        bool paused = /*mEnvironment.getWindowManager()->containsMode(MWGui::GM_MainMenu);*/ false;
+        // The above is overridden by tes3mp, where the game should never be pausable
 
         // update game state
         mEnvironment.getStateManager()->update (frametime);
 
-        bool guiActive = mEnvironment.getWindowManager()->isGuiMode();
+        bool guiActive = /*mEnvironment.getWindowManager()->isGuiMode()*/ false;
+        // The above is overridden by tes3mp, where the Gui being active doesn't matter
 
         osg::Timer_t beforeScriptTick = osg::Timer::instance()->tick();
         if (mEnvironment.getStateManager()->getState()==
@@ -147,9 +163,9 @@ void OMW::Engine::frame(float frametime)
         if (mEnvironment.getStateManager()->getState()==
             MWBase::StateManager::State_Running)
         {
-            MWWorld::Ptr player = mEnvironment.getWorld()->getPlayerPtr();
+            /*MWWorld::Ptr player = mEnvironment.getWorld()->getPlayerPtr();
             if(!guiActive && player.getClass().getCreatureStats(player).isDead())
-                mEnvironment.getStateManager()->endGame();
+                mEnvironment.getStateManager()->endGame();*/
         }
 
         // update world
@@ -169,7 +185,7 @@ void OMW::Engine::frame(float frametime)
             mEnvironment.getWindowManager()->update();
         }
 
-        int frameNumber = mViewer->getFrameStamp()->getFrameNumber();
+        unsigned int frameNumber = mViewer->getFrameStamp()->getFrameNumber();
         osg::Stats* stats = mViewer->getViewerStats();
         stats->setAttribute(frameNumber, "script_time_begin", osg::Timer::instance()->delta_s(mStartTick, beforeScriptTick));
         stats->setAttribute(frameNumber, "script_time_taken", osg::Timer::instance()->delta_s(beforeScriptTick, afterScriptTick));
@@ -183,6 +199,14 @@ void OMW::Engine::frame(float frametime)
         stats->setAttribute(frameNumber, "physics_time_taken", osg::Timer::instance()->delta_s(beforePhysicsTick, afterPhysicsTick));
         stats->setAttribute(frameNumber, "physics_time_end", osg::Timer::instance()->delta_s(mStartTick, afterPhysicsTick));
 
+        if (stats->collectStats("resource"))
+        {
+            mResourceSystem->reportStats(frameNumber, stats);
+
+            stats->setAttribute(frameNumber, "WorkQueue", mWorkQueue->getNumItems());
+            stats->setAttribute(frameNumber, "WorkThread", mWorkQueue->getNumActiveThreads());
+        }
+
     }
     catch (const std::exception& e)
     {
@@ -194,7 +218,6 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
   : mWindow(NULL)
   , mEncoding(ToUTF8::WINDOWS_1252)
   , mEncoder(NULL)
-  , mVerboseScripts (false)
   , mSkipMenu (false)
   , mUseSound (true)
   , mCompileAll (false)
@@ -228,11 +251,16 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
 
 OMW::Engine::~Engine()
 {
+    mwmp::Main::get().getGUIController()->cleanUp();
     mEnvironment.cleanup();
 
+    mwmp::Main::destroy();
+
     delete mScriptContext;
     mScriptContext = NULL;
 
+    mWorkQueue = NULL;
+
     mResourceSystem.reset();
 
     mViewer = NULL;
@@ -244,6 +272,9 @@ OMW::Engine::~Engine()
     }
 
     SDL_Quit();
+
+
+    LOG_QUIT();
 }
 
 void OMW::Engine::enableFSStrict(bool fsStrict)
@@ -282,11 +313,6 @@ void OMW::Engine::addContentFile(const std::string& file)
     mContentFiles.push_back(file);
 }
 
-void OMW::Engine::setScriptsVerbosity(bool scriptsVerbosity)
-{
-    mVerboseScripts = scriptsVerbosity;
-}
-
 void OMW::Engine::setSkipMenu (bool skipMenu, bool newGame)
 {
     mSkipMenu = skipMenu;
@@ -406,6 +432,8 @@ void OMW::Engine::createWindow(Settings::Manager& settings)
     camera->setViewport(0, 0, width, height);
 
     mViewer->realize();
+
+    mViewer->getEventQueue()->getCurrentEventState()->setWindowRectangle(0, 0, width, height);
 }
 
 void OMW::Engine::setWindowIcon()
@@ -453,10 +481,14 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
         Settings::Manager::getString("texture mag filter", "General"),
         Settings::Manager::getString("texture min filter", "General"),
         Settings::Manager::getString("texture mipmap", "General"),
-        Settings::Manager::getInt("anisotropy", "General"),
-        NULL
+        Settings::Manager::getInt("anisotropy", "General")
     );
 
+    int numThreads = Settings::Manager::getInt("preload num threads", "Cells");
+    if (numThreads <= 0)
+        throw std::runtime_error("Invalid setting: 'preload num threads' must be >0");
+    mWorkQueue = new SceneUtil::WorkQueue(numThreads);
+
     // Create input and UI first to set up a bootstrapping environment for
     // showing a loading screen and keeping the window responsive while doing so
 
@@ -487,16 +519,17 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 
     std::string myguiResources = (mResDir / "mygui").string();
     osg::ref_ptr<osg::Group> guiRoot = new osg::Group;
+    guiRoot->setName("GUI Root");
     guiRoot->setNodeMask(MWRender::Mask_GUI);
     rootNode->addChild(guiRoot);
-    MWGui::WindowManager* window = new MWGui::WindowManager(mViewer, guiRoot, mResourceSystem.get(),
+    MWGui::WindowManager* window = new MWGui::WindowManager(mViewer, guiRoot, mResourceSystem.get(), mWorkQueue.get(),
                 mCfgMgr.getLogPath().string() + std::string("/"), myguiResources,
                 mScriptConsoleMode, mTranslationDataStorage, mEncoding, mExportFonts, mFallbackMap,
                 Version::getOpenmwVersionDescription(mResDir.string()));
     mEnvironment.setWindowManager (window);
 
     // Create sound system
-    mEnvironment.setSoundManager (new MWSound::SoundManager(mVFS.get(), mUseSound));
+    mEnvironment.setSoundManager (new MWSound::SoundManager(mVFS.get(), mFallbackMap, mUseSound));
 
     if (!mSkipMenu)
     {
@@ -506,9 +539,9 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     }
 
     // Create the world
-    mEnvironment.setWorld( new MWWorld::World (mViewer, rootNode, mResourceSystem.get(),
+    mEnvironment.setWorld( new MWWorld::World (mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(),
         mFileCollections, mContentFiles, mEncoder, mFallbackMap,
-        mActivationDistanceOverride, mCellName, mStartupScript, mResDir.string()));
+        mActivationDistanceOverride, mCellName, mStartupScript, mResDir.string(), mCfgMgr.getUserDataPath().string()));
     mEnvironment.getWorld()->setupPlayer();
     input->setPlayer(&mEnvironment.getWorld()->getPlayer());
 
@@ -527,8 +560,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     mScriptContext = new MWScript::CompilerContext (MWScript::CompilerContext::Type_Full);
     mScriptContext->setExtensions (&mExtensions);
 
-    mEnvironment.setScriptManager (new MWScript::ScriptManager (mEnvironment.getWorld()->getStore(),
-        mVerboseScripts, *mScriptContext, mWarningsMode,
+    mEnvironment.setScriptManager (new MWScript::ScriptManager (mEnvironment.getWorld()->getStore(), *mScriptContext, mWarningsMode,
         mScriptBlacklistUse ? mScriptBlacklist : std::vector<std::string>()));
 
     // Create game mechanics system
@@ -537,7 +569,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 
     // Create dialog system
     mEnvironment.setJournal (new MWDialogue::Journal);
-    mEnvironment.setDialogueManager (new MWDialogue::DialogueManager (mExtensions, mVerboseScripts, mTranslationDataStorage));
+    mEnvironment.setDialogueManager (new MWDialogue::DialogueManager (mExtensions, mTranslationDataStorage));
 
     // scripts
     if (mCompileAll)
@@ -615,8 +647,13 @@ private:
 void OMW::Engine::go()
 {
     assert (!mContentFiles.empty());
+    if(!mwmp::Main::init(mContentFiles))
+        return;
+
+    std::cout << "OSG version: " << osgGetVersion() << std::endl;
 
     mViewer = new osgViewer::Viewer;
+    mViewer->setReleaseContextAtEndOfFrameHint(false);
 
     osg::ref_ptr<osgViewer::StatsHandler> statshandler = new osgViewer::StatsHandler;
     statshandler->setKeyEventTogglesOnScreenStats(osgGA::GUIEventAdapter::KEY_F3);
@@ -630,6 +667,8 @@ void OMW::Engine::go()
 
     mViewer->addEventHandler(statshandler);
 
+    mViewer->addEventHandler(new Resource::StatsHandler);
+
     Settings::Manager settings;
     std::string settingspath;
 
@@ -644,6 +683,8 @@ void OMW::Engine::go()
     mEncoder = &encoder;
 
     prepareEngine (settings);
+    mwmp::Main::postInit();
+    mSkipMenu = true;
 
     if (!mSaveGameFile.empty())
     {
@@ -651,8 +692,6 @@ void OMW::Engine::go()
     }
     else if (!mSkipMenu)
     {
-        mEnvironment.getWorld()->preloadCommonAssets();
-
         // start in main menu
         mEnvironment.getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
         try
@@ -681,7 +720,9 @@ void OMW::Engine::go()
         frameTimer.setStartTick();
         dt = std::min(dt, 0.2);
 
-        bool guiActive = mEnvironment.getWindowManager()->isGuiMode();
+        bool guiActive = /*mEnvironment.getWindowManager()->isGuiMode()*/ false;
+        // The above is overridden by tes3mp, where the Gui being active doesn't matter
+
         if (!guiActive)
             simulationTime += dt;
 
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index a03752b86..d06ca594d 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -18,6 +18,11 @@ namespace Resource
     class ResourceSystem;
 }
 
+namespace SceneUtil
+{
+    class WorkQueue;
+}
+
 namespace VFS
 {
     class Manager;
@@ -68,6 +73,7 @@ namespace OMW
             SDL_Window* mWindow;
             std::auto_ptr<VFS::Manager> mVFS;
             std::auto_ptr<Resource::ResourceSystem> mResourceSystem;
+            osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
             MWBase::Environment mEnvironment;
             ToUTF8::FromType mEncoding;
             ToUTF8::Utf8Encoder* mEncoder;
@@ -78,7 +84,6 @@ namespace OMW
             osg::ref_ptr<osgViewer::ScreenCaptureHandler> mScreenCaptureHandler;
             std::string mCellName;
             std::vector<std::string> mContentFiles;
-            bool mVerboseScripts;
             bool mSkipMenu;
             bool mUseSound;
             bool mCompileAll;
@@ -152,9 +157,6 @@ namespace OMW
              */
             void addContentFile(const std::string& file);
 
-            /// Enable or disable verbose script output
-            void setScriptsVerbosity(bool scriptsVerbosity);
-
             /// Disable or enable all sounds
             void setSoundUsage(bool soundUsage);
 
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index a4bf1fe5b..ca835ad51 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -3,6 +3,7 @@
 
 #include <components/version/version.hpp>
 #include <components/files/configurationmanager.hpp>
+#include <components/files/escape.hpp>
 #include <components/fallback/validate.hpp>
 
 #include <SDL_messagebox.h>
@@ -12,6 +13,7 @@
 #include <boost/iostreams/concepts.hpp>
 #include <boost/iostreams/stream_buffer.hpp>
 #include <boost/filesystem/fstream.hpp>
+#include "mwmp/Main.hpp"
 
 #if defined(_WIN32)
 // For OutputDebugString
@@ -37,6 +39,7 @@ extern int is_debugger_attached(void);
 #endif
 
 #include <boost/version.hpp>
+#include <components/openmw-mp/Log.hpp>
 /**
  * Workaround for problems with whitespaces in paths in older versions of Boost library
  */
@@ -76,30 +79,27 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     desc.add_options()
         ("help", "print help message")
         ("version", "print version information and quit")
-        ("data", bpo::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")
+        ("data", bpo::value<Files::EscapePathContainer>()->default_value(Files::EscapePathContainer(), "data")
             ->multitoken()->composing(), "set data directories (later directories have higher priority)")
 
-        ("data-local", bpo::value<std::string>()->default_value(""),
+            ("data-local", bpo::value<Files::EscapeHashString>()->default_value(""),
             "set local data directory (highest priority)")
 
-        ("fallback-archive", bpo::value<StringsVector>()->default_value(StringsVector(), "fallback-archive")
+        ("fallback-archive", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "fallback-archive")
             ->multitoken(), "set fallback BSA archives (later archives have higher priority)")
 
-        ("resources", bpo::value<std::string>()->default_value("resources"),
+            ("resources", bpo::value<Files::EscapeHashString>()->default_value("resources"),
             "set resources directory")
 
-        ("start", bpo::value<std::string>()->default_value(""),
+            ("start", bpo::value<Files::EscapeHashString>()->default_value(""),
             "set initial cell")
 
-        ("content", bpo::value<StringsVector>()->default_value(StringsVector(), "")
+        ("content", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
             ->multitoken(), "content file(s): esm/esp, or omwgame/omwaddon")
 
         ("no-sound", bpo::value<bool>()->implicit_value(true)
             ->default_value(false), "disable all sounds")
 
-        ("script-verbose", bpo::value<bool>()->implicit_value(true)
-            ->default_value(false), "verbose script output")
-
         ("script-all", bpo::value<bool>()->implicit_value(true)
             ->default_value(false), "compile all scripts (excluding dialogue scripts) at startup")
 
@@ -109,7 +109,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         ("script-console", bpo::value<bool>()->implicit_value(true)
             ->default_value(false), "enable console-only script functionality")
 
-        ("script-run", bpo::value<std::string>()->default_value(""),
+            ("script-run", bpo::value<Files::EscapeHashString>()->default_value(""),
             "select a file containing a list of console commands that is executed on startup")
 
         ("script-warn", bpo::value<int>()->implicit_value (1)
@@ -119,13 +119,13 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
             "\t1 - show warning but consider script as correctly compiled anyway\n"
             "\t2 - treat warnings as errors")
 
-        ("script-blacklist", bpo::value<StringsVector>()->default_value(StringsVector(), "")
+        ("script-blacklist", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
             ->multitoken(), "ignore the specified script (if the use of the blacklist is enabled)")
 
         ("script-blacklist-use", bpo::value<bool>()->implicit_value(true)
             ->default_value(true), "enable script blacklisting")
 
-        ("load-savegame", bpo::value<std::string>()->default_value(""),
+            ("load-savegame", bpo::value<Files::EscapeHashString>()->default_value(""),
             "load a save game file on game startup (specify an absolute filename or a filename relative to the current working directory)")
 
         ("skip-menu", bpo::value<bool>()->implicit_value(true)
@@ -137,14 +137,14 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         ("fs-strict", bpo::value<bool>()->implicit_value(true)
             ->default_value(false), "strict file system handling (no case folding)")
 
-        ( "encoding", bpo::value<std::string>()->
+            ("encoding", bpo::value<Files::EscapeHashString>()->
             default_value("win1252"),
             "Character encoding used in OpenMW game messages:\n"
             "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
             "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
             "\n\twin1252 - Western European (Latin) alphabet, used by default")
 
-        ("fallback", bpo::value<FallbackMap>()->default_value(FallbackMap(), "")
+            ("fallback", bpo::value<FallbackMap>()->default_value(FallbackMap(), "")
             ->multitoken()->composing(), "fallback values")
 
         ("no-grab", "Don't grab mouse cursor")
@@ -154,6 +154,8 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
 
         ("activate-dist", bpo::value <int> ()->default_value (-1), "activation distance override");
 
+    mwmp::Main::optionsDesc(&desc);
+
     bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv)
         .options(desc).allow_unregistered().run();
 
@@ -173,29 +175,29 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     {
         cfgMgr.readConfiguration(variables, desc, true);
 
-        Version::Version v = Version::getOpenmwVersion(variables["resources"].as<std::string>());
+        Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::EscapeHashString>().toStdString());
         std::cout << v.describe() << std::endl;
         return false;
     }
 
     cfgMgr.readConfiguration(variables, desc);
 
-    Version::Version v = Version::getOpenmwVersion(variables["resources"].as<std::string>());
+    Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::EscapeHashString>().toStdString());
     std::cout << v.describe() << std::endl;
 
     engine.setGrabMouse(!variables.count("no-grab"));
 
     // Font encoding settings
-    std::string encoding(variables["encoding"].as<std::string>());
+    std::string encoding(variables["encoding"].as<Files::EscapeHashString>().toStdString());
     std::cout << ToUTF8::encodingUsingMessage(encoding) << std::endl;
     engine.setEncoding(ToUTF8::calculateEncoding(encoding));
 
     // directory settings
     engine.enableFSStrict(variables["fs-strict"].as<bool>());
 
-    Files::PathContainer dataDirs(variables["data"].as<Files::PathContainer>());
+    Files::PathContainer dataDirs(Files::EscapePath::toPathContainer(variables["data"].as<Files::EscapePathContainer>()));
 
-    std::string local(variables["data-local"].as<std::string>());
+    std::string local(variables["data-local"].as<Files::EscapeHashString>().toStdString());
     if (!local.empty())
     {
         dataDirs.push_back(Files::PathContainer::value_type(local));
@@ -206,15 +208,15 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     engine.setDataDirs(dataDirs);
 
     // fallback archives
-    StringsVector archives = variables["fallback-archive"].as<StringsVector>();
+    StringsVector archives = variables["fallback-archive"].as<Files::EscapeStringVector>().toStdStringVector();
     for (StringsVector::const_iterator it = archives.begin(); it != archives.end(); ++it)
     {
         engine.addArchive(*it);
     }
 
-    engine.setResourceDir(variables["resources"].as<std::string>());
+    engine.setResourceDir(variables["resources"].as<Files::EscapeHashString>().toStdString());
 
-    StringsVector content = variables["content"].as<StringsVector>();
+    StringsVector content = variables["content"].as<Files::EscapeStringVector>().toStdStringVector();
     if (content.empty())
     {
       std::cout << "No content file given (esm/esp, nor omwgame/omwaddon). Aborting..." << std::endl;
@@ -229,7 +231,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     }
 
     // startup-settings
-    engine.setCell(variables["start"].as<std::string>());
+    engine.setCell(variables["start"].as<Files::EscapeHashString>().toStdString());
     engine.setSkipMenu (variables["skip-menu"].as<bool>(), variables["new-game"].as<bool>());
     if (!variables["skip-menu"].as<bool>() && variables["new-game"].as<bool>())
         std::cerr << "new-game used without skip-menu -> ignoring it" << std::endl;
@@ -237,13 +239,12 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     // scripts
     engine.setCompileAll(variables["script-all"].as<bool>());
     engine.setCompileAllDialogue(variables["script-all-dialogue"].as<bool>());
-    engine.setScriptsVerbosity(variables["script-verbose"].as<bool>());
     engine.setScriptConsoleMode (variables["script-console"].as<bool>());
-    engine.setStartupScript (variables["script-run"].as<std::string>());
+    engine.setStartupScript (variables["script-run"].as<Files::EscapeHashString>().toStdString());
     engine.setWarningsMode (variables["script-warn"].as<int>());
-    engine.setScriptBlacklist (variables["script-blacklist"].as<StringsVector>());
+    engine.setScriptBlacklist (variables["script-blacklist"].as<Files::EscapeStringVector>().toStdStringVector());
     engine.setScriptBlacklistUse (variables["script-blacklist-use"].as<bool>());
-    engine.setSaveGameFile (variables["load-savegame"].as<std::string>());
+    engine.setSaveGameFile (variables["load-savegame"].as<Files::EscapeHashString>().toStdString());
 
     // other settings
     engine.setSoundUsage(!variables["no-sound"].as<bool>());
@@ -251,6 +252,8 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     engine.setActivationDistanceOverride (variables["activate-dist"].as<int>());
     engine.enableFontExport(variables["export-fonts"].as<bool>());
 
+    mwmp::Main::configure(&variables);
+
     return true;
 }
 
@@ -327,8 +330,8 @@ int main(int argc, char**argv)
         std::cout.rdbuf (&sb);
         std::cerr.rdbuf (&sb);
 #else
-        // Redirect cout and cerr to openmw.log
-        logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / "/openmw.log"));
+        // Redirect cout and cerr to tes3mp client log
+        logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / "/tes3mp-client-" += Log::getFilenameTimestamp() += ".log"));
 
         coutsb.open (Tee(logfile, oldcout));
         cerrsb.open (Tee(logfile, oldcerr));
@@ -336,6 +339,7 @@ int main(int argc, char**argv)
         std::cout.rdbuf (&coutsb);
         std::cerr.rdbuf (&cerrsb);
 #endif
+        LOG_INIT(Log::LOG_INFO);
 
 
 #if USE_CRASH_CATCHER
@@ -351,9 +355,8 @@ int main(int argc, char**argv)
 #endif
 
 #ifdef __APPLE__
-        // FIXME: set current dir to bundle path
-        //boost::filesystem::path bundlePath = boost::filesystem::path(Ogre::macBundlePath()).parent_path();
-        //boost::filesystem::current_path(bundlePath);
+        boost::filesystem::path binary_path = boost::filesystem::system_complete(boost::filesystem::path(argv[0]));
+        boost::filesystem::current_path(binary_path.parent_path());
 #endif
 
         engine.reset(new OMW::Engine(cfgMgr));
@@ -379,6 +382,7 @@ int main(int argc, char**argv)
     std::cout.rdbuf(cout_rdbuf);
     std::cerr.rdbuf(cerr_rdbuf);
 
+
     return ret;
 }
 
diff --git a/apps/openmw/mwbase/inputmanager.hpp b/apps/openmw/mwbase/inputmanager.hpp
index 75c55e028..0eb06ee3d 100644
--- a/apps/openmw/mwbase/inputmanager.hpp
+++ b/apps/openmw/mwbase/inputmanager.hpp
@@ -5,6 +5,19 @@
 #include <set>
 #include <vector>
 
+#include <stdint.h>
+
+namespace Loading
+{
+    class Listener;
+}
+
+namespace ESM
+{
+    class ESMReader;
+    class ESMWriter;
+}
+
 namespace MWBase
 {
     /// \brief Interface for input manager (implemented in MWInput)
@@ -56,6 +69,10 @@ namespace MWBase
             /// Returns if the last used input device was a joystick or a keyboard
             /// @return true if joystick, false otherwise
             virtual bool joystickLastUsed() = 0;
+
+            virtual int countSavedGameRecords() const = 0;
+            virtual void write(ESM::ESMWriter& writer, Loading::Listener& progress) = 0;
+            virtual void readRecord(ESM::ESMReader& reader, uint32_t type) = 0;
     };
 }
 
diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 42da1a052..bd0d2ea4a 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <vector>
 #include <list>
+#include <set>
 #include <stdint.h>
 
 namespace osg
@@ -97,7 +98,7 @@ namespace MWBase
             virtual int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying) = 0;
             ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
 
-            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr) = 0;
+            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange = true) = 0;
             ///< Calculate the diposition of an NPC toward the player.
 
             virtual int countDeaths (const std::string& id) const = 0;
@@ -153,19 +154,20 @@ namespace MWBase
                 PT_Bribe100,
                 PT_Bribe1000
             };
-            virtual void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type,
-                float currentTemporaryDispositionDelta, bool& success, float& tempChange, float& permChange) = 0;
+            virtual void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, float& tempChange, float& permChange) = 0;
             ///< Perform a persuasion action on NPC
 
             virtual void forceStateUpdate(const MWWorld::Ptr &ptr) = 0;
             ///< Forces an object to refresh its animation state.
 
-            virtual bool playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number=1) = 0;
+            virtual bool playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number=1, bool persist=false) = 0;
             ///< Run animation for a MW-reference. Calls to this function for references that are currently not
             /// in the scene should be ignored.
             ///
             /// \param mode 0 normal, 1 immediate start, 2 immediate loop
             /// \param count How many times the animation should be run
+            /// \param persist Whether the animation state should be stored in saved games
+            ///                and persist after cell unload.
             /// \return Success or error
 
             virtual void skipAnimation(const MWWorld::Ptr& ptr) = 0;
@@ -174,6 +176,9 @@ namespace MWBase
 
             virtual bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName) = 0;
 
+            /// Save the current animation state of managed references to their RefData.
+            virtual void persistAnimationStates() = 0;
+
             /// Update magic effects for an actor. Usually done automatically once per frame, but if we're currently
             /// paused we may want to do it manually (after equipping permanent enchantment)
             virtual void updateMagicEffects (const MWWorld::Ptr& ptr) = 0;
@@ -194,6 +199,12 @@ namespace MWBase
             /** ie AiCombat is active and the target is the actor **/
             virtual std::list<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor) = 0;
 
+            virtual std::list<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor) = 0;
+
+            /// Recursive versions of above methods
+            virtual void getActorsFollowing(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) = 0;
+            virtual void getActorsSidingWith(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) = 0;
+
             virtual void playerLoaded() = 0;
 
             virtual int countSavedGameRecords() const = 0;
@@ -228,6 +239,8 @@ namespace MWBase
             /// Sets the NPC's Acrobatics skill to match the fWerewolfAcrobatics GMST.
             /// It only applies to the current form the NPC is in.
             virtual void applyWerewolfAcrobatics(const MWWorld::Ptr& actor) = 0;
+
+            virtual void cleanupSummonedCreature(const MWWorld::Ptr& caster, int creatureActorId) = 0;
     };
 }
 
diff --git a/apps/openmw/mwbase/statemanager.hpp b/apps/openmw/mwbase/statemanager.hpp
index 79ddbfa2a..48a95f029 100644
--- a/apps/openmw/mwbase/statemanager.hpp
+++ b/apps/openmw/mwbase/statemanager.hpp
@@ -78,8 +78,8 @@ namespace MWBase
             /** Used for quickload **/
             virtual void quickLoad()=0;
 
-            virtual MWState::Character *getCurrentCharacter (bool create = true) = 0;
-            ///< \param create Create a new character, if there is no current character.
+            virtual MWState::Character *getCurrentCharacter () = 0;
+            ///< @note May return null.
 
             virtual CharacterIterator characterBegin() = 0;
             ///< Any call to SaveGame and getCurrentCharacter can invalidate the returned
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 2d4c0e2ca..f103ce191 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -215,7 +215,9 @@ namespace MWBase
             virtual std::string getSelectedSpell() = 0;
             virtual void setSelectedSpell(const std::string& spellId, int successChancePercent) = 0;
             virtual void setSelectedEnchantItem(const MWWorld::Ptr& item) = 0;
+            virtual const MWWorld::Ptr& getSelectedEnchantItem() const = 0;
             virtual void setSelectedWeapon(const MWWorld::Ptr& item) = 0;
+            virtual const MWWorld::Ptr& getSelectedWeapon() const = 0;
             virtual void unsetSelectedSpell() = 0;
             virtual void unsetSelectedWeapon() = 0;
 
@@ -233,7 +235,7 @@ namespace MWBase
             virtual void removeDialog(MWGui::Layout* dialog) = 0;
 
             ///Gracefully attempts to exit the topmost GUI mode
-            /** No guarentee of actually closing the window **/
+            /** No guarantee of actually closing the window **/
             virtual void exitCurrentGuiMode() = 0;
 
             virtual void messageBox (const std::string& message, enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible) = 0;
@@ -353,6 +355,7 @@ namespace MWBase
             virtual std::string correctIconPath(const std::string& path) = 0;
             virtual std::string correctBookartPath(const std::string& path, int width, int height) = 0;
             virtual std::string correctTexturePath(const std::string& path) = 0;
+            virtual bool textureExists(const std::string& path) = 0;
 
             virtual void removeCell(MWWorld::CellStore* cell) = 0;
             virtual void writeFog(MWWorld::CellStore* cell) = 0;
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 946a9a5dd..60d405307 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -95,8 +95,6 @@ namespace MWBase
 
             virtual ~World() {}
 
-            virtual void preloadCommonAssets() = 0;
-
             virtual void startNewGame (bool bypass) = 0;
             ///< \param bypass Bypass regular game start.
 
@@ -217,7 +215,7 @@ namespace MWBase
             virtual bool toggleSky() = 0;
             ///< \return Resulting mode
 
-            virtual void changeWeather(const std::string& region, unsigned int id) = 0;
+            virtual void changeWeather(const std::string& region, const unsigned int id) = 0;
 
             virtual int getCurrentWeather() const = 0;
 
@@ -231,15 +229,16 @@ namespace MWBase
 
             virtual float getTimeScaleFactor() const = 0;
 
-            virtual void changeToInteriorCell (const std::string& cellName,
-                const ESM::Position& position) = 0;
+            virtual void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true) = 0;
             ///< Move to interior cell.
+            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual void changeToExteriorCell (const ESM::Position& position) = 0;
+            virtual void changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true) = 0;
             ///< Move to exterior cell.
+            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool detectWorldSpaceChange=true) = 0;
-            ///< @param detectWorldSpaceChange if true, clean up worldspace-specific data when the world space changes
+            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true) = 0;
+            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
             virtual const ESM::Cell *getExterior (const std::string& cellName) const = 0;
             ///< Return a cell matching the given name or a 0-pointer, if there is no such cell.
@@ -249,12 +248,14 @@ namespace MWBase
             virtual MWWorld::Ptr  getFacedObject() = 0;
             ///< Return pointer to the object the player is looking at, if it is within activation range
 
+            virtual float getDistanceToFacedObject() = 0;
+
             virtual float getMaxActivationDistance() = 0;
 
             /// Returns a pointer to the object the provided object would hit (if within the
             /// specified distance), and the point where the hit occurs. This will attempt to
             /// use the "Head" node, or alternatively the "Bip01 Head" node as a basis.
-            virtual std::pair<MWWorld::Ptr,osg::Vec3f> getHitContact(const MWWorld::ConstPtr &ptr, float distance) = 0;
+            virtual std::pair<MWWorld::Ptr,osg::Vec3f> getHitContact(const MWWorld::ConstPtr &ptr, float distance, std::vector<MWWorld::Ptr> &targets) = 0;
 
             virtual void adjustPosition (const MWWorld::Ptr& ptr, bool force) = 0;
             ///< Adjust position after load to be on ground. Must be called after model load.
@@ -270,15 +271,19 @@ namespace MWBase
             virtual MWWorld::Ptr moveObject (const MWWorld::Ptr& ptr, float x, float y, float z) = 0;
             ///< @return an updated Ptr in case the Ptr's cell changes
 
-            virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, float x, float y, float z) = 0;
+            virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, float x, float y, float z, bool movePhysics=true) = 0;
             ///< @return an updated Ptr
 
             virtual void scaleObject (const MWWorld::Ptr& ptr, float scale) = 0;
 
             virtual void rotateObject(const MWWorld::Ptr& ptr,float x,float y,float z, bool adjust = false) = 0;
 
-            virtual MWWorld::Ptr safePlaceObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos) = 0;
-            ///< place an object in a "safe" location (ie not in the void, etc).
+            virtual MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos) = 0;
+            ///< Place an object. Makes a copy of the Ptr.
+
+            virtual MWWorld::Ptr safePlaceObject (const MWWorld::ConstPtr& ptr, const MWWorld::ConstPtr& referenceObject, MWWorld::CellStore* referenceCell, int direction, float distance) = 0;
+            ///< Place an object in a safe place next to \a referenceObject. \a direction and \a distance specify the wanted placement
+            /// relative to \a referenceObject (but the object may be placed somewhere else if the wanted location is obstructed).
 
             virtual void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false)
                 const = 0;
@@ -378,6 +383,7 @@ namespace MWBase
             ///Is the head of the creature underwater?
             virtual bool isSubmerged(const MWWorld::ConstPtr &object) const = 0;
             virtual bool isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f &pos) const = 0;
+            virtual bool isWaterWalkingCastableOnTarget(const MWWorld::ConstPtr &target) const = 0;
             virtual bool isOnGround(const MWWorld::Ptr &ptr) const = 0;
 
             virtual osg::Matrixf getActorHeadTransform(const MWWorld::ConstPtr& actor) const = 0;
@@ -402,6 +408,9 @@ namespace MWBase
             /// @note throws an exception when invoked on a teleport door
             virtual void activateDoor(const MWWorld::Ptr& door, int state) = 0;
 
+            // Added by tes3mp to allow saving a door state received from a packet
+            virtual void saveDoorState(const MWWorld::Ptr& door, int state) = 0;
+
             virtual bool getPlayerStandingOn (const MWWorld::ConstPtr& object) = 0; ///< @return true if the player is standing on \a object
             virtual bool getActorStandingOn (const MWWorld::ConstPtr& object) = 0; ///< @return true if any actor is standing on \a object
             virtual bool getPlayerCollidingWith(const MWWorld::ConstPtr& object) = 0; ///< @return true if the player is colliding with \a object
@@ -423,7 +432,7 @@ namespace MWBase
             virtual bool getLOS(const MWWorld::ConstPtr& actor,const MWWorld::ConstPtr& targetActor) = 0;
             ///< get Line of Sight (morrowind stupid implementation)
 
-            virtual float getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist) = 0;
+            virtual float getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist, bool includeWater = false) = 0;
 
             virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable) = 0;
 
@@ -478,9 +487,8 @@ namespace MWBase
 
             virtual void castSpell (const MWWorld::Ptr& actor) = 0;
 
-            virtual void launchMagicBolt (const std::string& model, const std::string& sound, const std::string& spellId,
-                                          float speed, bool stack, const ESM::EffectList& effects,
-                                           const MWWorld::Ptr& caster, const std::string& sourceName, const osg::Vec3f& fallbackDirection) = 0;
+            virtual void launchMagicBolt (const std::string& spellId, bool stack, const ESM::EffectList& effects,
+                                          const MWWorld::Ptr& caster, const std::string& sourceName, const osg::Vec3f& fallbackDirection) = 0;
             virtual void launchProjectile (MWWorld::Ptr actor, MWWorld::ConstPtr projectile,
                                            const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr bow, float speed, float attackStrength) = 0;
 
@@ -527,8 +535,9 @@ namespace MWBase
 
             virtual void spawnEffect (const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPos) = 0;
 
-            virtual void explodeSpell (const osg::Vec3f& origin, const ESM::EffectList& effects, const MWWorld::Ptr& caster,
-                                       const MWWorld::Ptr& ignore, ESM::RangeType rangeType, const std::string& id, const std::string& sourceName) = 0;
+            virtual void explodeSpell(const osg::Vec3f& origin, const ESM::EffectList& effects, const MWWorld::Ptr& caster,
+                                      const MWWorld::Ptr& ignore, ESM::RangeType rangeType, const std::string& id,
+                                      const std::string& sourceName, const bool fromProjectile=false) = 0;
 
             virtual void activate (const MWWorld::Ptr& object, const MWWorld::Ptr& actor) = 0;
 
@@ -541,7 +550,7 @@ namespace MWBase
             /// Resets all actors in the current active cells to their original location within that cell.
             virtual void resetActors() = 0;
 
-            virtual bool isWalkingOnWater (const MWWorld::ConstPtr& actor) = 0;
+            virtual bool isWalkingOnWater (const MWWorld::ConstPtr& actor) const = 0;
 
             /// Return a vector aiming the actor's weapon towards a target.
             /// @note The length of the vector is the distance between actor and target.
@@ -553,6 +562,19 @@ namespace MWBase
             virtual void removeContainerScripts(const MWWorld::Ptr& reference) = 0;
 
             virtual bool isPlayerInJail() const = 0;
+
+            /// Return terrain height at \a worldPos position.
+            virtual float getTerrainHeightAt(const osg::Vec3f& worldPos) const = 0;
+
+            /// Return physical or rendering half extents of the given actor.
+            virtual osg::Vec3f getHalfExtents(const MWWorld::ConstPtr& actor, bool rendering=false) const = 0;
+
+            /// Export scene graph to a file and return the filename.
+            /// \param ptr object to export scene graph for (if empty, export entire scene graph)
+            virtual std::string exportSceneGraph(const MWWorld::Ptr& ptr) = 0;
+
+            /// Preload VFX associated with this effect list
+            virtual void preloadEffects(const ESM::EffectList* effectList) = 0;
     };
 }
 
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 9785eef1e..3e0ec366f 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -38,7 +38,6 @@ namespace MWClass
     {
         if(!model.empty())
             physics.addObject(ptr, model);
-        MWBase::Environment::get().getMechanicsManager()->add(ptr);
     }
 
     std::string Activator::getModel(const MWWorld::ConstPtr &ptr) const
@@ -52,6 +51,11 @@ namespace MWClass
         return "";
     }
 
+    bool Activator::useAnim() const
+    {
+        return true;
+    }
+
     std::string Activator::getName (const MWWorld::ConstPtr& ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Activator> *ref = ptr.get<ESM::Activator>();
@@ -81,6 +85,10 @@ namespace MWClass
         return (ref->mBase->mName != "");
     }
 
+    bool Activator::allowTelekinesis(const MWWorld::ConstPtr &ptr) const {
+        return false;
+    }
+
     MWGui::ToolTipInfo Activator::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
     {
         const MWWorld::LiveCellRef<ESM::Activator> *ref = ptr.get<ESM::Activator>();
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 15dbf5767..4fe4dda7e 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -24,6 +24,9 @@ namespace MWClass
             virtual bool hasToolTip (const MWWorld::ConstPtr& ptr) const;
             ///< @return true if this object has a tooltip when focused (default implementation: false)
 
+            virtual bool allowTelekinesis(const MWWorld::ConstPtr& ptr) const;
+            ///< Return whether this class of object can be activated with telekinesis
+
             virtual MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const;
             ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
@@ -36,6 +39,9 @@ namespace MWClass
             static void registerSelf();
 
             virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
+
+            virtual bool useAnim() const;
+            ///< Whether or not to use animated variant of model (default false)
     };
 }
 
diff --git a/apps/openmw/mwclass/actor.cpp b/apps/openmw/mwclass/actor.cpp
index 4e89c7282..ecf089b35 100644
--- a/apps/openmw/mwclass/actor.cpp
+++ b/apps/openmw/mwclass/actor.cpp
@@ -34,7 +34,11 @@ namespace MWClass
             if (getCreatureStats(ptr).isDead())
                 MWBase::Environment::get().getWorld()->enableActorCollision(ptr, false);
         }
-        MWBase::Environment::get().getMechanicsManager()->add(ptr);
+    }
+
+    bool Actor::useAnim() const
+    {
+        return true;
     }
 
     void Actor::block(const MWWorld::Ptr &ptr) const
@@ -79,4 +83,23 @@ namespace MWClass
         weight += effects.get(MWMechanics::EffectKey(ESM::MagicEffect::Burden)).getMagnitude();
         return (weight < 0) ? 0.0f : weight;
     }
+
+    bool Actor::allowTelekinesis(const MWWorld::ConstPtr &ptr) const {
+        return false;
+    }
+
+    bool Actor::isActor() const
+    {
+        return true;
+    }
+
+    bool Actor::canBeActivated(const MWWorld::Ptr& ptr) const
+    {
+        MWMechanics::CreatureStats &stats = getCreatureStats(ptr);
+
+        if (stats.getAiSequence().isInCombat() && !stats.isDead())
+            return false;
+
+        return true;
+    }
 }
diff --git a/apps/openmw/mwclass/actor.hpp b/apps/openmw/mwclass/actor.hpp
index 88a3f1a32..c3720050c 100644
--- a/apps/openmw/mwclass/actor.hpp
+++ b/apps/openmw/mwclass/actor.hpp
@@ -26,6 +26,8 @@ namespace MWClass
 
         virtual void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const;
 
+        virtual bool useAnim() const;
+
         virtual void block(const MWWorld::Ptr &ptr) const;
 
         virtual osg::Vec3f getRotationVector(const MWWorld::Ptr& ptr) const;
@@ -35,6 +37,13 @@ namespace MWClass
         ///< Returns total weight of objects inside this object (including modifications from magic
         /// effects). Throws an exception, if the object can't hold other objects.
 
+        virtual bool allowTelekinesis(const MWWorld::ConstPtr& ptr) const;
+        ///< Return whether this class of object can be activated with telekinesis
+
+        virtual bool isActor() const;
+
+        virtual bool canBeActivated(const MWWorld::Ptr& ptr) const;
+
         // not implemented
         Actor(const Actor&);
         Actor& operator= (const Actor&);
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 8907a5f8d..3642a22ed 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -112,7 +112,7 @@ namespace MWClass
 
         std::string text;
         text += "\n#{sQuality}: " + MWGui::ToolTips::toString(ref->mBase->mData.mQuality);
-        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight);
+        text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 2e4667016..a1eb65154 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -146,9 +146,6 @@ namespace MWClass
 
         float epsilon = 0.0005f;
 
-        if (ref->mBase->mData.mWeight == 0)
-            return ESM::Skill::Unarmored;
-
         if (ref->mBase->mData.mWeight <= iWeight * gmst.find ("fLightMaxMod")->getFloat() + epsilon)
             return ESM::Skill::LightArmor;
 
@@ -220,23 +217,30 @@ namespace MWClass
         std::string text;
 
         // get armor type string (light/medium/heavy)
-        int armorType = getEquipmentSkill(ptr);
         std::string typeText;
-        if (armorType == ESM::Skill::LightArmor)
-            typeText = "#{sLight}";
-        else if (armorType == ESM::Skill::MediumArmor)
-            typeText = "#{sMedium}";
+        if (ref->mBase->mData.mWeight == 0)
+            typeText = "";
         else
-            typeText = "#{sHeavy}";
+        {
+            int armorType = getEquipmentSkill(ptr);       
+            if (armorType == ESM::Skill::LightArmor)
+                typeText = "#{sLight}";
+            else if (armorType == ESM::Skill::MediumArmor)
+                typeText = "#{sMedium}";
+            else
+                typeText = "#{sHeavy}";
+        }
 
-        text += "\n#{sArmorRating}: " + MWGui::ToolTips::toString(getEffectiveArmorRating(ptr,
-            MWMechanics::getPlayer()));
+        text += "\n#{sArmorRating}: " + MWGui::ToolTips::toString(static_cast<int>(getEffectiveArmorRating(ptr,
+            MWMechanics::getPlayer())));
 
         int remainingHealth = getItemHealth(ptr);
         text += "\n#{sCondition}: " + MWGui::ToolTips::toString(remainingHealth) + "/"
                 + MWGui::ToolTips::toString(ref->mBase->mData.mHealth);
 
-        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight) + " (" + typeText + ")";
+        if (typeText != "")
+            text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight) + " (" + typeText + ")";
+
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
@@ -273,7 +277,7 @@ namespace MWClass
         return record->mId;
     }
 
-    int Armor::getEffectiveArmorRating(const MWWorld::ConstPtr &ptr, const MWWorld::Ptr &actor) const
+    float Armor::getEffectiveArmorRating(const MWWorld::ConstPtr &ptr, const MWWorld::Ptr &actor) const
     {
         const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
 
@@ -286,7 +290,7 @@ namespace MWClass
         if(ref->mBase->mData.mWeight == 0)
             return ref->mBase->mData.mArmor;
         else
-            return ref->mBase->mData.mArmor * armorSkill / iBaseArmorSkill;
+            return ref->mBase->mData.mArmor * armorSkill / static_cast<float>(iBaseArmorSkill);
     }
 
     std::pair<int, std::string> Armor::canBeEquipped(const MWWorld::ConstPtr &ptr, const MWWorld::Ptr &npc) const
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index 9746d6d20..025bc8af1 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -84,7 +84,7 @@ namespace MWClass
             virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;
 
             /// Get the effective armor rating, factoring in the actor's skills, for the given armor.
-            virtual int getEffectiveArmorRating(const MWWorld::ConstPtr& armor, const MWWorld::Ptr& actor) const;
+            virtual float getEffectiveArmorRating(const MWWorld::ConstPtr& armor, const MWWorld::Ptr& actor) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index a7d8ed8f4..f2c97d770 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -126,7 +126,7 @@ namespace MWClass
 
         std::string text;
 
-        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight);
+        text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 20ebab314..1d99ee8e2 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -175,7 +175,7 @@ namespace MWClass
 
         std::string text;
 
-        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight);
+        text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 675287af9..b0d3ca791 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -7,6 +7,7 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/failedaction.hpp"
@@ -99,7 +100,6 @@ namespace MWClass
     {
         if(!model.empty())
             physics.addObject(ptr, model);
-        MWBase::Environment::get().getMechanicsManager()->add(ptr);
     }
 
     std::string Container::getModel(const MWWorld::ConstPtr &ptr) const
@@ -113,6 +113,11 @@ namespace MWClass
         return "";
     }
 
+    bool Container::useAnim() const
+    {
+        return true;
+    }
+
     boost::shared_ptr<MWWorld::Action> Container::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
@@ -136,7 +141,8 @@ namespace MWClass
         MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
         MWWorld::InventoryStore& invStore = player.getClass().getInventoryStore(player);
 
-        bool needKey = ptr.getCellRef().getLockLevel() > 0;
+        bool isLocked = ptr.getCellRef().getLockLevel() > 0;
+        bool isTrapped = !ptr.getCellRef().getTrap().empty();
         bool hasKey = false;
         std::string keyName;
 
@@ -154,18 +160,26 @@ namespace MWClass
             }
         }
 
-        if (needKey && hasKey)
+        if ((isLocked || isTrapped) && hasKey)
         {
             MWBase::Environment::get().getWindowManager ()->messageBox (keyName + " #{sKeyUsed}");
-            unlock(ptr);
+            if(isLocked)
+                unlock(ptr);
             // using a key disarms the trap
-            ptr.getCellRef().setTrap("");
+            if(isTrapped)
+            {
+                ptr.getCellRef().setTrap("");
+                MWBase::Environment::get().getSoundManager()->playSound3D(ptr,
+                    "Disarm Trap", 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx,
+                    MWBase::SoundManager::Play_Normal);
+                isTrapped = false;
+            }
         }
 
 
-        if (!needKey || hasKey)
+        if (!isLocked || hasKey)
         {
-            if(ptr.getCellRef().getTrap().empty())
+            if(!isTrapped)
             {
                 boost::shared_ptr<MWWorld::Action> action (new MWWorld::ActionOpen(ptr));
                 return action;
@@ -173,14 +187,14 @@ namespace MWClass
             else
             {
                 // Activate trap
-                boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTrap(actor, ptr.getCellRef().getTrap(), ptr));
+                boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTrap(ptr.getCellRef().getTrap(), ptr));
                 action->setSound(trapActivationSound);
                 return action;
             }
         }
         else
         {
-            boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction);
+            boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction(std::string(), ptr));
             action->setSound(lockedSound);
             return action;
         }
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 3add65a7e..04223f264 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -70,6 +70,8 @@ namespace MWClass
             virtual void restock (const MWWorld::Ptr &ptr) const;
 
             virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
+
+            virtual bool useAnim() const;
     };
 }
 
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 6e9cfccb9..0be61ef51 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -134,6 +134,9 @@ namespace MWClass
             data->mCreatureStats.setAiSetting (MWMechanics::CreatureStats::AI_Flee, ref->mBase->mAiData.mFlee);
             data->mCreatureStats.setAiSetting (MWMechanics::CreatureStats::AI_Alarm, ref->mBase->mAiData.mAlarm);
 
+            if (data->mCreatureStats.isDead())
+                data->mCreatureStats.setDeathAnimationFinished(true);
+
             // spells
             for (std::vector<std::string>::const_iterator iter (ref->mBase->mSpells.mList.begin());
                 iter!=ref->mBase->mSpells.mList.end(); ++iter)
@@ -161,7 +164,7 @@ namespace MWClass
             getContainerStore(ptr).fill(ref->mBase->mInventory, ptr.getCellRef().getRefId());
 
             if (hasInventory)
-                getInventoryStore(ptr).autoEquip(ptr);   
+                getInventoryStore(ptr).autoEquipShield(ptr);
         }
     }
 
@@ -242,14 +245,16 @@ namespace MWClass
 
         MWMechanics::applyFatigueLoss(ptr, weapon, attackStrength);
 
-        // TODO: where is the distance defined?
-        float dist = 200.f;
+        float dist = gmst.find("fCombatDistance")->getFloat();
         if (!weapon.isEmpty())
-        {
-            const float fCombatDistance = gmst.find("fCombatDistance")->getFloat();
-            dist = fCombatDistance * weapon.get<ESM::Weapon>()->mBase->mData.mReach;
-        }
-        std::pair<MWWorld::Ptr, osg::Vec3f> result = MWBase::Environment::get().getWorld()->getHitContact(ptr, dist);
+            dist *= weapon.get<ESM::Weapon>()->mBase->mData.mReach;
+
+        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
+        std::vector<MWWorld::Ptr> targetActors;
+        if (!ptr.isEmpty() && ptr.getClass().isActor() && ptr != MWMechanics::getPlayer())
+            ptr.getClass().getCreatureStats(ptr).getAiSequence().getCombatTargets(targetActors);
+
+        std::pair<MWWorld::Ptr, osg::Vec3f> result = MWBase::Environment::get().getWorld()->getHitContact(ptr, dist, targetActors);
         if (result.first.isEmpty())
             return; // Didn't hit anything
 
@@ -264,7 +269,7 @@ namespace MWClass
 
         if(Misc::Rng::roll0to99() >= hitchance)
         {
-            victim.getClass().onHit(victim, 0.0f, false, MWWorld::Ptr(), ptr, false);
+            victim.getClass().onHit(victim, 0.0f, false, MWWorld::Ptr(), ptr, osg::Vec3f(), false);
             MWMechanics::reduceWeaponCondition(0.f, false, weapon, ptr);
             return;
         }
@@ -306,18 +311,7 @@ namespace MWClass
             }
 
             // Apply "On hit" enchanted weapons
-            std::string enchantmentName = !weapon.isEmpty() ? weapon.getClass().getEnchantment(weapon) : "";
-            if (!enchantmentName.empty())
-            {
-                const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
-                            enchantmentName);
-                if (enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
-                {
-                    MWMechanics::CastSpell cast(ptr, victim);
-                    cast.mHitPosition = hitPosition;
-                    cast.cast(weapon);
-                }
-            }
+            MWMechanics::applyOnStrikeEnchantment(ptr, victim, weapon, hitPosition);
         }
         else if (isBipedal(ptr))
         {
@@ -329,34 +323,47 @@ namespace MWClass
         if (MWMechanics::blockMeleeAttack(ptr, victim, weapon, damage, attackStrength))
             damage = 0;
 
-        if (damage > 0)
-            MWBase::Environment::get().getWorld()->spawnBloodEffect(victim, hitPosition);
-
         MWMechanics::diseaseContact(victim, ptr);
 
-        victim.getClass().onHit(victim, damage, healthdmg, weapon, ptr, true);
+        victim.getClass().onHit(victim, damage, healthdmg, weapon, ptr, hitPosition, true);
     }
 
-    void Creature::onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, bool successful) const
+    void Creature::onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) const
     {
-        // NOTE: 'object' and/or 'attacker' may be empty.
+        MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
-        if (!attacker.isEmpty() && !ptr.getClass().getCreatureStats(ptr).getAiSequence().isInCombat(attacker))
-            getCreatureStats(ptr).setAttacked(true);
+        // NOTE: 'object' and/or 'attacker' may be empty.        
+        if (!attacker.isEmpty() && attacker.getClass().isActor() && !stats.getAiSequence().isInCombat(attacker))
+            stats.setAttacked(true);
 
         // Self defense
         bool setOnPcHitMe = true; // Note OnPcHitMe is not set for friendly hits.
         
         // No retaliation for totally static creatures (they have no movement or attacks anyway)
         if (isMobile(ptr) && !attacker.isEmpty())
-        {
             setOnPcHitMe = MWBase::Environment::get().getMechanicsManager()->actorAttacked(ptr, attacker);
+
+        // Attacker and target store each other as hitattemptactor if they have no one stored yet
+        if (!attacker.isEmpty() && attacker.getClass().isActor() && !ptr.isEmpty() && ptr.getClass().isActor())
+        {
+            MWMechanics::CreatureStats& statsAttacker = attacker.getClass().getCreatureStats(attacker);
+            // First handle the attacked actor
+            if ((stats.getHitAttemptActorId() == -1)
+                && (statsAttacker.getAiSequence().isInCombat(ptr)
+                    || attacker == MWMechanics::getPlayer()))
+                stats.setHitAttemptActorId(statsAttacker.getActorId());
+
+            // Next handle the attacking actor
+            if ((statsAttacker.getHitAttemptActorId() == -1)
+                && (statsAttacker.getAiSequence().isInCombat(ptr)
+                    || attacker == MWMechanics::getPlayer()))
+                statsAttacker.setHitAttemptActorId(stats.getActorId());
         }
 
-        if(!object.isEmpty())
-            getCreatureStats(ptr).setLastHitAttemptObject(object.getCellRef().getRefId());
+        if (!object.isEmpty())
+            stats.setLastHitAttemptObject(object.getCellRef().getRefId());
 
-        if(setOnPcHitMe && !attacker.isEmpty() && attacker == MWMechanics::getPlayer())
+        if (setOnPcHitMe && !attacker.isEmpty() && attacker == MWMechanics::getPlayer())
         {
             const std::string &script = ptr.get<ESM::Creature>()->mBase->mScript;
             /* Set the OnPCHitMe script variable. The script is responsible for clearing it. */
@@ -364,15 +371,15 @@ namespace MWClass
                 ptr.getRefData().getLocals().setVarByInt(script, "onpchitme", 1);
         }
 
-        if(!successful)
+        if (!successful)
         {
             // Missed
             MWBase::Environment::get().getSoundManager()->playSound3D(ptr, "miss", 1.0f, 1.0f);
             return;
         }
 
-        if(!object.isEmpty())
-            getCreatureStats(ptr).setLastHitObject(object.getCellRef().getRefId());
+        if (!object.isEmpty())
+            stats.setLastHitObject(object.getCellRef().getRefId());
 
         if (damage > 0.0f && !object.isEmpty())
             MWMechanics::resistNormalWeapon(ptr, attacker, object, damage);
@@ -385,16 +392,13 @@ namespace MWClass
             if (!attacker.isEmpty())
             {
                 // Check for knockdown
-                float agilityTerm = getCreatureStats(ptr).getAttribute(ESM::Attribute::Agility).getModified() * getGmst().fKnockDownMult->getFloat();
-                float knockdownTerm = getCreatureStats(ptr).getAttribute(ESM::Attribute::Agility).getModified()
+                float agilityTerm = stats.getAttribute(ESM::Attribute::Agility).getModified() * getGmst().fKnockDownMult->getFloat();
+                float knockdownTerm = stats.getAttribute(ESM::Attribute::Agility).getModified()
                         * getGmst().iKnockDownOddsMult->getInt() * 0.01f + getGmst().iKnockDownOddsBase->getInt();
                 if (ishealth && agilityTerm <= damage && knockdownTerm <= Misc::Rng::roll0to99())
-                {
-                    getCreatureStats(ptr).setKnockedDown(true);
-
-                }
+                    stats.setKnockedDown(true);
                 else
-                    getCreatureStats(ptr).setHitRecovery(true); // Is this supposed to always occur?
+                    stats.setHitRecovery(true); // Is this supposed to always occur?
             }
 
             damage = std::max(1.f, damage);
@@ -402,19 +406,22 @@ namespace MWClass
             if(ishealth)
             {
                 if (!attacker.isEmpty())
+                {
                     damage = scaleDamage(damage, attacker, ptr);
+                    MWBase::Environment::get().getWorld()->spawnBloodEffect(ptr, hitPosition);
+                }
 
                 MWBase::Environment::get().getSoundManager()->playSound3D(ptr, "Health Damage", 1.0f, 1.0f);
 
-                MWMechanics::DynamicStat<float> health(getCreatureStats(ptr).getHealth());
+                MWMechanics::DynamicStat<float> health(stats.getHealth());
                 health.setCurrent(health.getCurrent() - damage);
-                getCreatureStats(ptr).setHealth(health);
+                stats.setHealth(health);
             }
             else
             {
-                MWMechanics::DynamicStat<float> fatigue(getCreatureStats(ptr).getFatigue());
+                MWMechanics::DynamicStat<float> fatigue(stats.getFatigue());
                 fatigue.setCurrent(fatigue.getCurrent() - damage, true);
-                getCreatureStats(ptr).setFatigue(fatigue);
+                stats.setFatigue(fatigue);
             }
         }
     }
@@ -770,20 +777,31 @@ namespace MWClass
 
     void Creature::respawn(const MWWorld::Ptr &ptr) const
     {
-        if (isFlagBitSet(ptr, ESM::Creature::Respawn))
+        const MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
+        if (ptr.getRefData().getCount() > 0 && !creatureStats.isDead())
+            return;
+
+        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        static const float fCorpseRespawnDelay = gmst.find("fCorpseRespawnDelay")->getFloat();
+        static const float fCorpseClearDelay = gmst.find("fCorpseClearDelay")->getFloat();
+
+        float delay = ptr.getRefData().getCount() == 0 ? fCorpseClearDelay : std::min(fCorpseRespawnDelay, fCorpseClearDelay);
+
+        if (isFlagBitSet(ptr, ESM::Creature::Respawn)
+                && creatureStats.getTimeOfDeath() + delay <= MWBase::Environment::get().getWorld()->getTimeStamp())
         {
-            // Note we do not respawn moved references in the cell they were moved to. Instead they are respawned in the original cell.
-            // This also means we cannot respawn dynamically placed references with no content file connection.
             if (ptr.getCellRef().hasContentFile())
             {
                 if (ptr.getRefData().getCount() == 0)
                     ptr.getRefData().setCount(1);
 
-                // Reset to original position
-                ptr.getRefData().setPosition(ptr.getCellRef().getPosition());
-
                 MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
                 ptr.getRefData().setCustomData(NULL);
+
+                // Reset to original position
+                MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().pos[0],
+                        ptr.getCellRef().getPosition().pos[1],
+                        ptr.getCellRef().getPosition().pos[2]);
             }
         }
     }
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index bea56887a..076bc8572 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -58,7 +58,7 @@ namespace MWClass
 
             virtual void hit(const MWWorld::Ptr& ptr, float attackStrength, int type) const;
 
-            virtual void onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, bool successful) const;
+            virtual void onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) const;
 
             virtual boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const;
@@ -104,11 +104,6 @@ namespace MWClass
             virtual void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const;
             ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation: list getModel().
 
-            virtual bool
-            isActor() const {
-                return true;
-            }
-
             virtual bool isBipedal (const MWWorld::ConstPtr &ptr) const;
             virtual bool canFly (const MWWorld::ConstPtr &ptr) const;
             virtual bool canSwim (const MWWorld::ConstPtr &ptr) const;
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index e2f29ea72..5941a09f5 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -44,7 +44,28 @@ namespace MWClass
         ensureCustomData(ptr);
 
         CreatureLevListCustomData& customData = ptr.getRefData().getCustomData()->asCreatureLevListCustomData();
-        customData.mSpawn = true;
+        if (customData.mSpawn)
+            return;
+
+        MWWorld::Ptr creature = (customData.mSpawnActorId == -1) ? MWWorld::Ptr() : MWBase::Environment::get().getWorld()->searchPtrViaActorId(customData.mSpawnActorId);
+        if (!creature.isEmpty())
+        {
+            const MWMechanics::CreatureStats& creatureStats = creature.getClass().getCreatureStats(creature);
+            if (creature.getRefData().getCount() == 0)
+                customData.mSpawn = true;
+            else if (creatureStats.isDead())
+            {
+                const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+                static const float fCorpseRespawnDelay = gmst.find("fCorpseRespawnDelay")->getFloat();
+                static const float fCorpseClearDelay = gmst.find("fCorpseClearDelay")->getFloat();
+
+                float delay = std::min(fCorpseRespawnDelay, fCorpseClearDelay);
+                if (creatureStats.getTimeOfDeath() + delay <= MWBase::Environment::get().getWorld()->getTimeStamp())
+                    customData.mSpawn = true;
+            }
+        }
+        else
+            customData.mSpawn = true;
     }
 
     void CreatureLevList::registerSelf()
@@ -56,8 +77,9 @@ namespace MWClass
 
     void CreatureLevList::getModelsToPreload(const MWWorld::Ptr &ptr, std::vector<std::string> &models) const
     {
+        // disable for now, too many false positives
+        /*
         const MWWorld::LiveCellRef<ESM::CreatureLevList> *ref = ptr.get<ESM::CreatureLevList>();
-
         for (std::vector<ESM::LevelledListBase::LevelItem>::const_iterator it = ref->mBase->mList.begin(); it != ref->mBase->mList.end(); ++it)
         {
             MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
@@ -68,6 +90,7 @@ namespace MWClass
             MWWorld::ManualRef ref(store, it->mId);
             ref.getPtr().getClass().getModelsToPreload(ref.getPtr(), models);
         }
+        */
     }
 
     void CreatureLevList::insertObjectRendering(const MWWorld::Ptr &ptr, const std::string& model, MWRender::RenderingInterface &renderingInterface) const
@@ -95,9 +118,9 @@ namespace MWClass
             }
 
             const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-            MWWorld::ManualRef ref(store, id);
-            ref.getPtr().getCellRef().setPosition(ptr.getCellRef().getPosition());
-            MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(), ptr.getCell() , ptr.getCellRef().getPosition());
+            MWWorld::ManualRef manualRef(store, id);
+            manualRef.getPtr().getCellRef().setPosition(ptr.getCellRef().getPosition());
+            MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(manualRef.getPtr(), ptr.getCell() , ptr.getCellRef().getPosition());
             customData.mSpawnActorId = placed.getClass().getCreatureStats(placed).getActorId();
             customData.mSpawn = false;
         }
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 8d54dff5d..21e191931 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -25,6 +25,7 @@
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
+#include "../mwrender/animation.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
@@ -73,8 +74,11 @@ namespace MWClass
                 MWBase::Environment::get().getWorld()->activateDoor(ptr, customData.mDoorState);
             }
         }
+    }
 
-        MWBase::Environment::get().getMechanicsManager()->add(ptr);
+    bool Door::useAnim() const
+    {
+        return true;
     }
 
     std::string Door::getModel(const MWWorld::ConstPtr &ptr) const
@@ -107,10 +111,25 @@ namespace MWClass
 
         MWWorld::ContainerStore &invStore = actor.getClass().getContainerStore(actor);
 
-        bool needKey = ptr.getCellRef().getLockLevel() > 0;
+        bool isLocked = ptr.getCellRef().getLockLevel() > 0;
+        bool isTrapped = !ptr.getCellRef().getTrap().empty();
         bool hasKey = false;
         std::string keyName;
 
+        // make door glow if player activates it with telekinesis
+        if (actor == MWBase::Environment::get().getWorld()->getPlayerPtr() &&
+            MWBase::Environment::get().getWorld()->getDistanceToFacedObject() > 
+            MWBase::Environment::get().getWorld()->getMaxActivationDistance())
+        {
+            MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(ptr);
+
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();            
+            int index = ESM::MagicEffect::effectStringToId("sEffectTelekinesis");
+            const ESM::MagicEffect *effect = store.get<ESM::MagicEffect>().find(index);
+
+            animation->addSpellCastGlow(effect, 1); // 1 second glow to match the time taken for a door opening or closing
+        }
+
         // make key id lowercase
         std::string keyId = ptr.getCellRef().getKey();
         Misc::StringUtils::lowerCaseInPlace(keyId);
@@ -125,32 +144,47 @@ namespace MWClass
             }
         }
 
-        if (needKey && hasKey)
+        if ((isLocked || isTrapped) && hasKey)
         {
             if(actor == MWMechanics::getPlayer())
                 MWBase::Environment::get().getWindowManager()->messageBox(keyName + " #{sKeyUsed}");
-            unlock(ptr); //Call the function here. because that makes sense.
+            if(isLocked)
+                unlock(ptr); //Call the function here. because that makes sense.
             // using a key disarms the trap
-            ptr.getCellRef().setTrap("");
+            if(isTrapped)
+            {
+                ptr.getCellRef().setTrap("");
+                MWBase::Environment::get().getSoundManager()->playSound3D(ptr,
+                    "Disarm Trap", 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx,
+                    MWBase::SoundManager::Play_Normal);
+                isTrapped = false;
+            }
         }
 
-        if (!needKey || hasKey)
+        if (!isLocked || hasKey)
         {
-            if(!ptr.getCellRef().getTrap().empty())
+            if(isTrapped)
             {
                 // Trap activation
-                boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTrap(actor, ptr.getCellRef().getTrap(), ptr));
+                boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTrap(ptr.getCellRef().getTrap(), ptr));
                 action->setSound(trapActivationSound);
                 return action;
             }
 
             if (ptr.getCellRef().getTeleport())
             {
-                boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTeleport (ptr.getCellRef().getDestCell(), ptr.getCellRef().getDoorDest(), true));
-
-                action->setSound(openSound);
-
-                return action;
+                if (actor == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getDistanceToFacedObject() > MWBase::Environment::get().getWorld()->getMaxActivationDistance())
+                {
+                    // player activated teleport door with telekinesis
+                    boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction);
+                    return action;
+                }
+                else
+                {
+                    boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTeleport (ptr.getCellRef().getDestCell(), ptr.getCellRef().getDoorDest(), true));
+                    action->setSound(openSound);
+                    return action;
+                }              
             }
             else
             {
@@ -189,7 +223,7 @@ namespace MWClass
         else
         {
             // locked, and we can't open.
-            boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction);
+            boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction(std::string(), ptr));
             action->setSound(lockedSound);
             return action;
         }
@@ -200,7 +234,7 @@ namespace MWClass
         if(lockLevel!=0)
             ptr.getCellRef().setLockLevel(abs(lockLevel)); //Changes lock to locklevel, in positive
         else
-            ptr.getCellRef().setLockLevel(abs(ptr.getCellRef().getLockLevel())); //No locklevel given, just flip the origional one
+            ptr.getCellRef().setLockLevel(abs(ptr.getCellRef().getLockLevel())); //No locklevel given, just flip the original one
     }
 
     void Door::unlock (const MWWorld::Ptr& ptr) const
@@ -213,6 +247,14 @@ namespace MWClass
         return true;
     }
 
+    bool Door::allowTelekinesis(const MWWorld::ConstPtr &ptr) const
+    {
+        if (ptr.getCellRef().getTeleport() && ptr.getCellRef().getLockLevel() <= 0 && ptr.getCellRef().getTrap().empty())
+            return false;
+        else
+            return true;
+    }
+
     std::string Door::getScript (const MWWorld::ConstPtr& ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Door> *ref = ptr.get<ESM::Door>();
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index 42aa6d64d..3760f59c4 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -20,6 +20,8 @@ namespace MWClass
 
             virtual void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const;
 
+            virtual bool useAnim() const;
+
             virtual std::string getName (const MWWorld::ConstPtr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
@@ -45,6 +47,9 @@ namespace MWClass
 
             virtual bool canLock(const MWWorld::ConstPtr &ptr) const;
 
+            virtual bool allowTelekinesis(const MWWorld::ConstPtr &ptr) const;
+            ///< Return whether this class of object can be activated with telekinesis
+
             virtual std::string getScript (const MWWorld::ConstPtr& ptr) const;
             ///< Return name of the script attached to ptr
 
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 99a50a67a..a9a995f2f 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -125,7 +125,7 @@ namespace MWClass
 
         std::string text;
 
-        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight);
+        text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index c7ebc184f..e74b9da88 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -51,8 +51,11 @@ namespace MWClass
             MWBase::Environment::get().getSoundManager()->playSound3D(ptr, ref->mBase->mSound, 1.0, 1.0,
                                                                       MWBase::SoundManager::Play_TypeSfx,
                                                                       MWBase::SoundManager::Play_Loop);
+    }
 
-        MWBase::Environment::get().getMechanicsManager()->add(ptr);
+    bool Light::useAnim() const
+    {
+        return true;
     }
 
     std::string Light::getModel(const MWWorld::ConstPtr &ptr) const
@@ -159,11 +162,9 @@ namespace MWClass
 
         if (Settings::Manager::getBool("show effect duration","Game"))
             text += "\n#{sDuration}: " + MWGui::ToolTips::toString(ptr.getClass().getRemainingUsageTime(ptr));
-        if (ref->mBase->mData.mWeight != 0)
-        {
-            text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight);
-            text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
-        }
+
+        text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
+        text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
             text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
@@ -175,6 +176,16 @@ namespace MWClass
         return info;
     }
 
+    bool Light::showsInInventory (const MWWorld::ConstPtr& ptr) const
+    {
+        const ESM::Light* light = ptr.get<ESM::Light>()->mBase;
+
+        if (!(light->mData.mFlags & ESM::Light::Carry))
+            return false;
+
+        return Class::showsInInventory(ptr);
+    }
+
     boost::shared_ptr<MWWorld::Action> Light::use (const MWWorld::Ptr& ptr) const
     {
         boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr));
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 5ec21f41f..284a7d817 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -16,6 +16,8 @@ namespace MWClass
 
             virtual void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const;
 
+            virtual bool useAnim() const;
+
             virtual std::string getName (const MWWorld::ConstPtr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
@@ -26,6 +28,8 @@ namespace MWClass
             virtual MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const;
             ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
+            virtual bool showsInInventory (const MWWorld::ConstPtr& ptr) const;
+
             virtual boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const;
             ///< Generate action for activation
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index d3889d2fc..a335415ac 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -126,7 +126,7 @@ namespace MWClass
 
         text += "\n#{sUses}: " + MWGui::ToolTips::toString(remainingUses);
         text += "\n#{sQuality}: " + MWGui::ToolTips::toString(ref->mBase->mData.mQuality);
-        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight);
+        text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 2f41fca30..3e1d750ad 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -159,11 +159,9 @@ namespace MWClass
 
         std::string text;
 
+        text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         if (!gold && !ref->mBase->mData.mIsKey)
-        {
-            text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight);
             text += MWGui::ToolTips::getValueString(getValue(ptr), "#{sValue}");
-        }
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
             text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 3519f9d83..2a9025ebd 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -8,6 +8,11 @@
 #include <components/esm/loadnpc.hpp>
 #include <components/esm/npcstate.hpp>
 
+#include "../mwmp/DedicatedPlayer.hpp"
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/Main.hpp"
+#include "../mwmp/LocalPlayer.hpp"
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -351,6 +356,8 @@ namespace MWClass
 
                 data->mNpcStats.setNeedRecalcDynamicStats(true);
             }
+            if (data->mNpcStats.isDead())
+                data->mNpcStats.setDeathAnimationFinished(true);
 
             // race powers
             const ESM::Race *race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(ref->mBase->mRace);
@@ -546,6 +553,9 @@ namespace MWClass
 
     void Npc::hit(const MWWorld::Ptr& ptr, float attackStrength, int type) const
     {
+        if (mwmp::Main::get().getNetworking()->isDedicatedPlayer(ptr))
+            return;
+
         MWBase::World *world = MWBase::Environment::get().getWorld();
 
         const MWWorld::Store<ESM::GameSetting> &store = world->getStore().get<ESM::GameSetting>();
@@ -554,30 +564,34 @@ namespace MWClass
         MWWorld::InventoryStore &inv = getInventoryStore(ptr);
         MWWorld::ContainerStoreIterator weaponslot = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
         MWWorld::Ptr weapon = ((weaponslot != inv.end()) ? *weaponslot : MWWorld::Ptr());
-        if(!weapon.isEmpty() && weapon.getTypeName() != typeid(ESM::Weapon).name())
+        if (!weapon.isEmpty() && weapon.getTypeName() != typeid(ESM::Weapon).name())
             weapon = MWWorld::Ptr();
 
         MWMechanics::applyFatigueLoss(ptr, weapon, attackStrength);
 
         const float fCombatDistance = store.find("fCombatDistance")->getFloat();
         float dist = fCombatDistance * (!weapon.isEmpty() ?
-                               weapon.get<ESM::Weapon>()->mBase->mData.mReach :
-                               store.find("fHandToHandReach")->getFloat());
+                                        weapon.get<ESM::Weapon>()->mBase->mData.mReach :
+                                        store.find("fHandToHandReach")->getFloat());
+
+        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
+        std::vector<MWWorld::Ptr> targetActors;
+        if (!ptr.isEmpty() && ptr.getClass().isActor() && ptr != MWMechanics::getPlayer())
+            ptr.getClass().getCreatureStats(ptr).getAiSequence().getCombatTargets(targetActors);
 
         // TODO: Use second to work out the hit angle
-        std::pair<MWWorld::Ptr, osg::Vec3f> result = world->getHitContact(ptr, dist);
+        std::pair<MWWorld::Ptr, osg::Vec3f> result = world->getHitContact(ptr, dist, targetActors);
         MWWorld::Ptr victim = result.first;
-        osg::Vec3f hitPosition (result.second);
-        if(victim.isEmpty()) // Didn't hit anything
+        osg::Vec3f hitPosition(result.second);
+        if (victim.isEmpty()) // Didn't hit anything
             return;
 
         const MWWorld::Class &othercls = victim.getClass();
-        if(!othercls.isActor()) // Can't hit non-actors
+        if (!othercls.isActor()) // Can't hit non-actors
             return;
         MWMechanics::CreatureStats &otherstats = othercls.getCreatureStats(victim);
-        if(otherstats.isDead()) // Can't hit dead actors
+        if (otherstats.isDead()) // Can't hit dead actors
             return;
-
         if(ptr == MWMechanics::getPlayer())
             MWBase::Environment::get().getWindowManager()->setEnemy(victim);
 
@@ -587,9 +601,23 @@ namespace MWClass
 
         float hitchance = MWMechanics::getHitChance(ptr, victim, ptr.getClass().getSkill(ptr, weapskill));
 
-        if (Misc::Rng::roll0to99() >= hitchance)
+        if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+        {
+            mwmp::Main::get().getLocalPlayer()->attack.success = true;
+            mwmp::DedicatedPlayer *dedicatedPlayer = mwmp::Players::getPlayer(victim);
+            if (dedicatedPlayer != nullptr)
+                mwmp::Main::get().getLocalPlayer()->attack.target = dedicatedPlayer->guid;
+        }
+
+        if(Misc::Rng::roll0to99() >= hitchance)
         {
-            othercls.onHit(victim, 0.0f, false, weapon, ptr, false);
+            if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+            {
+                mwmp::Main::get().getLocalPlayer()->attack.success = false;
+                mwmp::Main::get().getLocalPlayer()->sendAttack(mwmp::Attack::MELEE);
+            }
+
+            othercls.onHit(victim, 0.0f, false, weapon, ptr, osg::Vec3f(), false);
             MWMechanics::reduceWeaponCondition(0.f, false, weapon, ptr);
             return;
         }
@@ -637,53 +665,55 @@ namespace MWClass
             damage *= store.find("fCombatKODamageMult")->getFloat();
 
         // Apply "On hit" enchanted weapons
-        std::string enchantmentName = !weapon.isEmpty() ? weapon.getClass().getEnchantment(weapon) : "";
-        if (!enchantmentName.empty())
-        {
-            const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
-                        enchantmentName);
-            if (enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
-            {
-                MWMechanics::CastSpell cast(ptr, victim);
-                cast.mHitPosition = hitPosition;
-                cast.cast(weapon);
-            }
-        }
+        MWMechanics::applyOnStrikeEnchantment(ptr, victim, weapon, hitPosition);
 
         MWMechanics::applyElementalShields(ptr, victim);
 
         if (MWMechanics::blockMeleeAttack(ptr, victim, weapon, damage, attackStrength))
             damage = 0;
 
-        if (healthdmg && damage > 0)
-            MWBase::Environment::get().getWorld()->spawnBloodEffect(victim, hitPosition);
-
         MWMechanics::diseaseContact(victim, ptr);
 
-        othercls.onHit(victim, damage, healthdmg, weapon, ptr, true);
+        othercls.onHit(victim, damage, healthdmg, weapon, ptr, hitPosition, true);
     }
 
-    void Npc::onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, bool successful) const
+    void Npc::onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) const
     {
         MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-
-        // NOTE: 'object' and/or 'attacker' may be empty.
-
-        bool wasDead = getCreatureStats(ptr).isDead();
+        MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+        bool wasDead = stats.isDead();
 
         // Note OnPcHitMe is not set for friendly hits.
         bool setOnPcHitMe = true;
-        if (!attacker.isEmpty() && !ptr.getClass().getCreatureStats(ptr).getAiSequence().isInCombat(attacker))
-        {
-            getCreatureStats(ptr).setAttacked(true);
 
+        // NOTE: 'object' and/or 'attacker' may be empty.
+        if (!attacker.isEmpty() && attacker.getClass().isActor() && !stats.getAiSequence().isInCombat(attacker))
+        {
+            stats.setAttacked(true);
             setOnPcHitMe = MWBase::Environment::get().getMechanicsManager()->actorAttacked(ptr, attacker);
         }
 
-        if(!object.isEmpty())
-            getCreatureStats(ptr).setLastHitAttemptObject(object.getCellRef().getRefId());
+        // Attacker and target store each other as hitattemptactor if they have no one stored yet
+        if (!attacker.isEmpty() && attacker.getClass().isActor() && !ptr.isEmpty() && ptr.getClass().isActor())
+        {
+            MWMechanics::CreatureStats& statsAttacker = attacker.getClass().getCreatureStats(attacker);
+            // First handle the attacked actor
+            if ((stats.getHitAttemptActorId() == -1)
+                && (statsAttacker.getAiSequence().isInCombat(ptr)
+                    || attacker == MWMechanics::getPlayer()))
+                stats.setHitAttemptActorId(statsAttacker.getActorId());
+
+            // Next handle the attacking actor
+            if ((statsAttacker.getHitAttemptActorId() == -1)
+                && (statsAttacker.getAiSequence().isInCombat(ptr)
+                    || attacker == MWMechanics::getPlayer()))
+                statsAttacker.setHitAttemptActorId(stats.getActorId());
+        }
+
+        if (!object.isEmpty())
+            stats.setLastHitAttemptObject(object.getCellRef().getRefId());
 
-        if(setOnPcHitMe && !attacker.isEmpty() && attacker == MWMechanics::getPlayer())
+        if (setOnPcHitMe && !attacker.isEmpty() && attacker == MWMechanics::getPlayer())
         {
             const std::string &script = ptr.getClass().getScript(ptr);
             /* Set the OnPCHitMe script variable. The script is responsible for clearing it. */
@@ -691,15 +721,15 @@ namespace MWClass
                 ptr.getRefData().getLocals().setVarByInt(script, "onpchitme", 1);
         }
 
-        if(!successful)
+        if (!successful)
         {
             // Missed
             sndMgr->playSound3D(ptr, "miss", 1.0f, 1.0f);
             return;
         }
 
-        if(!object.isEmpty())
-            getCreatureStats(ptr).setLastHitObject(object.getCellRef().getRefId());
+        if (!object.isEmpty())
+            stats.setLastHitObject(object.getCellRef().getRefId());
 
 
         if (damage > 0.0f && !object.isEmpty())
@@ -708,7 +738,7 @@ namespace MWClass
         if (damage < 0.001f)
             damage = 0;
 
-        if(damage > 0.0f && !attacker.isEmpty())
+        if (damage > 0.0f && !attacker.isEmpty())
         {
             // 'ptr' is losing health. Play a 'hit' voiced dialog entry if not already saying
             // something, alert the character controller, scripts, etc.
@@ -718,23 +748,25 @@ namespace MWClass
 
             int chance = store.get<ESM::GameSetting>().find("iVoiceHitOdds")->getInt();
             if (Misc::Rng::roll0to99() < chance)
-            {
                 MWBase::Environment::get().getDialogueManager()->say(ptr, "hit");
-            }
 
             // Check for knockdown
-            float agilityTerm = getCreatureStats(ptr).getAttribute(ESM::Attribute::Agility).getModified() * gmst.fKnockDownMult->getFloat();
-            float knockdownTerm = getCreatureStats(ptr).getAttribute(ESM::Attribute::Agility).getModified()
+            float agilityTerm = stats.getAttribute(ESM::Attribute::Agility).getModified() * gmst.fKnockDownMult->getFloat();
+            float knockdownTerm = stats.getAttribute(ESM::Attribute::Agility).getModified()
                     * gmst.iKnockDownOddsMult->getInt() * 0.01f + gmst.iKnockDownOddsBase->getInt();
-            if (ishealth && agilityTerm <= damage && knockdownTerm <= Misc::Rng::roll0to99())
-            {
-                getCreatureStats(ptr).setKnockedDown(true);
 
-            }
+            mwmp::DedicatedPlayer *dedicatedPlayer = mwmp::Players::getPlayer(attacker);
+            bool isDedicated = dedicatedPlayer != nullptr;
+            bool _knockdown = false;
+            if(isDedicated)
+                _knockdown = dedicatedPlayer->attack.knockdown;
+
+            if ((!isDedicated && ishealth && agilityTerm <= damage && knockdownTerm <= Misc::Rng::roll0to99()) || _knockdown)
+                stats.setKnockedDown(true);
             else
-                getCreatureStats(ptr).setHitRecovery(true); // Is this supposed to always occur?
+                stats.setHitRecovery(true); // Is this supposed to always occur?
 
-            if(damage > 0 && ishealth)
+            if (damage > 0 && ishealth)
             {
                 // Hit percentages:
                 // cuirass = 30%
@@ -796,26 +828,28 @@ namespace MWClass
             }
         }
 
-        if(ishealth)
+        if (ishealth)
         {
             if (!attacker.isEmpty())
                 damage = scaleDamage(damage, attacker, ptr);
 
-            if(damage > 0.0f)
+            if (damage > 0.0f)
             {
                 sndMgr->playSound3D(ptr, "Health Damage", 1.0f, 1.0f);
                 if (ptr == MWMechanics::getPlayer())
                     MWBase::Environment::get().getWindowManager()->activateHitOverlay();
+                if (!attacker.isEmpty())
+                    MWBase::Environment::get().getWorld()->spawnBloodEffect(ptr, hitPosition);
             }
             MWMechanics::DynamicStat<float> health(getCreatureStats(ptr).getHealth());
             health.setCurrent(health.getCurrent() - damage);
-            getCreatureStats(ptr).setHealth(health);
+            stats.setHealth(health);
         }
         else
         {
             MWMechanics::DynamicStat<float> fatigue(getCreatureStats(ptr).getFatigue());
             fatigue.setCurrent(fatigue.getCurrent() - damage, true);
-            getCreatureStats(ptr).setFatigue(fatigue);
+            stats.setFatigue(fatigue);
         }
 
         if (!wasDead && getCreatureStats(ptr).isDead())
@@ -828,11 +862,31 @@ namespace MWClass
 
             MWBase::Environment::get().getMechanicsManager()->actorKilled(ptr, attacker);
         }
+
+
+        mwmp::DedicatedPlayer *victimPlayer = mwmp::Players::getPlayer(ptr);
+        if (attacker == MWMechanics::getPlayer() && victimPlayer != nullptr)
+        {
+            mwmp::Attack *attack = &mwmp::Main::get().getLocalPlayer()->attack;
+            attack->damage = damage;
+            attack->attacker = mwmp::Main::get().getLocalPlayer()->guid;
+            attack->target = victimPlayer->guid;
+            attack->knockdown = getCreatureStats(ptr).getKnockedDown();
+            mwmp::Main::get().getLocalPlayer()->sendAttack(mwmp::Attack::MELEE); // todo: make this sensitive to different weapon types
+        }
+
+        if (ptr == MWMechanics::getPlayer())
+        {
+            mwmp::Main::get().getLocalPlayer()->updateDynamicStats(true);
+            mwmp::Main::get().getLocalPlayer()->updatePosition(true); // fix position after getting damage;
+        }
     }
 
     boost::shared_ptr<MWWorld::Action> Npc::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
+        if (actor == MWMechanics::getPlayer() && mwmp::Main::get().getNetworking()->isDedicatedPlayer(ptr))
+            return boost::shared_ptr<MWWorld::Action>(new MWWorld::FailedAction("Not implemented."));
         // player got activated by another NPC
         if(ptr == MWMechanics::getPlayer())
             return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionTalk(actor));
@@ -1079,14 +1133,14 @@ namespace MWClass
         float fUnarmoredBase2 = store.find("fUnarmoredBase2")->getFloat();
         int unarmoredSkill = stats.getSkill(ESM::Skill::Unarmored).getModified();
 
-        int ratings[MWWorld::InventoryStore::Slots];
+        float ratings[MWWorld::InventoryStore::Slots];
         for(int i = 0;i < MWWorld::InventoryStore::Slots;i++)
         {
             MWWorld::ContainerStoreIterator it = invStore.getSlot(i);
             if (it == invStore.end() || it->getTypeName() != typeid(ESM::Armor).name())
             {
                 // unarmored
-                ratings[i] = static_cast<int>((fUnarmoredBase1 * unarmoredSkill) * (fUnarmoredBase2 * unarmoredSkill));
+                ratings[i] = (fUnarmoredBase1 * unarmoredSkill) * (fUnarmoredBase2 * unarmoredSkill);
             }
             else
             {
@@ -1303,20 +1357,31 @@ namespace MWClass
 
     void Npc::respawn(const MWWorld::Ptr &ptr) const
     {
-        if (ptr.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Respawn)
+        const MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
+        if (ptr.getRefData().getCount() > 0 && !creatureStats.isDead())
+            return;
+
+        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        static const float fCorpseRespawnDelay = gmst.find("fCorpseRespawnDelay")->getFloat();
+        static const float fCorpseClearDelay = gmst.find("fCorpseClearDelay")->getFloat();
+
+        float delay = ptr.getRefData().getCount() == 0 ? fCorpseClearDelay : std::min(fCorpseRespawnDelay, fCorpseClearDelay);
+
+        if (ptr.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Respawn
+                && creatureStats.getTimeOfDeath() + delay <= MWBase::Environment::get().getWorld()->getTimeStamp())
         {
-            // Note we do not respawn moved references in the cell they were moved to. Instead they are respawned in the original cell.
-            // This also means we cannot respawn dynamically placed references with no content file connection.
             if (ptr.getCellRef().hasContentFile())
             {
                 if (ptr.getRefData().getCount() == 0)
                     ptr.getRefData().setCount(1);
 
-                // Reset to original position
-                ptr.getRefData().setPosition(ptr.getCellRef().getPosition());
-
                 MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
                 ptr.getRefData().setCustomData(NULL);
+
+                // Reset to original position
+                MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().pos[0],
+                        ptr.getCellRef().getPosition().pos[1],
+                        ptr.getCellRef().getPosition().pos[2]);
             }
         }
     }
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 95edbd408..3120c498c 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -73,7 +73,7 @@ namespace MWClass
 
             virtual void hit(const MWWorld::Ptr& ptr, float attackStrength, int type) const;
 
-            virtual void onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, bool successful) const;
+            virtual void onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) const;
 
             virtual void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const;
             ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation: list getModel().
@@ -135,10 +135,6 @@ namespace MWClass
             /// Get a blood texture suitable for \a ptr (see Blood Texture 0-2 in Morrowind.ini)
             virtual int getBloodTexture (const MWWorld::ConstPtr& ptr) const;
 
-            virtual bool isActor() const {
-                return true;
-            }
-
             virtual bool isNpc() const {
                 return true;
             }
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index c26b925f6..225175979 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -122,7 +122,7 @@ namespace MWClass
 
         info.effects = MWGui::Widgets::MWEffectList::effectListFromESM(&ref->mBase->mEffects);
 
-        // hide effects the player doesnt know about
+        // hide effects the player doesn't know about
         MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
         for (unsigned int i=0; i<info.effects.size(); ++i)
             info.effects[i].mKnown = MWMechanics::Alchemy::knownEffect(i, player);
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 79d33ba60..185aa66cb 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -126,7 +126,7 @@ namespace MWClass
 
         text += "\n#{sUses}: " + MWGui::ToolTips::toString(remainingUses);
         text += "\n#{sQuality}: " + MWGui::ToolTips::toString(ref->mBase->mData.mQuality);
-        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight);
+        text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 271f52bde..cbdfade2b 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -129,7 +129,7 @@ namespace MWClass
 
         text += "\n#{sUses}: " + MWGui::ToolTips::toString(remainingUses);
         text += "\n#{sQuality}: " + MWGui::ToolTips::toString(ref->mBase->mData.mQuality);
-        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight);
+        text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index f3f840921..470c7040d 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -318,7 +318,7 @@ namespace MWClass
                     + MWGui::ToolTips::toString(ref->mBase->mData.mHealth);
         }
 
-        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight);
+        text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
         info.enchant = ref->mBase->mEnchant;
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index c99e86c2d..29bbc80f8 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -48,7 +48,7 @@
 
 namespace MWDialogue
 {
-    DialogueManager::DialogueManager (const Compiler::Extensions& extensions, bool scriptVerbose, Translation::Storage& translationDataStorage) :
+    DialogueManager::DialogueManager (const Compiler::Extensions& extensions, Translation::Storage& translationDataStorage) :
       mTranslationDataStorage(translationDataStorage)
       , mCompilerContext (MWScript::CompilerContext::Type_Dialogue)
       , mErrorStream(std::cout.rdbuf())
@@ -174,7 +174,7 @@ namespace MWDialogue
                     executeScript (info->mResultScript);
                     mLastTopic = Misc::StringUtils::lowerCase(it->mId);
 
-                    // update topics again to accomodate changes resulting from executeScript
+                    // update topics again to accommodate changes resulting from executeScript
                     updateTopics();
 
                     return;
@@ -198,6 +198,8 @@ namespace MWDialogue
         {
             mErrorHandler.reset();
 
+            mErrorHandler.setContext("[dialogue script]");
+
             std::istringstream input (cmd + "\n");
 
             Compiler::Scanner scanner (mErrorHandler, input, mCompilerContext.getExtensions());
@@ -451,6 +453,11 @@ namespace MWDialogue
         // Apply disposition change to NPC's base disposition
         if (mActor.getClass().isNpc())
         {
+            // Clamp permanent disposition change so that final disposition doesn't go below 0 (could happen with intimidate)       
+            float curDisp = static_cast<float>(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor, false));
+            if (curDisp + mPermanentDispositionChange < 0)
+                mPermanentDispositionChange = -curDisp;
+
             MWMechanics::NpcStats& npcStats = mActor.getClass().getNpcStats(mActor);
             npcStats.setBaseDisposition(static_cast<int>(npcStats.getBaseDisposition() + mPermanentDispositionChange));
         }
@@ -529,13 +536,13 @@ namespace MWDialogue
         bool success;
         float temp, perm;
         MWBase::Environment::get().getMechanicsManager()->getPersuasionDispositionChange(
-                    mActor, MWBase::MechanicsManager::PersuasionType(type), mTemporaryDispositionChange,
+                    mActor, MWBase::MechanicsManager::PersuasionType(type),
                     success, temp, perm);
         mTemporaryDispositionChange += temp;
         mPermanentDispositionChange += perm;
 
         // change temp disposition so that final disposition is between 0...100
-        float curDisp = static_cast<float>(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor));
+        float curDisp = static_cast<float>(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor, false));
         if (curDisp + mTemporaryDispositionChange < 0)
             mTemporaryDispositionChange = -curDisp;
         else if (curDisp + mTemporaryDispositionChange > 100)
@@ -629,7 +636,8 @@ namespace MWDialogue
         const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
         const ESM::Dialogue *dial = store.get<ESM::Dialogue>().find(topic);
 
-        Filter filter(actor, 0, false);
+        const MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
+        Filter filter(actor, 0, creatureStats.hasTalkedToPlayer());
         const ESM::DialInfo *info = filter.search(*dial, false);
         if(info != NULL)
         {
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
index 086b5ef2f..bbe42975c 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
@@ -58,7 +58,7 @@ namespace MWDialogue
 
         public:
 
-            DialogueManager (const Compiler::Extensions& extensions, bool scriptVerbose, Translation::Storage& translationDataStorage);
+            DialogueManager (const Compiler::Extensions& extensions, Translation::Storage& translationDataStorage);
 
             virtual void clear();
 
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 69df38ccf..d51918152 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -62,7 +62,15 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
     }
 
     // NPC faction
-    if (!info.mFaction.empty())
+    if (info.mFactionLess)
+    {
+        if (isCreature)
+            return true;
+
+        if (!mActor.getClass().getPrimaryFaction(mActor).empty())
+            return false;
+    }
+    else if (!info.mFaction.empty())
     {
         if (isCreature)
             return true;
@@ -99,11 +107,11 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
 bool MWDialogue::Filter::testPlayer (const ESM::DialInfo& info) const
 {
     const MWWorld::Ptr player = MWMechanics::getPlayer();
+    MWMechanics::NpcStats& stats = player.getClass().getNpcStats (player);
 
-    // check player faction
+    // check player faction and rank
     if (!info.mPcFaction.empty())
     {
-        MWMechanics::NpcStats& stats = player.getClass().getNpcStats (player);
         std::map<std::string,int>::const_iterator iter = stats.getFactionRanks().find (Misc::StringUtils::lowerCase (info.mPcFaction));
 
         if(iter==stats.getFactionRanks().end())
@@ -113,6 +121,18 @@ bool MWDialogue::Filter::testPlayer (const ESM::DialInfo& info) const
         if (iter->second < info.mData.mPCrank)
             return false;
     }
+    else if (info.mData.mPCrank != -1)
+    {
+        // required PC faction is not specified but PC rank is; use speaker's faction
+        std::map<std::string,int>::const_iterator iter = stats.getFactionRanks().find (Misc::StringUtils::lowerCase (mActor.getClass().getPrimaryFaction(mActor)));
+
+        if(iter==stats.getFactionRanks().end())
+            return false;
+
+        // check rank
+        if (iter->second < info.mData.mPCrank)
+            return false;
+    }
 
     // check cell
     if (!info.mCell.empty())
@@ -145,13 +165,45 @@ bool MWDialogue::Filter::testDisposition (const ESM::DialInfo& info, bool invert
     if (isCreature)
         return true;
 
-    int actorDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor)
-            + MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange();
+    int actorDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor);
     // For service refusal, the disposition check is inverted. However, a value of 0 still means "always succeed".
     return invert ? (info.mData.mDisposition == 0 || actorDisposition < info.mData.mDisposition)
                   : (actorDisposition >= info.mData.mDisposition);
 }
 
+bool MWDialogue::Filter::testFunctionLocal(const MWDialogue::SelectWrapper& select) const
+{
+    std::string scriptName = mActor.getClass().getScript (mActor);
+
+    if (scriptName.empty())
+        return false; // no script
+
+    std::string name = Misc::StringUtils::lowerCase (select.getName());
+
+    const Compiler::Locals& localDefs =
+        MWBase::Environment::get().getScriptManager()->getLocals (scriptName);
+
+    char type = localDefs.getType (name);
+
+    if (type==' ')
+        return false; // script does not have a variable of this name.
+
+    int index = localDefs.getIndex (name);
+    if (index < 0)
+        return false; // shouldn't happen, we checked that variable has a type above, so must exist
+
+    const MWScript::Locals& locals = mActor.getRefData().getLocals();
+
+    switch (type)
+    {
+        case 's': return select.selectCompare (static_cast<int> (locals.mShorts[index]));
+        case 'l': return select.selectCompare (locals.mLongs[index]);
+        case 'f': return select.selectCompare (locals.mFloats[index]);
+    }
+
+    throw std::logic_error ("unknown local variable type in dialogue filter");
+}
+
 bool MWDialogue::Filter::testSelectStruct (const SelectWrapper& select) const
 {
     if (select.isNpcOnly() && (mActor.getTypeName() != typeid (ESM::NPC).name()))
@@ -162,6 +214,11 @@ bool MWDialogue::Filter::testSelectStruct (const SelectWrapper& select) const
         // If not currently in a choice, we reject all conditions that test against choices.
         return false;
 
+    if (select.getFunction() == SelectWrapper::Function_Weather && !(MWBase::Environment::get().getWorld()->isCellExterior() || MWBase::Environment::get().getWorld()->isCellQuasiExterior()))
+        // Reject weather conditions in interior cells
+        // Note that the original engine doesn't include the "|| isCellQuasiExterior()" check, which could be considered a bug.
+        return false;
+
     switch (select.getType())
     {
         case SelectWrapper::Type_None: return true;
@@ -188,35 +245,12 @@ bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) c
 
         case SelectWrapper::Function_Local:
         {
-            std::string scriptName = mActor.getClass().getScript (mActor);
-
-            if (scriptName.empty())
-                return false; // no script
-
-            std::string name = Misc::StringUtils::lowerCase (select.getName());
-
-            const Compiler::Locals& localDefs =
-                MWBase::Environment::get().getScriptManager()->getLocals (scriptName);
-
-            char type = localDefs.getType (name);
-
-            if (type==' ')
-                return false; // script does not have a variable of this name.
-
-            int index = localDefs.getIndex (name);
-            if (index < 0)
-                return false; // shouldn't happen, we checked that variable has a type above, so must exist
-
-            const MWScript::Locals& locals = mActor.getRefData().getLocals();
-
-            switch (type)
-            {
-                case 's': return select.selectCompare (static_cast<int> (locals.mShorts[index]));
-                case 'l': return select.selectCompare (locals.mLongs[index]);
-                case 'f': return select.selectCompare (locals.mFloats[index]);
-            }
+            return testFunctionLocal(select);
+        }
 
-            throw std::logic_error ("unknown local variable type in dialogue filter");
+        case SelectWrapper::Function_NotLocal:
+        {
+            return !testFunctionLocal(select);
         }
 
         case SelectWrapper::Function_PcHealthPercent:
@@ -460,20 +494,6 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
             return !Misc::StringUtils::ciEqual(MWBase::Environment::get().getWorld()->getCellName(mActor.getCell())
                                                , select.getName());
 
-        case SelectWrapper::Function_NotLocal:
-        {
-            std::string scriptName = mActor.getClass().getScript (mActor);
-
-            if (scriptName.empty())
-                // This actor has no attached script, so there is no local variable
-                return true;
-
-            const Compiler::Locals& localDefs =
-                MWBase::Environment::get().getScriptManager()->getLocals (scriptName);
-
-            return localDefs.getIndex (Misc::StringUtils::lowerCase (select.getName()))==-1;
-        }
-
         case SelectWrapper::Function_SameGender:
 
             return (player.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Female)==
diff --git a/apps/openmw/mwdialogue/filter.hpp b/apps/openmw/mwdialogue/filter.hpp
index d41b7aa1e..4e2ebe6e5 100644
--- a/apps/openmw/mwdialogue/filter.hpp
+++ b/apps/openmw/mwdialogue/filter.hpp
@@ -33,6 +33,8 @@ namespace MWDialogue
             bool testDisposition (const ESM::DialInfo& info, bool invert=false) const;
             ///< Is the actor disposition toward the player high enough (or low enough, if \a invert is true)?
 
+            bool testFunctionLocal(const SelectWrapper& select) const;
+
             bool testSelectStruct (const SelectWrapper& select) const;
 
             bool testSelectStructNumeric (const SelectWrapper& select) const;
diff --git a/apps/openmw/mwdialogue/journalimp.cpp b/apps/openmw/mwdialogue/journalimp.cpp
index 8ea72e3ba..f11ec651d 100644
--- a/apps/openmw/mwdialogue/journalimp.cpp
+++ b/apps/openmw/mwdialogue/journalimp.cpp
@@ -187,12 +187,12 @@ namespace MWDialogue
             state.save (writer);
             writer.endRecord (ESM::REC_QUES);
 
-            for (Topic::TEntryIter iter (quest.begin()); iter!=quest.end(); ++iter)
+            for (Topic::TEntryIter entryIter (quest.begin()); entryIter!=quest.end(); ++entryIter)
             {
                 ESM::JournalEntry entry;
                 entry.mType = ESM::JournalEntry::Type_Quest;
                 entry.mTopic = quest.getTopic();
-                iter->write (entry);
+                entryIter->write (entry);
                 writer.startRecord (ESM::REC_JOUR);
                 entry.save (writer);
                 writer.endRecord (ESM::REC_JOUR);
@@ -213,12 +213,12 @@ namespace MWDialogue
         {
             const Topic& topic = iter->second;
 
-            for (Topic::TEntryIter iter (topic.begin()); iter!=topic.end(); ++iter)
+            for (Topic::TEntryIter entryIter (topic.begin()); entryIter!=topic.end(); ++entryIter)
             {
                 ESM::JournalEntry entry;
                 entry.mType = ESM::JournalEntry::Type_Topic;
                 entry.mTopic = topic.getTopic();
-                iter->write (entry);
+                entryIter->write (entry);
                 writer.startRecord (ESM::REC_JOUR);
                 entry.save (writer);
                 writer.endRecord (ESM::REC_JOUR);
diff --git a/apps/openmw/mwdialogue/keywordsearch.hpp b/apps/openmw/mwdialogue/keywordsearch.hpp
index 3532dc22b..f296f223f 100644
--- a/apps/openmw/mwdialogue/keywordsearch.hpp
+++ b/apps/openmw/mwdialogue/keywordsearch.hpp
@@ -158,7 +158,7 @@ public:
         }
 
         // resolve overlapping keywords
-        while (matches.size())
+        while (!matches.empty())
         {
             int longestKeywordSize = 0;
             typename std::vector<Match>::iterator longestKeyword = matches.begin();
diff --git a/apps/openmw/mwdialogue/scripttest.cpp b/apps/openmw/mwdialogue/scripttest.cpp
index 3f4654610..54b4d8cd9 100644
--- a/apps/openmw/mwdialogue/scripttest.cpp
+++ b/apps/openmw/mwdialogue/scripttest.cpp
@@ -39,9 +39,9 @@ void test(const MWWorld::Ptr& actor, int &compiled, int &total, const Compiler::
     {
         std::vector<const ESM::DialInfo*> infos = filter.listAll(*it);
 
-        for (std::vector<const ESM::DialInfo*>::iterator it = infos.begin(); it != infos.end(); ++it)
+        for (std::vector<const ESM::DialInfo*>::iterator iter = infos.begin(); iter != infos.end(); ++iter)
         {
-            const ESM::DialInfo* info = *it;
+            const ESM::DialInfo* info = *iter;
             if (!info->mResultScript.empty())
             {
                 bool success = true;
diff --git a/apps/openmw/mwdialogue/selectwrapper.cpp b/apps/openmw/mwdialogue/selectwrapper.cpp
index 68c88e943..793963e48 100644
--- a/apps/openmw/mwdialogue/selectwrapper.cpp
+++ b/apps/openmw/mwdialogue/selectwrapper.cpp
@@ -210,7 +210,7 @@ MWDialogue::SelectWrapper::Type MWDialogue::SelectWrapper::getType() const
 
     static const Function numericFunctions[] =
     {
-        Function_Global, Function_Local,
+        Function_Global, Function_Local, Function_NotLocal,
         Function_PcDynamicStat, Function_PcHealthPercent,
         Function_HealthPercent,
         Function_None // end marker
@@ -232,7 +232,7 @@ MWDialogue::SelectWrapper::Type MWDialogue::SelectWrapper::getType() const
     static const Function invertedBooleanFunctions[] =
     {
         Function_NotId, Function_NotFaction, Function_NotClass,
-        Function_NotRace, Function_NotCell, Function_NotLocal,
+        Function_NotRace, Function_NotCell,
         Function_None // end marker
     };
 
diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index 3299846b7..385010ac5 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -67,46 +67,29 @@ namespace MWGui
     {
         MWMechanics::Alchemy::Result result = mAlchemy->create (mNameEdit->getCaption ());
 
-        if (result == MWMechanics::Alchemy::Result_NoName)
+        switch (result)
         {
+        case MWMechanics::Alchemy::Result_NoName:
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage37}");
-            return;
-        }
-
-        // check if mortar & pestle is available (always needed)
-        if (result == MWMechanics::Alchemy::Result_NoMortarAndPestle)
-        {
+            break;
+        case MWMechanics::Alchemy::Result_NoMortarAndPestle:
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage45}");
-            return;
-        }
-
-        // make sure 2 or more ingredients were selected
-        if (result == MWMechanics::Alchemy::Result_LessThanTwoIngredients)
-        {
+            break;
+        case MWMechanics::Alchemy::Result_LessThanTwoIngredients:
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage6a}");
-            return;
-        }
-
-        if (result == MWMechanics::Alchemy::Result_NoEffects)
-        {
-            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage8}");
-            MWBase::Environment::get().getSoundManager()->playSound("potion fail", 1.f, 1.f);
-            return;
-        }
-
-        if (result == MWMechanics::Alchemy::Result_Success)
-        {
+            break;
+        case MWMechanics::Alchemy::Result_Success:
             MWBase::Environment::get().getWindowManager()->messageBox("#{sPotionSuccess}");
             MWBase::Environment::get().getSoundManager()->playSound("potion success", 1.f, 1.f);
-        }
-        else if (result == MWMechanics::Alchemy::Result_RandomFailure)
-        {
-            // potion failed
+            break;
+        case MWMechanics::Alchemy::Result_NoEffects:
+        case MWMechanics::Alchemy::Result_RandomFailure:
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage8}");
             MWBase::Environment::get().getSoundManager()->playSound("potion fail", 1.f, 1.f);
+            break;
         }
 
-        // reduce count of the ingredients
+        // remove ingredient slots that have been fully used up
         for (int i=0; i<4; ++i)
             if (mIngredients[i]->isUserString("ToolTipType"))
             {
@@ -217,15 +200,15 @@ namespace MWGui
         std::set<MWMechanics::EffectKey> effectIds = mAlchemy->listEffects();
         Widgets::SpellEffectList list;
         unsigned int effectIndex=0;
-        for (std::set<MWMechanics::EffectKey>::iterator it = effectIds.begin(); it != effectIds.end(); ++it)
+        for (std::set<MWMechanics::EffectKey>::iterator it2 = effectIds.begin(); it2 != effectIds.end(); ++it2)
         {
             Widgets::SpellEffectParams params;
-            params.mEffectID = it->mId;
-            const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(it->mId);
+            params.mEffectID = it2->mId;
+            const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(it2->mId);
             if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetSkill)
-                params.mSkill = it->mArg;
+                params.mSkill = it2->mArg;
             else if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetAttribute)
-                params.mAttribute = it->mArg;
+                params.mAttribute = it2->mArg;
             params.mIsConstant = true;
             params.mNoTarget = true;
 
diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp
index de8614004..69fb2c462 100644
--- a/apps/openmw/mwgui/birth.cpp
+++ b/apps/openmw/mwgui/birth.cpp
@@ -225,8 +225,8 @@ namespace MWGui
                 mSpellItems.push_back(label);
                 coord.top += lineHeight;
 
-                std::vector<std::string>::const_iterator end = categories[category].spells.end();
-                for (std::vector<std::string>::const_iterator it = categories[category].spells.begin(); it != end; ++it)
+                end = categories[category].spells.end();
+                for (it = categories[category].spells.begin(); it != end; ++it)
                 {
                     const std::string &spellId = *it;
                     spellWidget = mSpellArea->createWidget<Widgets::MWSpell>("MW_StatName", coord, MyGUI::Align::Default, std::string("Spell") + MyGUI::utility::toString(i));
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index 8506f04ed..c5c4e8d03 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -157,7 +157,7 @@ struct TypesetBookImpl : TypesetBook
     StyleImpl * hitTestWithMargin (int left, int top)
     {
         StyleImpl * hit = hitTest(left, top);
-        if (hit && hit->mInteractiveId > 0)
+        if (hit && hit->mInteractiveId != 0)
             return hit;
 
         const int maxMargin = 10;
@@ -174,7 +174,7 @@ struct TypesetBookImpl : TypesetBook
                 else
                     hit = hitTest(left+margin, top);
 
-                if (hit && hit->mInteractiveId > 0)
+                if (hit && hit->mInteractiveId != 0)
                     return hit;
             }
         }
@@ -275,9 +275,12 @@ struct TypesetBookImpl::Typesetter : BookTypesetter
             if (i->match (fontName, fontColour, fontColour, fontColour, 0))
                 return &*i;
 
-        StyleImpl & style = *mBook->mStyles.insert (mBook->mStyles.end (), StyleImpl ());
+        MyGUI::IFont* font = MyGUI::FontManager::getInstance().getByName(fontName);
+        if (!font)
+            throw std::runtime_error(std::string("can't find font ") + fontName);
 
-        style.mFont = MyGUI::FontManager::getInstance().getByName(fontName);
+        StyleImpl & style = *mBook->mStyles.insert (mBook->mStyles.end (), StyleImpl ());
+        style.mFont = font;
         style.mHotColour = fontColour;
         style.mActiveColour = fontColour;
         style.mNormalColour = fontColour;
@@ -1252,72 +1255,65 @@ class BookPageImpl : public BookPage
 MYGUI_RTTI_DERIVED(BookPage)
 public:
 
+    BookPageImpl()
+        : mPageDisplay(NULL)
+    {
+    }
+
     void showPage (TypesetBook::Ptr book, size_t page)
     {
-        if (PageDisplay* pd = dynamic_cast <PageDisplay*> (getSubWidgetText ()))
-            pd->showPage (book, page);
-        else
-            throw std::runtime_error ("The main sub-widget for a BookPage must be a PageDisplay.");
+        mPageDisplay->showPage (book, page);
     }
 
     void adviseLinkClicked (boost::function <void (InteractiveId)> linkClicked)
     {
-        if (PageDisplay* pd = dynamic_cast <PageDisplay*> (getSubWidgetText ()))
-        {
-            pd->mLinkClicked = linkClicked;
-        }
+        mPageDisplay->mLinkClicked = linkClicked;
     }
 
     void unadviseLinkClicked ()
     {
-        if (PageDisplay* pd = dynamic_cast <PageDisplay*> (getSubWidgetText ()))
+        mPageDisplay->mLinkClicked = boost::function <void (InteractiveId)> ();
+    }
+
+protected:
+
+    virtual void initialiseOverride()
+    {
+        Base::initialiseOverride();
+
+        if (getSubWidgetText())
         {
-            pd->mLinkClicked = boost::function <void (InteractiveId)> ();
+            mPageDisplay = getSubWidgetText()->castType<PageDisplay>();
+        }
+        else
+        {
+            throw std::runtime_error("BookPage unable to find page display sub widget");
         }
     }
 
-protected:
     void onMouseLostFocus(Widget* _new)
     {
         // NOTE: MyGUI also fires eventMouseLostFocus for widgets that are about to be destroyed (if they had focus).
         // Child widgets may already be destroyed! So be careful.
-        if (PageDisplay* pd = dynamic_cast <PageDisplay*> (getSubWidgetText ()))
-        {
-            pd->onMouseLostFocus ();
-        }
-        else
-            Widget::onMouseLostFocus (_new);
+        mPageDisplay->onMouseLostFocus ();
     }
 
     void onMouseMove(int left, int top)
     {
-        if (PageDisplay* pd = dynamic_cast <PageDisplay*> (getSubWidgetText ()))
-        {
-            pd->onMouseMove (left, top);
-        }
-        else
-            Widget::onMouseMove (left, top);
+        mPageDisplay->onMouseMove (left, top);
     }
 
     void onMouseButtonPressed (int left, int top, MyGUI::MouseButton id)
     {
-        if (PageDisplay* pd = dynamic_cast <PageDisplay*> (getSubWidgetText ()))
-        {
-            pd->onMouseButtonPressed (left, top, id);
-        }
-        else
-            Widget::onMouseButtonPressed (left, top, id);
+        mPageDisplay->onMouseButtonPressed (left, top, id);
     }
 
     void onMouseButtonReleased(int left, int top, MyGUI::MouseButton id)
     {
-        if (PageDisplay* pd = dynamic_cast <PageDisplay*> (getSubWidgetText ()))
-        {
-            pd->onMouseButtonReleased (left, top, id);
-        }
-        else
-            Widget::onMouseButtonReleased (left, top, id);
+        mPageDisplay->onMouseButtonReleased (left, top, id);
     }
+
+    PageDisplay* mPageDisplay;
 };
 
 void BookPage::registerMyGUIComponents ()
diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index 8c2ec6881..d72e6627f 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -62,8 +62,8 @@ namespace
 namespace MWGui
 {
 
-    CharacterCreation::CharacterCreation(osgViewer::Viewer* viewer, Resource::ResourceSystem* resourceSystem)
-        : mViewer(viewer)
+    CharacterCreation::CharacterCreation(osg::Group* parent, Resource::ResourceSystem* resourceSystem)
+        : mParent(parent)
         , mResourceSystem(resourceSystem)
         , mNameDialog(0)
         , mRaceDialog(0)
@@ -132,6 +132,12 @@ namespace MWGui
             mReviewDialog->configureSkills(major, minor);
     }
 
+    void CharacterCreation::onFrame(float duration)
+    {
+        if (mReviewDialog)
+            mReviewDialog->onFrame(duration);
+    }
+
     void CharacterCreation::spawnDialog(const char id)
     {
         try
@@ -152,7 +158,7 @@ namespace MWGui
                 case GM_Race:
                     MWBase::Environment::get().getWindowManager()->removeDialog(mRaceDialog);
                     mRaceDialog = 0;
-                    mRaceDialog = new RaceDialog(mViewer, mResourceSystem);
+                    mRaceDialog = new RaceDialog(mParent, mResourceSystem);
                     mRaceDialog->setNextButtonShow(mCreationStage >= CSE_RaceChosen);
                     mRaceDialog->setRaceId(mPlayerRaceId);
                     mRaceDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onRaceDialogDone);
@@ -177,7 +183,7 @@ namespace MWGui
                     mPickClassDialog = 0;
                     mPickClassDialog = new PickClassDialog();
                     mPickClassDialog->setNextButtonShow(mCreationStage >= CSE_ClassChosen);
-                    mPickClassDialog->setClassId(mPlayerClass.mName);
+                    mPickClassDialog->setClassId(mPlayerClass.mId);
                     mPickClassDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onPickClassDialogDone);
                     mPickClassDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onPickClassDialogBack);
                     mPickClassDialog->setVisible(true);
diff --git a/apps/openmw/mwgui/charactercreation.hpp b/apps/openmw/mwgui/charactercreation.hpp
index 7fb67caf6..0130222f3 100644
--- a/apps/openmw/mwgui/charactercreation.hpp
+++ b/apps/openmw/mwgui/charactercreation.hpp
@@ -8,9 +8,9 @@
 
 #include "../mwmechanics/stat.hpp"
 
-namespace osgViewer
+namespace osg
 {
-    class Viewer;
+    class Group;
 }
 
 namespace Resource
@@ -39,7 +39,7 @@ namespace MWGui
     public:
     typedef std::vector<int> SkillList;
 
-    CharacterCreation(osgViewer::Viewer* viewer, Resource::ResourceSystem* resourceSystem);
+    CharacterCreation(osg::Group* parent, Resource::ResourceSystem* resourceSystem);
     ~CharacterCreation();
 
     //Show a dialog
@@ -50,8 +50,10 @@ namespace MWGui
     void setValue(const ESM::Skill::SkillEnum parSkill, const MWMechanics::SkillValue& value);
     void configureSkills (const SkillList& major, const SkillList& minor);
 
+    void onFrame(float duration);
+
     private:
-    osgViewer::Viewer* mViewer;
+    osg::Group* mParent;
     Resource::ResourceSystem* mResourceSystem;
 
     //Dialogs
diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index 57cd9ca8e..e1f5a165e 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -55,7 +55,9 @@ namespace MWGui
     void GenerateClassResultDialog::setClassId(const std::string &classId)
     {
         mCurrentClassId = classId;
-        mClassImage->setImageTexture(std::string("textures\\levelup\\") + mCurrentClassId + ".dds");
+
+        setClassImage(mClassImage, mCurrentClassId);
+
         mClassName->setCaption(MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(mCurrentClassId)->mName);
 
         center();
@@ -191,14 +193,16 @@ namespace MWGui
 
         const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
 
-        std::vector<std::pair<std::string, std::string> > items; // class id, class name
-        MWWorld::Store<ESM::Class>::iterator it = store.get<ESM::Class>().begin();
-        for (; it != store.get<ESM::Class>().end(); ++it)
+        std::vector<std::pair<std::string, std::string> > items; // class id, class name       
+        for (MWWorld::Store<ESM::Class>::iterator it = store.get<ESM::Class>().begin(); it != store.get<ESM::Class>().end(); ++it)
         {
             bool playable = (it->mData.mIsPlayable != 0);
             if (!playable) // Only display playable classes
                 continue;
 
+            if (store.get<ESM::Class>().isDynamic(it->mId))
+                continue; // custom-made class not relevant for this dialog
+
             items.push_back(std::make_pair(it->mId, it->mName));
         }
         std::sort(items.begin(), items.end(), sortClasses);
@@ -254,7 +258,7 @@ namespace MWGui
             ToolTips::createSkillToolTip(mMajorSkill[i], klass->mData.mSkills[i][1]);
         }
 
-        mClassImage->setImageTexture(std::string("textures\\levelup\\") + mCurrentClassId + ".dds");
+        setClassImage(mClassImage, mCurrentClassId);
     }
 
     /* InfoBoxDialog */
@@ -900,4 +904,15 @@ namespace MWGui
         eventDone(this);
     }
 
+    void setClassImage(MyGUI::ImageBox* imageBox, const std::string &classId)
+    {
+        std::string classImage = std::string("textures\\levelup\\") + classId + ".dds";
+        if (!MWBase::Environment::get().getWindowManager()->textureExists(classImage))
+        {
+            std::cout << "No class image for " << classId << ", falling back to default" << std::endl;
+            classImage = "textures\\levelup\\warrior.dds";
+        }
+        imageBox->setImageTexture(classImage);
+    }
+
 }
diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp
index e36a9a98b..8206d6b03 100644
--- a/apps/openmw/mwgui/class.hpp
+++ b/apps/openmw/mwgui/class.hpp
@@ -8,6 +8,8 @@
 
 namespace MWGui
 {
+    void setClassImage(MyGUI::ImageBox* imageBox, const std::string& classId);
+
     class InfoBoxDialog : public WindowModal
     {
     public:
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index 1777d86ad..aeff7dc39 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -240,7 +240,7 @@ namespace MWGui
             mCommandLine->setCaption(newCaption);
 
             // List candidates if repeatedly pressing tab
-            if (oldCaption == newCaption && matches.size())
+            if (oldCaption == newCaption && !matches.empty())
             {
                 int i = 0;
                 printOK("");
diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 5d71fc445..999578105 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -3,6 +3,12 @@
 #include <MyGUI_InputManager.h>
 #include <MyGUI_Button.h>
 
+#include <components/openmw-mp/Log.hpp>
+#include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/WorldEvent.hpp"
+#include "../mwmp/WorldController.hpp"
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -57,7 +63,7 @@ namespace MWGui
     {
         if (mDragAndDrop->mIsOnDragAndDrop)
         {
-            if (!dynamic_cast<PickpocketItemModel*>(mModel))
+            if (mModel && mModel->allowedToInsertItems())
                 dropItem();
             return;
         }
@@ -95,6 +101,35 @@ namespace MWGui
         if (!onTakeItem(mModel->getItem(mSelectedItem), count))
             return;
 
+        // Added by tes3mp
+        mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+        worldEvent->cell = *mPtr.getCell()->getCell();
+        worldEvent->action = mwmp::BaseEvent::REMOVE;
+
+        mwmp::WorldObject worldObject;
+        worldObject.refId = mPtr.getCellRef().getRefId();
+        worldObject.refNumIndex = mPtr.getCellRef().getRefNum().mIndex;
+
+        MWWorld::Ptr itemPtr = mModel->getItem(mSelectedItem).mBase;
+
+        mwmp::ContainerItem containerItem;
+        containerItem.refId =itemPtr.getCellRef().getRefId();
+        containerItem.count = itemPtr.getRefData().getCount();
+        containerItem.charge = itemPtr.getCellRef().getCharge();
+        containerItem.actionCount = count;
+
+        worldObject.containerChanges.items.push_back(containerItem);
+        worldEvent->addObject(worldObject);
+
+        mwmp::Main::get().getNetworking()->getWorldPacket(ID_CONTAINER)->Send(worldEvent);
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_CONTAINER about\n- Ptr cellRef: %s, %i\n- cell: %s\n- item: %s, %i",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex,
+            worldEvent->cell.getDescription().c_str(),
+            containerItem.refId.c_str(),
+            containerItem.count);
+
         mDragAndDrop->startDrag(mSelectedItem, mSortModel, mModel, mItemView, count);
     }
 
@@ -121,17 +156,50 @@ namespace MWGui
             }
         }
 
+        // Added by tes3mp
+        mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+        worldEvent->cell = *mPtr.getCell()->getCell();
+        worldEvent->action = mwmp::BaseEvent::ADD;
+
+        mwmp::WorldObject worldObject;
+        worldObject.refId = mPtr.getCellRef().getRefId();
+        worldObject.refNumIndex = mPtr.getCellRef().getRefNum().mIndex;
+
+        MWWorld::Ptr itemPtr = mDragAndDrop->mItem.mBase;
+
+        mwmp::ContainerItem containerItem;
+        containerItem.refId = itemPtr.getCellRef().getRefId();
+        
+        // Make sure we get the drag and drop count, not the count of the original item
+        containerItem.count = mDragAndDrop->mDraggedCount;
+
+        containerItem.charge = itemPtr.getCellRef().getCharge();
+
+        worldObject.containerChanges.items.push_back(containerItem);
+        worldEvent->addObject(worldObject);
+
+        mwmp::Main::get().getNetworking()->getWorldPacket(ID_CONTAINER)->Send(worldEvent);
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_CONTAINER about\n- Ptr cellRef: %s, %i\n- cell: %s\n- item: %s, %i",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex,
+            worldEvent->cell.getDescription().c_str(),
+            containerItem.refId.c_str(),
+            containerItem.count);
+
         mDragAndDrop->drop(mModel, mItemView);
     }
 
     void ContainerWindow::onBackgroundSelected()
     {
-        if (mDragAndDrop->mIsOnDragAndDrop && !dynamic_cast<PickpocketItemModel*>(mModel))
+        if (mDragAndDrop->mIsOnDragAndDrop && mModel && mModel->allowedToInsertItems())
             dropItem();
     }
 
     void ContainerWindow::openContainer(const MWWorld::Ptr& container, bool loot)
     {
+        mwmp::Main::get().getWorldController()->openContainer(container, loot);
+
         mPickpocketDetected = false;
         mPtr = container;
 
@@ -175,6 +243,7 @@ namespace MWGui
 
     void ContainerWindow::close()
     {
+        mwmp::Main::get().getWorldController()->closeContainer(mPtr);
         WindowBase::close();
 
         if (dynamic_cast<PickpocketItemModel*>(mModel)
@@ -236,6 +305,23 @@ namespace MWGui
             }
 
             MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Container);
+
+            // Added by tes3mp
+            mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+            worldEvent->cell = *mPtr.getCell()->getCell();
+            worldEvent->action = mwmp::BaseEvent::SET;
+
+            mwmp::WorldObject worldObject;
+            worldObject.refId = mPtr.getCellRef().getRefId();
+            worldObject.refNumIndex = mPtr.getCellRef().getRefNum().mIndex;
+            worldEvent->addObject(worldObject);
+
+            mwmp::Main::get().getNetworking()->getWorldPacket(ID_CONTAINER)->Send(worldEvent);
+
+            LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_CONTAINER about\n- Ptr cellRef: %s, %i\n- cell: %s",
+                worldObject.refId.c_str(),
+                worldObject.refNumIndex,
+                worldEvent->cell.getDescription().c_str());
         }
     }
 
@@ -271,7 +357,7 @@ namespace MWGui
             {
                 int value = item.mBase.getClass().getValue(item.mBase) * count;
                 MWBase::Environment::get().getMechanicsManager()->commitCrime(
-                            player, MWWorld::Ptr(), MWBase::MechanicsManager::OT_Theft, value, true);
+                            player, mPtr, MWBase::MechanicsManager::OT_Theft, value, true);
                 MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container);
                 mPickpocketDetected = true;
                 return false;
diff --git a/apps/openmw/mwgui/containeritemmodel.cpp b/apps/openmw/mwgui/containeritemmodel.cpp
index b2befc3ba..1e4749695 100644
--- a/apps/openmw/mwgui/containeritemmodel.cpp
+++ b/apps/openmw/mwgui/containeritemmodel.cpp
@@ -37,7 +37,7 @@ ContainerItemModel::ContainerItemModel(const std::vector<MWWorld::Ptr>& itemSour
     : mItemSources(itemSources)
     , mWorldItems(worldItems)
 {
-    assert (mItemSources.size());
+    assert (!mItemSources.empty());
 }
 
 ContainerItemModel::ContainerItemModel (const MWWorld::Ptr& source)
diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp
index 37ea3470d..a29910f00 100644
--- a/apps/openmw/mwgui/debugwindow.cpp
+++ b/apps/openmw/mwgui/debugwindow.cpp
@@ -7,6 +7,8 @@
 
 #include <LinearMath/btQuickprof.h>
 
+#ifndef BT_NO_PROFILE
+
 namespace
 {
     void bulletDumpRecursive(CProfileIterator* pit, int spacing, std::stringstream& os)
@@ -71,6 +73,7 @@ namespace
     }
 }
 
+#endif // BT_NO_PROFILE
 
 namespace MWGui
 {
@@ -92,10 +95,13 @@ namespace MWGui
 
         MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
         mMainWidget->setSize(viewSize);
+
+
     }
 
     void DebugWindow::onFrame(float dt)
     {
+#ifndef BT_NO_PROFILE
         if (!isVisible())
             return;
 
@@ -115,6 +121,7 @@ namespace MWGui
         size_t previousPos = mBulletProfilerEdit->getVScrollPosition();
         mBulletProfilerEdit->setCaption(stream.str());
         mBulletProfilerEdit->setVScrollPosition(std::min(previousPos, mBulletProfilerEdit->getVScrollRange()-1));
+#endif
     }
 
 }
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 040cd6d65..771e1bf95 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -639,9 +639,7 @@ namespace MWGui
     {
         if(mMainWidget->getVisible() && mEnabled && mPtr.getTypeName() == typeid(ESM::NPC).name())
         {
-            int disp = std::max(0, std::min(100,
-                MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr)
-                    + MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange()));
+            int disp = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr);
             mDispositionBar->setProgressRange(100);
             mDispositionBar->setProgressPosition(disp);
             mDispositionText->setCaption(MyGUI::utility::toString(disp)+std::string("/100"));
diff --git a/apps/openmw/mwgui/draganddrop.cpp b/apps/openmw/mwgui/draganddrop.cpp
index 55aeb969c..6053a7fb0 100644
--- a/apps/openmw/mwgui/draganddrop.cpp
+++ b/apps/openmw/mwgui/draganddrop.cpp
@@ -36,7 +36,6 @@ void DragAndDrop::startDrag (int index, SortFilterItemModel* sortModel, ItemMode
     mSourceModel = sourceModel;
     mSourceView = sourceView;
     mSourceSortModel = sortModel;
-    mIsOnDragAndDrop = true;
 
     // If picking up an item that isn't from the player's inventory, the item gets added to player inventory backend
     // immediately, even though it's still floating beneath the mouse cursor. A bit counterintuitive,
@@ -88,6 +87,8 @@ void DragAndDrop::startDrag (int index, SortFilterItemModel* sortModel, ItemMode
     sourceView->update();
 
     MWBase::Environment::get().getWindowManager()->setDragDrop(true);
+
+    mIsOnDragAndDrop = true;
 }
 
 void DragAndDrop::drop(ItemModel *targetModel, ItemView *targetView)
diff --git a/apps/openmw/mwgui/formatting.cpp b/apps/openmw/mwgui/formatting.cpp
index 6a8145e97..72e1c09f3 100644
--- a/apps/openmw/mwgui/formatting.cpp
+++ b/apps/openmw/mwgui/formatting.cpp
@@ -413,7 +413,10 @@ namespace MWGui
         int TextElement::currentFontHeight() const
         {
             std::string fontName(mTextStyle.mFont == "Default" ? MyGUI::FontManager::getInstance().getDefaultFont() : mTextStyle.mFont);
-            return MyGUI::FontManager::getInstance().getByName(fontName)->getDefaultHeight();
+            MyGUI::IFont* font = MyGUI::FontManager::getInstance().getByName(fontName);
+            if (!font)
+                return 0;
+            return font->getDefaultHeight();
         }
 
         int TextElement::getHeight()
@@ -425,7 +428,9 @@ namespace MWGui
         {
             // split lines
             const int lineHeight = currentFontHeight();
-            unsigned int lastLine = (mPaginator.getStartTop() + mPaginator.getPageHeight() - mPaginator.getCurrentTop()) / lineHeight;
+            unsigned int lastLine = (mPaginator.getStartTop() + mPaginator.getPageHeight() - mPaginator.getCurrentTop());
+            if (lineHeight > 0)
+                lastLine /= lineHeight;
             int ret = mPaginator.getCurrentTop() + lastLine * lineHeight;
 
             // first empty lines that would go to the next page should be ignored
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index b5c8dc8bb..5d1e97bb5 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -1,5 +1,11 @@
 #include "hud.hpp"
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/WorldEvent.hpp"
+#include "../mwmp/LocalPlayer.hpp"
+#include "../mwworld/cellstore.hpp"
+
 #include <MyGUI_RenderManager.h>
 #include <MyGUI_ProgressBar.h>
 #include <MyGUI_Button.h>
@@ -8,6 +14,7 @@
 #include <MyGUI_ScrollView.h>
 
 #include <components/settings/settings.hpp>
+#include <components/openmw-mp/Log.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -51,6 +58,43 @@ namespace MWGui
             if (setNewOwner)
                 dropped.getCellRef().setOwner("");
 
+            // Major change done by tes3mp:
+            // When the object is dropped, generate a new RefNum index for it that follows the last one
+            // in the cell, so that packets can be sent and received specifically about it, instead
+            // of giving it a RefNum index of 0 as in regular OpenMW
+            MWWorld::CellStore *cellStore = dropped.getCell();
+            cellStore->setLastRefNumIndex(cellStore->getLastRefNumIndex() + 1);
+            dropped.getCellRef().setRefNumIndex(cellStore->getLastRefNumIndex());
+
+            // Added by tes3mp
+            mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+            worldEvent->cell = *dropped.getCell()->getCell();
+
+            mwmp::WorldObject worldObject;
+            worldObject.refId = dropped.getCellRef().getRefId();
+            worldObject.refNumIndex = dropped.getCellRef().getRefNum().mIndex;
+            worldObject.charge = dropped.getCellRef().getCharge();
+
+            // Make sure we send the RefData position instead of the CellRef one, because that's what
+            // we actually see on this client
+            worldObject.pos = dropped.getRefData().getPosition();
+
+            // We have to get the count from the dropped object because it gets changed
+            // automatically for stacks of gold
+            worldObject.count = dropped.getRefData().getCount();
+
+            // Get the real count of gold in a stack
+            worldObject.goldValue = dropped.getCellRef().getGoldValue();
+
+            worldEvent->addObject(worldObject);
+
+            mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_PLACE)->Send(worldEvent);
+
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Sending ID_OBJECT_PLACE\n- cellRef: %s, %i\n- count: %i",
+                worldObject.refId.c_str(),
+                worldObject.refNumIndex,
+                worldObject.count);
+
             return dropped;
         }
 
@@ -244,6 +288,11 @@ namespace MWGui
             WorldItemModel drop (mouseX, mouseY);
             mDragAndDrop->drop(&drop, NULL);
 
+            // Added by tes3mp
+            //
+            // LocalPlayer's inventory has changed, so send a packet with it
+            mwmp::Main::get().getLocalPlayer()->sendInventory();
+
             MWBase::Environment::get().getWindowManager()->changePointer("arrow");
         }
         else
diff --git a/apps/openmw/mwgui/hud.hpp b/apps/openmw/mwgui/hud.hpp
index c5ae45789..e2ef52be0 100644
--- a/apps/openmw/mwgui/hud.hpp
+++ b/apps/openmw/mwgui/hud.hpp
@@ -39,6 +39,7 @@ namespace MWGui
 
         void setSelectedSpell(const std::string& spellId, int successChancePercent);
         void setSelectedEnchantItem(const MWWorld::Ptr& item, int chargePercent);
+        const MWWorld::Ptr& getSelectedEnchantItem();
         void setSelectedWeapon(const MWWorld::Ptr& item, int durabilityPercent);
         void unsetSelectedSpell();
         void unsetSelectedWeapon();
diff --git a/apps/openmw/mwgui/inventoryitemmodel.cpp b/apps/openmw/mwgui/inventoryitemmodel.cpp
index b80850ba1..2fe540f22 100644
--- a/apps/openmw/mwgui/inventoryitemmodel.cpp
+++ b/apps/openmw/mwgui/inventoryitemmodel.cpp
@@ -77,18 +77,16 @@ void InventoryItemModel::update()
     for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
     {
         MWWorld::Ptr item = *it;
-        // NOTE: Don't show WerewolfRobe objects in the inventory, or allow them to be taken.
-        // Vanilla likely uses a hack like this since there's no other way to prevent it from
-        // being shown or taken.
-        if(item.getCellRef().getRefId() == "werewolfrobe")
+
+        if (!item.getClass().showsInInventory(item))
             continue;
 
         ItemStack newItem (item, this, item.getRefData().getCount());
 
         if (mActor.getClass().hasInventoryStore(mActor))
         {
-            MWWorld::InventoryStore& store = mActor.getClass().getInventoryStore(mActor);
-            if (store.isEquipped(newItem.mBase))
+            MWWorld::InventoryStore& invStore = mActor.getClass().getInventoryStore(mActor);
+            if (invStore.isEquipped(newItem.mBase))
                 newItem.mType = ItemStack::Type_Equipped;
         }
 
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 4599132e3..d8ce07a43 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -16,6 +16,12 @@
 
 #include <components/settings/settings.hpp>
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/WorldEvent.hpp"
+#include "../mwmp/LocalPlayer.hpp"
+#include "../mwworld/cellstore.hpp"
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -56,7 +62,7 @@ namespace
 namespace MWGui
 {
 
-    InventoryWindow::InventoryWindow(DragAndDrop* dragAndDrop, osgViewer::Viewer* viewer, Resource::ResourceSystem* resourceSystem)
+    InventoryWindow::InventoryWindow(DragAndDrop* dragAndDrop, osg::Group* parent, Resource::ResourceSystem* resourceSystem)
         : WindowPinnableBase("openmw_inventory_window.layout")
         , mDragAndDrop(dragAndDrop)
         , mSelectedItem(-1)
@@ -65,7 +71,7 @@ namespace MWGui
         , mGuiMode(GM_Inventory)
         , mLastXSize(0)
         , mLastYSize(0)
-        , mPreview(new MWRender::InventoryPreview(viewer, resourceSystem, MWMechanics::getPlayer()))
+        , mPreview(new MWRender::InventoryPreview(parent, resourceSystem, MWMechanics::getPlayer()))
         , mTrading(false)
     {
         mPreviewTexture.reset(new osgMyGUI::OSGTexture(mPreview->getTexture()));
@@ -545,10 +551,7 @@ namespace MWGui
         if(invStore.getSlot(slot) != invStore.end())
         {
             MWWorld::Ptr item = *invStore.getSlot(slot);
-            // NOTE: Don't allow users to select WerewolfRobe objects in the inventory. Vanilla
-            // likely uses a hack like this since there's no other way to prevent it from being
-            // taken.
-            if(item.getCellRef().getRefId() == "werewolfrobe")
+            if (!item.getClass().showsInInventory(item))
                 return MWWorld::Ptr();
             return item;
         }
@@ -631,6 +634,21 @@ namespace MWGui
         // add to player inventory
         // can't use ActionTake here because we need an MWWorld::Ptr to the newly inserted object
         MWWorld::Ptr newObject = *player.getClass().getContainerStore (player).add (object, object.getRefData().getCount(), player);
+
+        // Added by tes3mp
+        mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+        worldEvent->cell = *object.getCell()->getCell();
+
+        mwmp::WorldObject worldObject;
+        worldObject.refId = object.getCellRef().getRefId();
+        worldObject.refNumIndex = object.getCellRef().getRefNum().mIndex;
+        worldEvent->addObject(worldObject);
+
+        mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_DELETE)->Send(worldEvent);
+
+        // LocalPlayer's inventory has changed, so send a packet with it
+        mwmp::Main::get().getLocalPlayer()->sendInventory();
+
         // remove from world
         MWBase::Environment::get().getWorld()->deleteObject (object);
 
diff --git a/apps/openmw/mwgui/inventorywindow.hpp b/apps/openmw/mwgui/inventorywindow.hpp
index b7ae067ac..651bda590 100644
--- a/apps/openmw/mwgui/inventorywindow.hpp
+++ b/apps/openmw/mwgui/inventorywindow.hpp
@@ -6,9 +6,9 @@
 
 #include "../mwworld/ptr.hpp"
 
-namespace osgViewer
+namespace osg
 {
-    class Viewer;
+    class Group;
 }
 
 namespace Resource
@@ -37,7 +37,7 @@ namespace MWGui
     class InventoryWindow : public WindowPinnableBase
     {
         public:
-            InventoryWindow(DragAndDrop* dragAndDrop, osgViewer::Viewer* viewer, Resource::ResourceSystem* resourceSystem);
+            InventoryWindow(DragAndDrop* dragAndDrop, osg::Group* parent, Resource::ResourceSystem* resourceSystem);
 
             virtual void open();
 
diff --git a/apps/openmw/mwgui/itemchargeview.cpp b/apps/openmw/mwgui/itemchargeview.cpp
new file mode 100644
index 000000000..522acca26
--- /dev/null
+++ b/apps/openmw/mwgui/itemchargeview.cpp
@@ -0,0 +1,212 @@
+#include "itemchargeview.hpp"
+
+#include <set>
+
+#include <MyGUI_Gui.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_ScrollView.h>
+#include <MyGUI_FactoryManager.h>
+
+#include <components/esm/loadench.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
+
+#include "itemmodel.hpp"
+#include "itemwidget.hpp"
+
+namespace MWGui
+{
+    ItemChargeView::ItemChargeView()
+        : mScrollView(NULL),
+          mDisplayMode(DisplayMode_Health)
+    {
+    }
+
+    void ItemChargeView::registerComponents()
+    {
+        MyGUI::FactoryManager::getInstance().registerFactory<ItemChargeView>("Widget");
+    }
+
+    void ItemChargeView::initialiseOverride()
+    {
+        Base::initialiseOverride();
+
+        assignWidget(mScrollView, "ScrollView");
+        if (mScrollView == NULL)
+            throw std::runtime_error("Item charge view needs a scroll view");
+
+        mScrollView->setCanvasAlign(MyGUI::Align::Left | MyGUI::Align::Top);
+    }
+
+    void ItemChargeView::setModel(ItemModel* model)
+    {
+        mModel.reset(model);
+    }
+
+    void ItemChargeView::setDisplayMode(ItemChargeView::DisplayMode type)
+    {
+        mDisplayMode = type;
+        update();
+    }
+
+    void ItemChargeView::update()
+    {
+        if (!mModel.get())
+        {
+            layoutWidgets();
+            return;
+        }
+
+        mModel->update();
+
+        Lines lines;
+        std::set<Lines::const_iterator> visitedLines;
+
+        for (size_t i = 0; i < mModel->getItemCount(); ++i)
+        {
+            ItemStack stack = mModel->getItem(static_cast<ItemModel::ModelIndex>(i));
+
+            bool found = false;
+            for (Lines::const_iterator iter = mLines.begin(); iter != mLines.end(); ++iter)
+            {
+                if (iter->mItemPtr == stack.mBase)
+                {
+                    found = true;
+                    visitedLines.insert(iter);
+
+                    // update line widgets
+                    updateLine(*iter);
+                    lines.push_back(*iter);
+                    break;
+                }
+            }
+
+            if (!found)
+            {
+                // add line widgets
+                Line line;
+                line.mItemPtr = stack.mBase;
+
+                line.mText = mScrollView->createWidget<MyGUI::TextBox>("SandText", MyGUI::IntCoord(), MyGUI::Align::Default);
+                line.mText->setNeedMouseFocus(false);
+
+                line.mIcon = mScrollView->createWidget<ItemWidget>("MW_ItemIconSmall", MyGUI::IntCoord(), MyGUI::Align::Default);
+                line.mIcon->setItem(line.mItemPtr);
+                line.mIcon->setUserString("ToolTipType", "ItemPtr");
+                line.mIcon->setUserData(line.mItemPtr);
+                line.mIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemChargeView::onIconClicked);
+                line.mIcon->eventMouseWheel += MyGUI::newDelegate(this, &ItemChargeView::onMouseWheelMoved);
+
+                line.mCharge = mScrollView->createWidget<Widgets::MWDynamicStat>("MW_ChargeBar", MyGUI::IntCoord(), MyGUI::Align::Default);
+                line.mCharge->setNeedMouseFocus(false);
+
+                updateLine(line);
+
+                lines.push_back(line);
+            }
+        }
+
+        for (Lines::iterator iter = mLines.begin(); iter != mLines.end(); ++iter)
+        {
+            if (visitedLines.count(iter))
+                continue;
+
+            // remove line widgets
+            MyGUI::Gui::getInstance().destroyWidget(iter->mText);
+            MyGUI::Gui::getInstance().destroyWidget(iter->mIcon);
+            MyGUI::Gui::getInstance().destroyWidget(iter->mCharge);
+        }
+
+        mLines.swap(lines);
+
+        layoutWidgets();
+    }
+
+    void ItemChargeView::layoutWidgets()
+    {
+        int currentY = 0;
+
+        for (Lines::const_iterator iter = mLines.begin(); iter != mLines.end(); ++iter)
+        {
+            iter->mText->setCoord(8, currentY, mScrollView->getWidth()-8, 18);
+            currentY += 19;
+
+            iter->mIcon->setCoord(16, currentY, 32, 32);
+            iter->mCharge->setCoord(72, currentY+2, std::max(199, mScrollView->getWidth()-72-38), 20);
+            currentY += 32 + 4;
+        }
+
+        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
+        mScrollView->setVisibleVScroll(false);
+        mScrollView->setCanvasSize(MyGUI::IntSize(mScrollView->getWidth(), std::max(mScrollView->getHeight(), currentY)));
+        mScrollView->setVisibleVScroll(true);
+    }
+
+    void ItemChargeView::resetScrollbars()
+    {
+        mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
+    }
+
+    void ItemChargeView::setSize(const MyGUI::IntSize& value)
+    {
+        bool changed = (value.width != getWidth() || value.height != getHeight());
+        Base::setSize(value);
+        if (changed)
+            layoutWidgets();
+    }
+
+    void ItemChargeView::setCoord(const MyGUI::IntCoord& value)
+    {
+        bool changed = (value.width != getWidth() || value.height != getHeight());
+        Base::setCoord(value);
+        if (changed)
+            layoutWidgets();
+    }
+
+    void ItemChargeView::updateLine(const ItemChargeView::Line& line)
+    {
+        line.mText->setCaption(line.mItemPtr.getClass().getName(line.mItemPtr));
+
+        line.mCharge->setVisible(false);
+        switch (mDisplayMode)
+        {
+            case DisplayMode_Health:
+                if (!line.mItemPtr.getClass().hasItemHealth(line.mItemPtr))
+                    break;
+
+                line.mCharge->setVisible(true);
+                line.mCharge->setValue(line.mItemPtr.getClass().getItemHealth(line.mItemPtr),
+                                       line.mItemPtr.getClass().getItemMaxHealth(line.mItemPtr));
+                break;
+            case DisplayMode_EnchantmentCharge:
+                std::string enchId = line.mItemPtr.getClass().getEnchantment(line.mItemPtr);
+                if (enchId.empty())
+                    break;
+                const ESM::Enchantment* ench = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(enchId);
+                if (!ench)
+                    break;
+
+                line.mCharge->setVisible(true);
+                line.mCharge->setValue(static_cast<int>(line.mItemPtr.getCellRef().getEnchantmentCharge()),
+                                       ench->mData.mCharge);
+                break;
+        }
+    }
+
+    void ItemChargeView::onIconClicked(MyGUI::Widget* sender)
+    {
+        eventItemClicked(this, *sender->getUserData<MWWorld::Ptr>());
+    }
+
+    void ItemChargeView::onMouseWheelMoved(MyGUI::Widget* /*sender*/, int rel)
+    {
+        if (mScrollView->getViewOffset().top + rel*0.3f > 0)
+            mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
+        else
+            mScrollView->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mScrollView->getViewOffset().top + rel*0.3f)));
+    }
+}
diff --git a/apps/openmw/mwgui/itemchargeview.hpp b/apps/openmw/mwgui/itemchargeview.hpp
new file mode 100644
index 000000000..0988f655b
--- /dev/null
+++ b/apps/openmw/mwgui/itemchargeview.hpp
@@ -0,0 +1,78 @@
+#ifndef MWGUI_ITEMCHARGEVIEW_H
+#define MWGUI_ITEMCHARGEVIEW_H
+
+#include <vector>
+#include <memory>
+
+#include <MyGUI_Widget.h>
+
+#include "../mwworld/ptr.hpp"
+
+#include "widgets.hpp"
+
+namespace MyGUI
+{
+    class TextBox;
+    class ScrollView;
+}
+
+namespace MWGui
+{
+    class ItemModel;
+    class ItemWidget;
+
+    class ItemChargeView : public MyGUI::Widget
+    {
+        MYGUI_RTTI_DERIVED(ItemChargeView)
+        public:
+            enum DisplayMode
+            {
+                DisplayMode_Health,
+                DisplayMode_EnchantmentCharge
+            };
+
+            ItemChargeView();
+
+            /// Register needed components with MyGUI's factory manager
+            static void registerComponents();
+
+            virtual void initialiseOverride();
+
+            /// Takes ownership of \a model
+            void setModel(ItemModel* model);
+
+            void setDisplayMode(DisplayMode type);
+
+            void update();
+            void layoutWidgets();
+            void resetScrollbars();
+
+            virtual void setSize(const MyGUI::IntSize& value);
+            virtual void setCoord(const MyGUI::IntCoord& value);
+
+            MyGUI::delegates::CMultiDelegate2<MyGUI::Widget*, const MWWorld::Ptr&> eventItemClicked;
+
+        private:
+            struct Line
+            {
+                MWWorld::Ptr mItemPtr;
+                MyGUI::TextBox* mText;
+                ItemWidget* mIcon;
+                Widgets::MWDynamicStatPtr mCharge;
+            };
+
+            void updateLine(const Line& line);
+
+            void onIconClicked(MyGUI::Widget* sender);
+            void onMouseWheelMoved(MyGUI::Widget* sender, int rel);
+
+            typedef std::vector<Line> Lines;
+            Lines mLines;
+
+            std::auto_ptr<ItemModel> mModel;
+            MyGUI::ScrollView* mScrollView;
+            DisplayMode mDisplayMode;
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwgui/itemmodel.cpp b/apps/openmw/mwgui/itemmodel.cpp
index 2c382f3cf..390bb0586 100644
--- a/apps/openmw/mwgui/itemmodel.cpp
+++ b/apps/openmw/mwgui/itemmodel.cpp
@@ -119,6 +119,11 @@ namespace MWGui
         return ret;
     }
 
+    bool ItemModel::allowedToInsertItems() const
+    {
+        return true;
+    }
+
 
     ProxyItemModel::ProxyItemModel()
         : mSourceModel(NULL)
diff --git a/apps/openmw/mwgui/itemmodel.hpp b/apps/openmw/mwgui/itemmodel.hpp
index 2019c1042..20955b206 100644
--- a/apps/openmw/mwgui/itemmodel.hpp
+++ b/apps/openmw/mwgui/itemmodel.hpp
@@ -70,6 +70,9 @@ namespace MWGui
         virtual MWWorld::Ptr copyItem (const ItemStack& item, size_t count, bool setNewOwner=false) = 0;
         virtual void removeItem (const ItemStack& item, size_t count) = 0;
 
+        /// Is the player allowed to insert items into this model? (default true)
+        virtual bool allowedToInsertItems() const;
+
     private:
         ItemModel(const ItemModel&);
         ItemModel& operator=(const ItemModel&);
diff --git a/apps/openmw/mwgui/itemwidget.cpp b/apps/openmw/mwgui/itemwidget.cpp
index 75436e797..a31eb9c76 100644
--- a/apps/openmw/mwgui/itemwidget.cpp
+++ b/apps/openmw/mwgui/itemwidget.cpp
@@ -28,6 +28,7 @@ namespace MWGui
 
     ItemWidget::ItemWidget()
         : mItem(NULL)
+        , mItemShadow(NULL)
         , mFrame(NULL)
         , mText(NULL)
     {
@@ -44,6 +45,9 @@ namespace MWGui
         assignWidget(mItem, "Item");
         if (mItem)
             mItem->setNeedMouseFocus(false);
+        assignWidget(mItemShadow, "ItemShadow");
+        if (mItemShadow)
+            mItemShadow->setNeedMouseFocus(false);
         assignWidget(mFrame, "Frame");
         if (mFrame)
             mFrame->setNeedMouseFocus(false);
@@ -63,23 +67,38 @@ namespace MWGui
 
     void ItemWidget::setIcon(const std::string &icon)
     {
-        if (mItem)
-            mItem->setImageTexture(icon);
+        if (mCurrentIcon != icon)
+        {
+            mCurrentIcon = icon;
+
+            if (mItemShadow)
+                mItemShadow->setImageTexture(icon);
+            if (mItem)
+                mItem->setImageTexture(icon);
+        }
     }
 
     void ItemWidget::setFrame(const std::string &frame, const MyGUI::IntCoord &coord)
     {
         if (mFrame)
         {
-            mFrame->setImageTexture(frame);
             mFrame->setImageTile(MyGUI::IntSize(coord.width, coord.height)); // Why is this needed? MyGUI bug?
             mFrame->setImageCoord(coord);
         }
+
+        if (mCurrentFrame != frame)
+        {
+            mCurrentFrame = frame;
+            mFrame->setImageTexture(frame);
+        }
     }
 
     void ItemWidget::setIcon(const MWWorld::Ptr &ptr)
     {
-        setIcon(MWBase::Environment::get().getWindowManager()->correctIconPath(ptr.getClass().getInventoryIcon(ptr)));
+        std::string invIcon = ptr.getClass().getInventoryIcon(ptr);
+        if (invIcon.empty())
+            invIcon = "default icon.tga";
+        setIcon(MWBase::Environment::get().getWindowManager()->correctIconPath(invIcon));
     }
 
 
@@ -92,8 +111,12 @@ namespace MWGui
         {
             if (mFrame)
                 mFrame->setImageTexture("");
+            if (mItemShadow)
+                mItemShadow->setImageTexture("");
             mItem->setImageTexture("");
             mText->setCaption("");
+            mCurrentIcon.clear();
+            mCurrentFrame.clear();
             return;
         }
 
diff --git a/apps/openmw/mwgui/itemwidget.hpp b/apps/openmw/mwgui/itemwidget.hpp
index e7a902239..dd1717d11 100644
--- a/apps/openmw/mwgui/itemwidget.hpp
+++ b/apps/openmw/mwgui/itemwidget.hpp
@@ -44,8 +44,12 @@ namespace MWGui
         virtual void initialiseOverride();
 
         MyGUI::ImageBox* mItem;
+        MyGUI::ImageBox* mItemShadow;
         MyGUI::ImageBox* mFrame;
         MyGUI::TextBox* mText;
+
+        std::string mCurrentIcon;
+        std::string mCurrentFrame;
     };
 
 }
diff --git a/apps/openmw/mwgui/jailscreen.cpp b/apps/openmw/mwgui/jailscreen.cpp
index 7eaf5eb30..211e0c5f9 100644
--- a/apps/openmw/mwgui/jailscreen.cpp
+++ b/apps/openmw/mwgui/jailscreen.cpp
@@ -79,9 +79,9 @@ namespace MWGui
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
 
-        MWBase::Environment::get().getWorld()->advanceTime(mDays * 24);
         for (int i=0; i<mDays*24; ++i)
             MWBase::Environment::get().getMechanicsManager()->rest(true);
+        MWBase::Environment::get().getWorld()->advanceTime(mDays * 24);
 
         std::set<int> skills;
         for (int day=0; day<mDays; ++day)
diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index 4e8d0a02c..1434455b2 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -19,6 +19,8 @@
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
+#include "class.hpp"
+
 namespace MWGui
 {
     const unsigned int LevelupDialog::sMaxCoins = 3;
@@ -133,28 +135,9 @@ namespace MWGui
         MWMechanics::CreatureStats& creatureStats = player.getClass().getCreatureStats(player);
         MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats(player);
 
-        const ESM::NPC *playerData = player.get<ESM::NPC>()->mBase;
-
-        // set class image
-        const ESM::Class *cls =
-            world->getStore().get<ESM::Class>().find(playerData->mClass);
-
-        if(world->getStore().get<ESM::Class>().isDynamic(cls->mId))
-        {
-            // Choosing Stealth specialization and Speed/Agility as attributes, if possible. Otherwise fall back to first class found.
-            MWWorld::SharedIterator<ESM::Class> it = world->getStore().get<ESM::Class>().begin();
-            for(; it != world->getStore().get<ESM::Class>().end(); ++it)
-            {
-                if(it->mData.mIsPlayable && it->mData.mSpecialization == 2 && it->mData.mAttribute[0] == 4 && it->mData.mAttribute[1] == 3)
-                    break;
-            }
-            if (it == world->getStore().get<ESM::Class>().end())
-                it = world->getStore().get<ESM::Class>().begin();
-            if (it != world->getStore().get<ESM::Class>().end())
-                cls = &*it;
-        }
-
-        mClassImage->setImageTexture ("textures\\levelup\\" + cls->mId + ".dds");
+        setClassImage(mClassImage, getLevelupClassImage(pcStats.getSkillIncreasesForSpecialization(0),
+                                                        pcStats.getSkillIncreasesForSpecialization(1),
+                                                        pcStats.getSkillIncreasesForSpecialization(2)));
 
         int level = creatureStats.getLevel ()+1;
         mLevelText->setCaptionWithReplacing("#{sLevelUpMenu1} " + MyGUI::utility::toString(level));
@@ -246,4 +229,103 @@ namespace MWGui
         }
         assignCoins();
     }
+
+    std::string LevelupDialog::getLevelupClassImage(const int combatIncreases, const int magicIncreases, const int stealthIncreases)
+    {
+        std::string ret = "acrobat";
+
+        int total = combatIncreases + magicIncreases + stealthIncreases;
+        if (total == 0)
+            return ret;
+
+        int combatFraction = static_cast<int>(static_cast<float>(combatIncreases) / total * 10.f);
+        int magicFraction = static_cast<int>(static_cast<float>(magicIncreases) / total * 10.f);
+        int stealthFraction = static_cast<int>(static_cast<float>(stealthIncreases) / total * 10.f);
+
+        if (combatFraction > 7)
+            ret = "warrior";
+        else if (magicFraction > 7)
+            ret = "mage";
+        else if (stealthFraction > 7)
+            ret = "thief";
+
+        switch (combatFraction)
+        {
+            case 7:
+                ret = "warrior";
+                break;
+            case 6:
+                if (stealthFraction == 1)
+                    ret = "barbarian";
+                else if (stealthFraction == 3)
+                    ret = "crusader";
+                else
+                    ret = "knight";
+                break;
+            case 5:
+                if (stealthFraction == 3)
+                    ret = "scout";
+                else
+                    ret = "archer";
+                break;
+            case 4:
+                ret = "rogue";
+                break;
+            default:
+                break;
+        }
+
+        switch (magicFraction)
+        {
+            case 7:
+                ret = "mage";
+                break;
+            case 6:
+                if (combatFraction == 2)
+                    ret = "sorcerer";
+                else if (combatIncreases == 3)
+                    ret = "healer";
+                else
+                    ret = "battlemage";
+                break;
+            case 5:
+                ret = "witchhunter";
+                break;
+            case 4:
+                ret = "spellsword";
+                // In vanilla there's also code for "nightblade", however it seems to be unreachable.
+                break;
+            default:
+                break;
+        }
+
+        switch (stealthFraction)
+        {
+            case 7:
+                ret = "thief";
+                break;
+            case 6:
+                if (magicFraction == 1)
+                    ret = "agent";
+                else if (magicIncreases == 3)
+                    ret = "assassin";
+                else
+                    ret = "acrobat";
+                break;
+            case 5:
+                if (magicIncreases == 3)
+                    ret = "monk";
+                else
+                    ret = "pilgrim";
+                break;
+            case 3:
+                if (magicFraction == 3)
+                    ret = "bard";
+                break;
+            default:
+                break;
+        }
+
+        return ret;
+    }
 }
diff --git a/apps/openmw/mwgui/levelupdialog.hpp b/apps/openmw/mwgui/levelupdialog.hpp
index e5edbd53c..d49f7536d 100644
--- a/apps/openmw/mwgui/levelupdialog.hpp
+++ b/apps/openmw/mwgui/levelupdialog.hpp
@@ -39,6 +39,8 @@ namespace MWGui
         void resetCoins();
 
         void setAttributeValues();
+
+        std::string getLevelupClassImage(const int combatIncreases, const int magicIncreases, const int stealthIncreases);
     };
 
 }
diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 6385eb2c6..35a825bcd 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -38,6 +38,7 @@ namespace MWGui
         , mLoadingOnTime(0.0)
         , mImportantLabel(false)
         , mProgress(0)
+        , mShowWallpaper(true)
     {
         mMainWidget->setSize(MyGUI::RenderManager::getInstance().getViewSize());
 
@@ -104,14 +105,16 @@ namespace MWGui
     class CopyFramebufferToTextureCallback : public osg::Camera::DrawCallback
     {
     public:
-        CopyFramebufferToTextureCallback(osg::Texture2D* texture, int w, int h)
-            : mTexture(texture), mWidth(w), mHeight(h)
+        CopyFramebufferToTextureCallback(osg::Texture2D* texture)
+            : mTexture(texture)
         {
         }
 
         virtual void operator () (osg::RenderInfo& renderInfo) const
         {
-            mTexture->copyTexImage2D(*renderInfo.getState(), 0, 0, mWidth, mHeight);
+            int w = renderInfo.getCurrentCamera()->getViewport()->width();
+            int h = renderInfo.getCurrentCamera()->getViewport()->height();
+            mTexture->copyTexImage2D(*renderInfo.getState(), 0, 0, w, h);
 
             // Callback removes itself when done
             if (renderInfo.getCurrentCamera())
@@ -120,7 +123,12 @@ namespace MWGui
 
     private:
         osg::ref_ptr<osg::Texture2D> mTexture;
-        int mWidth, mHeight;
+    };
+
+    class DontComputeBoundCallback : public osg::Node::ComputeBoundingSphereCallback
+    {
+    public:
+        virtual osg::BoundingSphere computeBound(const osg::Node&) const { return osg::BoundingSphere(); }
     };
 
     void LoadingScreen::loadingOn()
@@ -136,45 +144,21 @@ namespace MWGui
             mViewer->getIncrementalCompileOperation()->setTargetFrameRate(mTargetFrameRate);
         }
 
-        bool showWallpaper = (MWBase::Environment::get().getStateManager()->getState()
-                == MWBase::StateManager::State_NoGame);
-
-        if (!showWallpaper)
-        {
-            // Copy the current framebuffer onto a texture and display that texture as the background image
-            // Note, we could also set the camera to disable clearing and have the background image transparent,
-            // but then we get shaking effects on buffer swaps.
-
-            if (!mTexture)
-            {
-                mTexture = new osg::Texture2D;
-                mTexture->setInternalFormat(GL_RGB);
-                mTexture->setResizeNonPowerOfTwoHint(false);
-            }
-
-            int width = mViewer->getCamera()->getViewport()->width();
-            int height = mViewer->getCamera()->getViewport()->height();
-            mViewer->getCamera()->setInitialDrawCallback(new CopyFramebufferToTextureCallback(mTexture, width, height));
-
-            if (!mGuiTexture.get())
-            {
-                mGuiTexture.reset(new osgMyGUI::OSGTexture(mTexture));
-            }
+        // Assign dummy bounding sphere callback to avoid the bounding sphere of the entire scene being recomputed after each frame of loading
+        // We are already using node masks to avoid the scene from being updated/rendered, but node masks don't work for computeBound()
+        mViewer->getSceneData()->setComputeBoundingSphereCallback(new DontComputeBoundCallback);
 
-            mBackgroundImage->setBackgroundImage("");
-
-            mBackgroundImage->setRenderItemTexture(mGuiTexture.get());
-            mBackgroundImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
-        }
+        mShowWallpaper = (MWBase::Environment::get().getStateManager()->getState()
+                == MWBase::StateManager::State_NoGame);
 
         setVisible(true);
 
-        if (showWallpaper)
+        if (mShowWallpaper)
         {
             changeWallpaper();
         }
 
-        MWBase::Environment::get().getWindowManager()->pushGuiMode(showWallpaper ? GM_LoadingWallpaper : GM_Loading);
+        MWBase::Environment::get().getWindowManager()->pushGuiMode(mShowWallpaper ? GM_LoadingWallpaper : GM_Loading);
     }
 
     void LoadingScreen::loadingOff()
@@ -192,6 +176,9 @@ namespace MWGui
         else
             mImportantLabel = false; // label was already shown on loading screen
 
+        mViewer->getSceneData()->setComputeBoundingSphereCallback(NULL);
+        mViewer->getSceneData()->dirtyBound();
+
         //std::cout << "loading took " << mTimer.time_m() - mLoadingOnTime << std::endl;
         setVisible(false);
 
@@ -260,26 +247,53 @@ namespace MWGui
             diff -= mProgress / static_cast<float>(mProgressBar->getScrollRange()) * 100.f;
         }
 
-        bool showWallpaper = (MWBase::Environment::get().getStateManager()->getState()
-                == MWBase::StateManager::State_NoGame);
-        if (!showWallpaper && diff < initialDelay*1000)
+        if (!mShowWallpaper && diff < initialDelay*1000)
             return false;
         return true;
     }
 
+    void LoadingScreen::setupCopyFramebufferToTextureCallback()
+    {
+        // Copy the current framebuffer onto a texture and display that texture as the background image
+        // Note, we could also set the camera to disable clearing and have the background image transparent,
+        // but then we get shaking effects on buffer swaps.
+
+        if (!mTexture)
+        {
+            mTexture = new osg::Texture2D;
+            mTexture->setInternalFormat(GL_RGB);
+            mTexture->setResizeNonPowerOfTwoHint(false);
+        }
+
+        if (!mGuiTexture.get())
+        {
+            mGuiTexture.reset(new osgMyGUI::OSGTexture(mTexture));
+        }
+
+        mViewer->getCamera()->setInitialDrawCallback(new CopyFramebufferToTextureCallback(mTexture));
+
+        mBackgroundImage->setBackgroundImage("");
+
+        mBackgroundImage->setRenderItemTexture(mGuiTexture.get());
+        mBackgroundImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
+    }
+
     void LoadingScreen::draw()
     {
         if (!needToDrawLoadingScreen())
             return;
 
-        bool showWallpaper = (MWBase::Environment::get().getStateManager()->getState()
-                == MWBase::StateManager::State_NoGame);
-        if (showWallpaper && mTimer.time_m() > mLastWallpaperChangeTime + 5000*1)
+        if (mShowWallpaper && mTimer.time_m() > mLastWallpaperChangeTime + 5000*1)
         {
             mLastWallpaperChangeTime = mTimer.time_m();
             changeWallpaper();
         }
 
+        if (!mShowWallpaper && mLastRenderTime < mLoadingOnTime)
+        {
+            setupCopyFramebufferToTextureCallback();
+        }
+
         // Turn off rendering except the GUI
         int oldUpdateMask = mViewer->getUpdateVisitor()->getTraversalMask();
         int oldCullMask = mViewer->getCamera()->getCullMask();
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index a7f7d3619..0b7edbc9e 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -47,6 +47,8 @@ namespace MWGui
         void findSplashScreens();
         bool needToDrawLoadingScreen();
 
+        void setupCopyFramebufferToTextureCallback();
+
         const VFS::Manager* mVFS;
         osg::ref_ptr<osgViewer::Viewer> mViewer;
 
@@ -61,6 +63,8 @@ namespace MWGui
 
         size_t mProgress;
 
+        bool mShowWallpaper;
+
         MyGUI::Widget* mLoadingBox;
 
         MyGUI::TextBox* mLoadingText;
diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index 258f0dfb0..9a8701c28 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -211,6 +211,8 @@ namespace MWGui
         if (state==MWBase::StateManager::State_Running)
             buttons.push_back("return");
 
+        /* Disabled by tes3mp
+
         buttons.push_back("newgame");
 
         if (state==MWBase::StateManager::State_Running &&
@@ -221,6 +223,7 @@ namespace MWGui
         if (MWBase::Environment::get().getStateManager()->characterBegin()!=
             MWBase::Environment::get().getStateManager()->characterEnd())
             buttons.push_back("loadgame");
+        */
 
         buttons.push_back("options");
 
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 1b8d5ab43..71a441ac8 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -16,6 +16,9 @@
 #include <components/settings/settings.hpp>
 #include <components/myguiplatform/myguitexture.hpp>
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/GUIController.hpp"
+
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
@@ -163,7 +166,6 @@ namespace MWGui
         , mInterior(false)
         , mLocalMap(NULL)
         , mCompass(NULL)
-        , mPrefix()
         , mChanged(true)
         , mFogOfWarToggled(true)
         , mFogOfWarEnabled(fogOfWarEnabled)
@@ -174,13 +176,16 @@ namespace MWGui
         , mMarkerUpdateTimer(0.0f)
         , mLastDirectionX(0.0f)
         , mLastDirectionY(0.0f)
+        , mNeedDoorMarkersUpdate(false)
     {
         mCustomMarkers.eventMarkersChanged += MyGUI::newDelegate(this, &LocalMapBase::updateCustomMarkers);
+        mwmp::Main::get().getGUIController()->mPlayerMarkers.eventMarkersChanged += MyGUI::newDelegate(this, &LocalMapBase::updatePlayerMarkers);
     }
 
     LocalMapBase::~LocalMapBase()
     {
         mCustomMarkers.eventMarkersChanged -= MyGUI::newDelegate(this, &LocalMapBase::updateCustomMarkers);
+        mwmp::Main::get().getGUIController()->mPlayerMarkers.eventMarkersChanged -= MyGUI::newDelegate(this, &LocalMapBase::updatePlayerMarkers);
     }
 
     void LocalMapBase::init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, int mapWidgetSize, int cellDistance)
@@ -322,7 +327,7 @@ namespace MWGui
             {
                 ESM::CellId cellId;
                 cellId.mPaged = !mInterior;
-                cellId.mWorldspace = (mInterior ? mPrefix : "sys::default");
+                cellId.mWorldspace = (mInterior ? mPrefix : ESM::CellId::sDefaultWorldspace);
                 cellId.mIndex.mX = mCurX+dX;
                 cellId.mIndex.mY = mCurY+dY;
 
@@ -356,6 +361,18 @@ namespace MWGui
         redraw();
     }
 
+    void LocalMapBase::updatePlayerMarkers()
+    {
+        mwmp::Main::get().getGUIController()->updatePlayersMarkers(this);
+    }
+
+    void MapWindow::updatePlayerMarkers()
+    {
+        LocalMapBase::updatePlayerMarkers();
+
+        mwmp::Main::get().getGUIController()->updateGlobalMapMarkerTooltips(this);
+    }
+
     void LocalMapBase::setActiveCell(const int x, const int y, bool interior)
     {
         if (x==mCurX && y==mCurY && mInterior==interior && !mChanged)
@@ -368,12 +385,6 @@ namespace MWGui
 
         applyFogOfWar();
 
-
-        // clear all previous door markers
-        for (std::vector<MyGUI::Widget*>::iterator it = mDoorMarkerWidgets.begin(); it != mDoorMarkerWidgets.end(); ++it)
-            MyGUI::Gui::getInstance().destroyWidget(*it);
-        mDoorMarkerWidgets.clear();
-
         // Update the map textures
         TextureVector textures;
         for (int mx=0; mx<mNumCells; ++mx)
@@ -399,60 +410,9 @@ namespace MWGui
         }
         mMapTextures.swap(textures);
 
-        MWBase::World* world = MWBase::Environment::get().getWorld();
-
-        // Retrieve the door markers we want to show
-        std::vector<MWBase::World::DoorMarker> doors;
-        if (interior)
-        {
-            MWWorld::CellStore* cell = world->getInterior (mPrefix);
-            world->getDoorMarkers(cell, doors);
-        }
-        else
-        {
-            for (int dX=-mCellDistance; dX<=mCellDistance; ++dX)
-            {
-                for (int dY=-mCellDistance; dY<=mCellDistance; ++dY)
-                {
-                    MWWorld::CellStore* cell = world->getExterior (mCurX+dX, mCurY+dY);
-                    world->getDoorMarkers(cell, doors);
-                }
-            }
-        }
-
-        // Create a widget for each marker
-        int counter = 0;
-        for (std::vector<MWBase::World::DoorMarker>::iterator it = doors.begin(); it != doors.end(); ++it)
-        {
-            MWBase::World::DoorMarker marker = *it;
-
-            std::vector<std::string> destNotes;
-            CustomMarkerCollection::RangeType markers = mCustomMarkers.getMarkers(marker.dest);
-            for (CustomMarkerCollection::ContainerType::const_iterator it = markers.first; it != markers.second; ++it)
-                destNotes.push_back(it->second.mNote);
-
-            MarkerUserData data (mLocalMapRender);
-            data.notes = destNotes;
-            data.caption = marker.name;
-            MyGUI::IntPoint widgetPos = getMarkerPosition(marker.x, marker.y, data);
-            MyGUI::IntCoord widgetCoord(widgetPos.left - 4,
-                                        widgetPos.top - 4,
-                                        8, 8);
-            ++counter;
-            MarkerWidget* markerWidget = mLocalMap->createWidget<MarkerWidget>("MarkerButton",
-                widgetCoord, MyGUI::Align::Default);
-            markerWidget->setNormalColour(MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal}")));
-            markerWidget->setHoverColour(MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal_over}")));
-            markerWidget->setDepth(Local_MarkerLayer);
-            markerWidget->setNeedMouseFocus(true);
-            // Used by tooltips to not show the tooltip if marker is hidden by fog of war
-            markerWidget->setUserString("ToolTipType", "MapMarker");
-
-            markerWidget->setUserData(data);
-            doorMarkerCreated(markerWidget);
-
-            mDoorMarkerWidgets.push_back(markerWidget);
-        }
+        // Delay the door markers update until scripts have been given a chance to run.
+        // If we don't do this, door markers that should be disabled will still appear on the map.
+        mNeedDoorMarkersUpdate = true;
 
         updateMagicMarkers();
         updateCustomMarkers();
@@ -565,6 +525,12 @@ namespace MWGui
 
     void LocalMapBase::onFrame(float dt)
     {
+        if (mNeedDoorMarkersUpdate)
+        {
+            updateDoorMarkers();
+            mNeedDoorMarkersUpdate = false;
+        }
+
         mMarkerUpdateTimer += dt;
 
         if (mMarkerUpdateTimer >= 0.25)
@@ -574,6 +540,69 @@ namespace MWGui
         }
     }
 
+    void LocalMapBase::updateDoorMarkers()
+    {
+        // clear all previous door markers
+        for (std::vector<MyGUI::Widget*>::iterator it = mDoorMarkerWidgets.begin(); it != mDoorMarkerWidgets.end(); ++it)
+            MyGUI::Gui::getInstance().destroyWidget(*it);
+        mDoorMarkerWidgets.clear();
+
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+
+        // Retrieve the door markers we want to show
+        std::vector<MWBase::World::DoorMarker> doors;
+        if (mInterior)
+        {
+            MWWorld::CellStore* cell = world->getInterior (mPrefix);
+            world->getDoorMarkers(cell, doors);
+        }
+        else
+        {
+            for (int dX=-mCellDistance; dX<=mCellDistance; ++dX)
+            {
+                for (int dY=-mCellDistance; dY<=mCellDistance; ++dY)
+                {
+                    MWWorld::CellStore* cell = world->getExterior (mCurX+dX, mCurY+dY);
+                    world->getDoorMarkers(cell, doors);
+                }
+            }
+        }
+
+        // Create a widget for each marker
+        int counter = 0;
+        for (std::vector<MWBase::World::DoorMarker>::iterator it = doors.begin(); it != doors.end(); ++it)
+        {
+            MWBase::World::DoorMarker marker = *it;
+
+            std::vector<std::string> destNotes;
+            CustomMarkerCollection::RangeType markers = mCustomMarkers.getMarkers(marker.dest);
+            for (CustomMarkerCollection::ContainerType::const_iterator iter = markers.first; iter != markers.second; ++iter)
+                destNotes.push_back(iter->second.mNote);
+
+            MarkerUserData data (mLocalMapRender);
+            data.notes = destNotes;
+            data.caption = marker.name;
+            MyGUI::IntPoint widgetPos = getMarkerPosition(marker.x, marker.y, data);
+            MyGUI::IntCoord widgetCoord(widgetPos.left - 4,
+                                        widgetPos.top - 4,
+                                        8, 8);
+            ++counter;
+            MarkerWidget* markerWidget = mLocalMap->createWidget<MarkerWidget>("MarkerButton",
+                widgetCoord, MyGUI::Align::Default);
+            markerWidget->setNormalColour(MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal}")));
+            markerWidget->setHoverColour(MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal_over}")));
+            markerWidget->setDepth(Local_MarkerLayer);
+            markerWidget->setNeedMouseFocus(true);
+            // Used by tooltips to not show the tooltip if marker is hidden by fog of war
+            markerWidget->setUserString("ToolTipType", "MapMarker");
+
+            markerWidget->setUserData(data);
+            doorMarkerCreated(markerWidget);
+
+            mDoorMarkerWidgets.push_back(markerWidget);
+        }
+    }
+
     void LocalMapBase::updateMagicMarkers()
     {
         // clear all previous markers
@@ -610,7 +639,7 @@ namespace MWGui
 
     // ------------------------------------------------------------------------------------------
 
-    MapWindow::MapWindow(CustomMarkerCollection &customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender)
+    MapWindow::MapWindow(CustomMarkerCollection &customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue)
         : WindowPinnableBase("openmw_map_window.layout")
         , LocalMapBase(customMarkers, localMapRender)
         , NoDrop(drag, mMainWidget)
@@ -620,7 +649,7 @@ namespace MWGui
         , mGlobal(false)
         , mEventBoxGlobal(NULL)
         , mEventBoxLocal(NULL)
-        , mGlobalMapRender(new MWRender::GlobalMap(localMapRender->getRoot()))
+        , mGlobalMapRender(new MWRender::GlobalMap(localMapRender->getRoot(), workQueue))
         , mEditNoteDialog()
     {
         static bool registered = false;
@@ -738,7 +767,7 @@ namespace MWGui
             mEditingMarker.mCell.mWorldspace = LocalMapBase::mPrefix;
         else
         {
-            mEditingMarker.mCell.mWorldspace = "sys::default";
+            mEditingMarker.mCell.mWorldspace = ESM::CellId::sDefaultWorldspace;
             mEditingMarker.mCell.mIndex.mX = x;
             mEditingMarker.mCell.mIndex.mY = y;
         }
@@ -762,19 +791,11 @@ namespace MWGui
         mLastScrollWindowCoordinates = currentCoordinates;
     }
 
-    void MapWindow::renderGlobalMap(Loading::Listener* loadingListener)
+    void MapWindow::renderGlobalMap()
     {
-        mGlobalMapRender->render(loadingListener);
+        mGlobalMapRender->render();
         mGlobalMap->setCanvasSize (mGlobalMapRender->getWidth(), mGlobalMapRender->getHeight());
         mGlobalMapImage->setSize(mGlobalMapRender->getWidth(), mGlobalMapRender->getHeight());
-
-        mGlobalMapTexture.reset(new osgMyGUI::OSGTexture(mGlobalMapRender->getBaseTexture()));
-        mGlobalMapImage->setRenderItemTexture(mGlobalMapTexture.get());
-        mGlobalMapImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
-
-        mGlobalMapOverlayTexture.reset(new osgMyGUI::OSGTexture(mGlobalMapRender->getOverlayTexture()));
-        mGlobalMapOverlay->setRenderItemTexture(mGlobalMapOverlayTexture.get());
-        mGlobalMapOverlay->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
     }
 
     MapWindow::~MapWindow()
@@ -848,7 +869,7 @@ namespace MWGui
         ESM::CellId cellId;
         cellId.mIndex.mX = x;
         cellId.mIndex.mY = y;
-        cellId.mWorldspace = "sys::default";
+        cellId.mWorldspace = ESM::CellId::sDefaultWorldspace;
         cellId.mPaged = true;
         CustomMarkerCollection::RangeType markers = mCustomMarkers.getMarkers(cellId);
         std::vector<std::string> destNotes;
@@ -928,6 +949,8 @@ namespace MWGui
 
     void MapWindow::open()
     {
+        ensureGlobalMapLoaded();
+
         globalMapUpdatePlayer();
     }
 
@@ -972,6 +995,20 @@ namespace MWGui
         rotatingSubskin->setAngle(angle);
     }
 
+    void MapWindow::ensureGlobalMapLoaded()
+    {
+        if (!mGlobalMapTexture.get())
+        {
+            mGlobalMapTexture.reset(new osgMyGUI::OSGTexture(mGlobalMapRender->getBaseTexture()));
+            mGlobalMapImage->setRenderItemTexture(mGlobalMapTexture.get());
+            mGlobalMapImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
+
+            mGlobalMapOverlayTexture.reset(new osgMyGUI::OSGTexture(mGlobalMapRender->getOverlayTexture()));
+            mGlobalMapOverlay->setRenderItemTexture(mGlobalMapOverlayTexture.get());
+            mGlobalMapOverlay->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
+        }
+    }
+
     void MapWindow::clear()
     {
         mMarkers.clear();
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index 773522903..1f9fc16e2 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -11,6 +11,11 @@
 
 #include <components/esm/custommarkerstate.hpp>
 
+namespace mwmp
+{
+    class GUIController;
+}
+
 namespace MWRender
 {
     class GlobalMap;
@@ -33,6 +38,11 @@ namespace Loading
     class Listener;
 }
 
+namespace SceneUtil
+{
+    class WorkQueue;
+}
+
 namespace MWGui
 {
 
@@ -65,6 +75,7 @@ namespace MWGui
 
     class LocalMapBase
     {
+        friend class mwmp::GUIController;
     public:
         LocalMapBase(CustomMarkerCollection& markers, MWRender::LocalMap* localMapRender, bool fogOfWarEnabled = true);
         virtual ~LocalMapBase();
@@ -133,8 +144,10 @@ namespace MWGui
         std::vector<MyGUI::Widget*> mDoorMarkerWidgets;
         std::vector<MyGUI::Widget*> mMagicMarkerWidgets;
         std::vector<MyGUI::Widget*> mCustomMarkerWidgets;
+        std::vector<MyGUI::Widget*> mPlayerMarkerWidgets;
 
         virtual void updateCustomMarkers();
+        virtual void updatePlayerMarkers();
 
         void applyFogOfWar();
 
@@ -155,6 +168,10 @@ namespace MWGui
 
         float mLastDirectionX;
         float mLastDirectionY;
+
+    private:
+        void updateDoorMarkers();
+        bool mNeedDoorMarkersUpdate;
     };
 
     class EditNoteDialog : public MWGui::WindowModal
@@ -188,15 +205,16 @@ namespace MWGui
 
     class MapWindow : public MWGui::WindowPinnableBase, public LocalMapBase, public NoDrop
     {
+        friend class mwmp::GUIController;
     public:
-        MapWindow(CustomMarkerCollection& customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender);
+        MapWindow(CustomMarkerCollection& customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue);
         virtual ~MapWindow();
 
         void setCellName(const std::string& cellName);
 
         virtual void setAlpha(float alpha);
 
-        void renderGlobalMap(Loading::Listener* loadingListener);
+        void renderGlobalMap();
 
         /// adds the marker to the global map
         /// @param name The ESM::Cell::mName
@@ -208,11 +226,14 @@ namespace MWGui
         void setGlobalMapPlayerPosition (float worldX, float worldY);
         void setGlobalMapPlayerDir(const float x, const float y);
 
+        void ensureGlobalMapLoaded();
+
         virtual void open();
 
         void onFrame(float dt);
 
         virtual void updateCustomMarkers();
+        virtual void updatePlayerMarkers();
 
         /// Clear all savegame-specific data
         void clear();
diff --git a/apps/openmw/mwgui/pickpocketitemmodel.cpp b/apps/openmw/mwgui/pickpocketitemmodel.cpp
index ab0d02f95..238fb5913 100644
--- a/apps/openmw/mwgui/pickpocketitemmodel.cpp
+++ b/apps/openmw/mwgui/pickpocketitemmodel.cpp
@@ -64,4 +64,10 @@ namespace MWGui
         /// \todo check if player is detected
     }
 
+    bool PickpocketItemModel::allowedToInsertItems() const
+    {
+        // don't allow "reverse pickpocket" (yet)
+        return false;
+    }
+
 }
diff --git a/apps/openmw/mwgui/pickpocketitemmodel.hpp b/apps/openmw/mwgui/pickpocketitemmodel.hpp
index af72119c8..61f0569b5 100644
--- a/apps/openmw/mwgui/pickpocketitemmodel.hpp
+++ b/apps/openmw/mwgui/pickpocketitemmodel.hpp
@@ -15,6 +15,7 @@ namespace MWGui
         virtual size_t getItemCount();
         virtual void update();
         virtual void removeItem (const ItemStack& item, size_t count);
+        virtual bool allowedToInsertItems() const;
 
     private:
         std::vector<ItemStack> mHiddenItems;
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index f2ae8dd83..938574f83 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -476,16 +476,16 @@ namespace MWGui
                 MWWorld::Ptr player = MWMechanics::getPlayer();
                 MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
                 MWWorld::Ptr item;
-                for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
+                for (MWWorld::ContainerStoreIterator iter = store.begin(); iter != store.end(); ++iter)
                 {
-                    if (Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), id))
+                    if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), id))
                     {
                         if (item.isEmpty() ||
                             // Prefer the stack with the lowest remaining uses
-                                !item.getClass().hasItemHealth(*it) ||
-                                it->getClass().getItemHealth(*it) < item.getClass().getItemHealth(item))
+                                !item.getClass().hasItemHealth(*iter) ||
+                                iter->getClass().getItemHealth(*iter) < item.getClass().getItemHealth(item))
                         {
-                            item = *it;
+                            item = *iter;
                         }
                     }
                 }
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index aa229de72..184ce0775 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -41,9 +41,9 @@ namespace
 namespace MWGui
 {
 
-    RaceDialog::RaceDialog(osgViewer::Viewer* viewer, Resource::ResourceSystem* resourceSystem)
+    RaceDialog::RaceDialog(osg::Group* parent, Resource::ResourceSystem* resourceSystem)
       : WindowModal("openmw_chargen_race.layout")
-      , mViewer(viewer)
+      , mParent(parent)
       , mResourceSystem(resourceSystem)
       , mGenderIndex(0)
       , mFaceIndex(0)
@@ -136,7 +136,7 @@ namespace MWGui
         mPreview.reset(NULL);
         mPreviewTexture.reset(NULL);
 
-        mPreview.reset(new MWRender::RaceSelectionPreview(mViewer, mResourceSystem));
+        mPreview.reset(new MWRender::RaceSelectionPreview(mParent, mResourceSystem));
         mPreview->rebuild();
         mPreview->setAngle (mCurrentAngle);
 
@@ -326,8 +326,11 @@ namespace MWGui
         record.mRace = mCurrentRaceId;
         record.setIsMale(mGenderIndex == 0);
 
-        record.mHead = mAvailableHeads[mFaceIndex];
-        record.mHair = mAvailableHairs[mHairIndex];
+        if (mFaceIndex >= 0 && mFaceIndex < int(mAvailableHeads.size()))
+            record.mHead = mAvailableHeads[mFaceIndex];
+
+        if (mHairIndex >= 0 && mHairIndex < int(mAvailableHairs.size()))
+            record.mHair = mAvailableHairs[mHairIndex];
 
         try
         {
@@ -359,10 +362,10 @@ namespace MWGui
         std::sort(items.begin(), items.end(), sortRaces);
 
         int index = 0;
-        for (std::vector<std::pair<std::string, std::string> >::const_iterator it = items.begin(); it != items.end(); ++it)
+        for (std::vector<std::pair<std::string, std::string> >::const_iterator iter = items.begin(); iter != items.end(); ++iter)
         {
-            mRaceList->addItem(it->second, it->first);
-            if (Misc::StringUtils::ciEqual(it->first, mCurrentRaceId))
+            mRaceList->addItem(iter->second, iter->first);
+            if (Misc::StringUtils::ciEqual(iter->first, mCurrentRaceId))
                 mRaceList->setIndexSelected(index);
             ++index;
         }
diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp
index b3de9bef0..42e758983 100644
--- a/apps/openmw/mwgui/race.hpp
+++ b/apps/openmw/mwgui/race.hpp
@@ -19,9 +19,9 @@ namespace ESM
     struct NPC;
 }
 
-namespace osgViewer
+namespace osg
 {
-    class Viewer;
+    class Group;
 }
 
 namespace Resource
@@ -34,7 +34,7 @@ namespace MWGui
     class RaceDialog : public WindowModal
     {
     public:
-        RaceDialog(osgViewer::Viewer* viewer, Resource::ResourceSystem* resourceSystem);
+        RaceDialog(osg::Group* parent, Resource::ResourceSystem* resourceSystem);
 
         enum Gender
         {
@@ -93,7 +93,7 @@ namespace MWGui
 
         void getBodyParts (int part, std::vector<std::string>& out);
 
-        osgViewer::Viewer* mViewer;
+        osg::Group* mParent;
         Resource::ResourceSystem* mResourceSystem;
 
         std::vector<std::string> mAvailableHeads;
diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp
index 1dac7138f..66d29bd59 100644
--- a/apps/openmw/mwgui/recharge.cpp
+++ b/apps/openmw/mwgui/recharge.cpp
@@ -5,6 +5,8 @@
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_Gui.h>
 
+#include <components/widgets/box.hpp>
+
 #include <components/misc/rng.hpp>
 
 #include "../mwbase/world.hpp"
@@ -21,6 +23,9 @@
 
 #include "widgets.hpp"
 #include "itemwidget.hpp"
+#include "itemchargeview.hpp"
+#include "sortfilteritemmodel.hpp"
+#include "inventoryitemmodel.hpp"
 
 namespace MWGui
 {
@@ -29,13 +34,15 @@ Recharge::Recharge()
     : WindowBase("openmw_recharge_dialog.layout")
 {
     getWidget(mBox, "Box");
-    getWidget(mView, "View");
     getWidget(mGemBox, "GemBox");
     getWidget(mGemIcon, "GemIcon");
     getWidget(mChargeLabel, "ChargeLabel");
     getWidget(mCancelButton, "CancelButton");
 
     mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &Recharge::onCancel);
+    mBox->eventItemClicked += MyGUI::newDelegate(this, &Recharge::onItemClicked);
+
+    mBox->setDisplayMode(ItemChargeView::DisplayMode_EnchantmentCharge);
 
     setVisible(false);
 }
@@ -43,8 +50,13 @@ Recharge::Recharge()
 void Recharge::open()
 {
     center();
+
+    SortFilterItemModel * model = new SortFilterItemModel(new InventoryItemModel(MWMechanics::getPlayer()));
+    model->setFilter(SortFilterItemModel::Filter_OnlyRechargable);
+    mBox->setModel(model);
+
     // Reset scrollbars
-    mView->setViewOffset(MyGUI::IntPoint(0, 0));
+    mBox->resetScrollbars();
 }
 
 void Recharge::exit()
@@ -72,66 +84,16 @@ void Recharge::updateView()
 
     bool toolBoxVisible = (gem.getRefData().getCount() != 0);
     mGemBox->setVisible(toolBoxVisible);
+    mGemBox->setUserString("Hidden", toolBoxVisible ? "false" : "true");
 
-    bool toolBoxWasVisible = (mBox->getPosition().top != mGemBox->getPosition().top);
-
-    if (toolBoxVisible && !toolBoxWasVisible)
-    {
-        // shrink
-        mBox->setPosition(mBox->getPosition() + MyGUI::IntPoint(0, mGemBox->getSize().height));
-        mBox->setSize(mBox->getSize() - MyGUI::IntSize(0,mGemBox->getSize().height));
-    }
-    else if (!toolBoxVisible && toolBoxWasVisible)
-    {
-        // expand
-        mBox->setPosition(MyGUI::IntPoint (mBox->getPosition().left, mGemBox->getPosition().top));
-        mBox->setSize(mBox->getSize() + MyGUI::IntSize(0,mGemBox->getSize().height));
-    }
-
-    while (mView->getChildCount())
-        MyGUI::Gui::getInstance().destroyWidget(mView->getChildAt(0));
+    mBox->update();
 
-    int currentY = 0;
+    Gui::Box* box = dynamic_cast<Gui::Box*>(mMainWidget);
+    if (box == NULL)
+        throw std::runtime_error("main widget must be a box");
 
-    MWWorld::Ptr player = MWMechanics::getPlayer();
-    MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
-    for (MWWorld::ContainerStoreIterator iter (store.begin());
-         iter!=store.end(); ++iter)
-    {
-        std::string enchantmentName = iter->getClass().getEnchantment(*iter);
-        if (enchantmentName.empty())
-            continue;
-        const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(enchantmentName);
-        if (iter->getCellRef().getEnchantmentCharge() >= enchantment->mData.mCharge
-                || iter->getCellRef().getEnchantmentCharge() == -1)
-            continue;
-
-        MyGUI::TextBox* text = mView->createWidget<MyGUI::TextBox> (
-                    "SandText", MyGUI::IntCoord(8, currentY, mView->getWidth()-8, 18), MyGUI::Align::Default);
-        text->setCaption(iter->getClass().getName(*iter));
-        text->setNeedMouseFocus(false);
-        currentY += 19;
-
-        ItemWidget* icon = mView->createWidget<ItemWidget> (
-                    "MW_ItemIconSmall", MyGUI::IntCoord(16, currentY, 32, 32), MyGUI::Align::Default);
-        icon->setItem(*iter);
-        icon->setUserString("ToolTipType", "ItemPtr");
-        icon->setUserData(*iter);
-        icon->eventMouseButtonClick += MyGUI::newDelegate(this, &Recharge::onItemClicked);
-        icon->eventMouseWheel += MyGUI::newDelegate(this, &Recharge::onMouseWheel);
-
-        Widgets::MWDynamicStatPtr chargeWidget = mView->createWidget<Widgets::MWDynamicStat>
-                ("MW_ChargeBar", MyGUI::IntCoord(72, currentY+2, 199, 20), MyGUI::Align::Default);
-        chargeWidget->setValue(static_cast<int>(iter->getCellRef().getEnchantmentCharge()), enchantment->mData.mCharge);
-        chargeWidget->setNeedMouseFocus(false);
-
-        currentY += 32 + 4;
-    }
-
-    // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
-    mView->setVisibleVScroll(false);
-    mView->setCanvasSize (MyGUI::IntSize(mView->getWidth(), std::max(mView->getHeight(), currentY)));
-    mView->setVisibleVScroll(true);
+    box->notifyChildrenSizeChanged();
+    center();
 }
 
 void Recharge::onCancel(MyGUI::Widget *sender)
@@ -139,15 +101,13 @@ void Recharge::onCancel(MyGUI::Widget *sender)
     exit();
 }
 
-void Recharge::onItemClicked(MyGUI::Widget *sender)
+void Recharge::onItemClicked(MyGUI::Widget *sender, const MWWorld::Ptr& item)
 {
     MWWorld::Ptr gem = *mGemIcon->getUserData<MWWorld::Ptr>();
 
     if (!gem.getRefData().getCount())
         return;
 
-    MWWorld::Ptr item = *sender->getUserData<MWWorld::Ptr>();
-
     MWWorld::Ptr player = MWMechanics::getPlayer();
     MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
     MWMechanics::NpcStats& npcStats = player.getClass().getNpcStats(player);
@@ -198,12 +158,4 @@ void Recharge::onItemClicked(MyGUI::Widget *sender)
     updateView();
 }
 
-void Recharge::onMouseWheel(MyGUI::Widget* _sender, int _rel)
-{
-    if (mView->getViewOffset().top + _rel*0.3f > 0)
-        mView->setViewOffset(MyGUI::IntPoint(0, 0));
-    else
-        mView->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mView->getViewOffset().top + _rel*0.3f)));
-}
-
 }
diff --git a/apps/openmw/mwgui/recharge.hpp b/apps/openmw/mwgui/recharge.hpp
index 3e8e1269e..bbcf994dd 100644
--- a/apps/openmw/mwgui/recharge.hpp
+++ b/apps/openmw/mwgui/recharge.hpp
@@ -12,6 +12,7 @@ namespace MWGui
 {
 
 class ItemWidget;
+class ItemChargeView;
 
 class Recharge : public WindowBase
 {
@@ -25,8 +26,7 @@ public:
     void start (const MWWorld::Ptr& gem);
 
 protected:
-    MyGUI::Widget* mBox;
-    MyGUI::ScrollView* mView;
+    ItemChargeView* mBox;
 
     MyGUI::Widget* mGemBox;
 
@@ -38,7 +38,7 @@ protected:
 
     void updateView();
 
-    void onItemClicked (MyGUI::Widget* sender);
+    void onItemClicked (MyGUI::Widget* sender, const MWWorld::Ptr& item);
     void onCancel (MyGUI::Widget* sender);
     void onMouseWheel(MyGUI::Widget* _sender, int _rel);
 
diff --git a/apps/openmw/mwgui/repair.cpp b/apps/openmw/mwgui/repair.cpp
index 49d5735a4..07fd6520c 100644
--- a/apps/openmw/mwgui/repair.cpp
+++ b/apps/openmw/mwgui/repair.cpp
@@ -4,6 +4,9 @@
 
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ItemBox.h>
+
+#include <components/widgets/box.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
@@ -17,6 +20,9 @@
 #include "widgets.hpp"
 
 #include "itemwidget.hpp"
+#include "itemchargeview.hpp"
+#include "sortfilteritemmodel.hpp"
+#include "inventoryitemmodel.hpp"
 
 namespace MWGui
 {
@@ -25,7 +31,6 @@ Repair::Repair()
     : WindowBase("openmw_repair.layout")
 {
     getWidget(mRepairBox, "RepairBox");
-    getWidget(mRepairView, "RepairView");
     getWidget(mToolBox, "ToolBox");
     getWidget(mToolIcon, "ToolIcon");
     getWidget(mUsesLabel, "UsesLabel");
@@ -33,13 +38,21 @@ Repair::Repair()
     getWidget(mCancelButton, "CancelButton");
 
     mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &Repair::onCancel);
+    mRepairBox->eventItemClicked += MyGUI::newDelegate(this, &Repair::onRepairItem);
+
+    mRepairBox->setDisplayMode(ItemChargeView::DisplayMode_Health);
 }
 
 void Repair::open()
 {
     center();
+
+    SortFilterItemModel * model = new SortFilterItemModel(new InventoryItemModel(MWMechanics::getPlayer()));
+    model->setFilter(SortFilterItemModel::Filter_OnlyRepairable);
+    mRepairBox->setModel(model);
+
     // Reset scrollbars
-    mRepairView->setViewOffset(MyGUI::IntPoint(0, 0));
+    mRepairBox->resetScrollbars();
 }
 
 void Repair::exit()
@@ -75,89 +88,31 @@ void Repair::updateRepairView()
 
     bool toolBoxVisible = (mRepair.getTool().getRefData().getCount() != 0);
     mToolBox->setVisible(toolBoxVisible);
+    mToolBox->setUserString("Hidden", toolBoxVisible ? "false" : "true");
+
+    mRepairBox->update();
 
-    bool toolBoxWasVisible = (mRepairBox->getPosition().top != mToolBox->getPosition().top);
-
-    if (toolBoxVisible && !toolBoxWasVisible)
-    {
-        // shrink
-        mRepairBox->setPosition(mRepairBox->getPosition() + MyGUI::IntPoint(0,mToolBox->getSize().height));
-        mRepairBox->setSize(mRepairBox->getSize() - MyGUI::IntSize(0,mToolBox->getSize().height));
-    }
-    else if (!toolBoxVisible && toolBoxWasVisible)
-    {
-        // expand
-        mRepairBox->setPosition(MyGUI::IntPoint (mRepairBox->getPosition().left, mToolBox->getPosition().top));
-        mRepairBox->setSize(mRepairBox->getSize() + MyGUI::IntSize(0,mToolBox->getSize().height));
-    }
-
-    while (mRepairView->getChildCount())
-        MyGUI::Gui::getInstance().destroyWidget(mRepairView->getChildAt(0));
-
-    int currentY = 0;
-
-    MWWorld::Ptr player = MWMechanics::getPlayer();
-    MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
-    int categories = MWWorld::ContainerStore::Type_Weapon | MWWorld::ContainerStore::Type_Armor;
-    for (MWWorld::ContainerStoreIterator iter (store.begin(categories));
-         iter!=store.end(); ++iter)
-    {
-        if (iter->getClass().hasItemHealth(*iter))
-        {
-            int maxDurability = iter->getClass().getItemMaxHealth(*iter);
-            int durability = iter->getClass().getItemHealth(*iter);
-            if (maxDurability == durability)
-                continue;
-
-            MyGUI::TextBox* text = mRepairView->createWidget<MyGUI::TextBox> (
-                        "SandText", MyGUI::IntCoord(8, currentY, mRepairView->getWidth()-8, 18), MyGUI::Align::Default);
-            text->setCaption(iter->getClass().getName(*iter));
-            text->setNeedMouseFocus(false);
-            currentY += 19;
-
-            ItemWidget* icon = mRepairView->createWidget<ItemWidget> (
-                        "MW_ItemIconSmall", MyGUI::IntCoord(16, currentY, 32, 32), MyGUI::Align::Default);
-            icon->setItem(*iter);
-            icon->setUserString("ToolTipType", "ItemPtr");
-            icon->setUserData(*iter);
-            icon->eventMouseButtonClick += MyGUI::newDelegate(this, &Repair::onRepairItem);
-            icon->eventMouseWheel += MyGUI::newDelegate(this, &Repair::onMouseWheel);
-
-            Widgets::MWDynamicStatPtr chargeWidget = mRepairView->createWidget<Widgets::MWDynamicStat>
-                    ("MW_ChargeBar", MyGUI::IntCoord(72, currentY+2, 199, 20), MyGUI::Align::Default);
-            chargeWidget->setValue(durability, maxDurability);
-            chargeWidget->setNeedMouseFocus(false);
-
-            currentY += 32 + 4;
-        }
-    }
-    // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
-    mRepairView->setVisibleVScroll(false);
-    mRepairView->setCanvasSize (MyGUI::IntSize(mRepairView->getWidth(), std::max(mRepairView->getHeight(), currentY)));
-    mRepairView->setVisibleVScroll(true);
+    Gui::Box* box = dynamic_cast<Gui::Box*>(mMainWidget);
+    if (box == NULL)
+        throw std::runtime_error("main widget must be a box");
+
+    box->notifyChildrenSizeChanged();
+    center();
 }
 
-void Repair::onCancel(MyGUI::Widget *sender)
+void Repair::onCancel(MyGUI::Widget* /*sender*/)
 {
     exit();
 }
 
-void Repair::onRepairItem(MyGUI::Widget *sender)
+void Repair::onRepairItem(MyGUI::Widget* /*sender*/, const MWWorld::Ptr& ptr)
 {
     if (!mRepair.getTool().getRefData().getCount())
         return;
 
-    mRepair.repair(*sender->getUserData<MWWorld::Ptr>());
+    mRepair.repair(ptr);
 
     updateRepairView();
 }
 
-void Repair::onMouseWheel(MyGUI::Widget* _sender, int _rel)
-{
-    if (mRepairView->getViewOffset().top + _rel*0.3f > 0)
-        mRepairView->setViewOffset(MyGUI::IntPoint(0, 0));
-    else
-        mRepairView->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mRepairView->getViewOffset().top + _rel*0.3f)));
-}
-
 }
diff --git a/apps/openmw/mwgui/repair.hpp b/apps/openmw/mwgui/repair.hpp
index 439ee1169..8746f7dc4 100644
--- a/apps/openmw/mwgui/repair.hpp
+++ b/apps/openmw/mwgui/repair.hpp
@@ -9,6 +9,7 @@ namespace MWGui
 {
 
 class ItemWidget;
+class ItemChargeView;
 
 class Repair : public WindowBase
 {
@@ -22,8 +23,7 @@ public:
     void startRepairItem (const MWWorld::Ptr& item);
 
 protected:
-    MyGUI::Widget* mRepairBox;
-    MyGUI::ScrollView* mRepairView;
+    ItemChargeView* mRepairBox;
 
     MyGUI::Widget* mToolBox;
 
@@ -38,9 +38,8 @@ protected:
 
     void updateRepairView();
 
-    void onRepairItem (MyGUI::Widget* sender);
-    void onCancel (MyGUI::Widget* sender);
-    void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+    void onRepairItem(MyGUI::Widget* sender, const MWWorld::Ptr& ptr);
+    void onCancel(MyGUI::Widget* sender);
 
 };
 
diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp
index d7d6c3cdb..d2971a093 100644
--- a/apps/openmw/mwgui/review.cpp
+++ b/apps/openmw/mwgui/review.cpp
@@ -10,6 +10,7 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwmechanics/autocalcspell.hpp"
 
 #include "tooltips.hpp"
 
@@ -29,7 +30,8 @@ namespace MWGui
     const int ReviewDialog::sLineHeight = 18;
 
     ReviewDialog::ReviewDialog()
-        : WindowModal("openmw_chargen_review.layout")
+        : WindowModal("openmw_chargen_review.layout"),
+          mUpdateSkillArea(false)
     {
         // Centre dialog
         center();
@@ -102,7 +104,16 @@ namespace MWGui
     void ReviewDialog::open()
     {
         WindowModal::open();
-        updateSkillArea();
+        mUpdateSkillArea = true;
+    }
+
+    void ReviewDialog::onFrame(float /*duration*/)
+    {
+        if (mUpdateSkillArea)
+        {
+            updateSkillArea();
+            mUpdateSkillArea = false;
+        }
     }
 
     void ReviewDialog::setPlayerName(const std::string &name)
@@ -121,6 +132,8 @@ namespace MWGui
             ToolTips::createRaceToolTip(mRaceWidget, race);
             mRaceWidget->setCaption(race->mName);
         }
+
+        mUpdateSkillArea = true;
     }
 
     void ReviewDialog::setClass(const ESM::Class& class_)
@@ -141,6 +154,8 @@ namespace MWGui
             mBirthSignWidget->setCaption(sign->mName);
             ToolTips::createBirthsignToolTip(mBirthSignWidget, mBirthSignId);
         }
+
+        mUpdateSkillArea = true;
     }
 
     void ReviewDialog::setHealth(const MWMechanics::DynamicStat<float>& value)
@@ -170,7 +185,11 @@ namespace MWGui
         if (attr == mAttributeWidgets.end())
             return;
 
-        attr->second->setAttributeValue(value);
+        if (attr->second->getAttributeValue() != value)
+        {
+            attr->second->setAttributeValue(value);
+            mUpdateSkillArea = true;
+        }
     }
 
     void ReviewDialog::setSkillValue(ESM::Skill::SkillEnum skillId, const MWMechanics::SkillValue& value)
@@ -191,6 +210,7 @@ namespace MWGui
             widget->_setWidgetState(state);
         }
 
+        mUpdateSkillArea = true;
     }
 
     void ReviewDialog::configureSkills(const std::vector<int>& major, const std::vector<int>& minor)
@@ -211,7 +231,7 @@ namespace MWGui
                 mMiscSkills.push_back(skill);
         }
 
-        updateSkillArea();
+        mUpdateSkillArea = true;
     }
 
     void ReviewDialog::addSeparator(MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
@@ -245,7 +265,7 @@ namespace MWGui
         skillNameWidget->setCaption(text);
         skillNameWidget->eventMouseWheel += MyGUI::newDelegate(this, &ReviewDialog::onMouseWheel);
 
-        skillValueWidget = mSkillView->createWidget<MyGUI::TextBox>("SandTextRight", coord2, MyGUI::Align::Top | MyGUI::Align::Right);
+        skillValueWidget = mSkillView->createWidget<MyGUI::TextBox>("SandTextRight", coord2, MyGUI::Align::Default);
         skillValueWidget->setCaption(value);
         skillValueWidget->_setWidgetState(state);
         skillValueWidget->eventMouseWheel += MyGUI::newDelegate(this, &ReviewDialog::onMouseWheel);
@@ -273,6 +293,20 @@ namespace MWGui
         coord2.top += sLineHeight;
     }
 
+    void ReviewDialog::addItem(const ESM::Spell* spell, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2)
+    {
+        Widgets::MWSpellPtr widget = mSkillView->createWidget<Widgets::MWSpell>("MW_StatName", coord1 + MyGUI::IntSize(coord2.width, 0), MyGUI::Align::Default);
+        widget->setSpellId(spell->mId);
+        widget->setUserString("ToolTipType", "Spell");
+        widget->setUserString("Spell", spell->mId);
+        widget->eventMouseWheel += MyGUI::newDelegate(this, &ReviewDialog::onMouseWheel);
+
+        mSkillWidgets.push_back(widget);
+
+        coord1.top += sLineHeight;
+        coord2.top += sLineHeight;
+    }
+
     void ReviewDialog::addSkills(const SkillList &skills, const std::string &titleId, const std::string &titleDefault, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
     {
         // Add a line separator if there are items above
@@ -332,6 +366,80 @@ namespace MWGui
         if (!mMiscSkills.empty())
             addSkills(mMiscSkills, "sSkillClassMisc", "Misc Skills", coord1, coord2);
 
+        // starting spells
+        std::vector<std::string> spells;
+
+        const ESM::Race* race = NULL;
+        if (!mRaceId.empty())
+            race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(mRaceId);
+
+        int skills[ESM::Skill::Length];
+        for (int i=0; i<ESM::Skill::Length; ++i)
+            skills[i] = mSkillValues.find(i)->second.getBase();
+
+        int attributes[ESM::Attribute::Length];
+        for (int i=0; i<ESM::Attribute::Length; ++i)
+            attributes[i] = mAttributeWidgets[i]->getAttributeValue().getBase();
+
+        std::vector<std::string> selectedSpells = MWMechanics::autoCalcPlayerSpells(skills, attributes, race);
+        for (std::vector<std::string>::iterator iter = selectedSpells.begin(); iter != selectedSpells.end(); ++iter)
+        {
+            std::string lower = Misc::StringUtils::lowerCase(*iter);
+            if (std::find(spells.begin(), spells.end(), lower) == spells.end())
+                spells.push_back(lower);
+        }
+
+        if (race)
+        {
+            for (std::vector<std::string>::const_iterator iter = race->mPowers.mList.begin();
+                 iter != race->mPowers.mList.end(); ++iter)
+            {
+                std::string lower = Misc::StringUtils::lowerCase(*iter);
+                if (std::find(spells.begin(), spells.end(), lower) == spells.end())
+                    spells.push_back(lower);
+            }
+        }
+
+        if (!mBirthSignId.empty())
+        {
+            const ESM::BirthSign* sign = MWBase::Environment::get().getWorld()->getStore().get<ESM::BirthSign>().find(mBirthSignId);
+            for (std::vector<std::string>::const_iterator iter = sign->mPowers.mList.begin();
+                 iter != sign->mPowers.mList.end(); ++iter)
+            {
+                std::string lower = Misc::StringUtils::lowerCase(*iter);
+                if (std::find(spells.begin(), spells.end(), lower) == spells.end())
+                    spells.push_back(lower);
+            }
+        }
+
+        if (!mSkillWidgets.empty())
+            addSeparator(coord1, coord2);
+        addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString("sTypeAbility", "Abilities"), coord1, coord2);
+        for (std::vector<std::string>::const_iterator iter = spells.begin(); iter != spells.end(); ++iter)
+        {
+            const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(*iter);
+            if (spell->mData.mType == ESM::Spell::ST_Ability)
+                addItem(spell, coord1, coord2);
+        }
+
+        addSeparator(coord1, coord2);
+        addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString("sTypePower", "Powers"), coord1, coord2);
+        for (std::vector<std::string>::const_iterator iter = spells.begin(); iter != spells.end(); ++iter)
+        {
+            const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(*iter);
+            if (spell->mData.mType == ESM::Spell::ST_Power)
+                addItem(spell, coord1, coord2);
+        }
+
+        addSeparator(coord1, coord2);
+        addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString("sTypeSpell", "Spells"), coord1, coord2);
+        for (std::vector<std::string>::const_iterator iter = spells.begin(); iter != spells.end(); ++iter)
+        {
+            const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(*iter);
+            if (spell->mData.mType == ESM::Spell::ST_Spell)
+                addItem(spell, coord1, coord2);
+        }
+
         // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
         mSkillView->setVisibleVScroll(false);
         mSkillView->setCanvasSize (mSkillView->getWidth(), std::max(mSkillView->getHeight(), coord1.top));
diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp
index 111d7de1d..f21f2fa9d 100644
--- a/apps/openmw/mwgui/review.hpp
+++ b/apps/openmw/mwgui/review.hpp
@@ -6,6 +6,11 @@
 #include "windowbase.hpp"
 #include "widgets.hpp"
 
+namespace ESM
+{
+    struct Spell;
+}
+
 namespace MWGui
 {
     class WindowManager;
@@ -42,6 +47,8 @@ namespace MWGui
 
         virtual void open();
 
+        void onFrame(float duration);
+
         // Events
         typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
         typedef MyGUI::delegates::CMultiDelegate1<int> EventHandle_Int;
@@ -75,6 +82,7 @@ namespace MWGui
         void addGroup(const std::string &label, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
         MyGUI::TextBox* addValueItem(const std::string& text, const std::string &value, const std::string& state, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
         void addItem(const std::string& text, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
+        void addItem(const ESM::Spell* spell, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
         void updateSkillArea();
 
         static const int sLineHeight;
@@ -92,6 +100,8 @@ namespace MWGui
         std::string mName, mRaceId, mBirthSignId;
         ESM::Class mKlass;
         std::vector<MyGUI::Widget*> mSkillWidgets; //< Skills and other information
+
+        bool mUpdateSkillArea;
     };
 }
 #endif
diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index 9de2374ad..5187c3043 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -86,16 +86,22 @@ namespace MWGui
     {
         MWBase::Environment::get().getStateManager()->deleteGame (mCurrentCharacter, mCurrentSlot);
         mSaveList->removeItemAt(mSaveList->getIndexSelected());
-        onSlotSelected(mSaveList, MyGUI::ITEM_NONE);
+        onSlotSelected(mSaveList, mSaveList->getIndexSelected());
+        MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mSaveList);
 
-        // The character might be deleted now
-        size_t previousIndex = mCharacterSelection->getIndexSelected();
-        open();
-        if (mCharacterSelection->getItemCount())
+        if (mSaveList->getItemCount() == 0)
         {
-            size_t nextCharacter = std::min(previousIndex, mCharacterSelection->getItemCount()-1);
-            mCharacterSelection->setIndexSelected(nextCharacter);
-            onCharacterSelected(mCharacterSelection, nextCharacter);
+            size_t previousIndex = mCharacterSelection->getIndexSelected();
+            mCurrentCharacter = NULL;
+            mCharacterSelection->removeItemAt(previousIndex);
+            if (mCharacterSelection->getItemCount())
+            {
+                size_t nextCharacter = std::min(previousIndex, mCharacterSelection->getItemCount()-1);
+                mCharacterSelection->setIndexSelected(nextCharacter);
+                onCharacterSelected(mCharacterSelection, nextCharacter);
+            }
+            else
+                fillSaveList();
         }
     }
 
@@ -132,7 +138,7 @@ namespace MWGui
         if (mgr->characterBegin() == mgr->characterEnd())
             return;
 
-        mCurrentCharacter = mgr->getCurrentCharacter (false);
+        mCurrentCharacter = mgr->getCurrentCharacter();
 
         std::string directory =
             Misc::StringUtils::lowerCase (Settings::Manager::getString ("character", "Saves"));
@@ -202,7 +208,7 @@ namespace MWGui
 
         if (!load)
         {
-            mCurrentCharacter = MWBase::Environment::get().getStateManager()->getCurrentCharacter (false);
+            mCurrentCharacter = MWBase::Environment::get().getStateManager()->getCurrentCharacter();
         }
 
         center();
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 86ecd9dfb..3211473e2 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -27,13 +27,6 @@
 
 namespace
 {
-    std::string fpsLevelToStr(int level)
-    {
-        if (level == 0)
-            return "#{sOff}";
-        else //if (level == 1)
-            return "#{sOn}";
-    }
 
     std::string textureMipmappingToStr(const std::string& val)
     {
@@ -182,13 +175,9 @@ namespace MWGui
         getWidget(mOkButton, "OkButton");
         getWidget(mResolutionList, "ResolutionList");
         getWidget(mFullscreenButton, "FullscreenButton");
-        getWidget(mVSyncButton, "VSyncButton");
         getWidget(mWindowBorderButton, "WindowBorderButton");
         getWidget(mTextureFilteringButton, "TextureFilteringButton");
         getWidget(mAnisotropyBox, "AnisotropyBox");
-        getWidget(mShadersButton, "ShadersButton");
-        getWidget(mShadowsEnabledButton, "ShadowsEnabledButton");
-        getWidget(mShadowsTextureSize, "ShadowsTextureSize");
         getWidget(mControlsBox, "ControlsBox");
         getWidget(mResetControlsButton, "ResetControlsButton");
         getWidget(mKeyboardSwitch, "KeyboardButton");
@@ -218,8 +207,6 @@ namespace MWGui
 
         mWaterTextureSize->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterTextureSizeChanged);
 
-        mShadowsTextureSize->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onShadowTextureSizeChanged);
-
         mKeyboardSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onKeyboardSwitchClicked);
         mControllerSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onControllerSwitchClicked);
 
@@ -260,13 +247,6 @@ namespace MWGui
         if (waterTextureSize >= 2048)
             mWaterTextureSize->setIndexSelected(2);
 
-        mShadowsTextureSize->setCaption (Settings::Manager::getString ("texture size", "Shadows"));
-
-        if (!Settings::Manager::getBool("shaders", "Objects"))
-        {
-            mShadowsEnabledButton->setEnabled(false);
-        }
-
         mWindowBorderButton->setEnabled(!Settings::Manager::getBool("fullscreen", "Video"));
 
         mKeyboardSwitch->setStateSelected(true);
@@ -346,12 +326,6 @@ namespace MWGui
         apply();
     }
 
-    void SettingsWindow::onShadowTextureSizeChanged(MyGUI::ComboBox *_sender, size_t pos)
-    {
-        Settings::Manager::setString("texture size", "Shadows", _sender->getItemNameAt(pos));
-        apply();
-    }
-
     void SettingsWindow::onButtonToggled(MyGUI::Widget* _sender)
     {
         std::string on = MWBase::Environment::get().getWindowManager()->getGameSettingString("sOn", "On");
@@ -368,21 +342,6 @@ namespace MWGui
             newState = true;
         }
 
-        if (_sender == mShadersButton)
-        {
-            if (newState == false)
-            {
-                // shadows not supported
-                mShadowsEnabledButton->setEnabled(false);
-                mShadowsEnabledButton->setCaptionWithReplacing("#{sOff}");
-                Settings::Manager::setBool("enabled", "Shadows", false);
-            }
-            else
-            {
-                mShadowsEnabledButton->setEnabled(true);
-            }
-        }
-
         if (_sender == mFullscreenButton)
         {
             // check if this resolution is supported in fullscreen
@@ -507,9 +466,6 @@ namespace MWGui
         else
             actions = MWBase::Environment::get().getInputManager()->getActionControllerSorting();
 
-        const int h = 18;
-        const int w = mControlsBox->getWidth() - 28;
-        int curH = 0;
         for (std::vector<int>::const_iterator it = actions.begin(); it != actions.end(); ++it)
         {
             std::string desc = MWBase::Environment::get().getInputManager()->getActionDescription (*it);
@@ -522,16 +478,15 @@ namespace MWGui
             else
                 binding = MWBase::Environment::get().getInputManager()->getActionControllerBindingName(*it);
 
-            Gui::SharedStateButton* leftText = mControlsBox->createWidget<Gui::SharedStateButton>("SandTextButton", MyGUI::IntCoord(0,curH,w,h), MyGUI::Align::Default);
+            Gui::SharedStateButton* leftText = mControlsBox->createWidget<Gui::SharedStateButton>("SandTextButton", MyGUI::IntCoord(), MyGUI::Align::Default);
             leftText->setCaptionWithReplacing(desc);
 
-            Gui::SharedStateButton* rightText = mControlsBox->createWidget<Gui::SharedStateButton>("SandTextButton", MyGUI::IntCoord(0,curH,w,h), MyGUI::Align::Default);
+            Gui::SharedStateButton* rightText = mControlsBox->createWidget<Gui::SharedStateButton>("SandTextButton", MyGUI::IntCoord(), MyGUI::Align::Default);
             rightText->setCaptionWithReplacing(binding);
             rightText->setTextAlign (MyGUI::Align::Right);
             rightText->setUserData(*it); // save the action id for callbacks
             rightText->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onRebindAction);
             rightText->eventMouseWheel += MyGUI::newDelegate(this, &SettingsWindow::onInputTabMouseWheel);
-            curH += h;
 
             Gui::ButtonGroup group;
             group.push_back(leftText);
@@ -539,9 +494,25 @@ namespace MWGui
             Gui::SharedStateButton::createButtonGroup(group);
         }
 
+        layoutControlsBox();
+    }
+
+    void SettingsWindow::layoutControlsBox()
+    {
+        const int h = 18;
+        const int w = mControlsBox->getWidth() - 28;
+        const int noWidgetsInRow = 2;
+        const int totalH = mControlsBox->getChildCount() / noWidgetsInRow * h;
+
+        for (size_t i = 0; i < mControlsBox->getChildCount(); i++)
+        {
+            MyGUI::Widget * widget = mControlsBox->getChildAt(i);
+            widget->setCoord(0, i / noWidgetsInRow * h, w, h);
+        }
+
         // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
         mControlsBox->setVisibleVScroll(false);
-        mControlsBox->setCanvasSize (mControlsBox->getWidth(), std::max(curH, mControlsBox->getHeight()));
+        mControlsBox->setCanvasSize (mControlsBox->getWidth(), std::max(totalH, mControlsBox->getHeight()));
         mControlsBox->setVisibleVScroll(true);
     }
 
@@ -597,7 +568,7 @@ namespace MWGui
 
     void SettingsWindow::onWindowResize(MyGUI::Window *_sender)
     {
-        updateControlsBox();
+        layoutControlsBox();
     }
 
     void SettingsWindow::resetScrollbars()
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 421465309..2ac06dcaa 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -28,17 +28,12 @@ namespace MWGui
             // graphics
             MyGUI::ListBox* mResolutionList;
             MyGUI::Button* mFullscreenButton;
-            MyGUI::Button* mVSyncButton;
             MyGUI::Button* mWindowBorderButton;
             MyGUI::ComboBox* mTextureFilteringButton;
             MyGUI::Widget* mAnisotropyBox;
-            MyGUI::Button* mShadersButton;
 
             MyGUI::ComboBox* mWaterTextureSize;
 
-            MyGUI::Button* mShadowsEnabledButton;
-            MyGUI::ComboBox* mShadowsTextureSize;
-
             // controls
             MyGUI::ScrollView* mControlsBox;
             MyGUI::Button* mResetControlsButton;
@@ -58,8 +53,6 @@ namespace MWGui
 
             void onWaterTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos);
 
-            void onShadowTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos);
-
             void onRebindAction(MyGUI::Widget* _sender);
             void onInputTabMouseWheel(MyGUI::Widget* _sender, int _rel);
             void onResetDefaultBindings(MyGUI::Widget* _sender);
@@ -73,6 +66,8 @@ namespace MWGui
 
             void configureWidgets(MyGUI::Widget* widget);
             void updateSliderLabel(MyGUI::ScrollBar* scroller, const std::string& value);
+
+            void layoutControlsBox();
         
         private:
             void resetScrollbars();
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index 1d086f2ee..0d7053404 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -1,5 +1,7 @@
 #include "sortfilteritemmodel.hpp"
 
+#include <iostream>
+
 #include <components/misc/stringops.hpp>
 
 #include <components/esm/loadalch.hpp>
@@ -14,9 +16,14 @@
 #include <components/esm/loadprob.hpp>
 #include <components/esm/loadrepa.hpp>
 #include <components/esm/loadweap.hpp>
+#include <components/esm/loadench.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/nullaction.hpp"
+#include "../mwworld/esmstore.hpp"
 
 namespace
 {
@@ -132,10 +139,38 @@ namespace MWGui
                 && !base.get<ESM::Book>()->mBase->mData.mIsScroll)
             return false;
 
-        if ((mFilter & Filter_OnlyUsableItems) && typeid(*base.getClass().use(base)) == typeid(MWWorld::NullAction)
-                && base.getClass().getScript(base).empty())
+        if ((mFilter & Filter_OnlyUsableItems) && base.getClass().getScript(base).empty())
+        {
+            boost::shared_ptr<MWWorld::Action> actionOnUse = base.getClass().use(base);
+            if (!actionOnUse || actionOnUse->isNullAction())
+                return false;
+        }
+
+        if ((mFilter & Filter_OnlyRepairable) && (
+                    !base.getClass().hasItemHealth(base)
+                    || (base.getClass().getItemHealth(base) == base.getClass().getItemMaxHealth(base))
+                    || (base.getTypeName() != typeid(ESM::Weapon).name()
+                        && base.getTypeName() != typeid(ESM::Armor).name())))
             return false;
 
+        if (mFilter & Filter_OnlyRechargable)
+        {
+            if (!(item.mFlags & ItemStack::Flag_Enchanted))
+                return false;
+
+            std::string enchId = base.getClass().getEnchantment(base);
+            const ESM::Enchantment* ench = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(enchId);
+            if (!ench)
+            {
+                std::cerr << "Can't find enchantment '" << enchId << "' on item " << base.getCellRef().getRefId() << std::endl;
+                return false;
+            }
+
+            if (base.getCellRef().getEnchantmentCharge() >= ench->mData.mCharge
+                    || base.getCellRef().getEnchantmentCharge() == -1)
+                return false;
+        }
+
         return true;
     }
 
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.hpp b/apps/openmw/mwgui/sortfilteritemmodel.hpp
index 064f62e77..3d5396e2a 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.hpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.hpp
@@ -39,6 +39,8 @@ namespace MWGui
         static const int Filter_OnlyEnchantable = (1<<2);
         static const int Filter_OnlyChargedSoulstones = (1<<3);
         static const int Filter_OnlyUsableItems = (1<<4); // Only items with a Use action
+        static const int Filter_OnlyRepairable = (1<<5);
+        static const int Filter_OnlyRechargable = (1<<6);
 
 
     private:
diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp
index 843731cff..6116e199b 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.cpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.cpp
@@ -17,6 +17,9 @@
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/LocalPlayer.hpp"
+
 namespace MWGui
 {
     const int SpellBuyingWindow::sLineHeight = 18;
@@ -140,6 +143,12 @@ namespace MWGui
         MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
         MWMechanics::Spells& spells = stats.getSpells();
         spells.add (mSpellsWidgetMap.find(_sender)->second);
+
+        // Added by tes3mp
+        //
+        // LocalPlayer has gained a spell, so send a packet with it
+        mwmp::Main::get().getLocalPlayer()->sendSpellAddition(mSpellsWidgetMap.find(_sender)->second);
+
         player.getClass().getContainerStore(player).remove(MWWorld::ContainerStore::sGoldId, price, player);
 
         // add gold to NPC trading gold pool
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 64d4d86c6..21f1cb8b7 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -6,6 +6,9 @@
 #include <components/esm/records.hpp>
 #include <components/widgets/list.hpp>
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/LocalPlayer.hpp"
+
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -404,6 +407,11 @@ namespace MWGui
         MWMechanics::Spells& spells = stats.getSpells();
         spells.add (spell->mId);
 
+        // Added by tes3mp
+        //
+        // LocalPlayer has gained a spell, so send a packet with it
+        mwmp::Main::get().getLocalPlayer()->sendSpellAddition(*spell);
+
         MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_SpellCreation);
     }
 
diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp
index 8422bb33f..553bcfdd6 100644
--- a/apps/openmw/mwgui/spellwindow.cpp
+++ b/apps/openmw/mwgui/spellwindow.cpp
@@ -11,6 +11,7 @@
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/player.hpp"
 
 #include "../mwmechanics/spellcasting.hpp"
 #include "../mwmechanics/spells.hpp"
@@ -21,6 +22,9 @@
 #include "confirmationdialog.hpp"
 #include "spellview.hpp"
 
+#include"../mwmp/Main.hpp"
+#include"../mwmp/LocalPlayer.hpp"
+
 namespace MWGui
 {
 
@@ -122,8 +126,15 @@ namespace MWGui
         const ESM::Spell* spell =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(spellId);
 
-        if (spell->mData.mFlags & ESM::Spell::F_Always
-            || spell->mData.mType == ESM::Spell::ST_Power)
+        MWWorld::Ptr player = MWMechanics::getPlayer();
+        std::string raceId = player.get<ESM::NPC>()->mBase->mRace;
+        const std::string& signId =
+            MWBase::Environment::get().getWorld()->getPlayer().getBirthSign();
+        const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(raceId);
+        const ESM::BirthSign* birthsign = MWBase::Environment::get().getWorld()->getStore().get<ESM::BirthSign>().find(signId);
+
+        // can't delete racial spells, birthsign spells or powers 
+        if (race->mPowers.exists(spell->mId) || birthsign->mPowers.exists(spell->mId) || spell->mData.mType == ESM::Spell::ST_Power)
         {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sDeleteSpellError}");
         }
@@ -178,6 +189,11 @@ namespace MWGui
 
         spells.remove(mSpellToDelete);
 
+        // Added by tes3mp
+        //
+        // LocalPlayer has lost a spell, so send a packet with it
+        mwmp::Main::get().getLocalPlayer()->sendSpellRemoval(mSpellToDelete);
+
         updateSpells();
     }
 
diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index e66e01238..cee015da0 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -68,12 +68,14 @@ namespace MWGui
 
         for (int i = 0; i < ESM::Skill::Length; ++i)
         {
-            mSkillValues.insert(std::pair<int, MWMechanics::SkillValue >(i, MWMechanics::SkillValue()));
-            mSkillWidgetMap.insert(std::pair<int, MyGUI::TextBox*>(i, (MyGUI::TextBox*)NULL));
+            mSkillValues.insert(std::make_pair(i, MWMechanics::SkillValue()));
+            mSkillWidgetMap.insert(std::make_pair(i, std::make_pair((MyGUI::TextBox*)NULL, (MyGUI::TextBox*)NULL)));
         }
 
         MyGUI::Window* t = mMainWidget->castType<MyGUI::Window>();
         t->eventWindowChangeCoord += MyGUI::newDelegate(this, &StatsWindow::onWindowResize);
+
+        onWindowResize(t);
     }
 
     void StatsWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel)
@@ -188,11 +190,32 @@ namespace MWGui
         }
     }
 
+    void setSkillProgress(MyGUI::Widget* w, float progress, int skillId)
+    {
+        MWWorld::Ptr player = MWMechanics::getPlayer();
+        const MWWorld::ESMStore &esmStore =
+            MWBase::Environment::get().getWorld()->getStore();
+
+        float progressRequirement = player.getClass().getNpcStats(player).getSkillProgressRequirement(skillId,
+            *esmStore.get<ESM::Class>().find(player.get<ESM::NPC>()->mBase->mClass));
+
+        // This is how vanilla MW displays the progress bar (I think). Note it's slightly inaccurate,
+        // due to the int casting in the skill levelup logic. Also the progress label could in rare cases
+        // reach 100% without the skill levelling up.
+        // Leaving the original display logic for now, for consistency with ess-imported savegames.
+        int progressPercent = int(float(progress) / float(progressRequirement) * 100.f + 0.5f);
+
+        w->setUserString("Caption_SkillProgressText", MyGUI::utility::toString(progressPercent)+"/100");
+        w->setUserString("RangePosition_SkillProgress", MyGUI::utility::toString(progressPercent));
+    }
+
     void StatsWindow::setValue(const ESM::Skill::SkillEnum parSkill, const MWMechanics::SkillValue& value)
     {
         mSkillValues[parSkill] = value;
-        MyGUI::TextBox* widget = mSkillWidgetMap[(int)parSkill];
-        if (widget)
+        std::pair<MyGUI::TextBox*, MyGUI::TextBox*> widgets = mSkillWidgetMap[(int)parSkill];
+        MyGUI::TextBox* valueWidget = widgets.second;
+        MyGUI::TextBox* nameWidget = widgets.first;
+        if (valueWidget && nameWidget)
         {
             int modified = value.getModified(), base = value.getBase();
             std::string text = MyGUI::utility::toString(modified);
@@ -202,8 +225,20 @@ namespace MWGui
             else if (modified < base)
                 state = "decreased";
 
-            widget->setCaption(text);
-            widget->_setWidgetState(state);
+            int widthBefore = valueWidget->getTextSize().width;
+
+            valueWidget->setCaption(text);
+            valueWidget->_setWidgetState(state);
+
+            int widthAfter = valueWidget->getTextSize().width;
+            if (widthBefore != widthAfter)
+            {
+                valueWidget->setCoord(valueWidget->getLeft() - (widthAfter-widthBefore), valueWidget->getTop(), valueWidget->getWidth() + (widthAfter-widthBefore), valueWidget->getHeight());
+                nameWidget->setSize(nameWidget->getWidth() - (widthAfter-widthBefore), nameWidget->getHeight());
+            }
+
+            if (value.getBase() < 100)
+                setSkillProgress(valueWidget, value.getProgress(), parSkill);
         }
     }
 
@@ -316,7 +351,7 @@ namespace MWGui
         coord2.top += sLineHeight;
     }
 
-    MyGUI::TextBox* StatsWindow::addValueItem(const std::string& text, const std::string &value, const std::string& state, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
+    std::pair<MyGUI::TextBox*, MyGUI::TextBox*> StatsWindow::addValueItem(const std::string& text, const std::string &value, const std::string& state, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
     {
         MyGUI::TextBox *skillNameWidget, *skillValueWidget;
 
@@ -340,7 +375,7 @@ namespace MWGui
         coord1.top += sLineHeight;
         coord2.top += sLineHeight;
 
-        return skillValueWidget;
+        return std::make_pair(skillNameWidget, skillValueWidget);
     }
 
     MyGUI::Widget* StatsWindow::addItem(const std::string& text, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
@@ -384,19 +419,9 @@ namespace MWGui
             int base = stat.getBase();
             int modified = stat.getModified();
 
-            MWWorld::Ptr player = MWMechanics::getPlayer();
             const MWWorld::ESMStore &esmStore =
                 MWBase::Environment::get().getWorld()->getStore();
 
-            float progressRequirement = player.getClass().getNpcStats(player).getSkillProgressRequirement(skillId,
-                *esmStore.get<ESM::Class>().find(player.get<ESM::NPC>()->mBase->mClass));
-
-            // This is how vanilla MW displays the progress bar (I think). Note it's slightly inaccurate,
-            // due to the int casting in the skill levelup logic. Also the progress label could in rare cases
-            // reach 100% without the skill levelling up.
-            // Leaving the original display logic for now, for consistency with ess-imported savegames.
-            int progressPercent = int(float(stat.getProgress()) / float(progressRequirement) * 100.f + 0.5f);
-
             const ESM::Skill* skill = esmStore.get<ESM::Skill>().find(skillId);
 
             std::string icon = "icons\\k\\" + ESM::Skill::sIconNames[skillId];
@@ -409,7 +434,7 @@ namespace MWGui
                 state = "increased";
             else if (modified < base)
                 state = "decreased";
-            MyGUI::TextBox* widget = addValueItem(MWBase::Environment::get().getWindowManager()->getGameSettingString(skillNameId, skillNameId),
+            std::pair<MyGUI::TextBox*, MyGUI::TextBox*> widgets = addValueItem(MWBase::Environment::get().getWindowManager()->getGameSettingString(skillNameId, skillNameId),
                 MyGUI::utility::toString(static_cast<int>(modified)), state, coord1, coord2);
 
             for (int i=0; i<2; ++i)
@@ -420,6 +445,7 @@ namespace MWGui
                 mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Caption_SkillDescription", skill->mDescription);
                 mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Caption_SkillAttribute", "#{sGoverningAttribute}: #{" + attr->mName + "}");
                 mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("ImageTexture_SkillImage", icon);
+                mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Range_SkillProgress", "100");
                 if (base < 100)
                 {
                     mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Visible_SkillMaxed", "false");
@@ -428,9 +454,7 @@ namespace MWGui
                     mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Visible_SkillProgressVBox", "true");
                     mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("UserData^Hidden_SkillProgressVBox", "false");
 
-                    mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Caption_SkillProgressText", MyGUI::utility::toString(progressPercent)+"/100");
-                    mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Range_SkillProgress", "100");
-                    mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("RangePosition_SkillProgress", MyGUI::utility::toString(progressPercent));
+                    setSkillProgress(mSkillWidgets[mSkillWidgets.size()-1-i], stat.getProgress(), skillId);
                 } else {
                     mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Visible_SkillMaxed", "true");
                     mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("UserData^Hidden_SkillMaxed", "false");
@@ -440,7 +464,7 @@ namespace MWGui
                 }
             }
 
-            mSkillWidgetMap[skillId] = widget;
+            mSkillWidgetMap[skillId] = widgets;
         }
     }
 
@@ -494,8 +518,8 @@ namespace MWGui
 
         if (!mFactions.empty())
         {
-            MWWorld::Ptr player = MWMechanics::getPlayer();
-            const MWMechanics::NpcStats &PCstats = player.getClass().getNpcStats(player);
+            MWWorld::Ptr playerPtr = MWMechanics::getPlayer();
+            const MWMechanics::NpcStats &PCstats = playerPtr.getClass().getNpcStats(playerPtr);
             const std::set<std::string> &expelled = PCstats.getExpelled();
 
             bool firstFaction=true;
diff --git a/apps/openmw/mwgui/statswindow.hpp b/apps/openmw/mwgui/statswindow.hpp
index 2cf4ca819..1fe3cb68d 100644
--- a/apps/openmw/mwgui/statswindow.hpp
+++ b/apps/openmw/mwgui/statswindow.hpp
@@ -43,7 +43,7 @@ namespace MWGui
             void addSkills(const SkillList &skills, const std::string &titleId, const std::string &titleDefault, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
             void addSeparator(MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
             void addGroup(const std::string &label, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
-            MyGUI::TextBox* addValueItem(const std::string& text, const std::string &value, const std::string& state, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
+            std::pair<MyGUI::TextBox*, MyGUI::TextBox*> addValueItem(const std::string& text, const std::string &value, const std::string& state, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
             MyGUI::Widget* addItem(const std::string& text, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
 
             void setFactions (const FactionList& factions);
@@ -62,7 +62,7 @@ namespace MWGui
 
             SkillList mMajorSkills, mMinorSkills, mMiscSkills;
             std::map<int, MWMechanics::SkillValue > mSkillValues;
-            std::map<int, MyGUI::TextBox*> mSkillWidgetMap;
+            std::map<int, std::pair<MyGUI::TextBox*, MyGUI::TextBox*> > mSkillWidgetMap;
             std::map<std::string, MyGUI::Widget*> mFactionWidgetMap;
             FactionList mFactions; ///< Stores a list of factions and the current rank
             std::string mBirthSignId;
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index cb3d0d0a1..b3cc19a64 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -256,7 +256,7 @@ namespace MWGui
                         std::string key = it->first.substr(0, underscorePos);
                         std::string widgetName = it->first.substr(underscorePos+1, it->first.size()-(underscorePos+1));
 
-                        std::string type = "Property";
+                        type = "Property";
                         size_t caretPos = key.find("^");
                         if (caretPos != std::string::npos)
                         {
@@ -395,15 +395,18 @@ namespace MWGui
         const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
         if (info.enchant != "")
         {
-            enchant = store.get<ESM::Enchantment>().find(info.enchant);
-            if (enchant->mData.mType == ESM::Enchantment::CastOnce)
-                text += "\n#{sItemCastOnce}";
-            else if (enchant->mData.mType == ESM::Enchantment::WhenStrikes)
-                text += "\n#{sItemCastWhenStrikes}";
-            else if (enchant->mData.mType == ESM::Enchantment::WhenUsed)
-                text += "\n#{sItemCastWhenUsed}";
-            else if (enchant->mData.mType == ESM::Enchantment::ConstantEffect)
-                text += "\n#{sItemCastConstant}";
+            enchant = store.get<ESM::Enchantment>().search(info.enchant);
+            if (enchant)
+            {
+                if (enchant->mData.mType == ESM::Enchantment::CastOnce)
+                    text += "\n#{sItemCastOnce}";
+                else if (enchant->mData.mType == ESM::Enchantment::WhenStrikes)
+                    text += "\n#{sItemCastWhenStrikes}";
+                else if (enchant->mData.mType == ESM::Enchantment::WhenUsed)
+                    text += "\n#{sItemCastWhenUsed}";
+                else if (enchant->mData.mType == ESM::Enchantment::ConstantEffect)
+                    text += "\n#{sItemCastConstant}";
+            }
         }
 
         // this the maximum width of the tooltip before it starts word-wrapping
@@ -472,9 +475,8 @@ namespace MWGui
             totalSize.width = std::max(totalSize.width, coord.width);
         }
 
-        if (info.enchant != "")
+        if (enchant)
         {
-            assert(enchant);
             MyGUI::Widget* enchantArea = mDynamicToolTipBox->createWidget<MyGUI::Widget>("",
                 MyGUI::IntCoord(padding.left, totalSize.height, 300-padding.left, 300-totalSize.height),
                 MyGUI::Align::Stretch);
@@ -584,6 +586,14 @@ namespace MWGui
         return stream.str();
     }
 
+    std::string ToolTips::getWeightString(const float weight, const std::string& prefix)
+    {
+        if (weight == 0)
+            return "";
+        else
+            return "\n" + prefix + ": " + toString(weight);
+    }
+
     std::string ToolTips::getValueString(const int value, const std::string& prefix)
     {
         if (value == 0)
@@ -725,9 +735,7 @@ namespace MWGui
 
         std::vector<std::string> abilities, powers, spells;
 
-        std::vector<std::string>::const_iterator it = sign->mPowers.mList.begin();
-        std::vector<std::string>::const_iterator end = sign->mPowers.mList.end();
-        for (; it != end; ++it)
+        for (std::vector<std::string>::const_iterator it = sign->mPowers.mList.begin(); it != sign->mPowers.mList.end(); ++it)
         {
             const std::string &spellId = *it;
             const ESM::Spell *spell = store.get<ESM::Spell>().search(spellId);
diff --git a/apps/openmw/mwgui/tooltips.hpp b/apps/openmw/mwgui/tooltips.hpp
index 1fc736bff..de5b89b7f 100644
--- a/apps/openmw/mwgui/tooltips.hpp
+++ b/apps/openmw/mwgui/tooltips.hpp
@@ -62,6 +62,7 @@ namespace MWGui
         void setFocusObjectScreenCoords(float min_x, float min_y, float max_x, float max_y);
         ///< set the screen-space position of the tooltip for focused object
 
+        static std::string getWeightString(const float weight, const std::string& prefix);
         static std::string getValueString(const int value, const std::string& prefix);
         ///< @return "prefix: value" or "" if value is 0
 
diff --git a/apps/openmw/mwgui/tradeitemmodel.cpp b/apps/openmw/mwgui/tradeitemmodel.cpp
index a5a2b3e88..ae3feb61c 100644
--- a/apps/openmw/mwgui/tradeitemmodel.cpp
+++ b/apps/openmw/mwgui/tradeitemmodel.cpp
@@ -163,6 +163,10 @@ namespace MWGui
                 MWWorld::Ptr base = item.mBase;
                 if(Misc::StringUtils::ciEqual(base.getCellRef().getRefId(), MWWorld::ContainerStore::sGoldId))
                     continue;
+
+                if (!base.getClass().showsInInventory(base))
+                    return;
+
                 if(!base.getClass().canSell(base, services))
                     continue;
 
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 6f45ed005..e191c16bb 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -4,8 +4,6 @@
 #include <MyGUI_InputManager.h>
 #include <MyGUI_ControllerManager.h>
 
-#include <components/misc/rng.hpp>
-
 #include <components/widgets/numericeditbox.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -19,8 +17,8 @@
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 #include "inventorywindow.hpp"
 #include "itemview.hpp"
@@ -323,78 +321,23 @@ namespace MWGui
             }
         }
 
-        // TODO: move to mwmechanics
+        bool offerAccepted = mTrading.haggle(player, mPtr, mCurrentBalance, mCurrentMerchantOffer);
 
-        // Is the player buying?
-        bool buying = (mCurrentMerchantOffer < 0);
+        // apply disposition change if merchant is NPC
+        if ( mPtr.getClass().isNpc() ) {
+            int dispositionDelta = offerAccepted
+                ? gmst.find("iBarterSuccessDisposition")->getInt()
+                : gmst.find("iBarterFailDisposition")->getInt();
 
-        if(mCurrentBalance > mCurrentMerchantOffer)
-        {
-            //if npc is a creature: reject (no haggle)
-            if (mPtr.getTypeName() != typeid(ESM::NPC).name())
-            {
-                MWBase::Environment::get().getWindowManager()->
-                    messageBox("#{sNotifyMessage9}");
-                return;
-            }
-
-            int a = abs(mCurrentMerchantOffer);
-            int b = abs(mCurrentBalance);
-            int d = 0;
-            if (buying)
-                d = int(100 * (a - b) / a);
-            else
-                d = int(100 * (b - a) / a);
-
-            int clampedDisposition = std::max(0, std::min(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr)
-                + MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange(),100));
-
-            const MWMechanics::CreatureStats &sellerStats = mPtr.getClass().getCreatureStats(mPtr);
-            const MWMechanics::CreatureStats &playerStats = player.getClass().getCreatureStats(player);
-
-            float a1 = static_cast<float>(player.getClass().getSkill(player, ESM::Skill::Mercantile));
-            float b1 = 0.1f * playerStats.getAttribute(ESM::Attribute::Luck).getModified();
-            float c1 = 0.2f * playerStats.getAttribute(ESM::Attribute::Personality).getModified();
-            float d1 = static_cast<float>(mPtr.getClass().getSkill(mPtr, ESM::Skill::Mercantile));
-            float e1 = 0.1f * sellerStats.getAttribute(ESM::Attribute::Luck).getModified();
-            float f1 = 0.2f * sellerStats.getAttribute(ESM::Attribute::Personality).getModified();
-
-            float dispositionTerm = gmst.find("fDispositionMod")->getFloat() * (clampedDisposition - 50);
-            float pcTerm = (dispositionTerm - 50 + a1 + b1 + c1) * playerStats.getFatigueTerm();
-            float npcTerm = (d1 + e1 + f1) * sellerStats.getFatigueTerm();
-            float x = gmst.find("fBargainOfferMulti")->getFloat() * d + gmst.find("fBargainOfferBase")->getFloat();
-            if (buying)
-                x += abs(int(pcTerm - npcTerm));
-            else
-                x += abs(int(npcTerm - pcTerm));
-
-            int roll = Misc::Rng::rollDice(100) + 1;
-            if(roll > x || (mCurrentMerchantOffer < 0) != (mCurrentBalance < 0)) //trade refused
-            {
-                MWBase::Environment::get().getWindowManager()->
-                    messageBox("#{sNotifyMessage9}");
-
-                int iBarterFailDisposition = gmst.find("iBarterFailDisposition")->getInt();
-                if (mPtr.getClass().isNpc())
-                    MWBase::Environment::get().getDialogueManager()->applyDispositionChange(iBarterFailDisposition);
-                return;
-            }
-
-            //skill use!
-            float skillGain = 0.f;
-            int finalPrice = std::abs(mCurrentBalance);
-            int initialMerchantOffer = std::abs(mCurrentMerchantOffer);
-            if (!buying && (finalPrice > initialMerchantOffer) && finalPrice > 0)
-                skillGain = floor(100 * (finalPrice - initialMerchantOffer) / float(finalPrice));
-            else if (buying && (finalPrice < initialMerchantOffer) && initialMerchantOffer > 0)
-                skillGain = floor(100 * (initialMerchantOffer - finalPrice) / float(initialMerchantOffer));
-
-            player.getClass().skillUsageSucceeded(player, ESM::Skill::Mercantile, 0, skillGain);
+            MWBase::Environment::get().getDialogueManager()->applyDispositionChange(dispositionDelta);
         }
 
-        int iBarterSuccessDisposition = gmst.find("iBarterSuccessDisposition")->getInt();
-        if (mPtr.getClass().isNpc())
-            MWBase::Environment::get().getDialogueManager()->applyDispositionChange(iBarterSuccessDisposition);
+        // display message on haggle failure
+        if ( !offerAccepted ) {
+            MWBase::Environment::get().getWindowManager()->
+                messageBox("#{sNotifyMessage9}");
+            return;
+        }
 
         // make the item transfer
         mTradeModel->transferItems();
@@ -477,15 +420,15 @@ namespace MWGui
         // prevent overflows, and prevent entering INT_MIN since abs(INT_MIN) is undefined
         if (mCurrentBalance == INT_MAX || mCurrentBalance == INT_MIN+1)
             return;
-        if(mCurrentBalance<=-1) mCurrentBalance -= 1;
-        if(mCurrentBalance>=1) mCurrentBalance += 1;
+        if (mCurrentBalance < 0) mCurrentBalance -= 1;
+        else mCurrentBalance += 1;
         updateLabels();
     }
 
     void TradeWindow::onDecreaseButtonTriggered()
     {
-        if(mCurrentBalance<-1) mCurrentBalance += 1;
-        if(mCurrentBalance>1) mCurrentBalance -= 1;
+        if (mCurrentBalance < 0) mCurrentBalance += 1;
+        else mCurrentBalance -= 1;
         updateLabels();
     }
 
@@ -496,13 +439,13 @@ namespace MWGui
 
         mPlayerGold->setCaptionWithReplacing("#{sYourGold} " + MyGUI::utility::toString(playerGold));
 
-        if (mCurrentBalance > 0)
+        if (mCurrentBalance < 0)
         {
-            mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalSold}");
+            mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalCost}");
         }
         else
         {
-            mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalCost}");
+            mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalSold}");
         }
 
         mTotalBalance->setValue(std::abs(mCurrentBalance));
diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp
index a23196d70..4b03c8d90 100644
--- a/apps/openmw/mwgui/tradewindow.hpp
+++ b/apps/openmw/mwgui/tradewindow.hpp
@@ -1,6 +1,8 @@
 #ifndef MWGUI_TRADEWINDOW_H
 #define MWGUI_TRADEWINDOW_H
 
+#include "../mwmechanics/trading.hpp"
+
 #include "referenceinterface.hpp"
 #include "windowbase.hpp"
 
@@ -40,6 +42,7 @@ namespace MWGui
             ItemView* mItemView;
             SortFilterItemModel* mSortModel;
             TradeItemModel* mTradeModel;
+            MWMechanics::Trading mTrading;
 
             static const float sBalanceChangeInitialPause; // in seconds
             static const float sBalanceChangeInterval; // in seconds
diff --git a/apps/openmw/mwgui/trainingwindow.cpp b/apps/openmw/mwgui/trainingwindow.cpp
index 30ad27e46..82218fef1 100644
--- a/apps/openmw/mwgui/trainingwindow.cpp
+++ b/apps/openmw/mwgui/trainingwindow.cpp
@@ -176,9 +176,9 @@ namespace MWGui
         MWBase::Environment::get().getDialogueManager()->goodbyeSelected();
 
         // advance time
-        MWBase::Environment::get().getWorld ()->advanceTime (2);
         MWBase::Environment::get().getMechanicsManager()->rest(false);
         MWBase::Environment::get().getMechanicsManager()->rest(false);
+        MWBase::Environment::get().getWorld ()->advanceTime (2);
 
         mProgressBar.setVisible(true);
         mProgressBar.setProgress(0, 2);
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index 8c55c3732..3063b3268 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -55,7 +55,7 @@ namespace MWGui
 
     void TravelWindow::addDestination(const std::string& name,ESM::Position pos,bool interior)
     {
-        int price = 0;
+        int price;
 
         const MWWorld::Store<ESM::GameSetting> &gmst =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
@@ -70,14 +70,21 @@ namespace MWGui
         else
         {
             ESM::Position PlayerPos = player.getRefData().getPosition();
-            float d = sqrt( pow(pos.pos[0] - PlayerPos.pos[0],2) + pow(pos.pos[1] - PlayerPos.pos[1],2) + pow(pos.pos[2] - PlayerPos.pos[2],2)   );
+            float d = sqrt(pow(pos.pos[0] - PlayerPos.pos[0], 2) + pow(pos.pos[1] - PlayerPos.pos[1], 2) + pow(pos.pos[2] - PlayerPos.pos[2], 2));
             price = static_cast<int>(d / gmst.find("fTravelMult")->getFloat());
         }
 
-        price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr,price,true);
+        price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, price, true);
+
+        // Add price for the travelling followers
+        std::set<MWWorld::Ptr> followers;
+        MWWorld::ActionTeleport::getFollowersToTeleport(player, followers);
+
+        // Apply followers cost, in vanilla one follower travels for free
+        price *= std::max(1, static_cast<int>(followers.size()));
 
         MyGUI::Button* toAdd = mDestinationsView->createWidget<MyGUI::Button>("SandTextButton", 0, mCurrentY, 200, sLineHeight, MyGUI::Align::Default);
-        toAdd->setEnabled(price<=playerGold);
+        toAdd->setEnabled(price <= playerGold);
         mCurrentY += sLineHeight;
         if(interior)
             toAdd->setUserString("interior","y");
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index e8ac63bf6..8685475a4 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -189,8 +189,12 @@ namespace MWGui
     void WaitDialog::onWaitingProgressChanged(int cur, int total)
     {
         mProgressBar.setProgress(cur, total);
-        MWBase::Environment::get().getWorld()->advanceTime(1);
         MWBase::Environment::get().getMechanicsManager()->rest(mSleeping);
+        MWBase::Environment::get().getWorld()->advanceTime(1);
+
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        if (player.getClass().getCreatureStats(player).isDead())
+            stopWaiting();
     }
 
     void WaitDialog::onWaitingInterrupted()
diff --git a/apps/openmw/mwgui/windowbase.cpp b/apps/openmw/mwgui/windowbase.cpp
index c9d1b0617..99b74529e 100644
--- a/apps/openmw/mwgui/windowbase.cpp
+++ b/apps/openmw/mwgui/windowbase.cpp
@@ -79,12 +79,13 @@ void WindowModal::close()
 NoDrop::NoDrop(DragAndDrop *drag, MyGUI::Widget *widget)
     : mWidget(widget), mDrag(drag), mTransparent(false)
 {
-    if (!mWidget)
-        throw std::runtime_error("NoDrop needs a non-NULL widget!");
 }
 
 void NoDrop::onFrame(float dt)
 {
+    if (!mWidget)
+        return;
+
     MyGUI::IntPoint mousePos = MyGUI::InputManager::getInstance().getMousePosition();
 
     if (mDrag->mIsOnDragAndDrop)
@@ -113,5 +114,6 @@ void NoDrop::onFrame(float dt)
 
 void NoDrop::setAlpha(float alpha)
 {
-    mWidget->setAlpha(alpha);
+    if (mWidget)
+        mWidget->setAlpha(alpha);
 }
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 03fbc9238..4fb096a7f 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -30,6 +30,8 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
 
+#include <components/sceneutil/workqueue.hpp>
+
 #include <components/translation/translation.hpp>
 
 #include <components/myguiplatform/myguiplatform.hpp>
@@ -46,6 +48,9 @@
 
 #include <components/misc/resourcehelpers.hpp>
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/GUIController.hpp"
+
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -109,16 +114,18 @@
 #include "container.hpp"
 #include "controllers.hpp"
 #include "jailscreen.hpp"
+#include "itemchargeview.hpp"
 
 namespace MWGui
 {
 
     WindowManager::WindowManager(
-            osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem
-            , const std::string& logpath, const std::string& resourcePath, bool consoleOnlyScripts,
+            osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
+            const std::string& logpath, const std::string& resourcePath, bool consoleOnlyScripts,
             Translation::Storage& translationDataStorage, ToUTF8::FromType encoding, bool exportFonts, const std::map<std::string, std::string>& fallbackMap, const std::string& versionDescription)
       : mStore(NULL)
       , mResourceSystem(resourceSystem)
+      , mWorkQueue(workQueue)
       , mViewer(viewer)
       , mConsoleOnlyScripts(consoleOnlyScripts)
       , mCurrentModals()
@@ -223,6 +230,7 @@ namespace MWGui
         MyGUI::FactoryManager::getInstance().registerFactory<osgMyGUI::ScalingLayer>("Layer");
         BookPage::registerMyGUIComponents ();
         ItemView::registerComponents();
+        ItemChargeView::registerComponents();
         ItemWidget::registerComponents();
         SpellView::registerComponents();
         Gui::registerAllWidgets();
@@ -282,8 +290,8 @@ namespace MWGui
 
         mRecharge = new Recharge();
         mMenu = new MainMenu(w, h, mResourceSystem->getVFS(), mVersionDescription);
-        mLocalMapRender = new MWRender::LocalMap(mViewer);
-        mMap = new MapWindow(mCustomMarkers, mDragAndDrop, mLocalMapRender);
+        mLocalMapRender = new MWRender::LocalMap(mViewer->getSceneData()->asGroup());
+        mMap = new MapWindow(mCustomMarkers, mDragAndDrop, mLocalMapRender, mWorkQueue);
         trackWindow(mMap, "map");
         mStatsWindow = new StatsWindow(mDragAndDrop);
         trackWindow(mStatsWindow, "stats");
@@ -293,7 +301,7 @@ namespace MWGui
         bool questList = mResourceSystem->getVFS()->exists("textures/tx_menubook_options_over.dds");
         mJournal = JournalWindow::create(JournalViewModel::create (), questList);
         mMessageBoxManager = new MessageBoxManager(mStore->get<ESM::GameSetting>().find("fMessageTimePerChar")->getFloat());
-        mInventoryWindow = new InventoryWindow(mDragAndDrop, mViewer, mResourceSystem);
+        mInventoryWindow = new InventoryWindow(mDragAndDrop, mViewer->getSceneData()->asGroup(), mResourceSystem);
         mTradeWindow = new TradeWindow();
         trackWindow(mTradeWindow, "barter");
         mSpellBuyingWindow = new SpellBuyingWindow();
@@ -350,7 +358,7 @@ namespace MWGui
 
         mHud->setVisible(mHudEnabled);
 
-        mCharGen = new CharacterCreation(mViewer, mResourceSystem);
+        mCharGen = new CharacterCreation(mViewer->getSceneData()->asGroup(), mResourceSystem);
 
         // Setup player stats
         for (int i = 0; i < ESM::Attribute::Length; ++i)
@@ -371,7 +379,7 @@ namespace MWGui
 
     void WindowManager::renderWorldMap()
     {
-        mMap->renderGlobalMap(mLoadingScreen);
+        mMap->renderGlobalMap();
     }
 
     void WindowManager::setNewGame(bool newgame)
@@ -384,7 +392,7 @@ namespace MWGui
         {
             disallowAll();
             delete mCharGen;
-            mCharGen = new CharacterCreation(mViewer, mResourceSystem);
+            mCharGen = new CharacterCreation(mViewer->getSceneData()->asGroup(), mResourceSystem);
             mGuiModes.clear();
             MWBase::Environment::get().getInputManager()->changeInputMode(false);
             mHud->unsetSelectedWeapon();
@@ -677,6 +685,7 @@ namespace MWGui
                     setCursorVisible(mMessageBoxManager && mMessageBoxManager->isInteractiveMessageBox());
                     break;
                 default:
+                    mwmp::Main::get().getGUIController()->WM_UpdateVisible(mode);
                     // Unsupported mode, switch back to game
                     break;
             }
@@ -1004,6 +1013,9 @@ namespace MWGui
         mScreenFader->update(frameDuration);
 
         mDebugWindow->onFrame(frameDuration);
+
+        if (mCharGen)
+            mCharGen->onFrame(frameDuration);
     }
 
     void WindowManager::changeCell(const MWWorld::CellStore* cell)
@@ -1274,6 +1286,7 @@ namespace MWGui
     void WindowManager::setSelectedSpell(const std::string& spellId, int successChancePercent)
     {
         mSelectedSpell = spellId;
+        mSelectedEnchantItem = MWWorld::Ptr();
         mHud->setSelectedSpell(spellId, successChancePercent);
 
         const ESM::Spell* spell = mStore->get<ESM::Spell>().find(spellId);
@@ -1283,6 +1296,7 @@ namespace MWGui
 
     void WindowManager::setSelectedEnchantItem(const MWWorld::Ptr& item)
     {
+        mSelectedEnchantItem = item;
         mSelectedSpell = "";
         const ESM::Enchantment* ench = mStore->get<ESM::Enchantment>()
                 .find(item.getClass().getEnchantment(item));
@@ -1293,17 +1307,29 @@ namespace MWGui
         mSpellWindow->setTitle(item.getClass().getName(item));
     }
 
+    const MWWorld::Ptr &WindowManager::getSelectedEnchantItem() const
+    {
+        return mSelectedEnchantItem;
+    }
+
     void WindowManager::setSelectedWeapon(const MWWorld::Ptr& item)
     {
+        mSelectedWeapon = item;
         int durabilityPercent =
              static_cast<int>(item.getClass().getItemHealth(item) / static_cast<float>(item.getClass().getItemMaxHealth(item)) * 100);
         mHud->setSelectedWeapon(item, durabilityPercent);
         mInventoryWindow->setTitle(item.getClass().getName(item));
     }
 
+    const MWWorld::Ptr &WindowManager::getSelectedWeapon() const
+    {
+        return mSelectedWeapon;
+    }
+
     void WindowManager::unsetSelectedSpell()
     {
         mSelectedSpell = "";
+        mSelectedEnchantItem = MWWorld::Ptr();
         mHud->unsetSelectedSpell();
 
         MWWorld::Player* player = &MWBase::Environment::get().getWorld()->getPlayer();
@@ -1315,6 +1341,7 @@ namespace MWGui
 
     void WindowManager::unsetSelectedWeapon()
     {
+        mSelectedWeapon = MWWorld::Ptr();
         mHud->unsetSelectedWeapon();
         mInventoryWindow->setTitle("#{sSkillHandtohand}");
     }
@@ -1635,9 +1662,7 @@ namespace MWGui
         layout->mMainWidget->setPosition(pos);
         layout->mMainWidget->setSize(size);
 
-        MyGUI::Window* window = dynamic_cast<MyGUI::Window*>(layout->mMainWidget);
-        if (!window)
-            throw std::runtime_error("Attempting to track size of a non-resizable window");
+        MyGUI::Window* window = layout->mMainWidget->castType<MyGUI::Window>();
         window->eventWindowChangeCoord += MyGUI::newDelegate(this, &WindowManager::onWindowChangeCoord);
         mTrackedWindows[window] = name;
     }
@@ -2004,13 +2029,19 @@ namespace MWGui
         return Misc::ResourceHelpers::correctTexturePath(path, mResourceSystem->getVFS());
     }
 
+    bool WindowManager::textureExists(const std::string &path)
+    {
+        std::string corrected = Misc::ResourceHelpers::correctTexturePath(path, mResourceSystem->getVFS());
+        return mResourceSystem->getVFS()->exists(corrected);
+    }
+
     void WindowManager::createCursors()
     {
         MyGUI::ResourceManager::EnumeratorPtr enumerator = MyGUI::ResourceManager::getInstance().getEnumerator();
         while (enumerator.next())
         {
             MyGUI::IResource* resource = enumerator.current().second;
-            ResourceImageSetPointerFix* imgSetPointer = dynamic_cast<ResourceImageSetPointerFix*>(resource);
+            ResourceImageSetPointerFix* imgSetPointer = resource->castType<ResourceImageSetPointerFix>(false);
             if (!imgSetPointer)
                 continue;
             std::string tex_name = imgSetPointer->getImageSet()->getIndexInfo(0,0).texture;
@@ -2020,13 +2051,11 @@ namespace MWGui
             if(image.valid())
             {
                 //everything looks good, send it to the cursor manager
-                Uint8 size_x = imgSetPointer->getSize().width;
-                Uint8 size_y = imgSetPointer->getSize().height;
                 Uint8 hotspot_x = imgSetPointer->getHotSpot().left;
                 Uint8 hotspot_y = imgSetPointer->getHotSpot().top;
                 int rotation = imgSetPointer->getRotation();
 
-                mCursorManager->createCursor(imgSetPointer->getResourceName(), rotation, image, size_x, size_y, hotspot_x, hotspot_y);
+                mCursorManager->createCursor(imgSetPointer->getResourceName(), rotation, image, hotspot_x, hotspot_y);
             }
         }
     }
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 3cdba8a87..a8f6263c2 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -9,8 +9,12 @@
 
 #include <stack>
 
+#include <osg/ref_ptr>
+
 #include "../mwbase/windowmanager.hpp"
 
+#include "../mwworld/ptr.hpp"
+
 #include <components/settings/settings.hpp>
 #include <components/to_utf8/to_utf8.hpp>
 
@@ -57,6 +61,11 @@ namespace Resource
     class ResourceSystem;
 }
 
+namespace SceneUtil
+{
+    class WorkQueue;
+}
+
 namespace SDLUtil
 {
     class SDLCursorManager;
@@ -119,7 +128,7 @@ namespace MWGui
     typedef std::pair<std::string, int> Faction;
     typedef std::vector<Faction> FactionList;
 
-    WindowManager(osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem,
+    WindowManager(osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
                   const std::string& logpath, const std::string& cacheDir, bool consoleOnlyScripts,
                   Translation::Storage& translationDataStorage, ToUTF8::FromType encoding, bool exportFonts, const std::map<std::string,std::string>& fallbackMap, const std::string& versionDescription);
     virtual ~WindowManager();
@@ -237,7 +246,9 @@ namespace MWGui
     virtual std::string getSelectedSpell() { return mSelectedSpell; }
     virtual void setSelectedSpell(const std::string& spellId, int successChancePercent);
     virtual void setSelectedEnchantItem(const MWWorld::Ptr& item);
+    virtual const MWWorld::Ptr& getSelectedEnchantItem() const;
     virtual void setSelectedWeapon(const MWWorld::Ptr& item);
+    virtual const MWWorld::Ptr& getSelectedWeapon() const;
     virtual void unsetSelectedSpell();
     virtual void unsetSelectedWeapon();
 
@@ -374,6 +385,7 @@ namespace MWGui
     virtual std::string correctIconPath(const std::string& path);
     virtual std::string correctBookartPath(const std::string& path, int width, int height);
     virtual std::string correctTexturePath(const std::string& path);
+    virtual bool textureExists(const std::string& path);
 
     void removeCell(MWWorld::CellStore* cell);
     void writeFog(MWWorld::CellStore* cell);
@@ -381,6 +393,7 @@ namespace MWGui
   private:
     const MWWorld::ESMStore* mStore;
     Resource::ResourceSystem* mResourceSystem;
+    osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
 
     osgMyGUI::Platform* mGuiPlatform;
     osgViewer::Viewer* mViewer;
@@ -394,6 +407,8 @@ namespace MWGui
     void onWindowChangeCoord(MyGUI::Window* _sender);
 
     std::string mSelectedSpell;
+    MWWorld::Ptr mSelectedEnchantItem;
+    MWWorld::Ptr mSelectedWeapon;
 
     std::stack<WindowModal*> mCurrentModals;
 
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index a46f1778b..3141e42f6 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -17,6 +17,12 @@
 #include <components/sdlutil/sdlinputwrapper.hpp>
 #include <components/sdlutil/sdlvideowrapper.hpp>
 
+#include "../mwmp/Main.hpp"
+
+#include <components/esm/esmwriter.hpp>
+#include <components/esm/esmreader.hpp>
+#include <components/esm/controlsstate.hpp>
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -658,6 +664,7 @@ namespace MWInput
 
     void InputManager::keyPressed( const SDL_KeyboardEvent &arg )
     {
+        mwmp::Main::pressedKey(arg.keysym.scancode);
         // HACK: to make Morrowind's default keybinding for the console work without printing an extra "^" upon closing
         // This assumes that SDL_TextInput events always come *after* the key event
         // (which is somewhat reasonable, and hopefully true for all SDL platforms)
@@ -902,13 +909,17 @@ namespace MWInput
     }
 
     void InputManager::quickLoad() {
+        /* Disabled by tes3mp
         if (!MyGUI::InputManager::getInstance().isModalAny())
             MWBase::Environment::get().getStateManager()->quickLoad();
+        */
     }
 
     void InputManager::quickSave() {
+        /* Disabled by tes3mp
         if (!MyGUI::InputManager::getInstance().isModalAny())
             MWBase::Environment::get().getStateManager()->quickSave();
+        */
     }
     void InputManager::toggleSpell()
     {
@@ -957,7 +968,7 @@ namespace MWInput
         if (!MWBase::Environment::get().getWindowManager()->getRestEnabled () || MWBase::Environment::get().getWindowManager()->isGuiMode ())
             return;
 
-        if(mPlayer->isInCombat()) {//Check if in combat
+        if(mPlayer->enemiesNearby()) {//Check if in combat
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage2}"); //Nope,
             return;
         }
@@ -1326,10 +1337,12 @@ namespace MWInput
 
         ICS::Control* c = mInputBinder->getChannel (action)->getAttachedControls ().front().control;
 
-        if (mInputBinder->getKeyBinding (c, ICS::Control::INCREASE) != SDL_SCANCODE_UNKNOWN)
-            return mInputBinder->scancodeToString (mInputBinder->getKeyBinding (c, ICS::Control::INCREASE));
-        else if (mInputBinder->getMouseButtonBinding (c, ICS::Control::INCREASE) != ICS_MAX_DEVICE_BUTTONS)
-            return "#{sMouse} " + boost::lexical_cast<std::string>(mInputBinder->getMouseButtonBinding (c, ICS::Control::INCREASE));
+        SDL_Scancode key = mInputBinder->getKeyBinding (c, ICS::Control::INCREASE);
+        unsigned int mouse = mInputBinder->getMouseButtonBinding (c, ICS::Control::INCREASE);
+        if (key != SDL_SCANCODE_UNKNOWN)
+            return MyGUI::TextIterator::toTagsString(mInputBinder->scancodeToString (key));
+        else if (mouse != ICS_MAX_DEVICE_BUTTONS)
+            return "#{sMouse} " + boost::lexical_cast<std::string>(mouse);
         else
             return "#{sNone}";
     }
@@ -1478,6 +1491,10 @@ namespace MWInput
         ret.push_back(A_QuickKey8);
         ret.push_back(A_QuickKey9);
         ret.push_back(A_QuickKey10);
+        ret.push_back(A_CycleSpellLeft);
+        ret.push_back(A_CycleSpellRight);
+        ret.push_back(A_CycleWeaponLeft);
+        ret.push_back(A_CycleWeaponRight);
 
         return ret;
     }
@@ -1572,6 +1589,44 @@ namespace MWInput
             mInputBinder->removeJoystickButtonBinding (mFakeDeviceID, mInputBinder->getJoystickButtonBinding (control, mFakeDeviceID, ICS::Control::INCREASE));
     }
 
+    int InputManager::countSavedGameRecords() const
+    {
+        return 1;
+    }
+
+    void InputManager::write(ESM::ESMWriter& writer, Loading::Listener& /*progress*/)
+    {
+        ESM::ControlsState controls;
+        controls.mViewSwitchDisabled = !getControlSwitch("playerviewswitch");
+        controls.mControlsDisabled = !getControlSwitch("playercontrols");
+        controls.mJumpingDisabled = !getControlSwitch("playerjumping");
+        controls.mLookingDisabled = !getControlSwitch("playerlooking");
+        controls.mVanityModeDisabled = !getControlSwitch("vanitymode");
+        controls.mWeaponDrawingDisabled = !getControlSwitch("playerfighting");
+        controls.mSpellDrawingDisabled = !getControlSwitch("playermagic");
+
+        writer.startRecord (ESM::REC_INPU);
+        controls.save(writer);
+        writer.endRecord (ESM::REC_INPU);
+    }
+
+    void InputManager::readRecord(ESM::ESMReader& reader, uint32_t type)
+    {
+        if (type == ESM::REC_INPU)
+        {
+            ESM::ControlsState controls;
+            controls.load(reader);
+
+            toggleControlSwitch("playerviewswitch", !controls.mViewSwitchDisabled);
+            toggleControlSwitch("playercontrols", !controls.mControlsDisabled);
+            toggleControlSwitch("playerjumping", !controls.mJumpingDisabled);
+            toggleControlSwitch("playerlooking", !controls.mLookingDisabled);
+            toggleControlSwitch("vanitymode", !controls.mVanityModeDisabled);
+            toggleControlSwitch("playerfighting", !controls.mWeaponDrawingDisabled);
+            toggleControlSwitch("playermagic", !controls.mSpellDrawingDisabled);
+        }
+    }
+
     void InputManager::resetToDefaultKeyBindings()
     {
         loadKeyDefaults(true);
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index 644391688..8809f44cd 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -149,6 +149,10 @@ namespace MWInput
         void clearAllKeyBindings (ICS::Control* control);
         void clearAllControllerBindings (ICS::Control* control);
 
+        virtual int countSavedGameRecords() const;
+        virtual void write(ESM::ESMWriter& writer, Loading::Listener& progress);
+        virtual void readRecord(ESM::ESMReader& reader, uint32_t type);
+
     private:
         SDL_Window* mWindow;
         bool mWindowVisible;
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index c98f7d829..52c05fdfa 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -1,7 +1,6 @@
 #include "activespells.hpp"
 
 #include <components/misc/rng.hpp>
-
 #include <components/misc/stringops.hpp>
 
 #include <components/esm/loadmgef.hpp>
diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp
index 3842ee61c..0f1f803b7 100644
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@@ -5,13 +5,13 @@
 #include <vector>
 #include <string>
 
+#include <components/esm/defs.hpp>
+#include <components/esm/activespells.hpp>
+
 #include "../mwworld/timestamp.hpp"
 
 #include "magiceffects.hpp"
 
-#include <components/esm/defs.hpp>
-#include <components/esm/activespells.hpp>
-
 namespace MWMechanics
 {
     /// \brief Lasting spell effects
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 70aab95df..75634356c 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -6,8 +6,15 @@
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
 #include <components/esm/loadnpc.hpp>
+
 #include <components/sceneutil/positionattitudetransform.hpp>
 
+#include <components/settings/settings.hpp>
+
+#include "../mwmp/Main.hpp"
+#include "../mwmp/DedicatedPlayer.hpp"
+#include "../mwmp/LocalPlayer.hpp"
+
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
@@ -20,14 +27,15 @@
 #include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/statemanager.hpp"
 
-#include "../mwmechanics/spellcasting.hpp"
-
+#include "spellcasting.hpp"
 #include "npcstats.hpp"
 #include "creaturestats.hpp"
 #include "movement.hpp"
 #include "character.hpp"
 #include "aicombat.hpp"
+#include "aicombataction.hpp"
 #include "aifollow.hpp"
 #include "aipursue.hpp"
 #include "actor.hpp"
@@ -82,15 +90,14 @@ public:
                              const std::string& sourceName, const std::string& sourceId, int casterActorId,
                         float magnitude, float remainingTime = -1, float totalTime = -1)
     {
-        MWWorld::Ptr player = MWMechanics::getPlayer();
-        if (    ((key.mId == ESM::MagicEffect::CommandHumanoid && mActor.getClass().isNpc())
-                || (key.mId == ESM::MagicEffect::CommandCreature && mActor.getTypeName() == typeid(ESM::Creature).name()))
-            && casterActorId == player.getClass().getCreatureStats(player).getActorId()
+        if (((key.mId == ESM::MagicEffect::CommandHumanoid && mActor.getClass().isNpc())
+            || (key.mId == ESM::MagicEffect::CommandCreature && mActor.getTypeName() == typeid(ESM::Creature).name()))
             && magnitude >= mActor.getClass().getCreatureStats(mActor).getLevel())
                 mCommanded = true;
     }
 };
 
+// Check for command effects having ended and remove package if necessary
 void adjustCommandedActor (const MWWorld::Ptr& actor)
 {
     CheckActorCommanded check(actor);
@@ -110,13 +117,7 @@ void adjustCommandedActor (const MWWorld::Ptr& actor)
         }
     }
 
-    if (check.mCommanded && !hasCommandPackage)
-    {
-        // FIXME: don't use refid string
-        MWMechanics::AiFollow package("player", true);
-        stats.getAiSequence().stack(package, actor);
-    }
-    else if (!check.mCommanded && hasCommandPackage)
+    if (!check.mCommanded && hasCommandPackage)
     {
         stats.getAiSequence().erase(it);
     }
@@ -145,6 +146,9 @@ void getRestorationPerHourOfSleep (const MWWorld::Ptr& ptr, float& health, float
 namespace MWMechanics
 {
 
+    const float aiProcessingDistance = 7168;
+    const float sqrAiProcessingDistance = aiProcessingDistance*aiProcessingDistance;
+
     class SoulTrap : public MWMechanics::EffectSourceVisitor
     {
         MWWorld::Ptr mCreature;
@@ -282,99 +286,142 @@ namespace MWMechanics
 
     void Actors::engageCombat (const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, bool againstPlayer)
     {
-        CreatureStats& creatureStats = actor1.getClass().getCreatureStats(actor1);
+        CreatureStats& creatureStats1 = actor1.getClass().getCreatureStats(actor1);
+        if (creatureStats1.getAiSequence().isInCombat(actor2))
+            return;
 
-        if (actor2.getClass().getCreatureStats(actor2).isDead()
-                || actor1.getClass().getCreatureStats(actor1).isDead())
+        const CreatureStats& creatureStats2 = actor2.getClass().getCreatureStats(actor2);
+        if (creatureStats1.isDead() || creatureStats2.isDead())
             return;
 
         const ESM::Position& actor1Pos = actor1.getRefData().getPosition();
         const ESM::Position& actor2Pos = actor2.getRefData().getPosition();
         float sqrDist = (actor1Pos.asVec3() - actor2Pos.asVec3()).length2();
-        if (sqrDist > 7168*7168)
-            return;
-
-        // pure water creatures won't try to fight with the target on the ground
-        // except that creature is already hostile
-        if ((againstPlayer || !creatureStats.getAiSequence().isInCombat())
-            && !MWMechanics::isEnvironmentCompatible(actor1, actor2)) // creature can't swim to target
-        {
+        if (sqrDist > sqrAiProcessingDistance)
             return;
-        }
 
-        // no combat for totally static creatures (they have no movement or attack animations anyway)
+        // No combat for totally static creatures
         if (!actor1.getClass().isMobile(actor1))
             return;
 
-        bool aggressive;
+        // If this is set to true, actor1 will start combat with actor2 if the awareness check at the end of the method returns true
+        bool aggressive = false;
 
-        if (againstPlayer)
-        {
-            // followers with high fight should not engage in combat with the player (e.g. bm_bear_black_summon)
-            const std::list<MWWorld::Ptr>& followers = getActorsSidingWith(actor2);
-            if (std::find(followers.begin(), followers.end(), actor1) != followers.end())
-                return;
+        // Get actors allied with actor1. Includes those following or escorting actor1, actors following or escorting those actors, (recursive)
+        // and any actor currently being followed or escorted by actor1
+        std::set<MWWorld::Ptr> allies1;
+        getActorsSidingWith(actor1, allies1);
 
-            aggressive = MWBase::Environment::get().getMechanicsManager()->isAggressive(actor1, actor2);
-        }
-        else
+        // If an ally of actor1 has been attacked by actor2 or has attacked actor2, start combat between actor1 and actor2
+        for (std::set<MWWorld::Ptr>::const_iterator it = allies1.begin(); it != allies1.end(); ++it)
         {
-            aggressive = false;
+            if (creatureStats1.getAiSequence().isInCombat(*it))
+                continue;
 
-            // Make guards fight aggressive creatures
-            if (!actor1.getClass().isNpc() && actor2.getClass().isClass(actor2, "Guard"))
+            if (creatureStats2.matchesActorId(it->getClass().getCreatureStats(*it).getHitAttemptActorId()))
             {
-                if (creatureStats.getAiSequence().isInCombat() && MWBase::Environment::get().getMechanicsManager()->isAggressive(actor1, actor2))
-                    aggressive = true;
+                MWBase::Environment::get().getMechanicsManager()->startCombat(actor1, actor2);
+                // Also set the same hit attempt actor. Otherwise, if fighting the player, they may stop combat
+                // if the player gets out of reach, while the ally would continue combat with the player
+                creatureStats1.setHitAttemptActorId(it->getClass().getCreatureStats(*it).getHitAttemptActorId());
+                return;             
             }
-        }
 
-        // start combat if target actor is in combat with one of our followers
-        const std::list<MWWorld::Ptr>& followers = getActorsSidingWith(actor1);
-        const CreatureStats& creatureStats2 = actor2.getClass().getCreatureStats(actor2);
-        for (std::list<MWWorld::Ptr>::const_iterator it = followers.begin(); it != followers.end(); ++it)
-        {
-            // need to check both ways since player doesn't use AI packages
-            if ((creatureStats2.getAiSequence().isInCombat(*it)
-                    || it->getClass().getCreatureStats(*it).getAiSequence().isInCombat(actor2))
-                    && !creatureStats.getAiSequence().isInCombat(*it))
+            // If there's been no attack attempt yet but an ally of actor1 is in combat with actor2, become aggressive to actor2
+            if (it->getClass().getCreatureStats(*it).getAiSequence().isInCombat(actor2))
                 aggressive = true;
         }
 
-        // start combat if target actor is in combat with someone we are following
-        for (std::list<MWMechanics::AiPackage*>::const_iterator it = creatureStats.getAiSequence().begin(); it != creatureStats.getAiSequence().end(); ++it)
-        {
-            if (!(*it)->sideWithTarget())
-                continue;
+        std::set<MWWorld::Ptr> playerFollowersAndEscorters;
+        getActorsSidingWith(MWMechanics::getPlayer(), playerFollowersAndEscorters);
 
-            MWWorld::Ptr followTarget = (*it)->getTarget();
+        bool isPlayerFollowerOrEscorter = std::find(playerFollowersAndEscorters.begin(), playerFollowersAndEscorters.end(), actor1) != playerFollowersAndEscorters.end();
 
-            if (followTarget.isEmpty())
-                continue;
+        // If actor2 and at least one actor2 are in combat with actor1, actor1 and its allies start combat with them
+        // Doesn't apply for player followers/escorters        
+        if (!aggressive && !isPlayerFollowerOrEscorter)
+        {
+            // Check that actor2 is in combat with actor1
+            if (actor2.getClass().getCreatureStats(actor2).getAiSequence().isInCombat(actor1))
+            {
+                std::set<MWWorld::Ptr> allies2;
+                getActorsSidingWith(actor2, allies2);
+                // Check that an ally of actor2 is also in combat with actor1
+                for (std::set<MWWorld::Ptr>::const_iterator it = allies2.begin(); it != allies2.end(); ++it)
+                {
+                    if ((it)->getClass().getCreatureStats(*it).getAiSequence().isInCombat(actor1))
+                    {
+                        MWBase::Environment::get().getMechanicsManager()->startCombat(actor1, actor2);
+                        // Also have actor1's allies start combat
+                        for (std::set<MWWorld::Ptr>::const_iterator it2 = allies1.begin(); it2 != allies1.end(); ++it2)
+                            MWBase::Environment::get().getMechanicsManager()->startCombat(*it2, actor2);
+                        return;
+                    }
+                }
+            }
+        }
 
-            if (creatureStats.getAiSequence().isInCombat(followTarget))
-                continue;
+        // If set in the settings file, player followers and escorters will become aggressive toward enemies in combat with them or the player
+        if (!aggressive && isPlayerFollowerOrEscorter && Settings::Manager::getBool("followers attack on sight", "Game"))
+        {
+            if (actor2.getClass().getCreatureStats(actor2).getAiSequence().isInCombat(actor1))
+                aggressive = true;
+            else
+            {
+                for (std::set<MWWorld::Ptr>::const_iterator it = allies1.begin(); it != allies1.end(); ++it)
+                {
+                    if (actor2.getClass().getCreatureStats(actor2).getAiSequence().isInCombat(*it))
+                    {
+                        aggressive = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        // Stop here if target is unreachable
+        if (!MWMechanics::canFight(actor1, actor2))
+            return;
 
-            // need to check both ways since player doesn't use AI packages
-            if (creatureStats2.getAiSequence().isInCombat(followTarget)
-                    || followTarget.getClass().getCreatureStats(followTarget).getAiSequence().isInCombat(actor2))
+        // Do aggression check if actor2 is the player or a player follower or escorter
+        if (!aggressive)
+        {
+            if (againstPlayer || std::find(playerFollowersAndEscorters.begin(), playerFollowersAndEscorters.end(), actor2) != playerFollowersAndEscorters.end())
+            {
+                // Player followers and escorters with high fight should not initiate combat with the player or with
+                // other player followers or escorters
+                if (std::find(playerFollowersAndEscorters.begin(), playerFollowersAndEscorters.end(), actor1) == playerFollowersAndEscorters.end())
+                    aggressive = MWBase::Environment::get().getMechanicsManager()->isAggressive(actor1, actor2);
+            }
+        }
+        
+        // Make guards go aggressive with creatures that are in combat, unless the creature is a follower or escorter
+        if (actor1.getClass().isClass(actor1, "Guard") && !actor2.getClass().isNpc())
+        {
+            bool followerOrEscorter = false;
+            for (std::list<MWMechanics::AiPackage*>::const_iterator it = creatureStats2.getAiSequence().begin(); it != creatureStats2.getAiSequence().end(); ++it)
+            {
+                // The follow package must be first or have nothing but combat before it
+                if ((*it)->sideWithTarget())
+                {
+                    followerOrEscorter = true;
+                    break;
+                }
+                else if ((*it)->getTypeId() != MWMechanics::AiPackage::TypeIdCombat)
+                    break;
+            }
+            if (!followerOrEscorter && creatureStats2.getAiSequence().isInCombat())
                 aggressive = true;
         }
 
-        if(aggressive)
+        // If any of the above conditions turned actor1 aggressive towards actor2, do an awareness check. If it passes, start combat with actor2.
+        if (aggressive)
         {
             bool LOS = MWBase::Environment::get().getWorld()->getLOS(actor1, actor2);
-
-            if (againstPlayer) LOS &= MWBase::Environment::get().getMechanicsManager()->awarenessCheck(actor2, actor1);
+            LOS &= MWBase::Environment::get().getMechanicsManager()->awarenessCheck(actor2, actor1);
 
             if (LOS)
-            {
                 MWBase::Environment::get().getMechanicsManager()->startCombat(actor1, actor2);
-                if (!againstPlayer) // start combat between each other
-                {
-                    MWBase::Environment::get().getMechanicsManager()->startCombat(actor2, actor1);
-                }
-            }
         }
     }
 
@@ -382,7 +429,6 @@ namespace MWMechanics
     {
         updateDrowning(ptr, duration);
         calculateNpcStatModifiers(ptr, duration);
-        updateEquippedLight(ptr, duration);
     }
 
     void Actors::adjustMagicEffects (const MWWorld::Ptr& creature)
@@ -421,7 +467,9 @@ namespace MWMechanics
 
         DynamicStat<float> magicka = creatureStats.getMagicka();
         float diff = (static_cast<int>(magickaFactor*intelligence)) - magicka.getBase();
-        magicka.modify(diff);
+        float currentToBaseRatio = (magicka.getCurrent() / magicka.getBase());
+        magicka.setModified(magicka.getModified() + diff, 0);
+        magicka.setCurrent(magicka.getBase() * currentToBaseRatio);
         creatureStats.setMagicka(magicka);
     }
 
@@ -487,6 +535,31 @@ namespace MWMechanics
         stats.setFatigue (fatigue);
     }
 
+    class ExpiryVisitor : public EffectSourceVisitor
+    {
+        private:
+            MWWorld::Ptr mActor;
+            float mDuration;
+
+        public:
+            ExpiryVisitor(const MWWorld::Ptr& actor, float duration)
+                : mActor(actor), mDuration(duration)
+            {
+            }
+
+            virtual void visit (MWMechanics::EffectKey key,
+                                const std::string& /*sourceName*/, const std::string& /*sourceId*/, int /*casterActorId*/,
+                                float magnitude, float remainingTime = -1, float /*totalTime*/ = -1)
+            {
+                if (magnitude > 0 && remainingTime > 0 && remainingTime < mDuration)
+                {
+                    CreatureStats& creatureStats = mActor.getClass().getCreatureStats(mActor);
+                    if (effectTick(creatureStats, mActor, key, magnitude * remainingTime))
+                        creatureStats.getMagicEffects().add(key, -magnitude);
+                }
+            }
+    };
+
     void Actors::calculateCreatureStatModifiers (const MWWorld::Ptr& ptr, float duration)
     {
         CreatureStats &creatureStats = ptr.getClass().getCreatureStats(ptr);
@@ -496,6 +569,13 @@ namespace MWMechanics
 
         if (duration > 0)
         {
+            // Apply correct magnitude for tickable effects that have just expired,
+            // in case duration > remaining time of effect.
+            // One case where this will happen is when the player uses the rest/wait command
+            // while there is a tickable effect active that should expire before the end of the rest/wait.
+            ExpiryVisitor visitor(ptr, duration);
+            creatureStats.getActiveSpells().visitEffectSources(visitor);
+
             for (MagicEffects::Collection::const_iterator it = effects.begin(); it != effects.end(); ++it)
             {
                 // tickable effects (i.e. effects having a lasting impact after expiry)
@@ -507,6 +587,7 @@ namespace MWMechanics
                     CastSpell cast(ptr, ptr);
                     if (cast.applyInstantEffect(ptr, ptr, it->first, it->second.getMagnitude()))
                     {
+                        creatureStats.getSpells().purgeEffect(it->first.mId);
                         creatureStats.getActiveSpells().purgeEffect(it->first.mId);
                         if (ptr.getClass().hasInventoryStore(ptr))
                             ptr.getClass().getInventoryStore(ptr).purgeEffect(it->first.mId);
@@ -526,6 +607,9 @@ namespace MWMechanics
             creatureStats.setAttribute(i, stat);
         }
 
+        if (creatureStats.needToRecalcDynamicStats())
+            calculateDynamicStats(ptr);
+
         {
             Spells & spells = creatureStats.getSpells();
             for (Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
@@ -549,8 +633,9 @@ namespace MWMechanics
             DynamicStat<float> stat = creatureStats.getDynamic(i);
             stat.setModifier(effects.get(ESM::MagicEffect::FortifyHealth+i).getMagnitude() -
                              effects.get(ESM::MagicEffect::DrainHealth+i).getMagnitude(),
+                             // Magicka can be decreased below zero due to a fortify effect wearing off
                              // Fatigue can be decreased below zero meaning the actor will be knocked out
-                             i == 2);
+                             i == 1 || i == 2);
 
             creatureStats.setDynamic(i, stat);
         }
@@ -680,11 +765,19 @@ namespace MWMechanics
             }
         }
 
-        UpdateSummonedCreatures updateSummonedCreatures(ptr);
-        creatureStats.getActiveSpells().visitEffectSources(updateSummonedCreatures);
-        if (ptr.getClass().hasInventoryStore(ptr))
-            ptr.getClass().getInventoryStore(ptr).visitEffectSources(updateSummonedCreatures);
-        updateSummonedCreatures.finish();
+        bool hasSummonEffect = false;
+        for (MagicEffects::Collection::const_iterator it = effects.begin(); it != effects.end(); ++it)
+            if (isSummoningEffect(it->first.mId))
+                hasSummonEffect = true;
+
+        if (!creatureStats.getSummonedCreatureMap().empty() || !creatureStats.getSummonedCreatureGraveyard().empty() || hasSummonEffect)
+        {
+            UpdateSummonedCreatures updateSummonedCreatures(ptr);
+            creatureStats.getActiveSpells().visitEffectSources(updateSummonedCreatures);
+            if (ptr.getClass().hasInventoryStore(ptr))
+                ptr.getClass().getInventoryStore(ptr).visitEffectSources(updateSummonedCreatures);
+            updateSummonedCreatures.process();
+        }
     }
 
     void Actors::calculateNpcStatModifiers (const MWWorld::Ptr& ptr, float duration)
@@ -759,7 +852,11 @@ namespace MWMechanics
         /**
          * Automatically equip NPCs torches at night and unequip them at day
          */
-        if (!isPlayer)
+
+         // tes3mp needs player-controlled NPCs to not automatically unequip
+         // their light-emitting items, so a 2nd condition has been added
+         // that should return false only for them
+        if (!isPlayer && ptr.getBase()->canChangeCell)
         {
             MWWorld::ContainerStoreIterator torch = inventoryStore.end();
             for (MWWorld::ContainerStoreIterator it = inventoryStore.begin(); it != inventoryStore.end(); ++it)
@@ -871,7 +968,10 @@ namespace MWMechanics
                 {
                     static const int iCrimeThresholdMultiplier = esmStore.get<ESM::GameSetting>().find("iCrimeThresholdMultiplier")->getInt();
                     if (player.getClass().getNpcStats(player).getBounty() >= cutoff * iCrimeThresholdMultiplier)
+                    {
                         MWBase::Environment::get().getMechanicsManager()->startCombat(ptr, player);
+                        creatureStats.setHitAttemptActorId(player.getClass().getCreatureStats(player).getActorId()); // Stops the guard from quitting combat if player is unreachable
+                    }
                     else
                         creatureStats.getAiSequence().stack(AiPursue(player), ptr);
                     creatureStats.setAlarmed(true);
@@ -965,38 +1065,67 @@ namespace MWMechanics
         {
             static float timerUpdateAITargets = 0;
             static float timerUpdateHeadTrack = 0;
+            static float timerUpdateEquippedLight = 0;
+            const float updateEquippedLightInterval = 1.0f;
 
             // target lists get updated once every 1.0 sec
             if (timerUpdateAITargets >= 1.0f) timerUpdateAITargets = 0;
             if (timerUpdateHeadTrack >= 0.3f) timerUpdateHeadTrack = 0;
+            if (timerUpdateEquippedLight >= updateEquippedLightInterval) timerUpdateEquippedLight = 0;
 
             MWWorld::Ptr player = getPlayer();
 
             int hostilesCount = 0; // need to know this to play Battle music
 
-            // AI processing is only done within distance of 7168 units to the player. Note the "AI distance" slider doesn't affect this
-            // (it only does some throttling for targets beyond the "AI distance", so doesn't give any guarantees as to whether AI will be enabled or not)
-            // This distance could be made configurable later, but the setting must be marked with a big warning:
-            // using higher values will make a quest in Bloodmoon harder or impossible to complete (bug #1876)
-            const float sqrProcessingDistance = 7168*7168;
-
             /// \todo move update logic to Actor class where appropriate
 
              // AI and magic effects update
             for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
             {
+                // AI processing is only done within distance of 7168 units to the player. Note the "AI distance" slider doesn't affect this
+                // (it only does some throttling for targets beyond the "AI distance", so doesn't give any guarantees as to whether AI will be enabled or not)
+                // This distance could be made configurable later, but the setting must be marked with a big warning:
+                // using higher values will make a quest in Bloodmoon harder or impossible to complete (bug #1876)
                 bool inProcessingRange = (player.getRefData().getPosition().asVec3() - iter->first.getRefData().getPosition().asVec3()).length2()
-                        <= sqrProcessingDistance;
+                        <= sqrAiProcessingDistance;
 
                 iter->second->getCharacterController()->setActive(inProcessingRange);
 
                 if (iter->first == player)
-                    iter->second->getCharacterController()->setAttackingOrSpell(MWBase::Environment::get().getWorld()->getPlayer().getAttackingOrSpell());
+                {
+                    bool state = MWBase::Environment::get().getWorld()->getPlayer().getAttackingOrSpell();
+                    DrawState_ dstate = player.getClass().getNpcStats(player).getDrawState();
+                    iter->second->getCharacterController()->setAttackingOrSpell(state);
+                    if (dstate == DrawState_Weapon)
+                        mwmp::Main::get().getLocalPlayer()->prepareAttack(mwmp::Attack::MELEE, state);
+                }
+
+                mwmp::DedicatedPlayer *dedicatedPlayer = mwmp::Players::getPlayer(iter->first);
+                if (dedicatedPlayer != NULL)
+                    dedicatedPlayer->updateActor(iter->second);
+
+
+                // If dead or no longer in combat, no longer store any actors who attempted to hit us. Also remove for the player.
+                if (iter->first != player && (iter->first.getClass().getCreatureStats(iter->first).isDead()
+                    || !iter->first.getClass().getCreatureStats(iter->first).getAiSequence().isInCombat()
+                    || !inProcessingRange))
+                {
+                    iter->first.getClass().getCreatureStats(iter->first).setHitAttemptActorId(-1);
+                    if (player.getClass().getCreatureStats(player).getHitAttemptActorId() == iter->first.getClass().getCreatureStats(iter->first).getActorId())
+                        player.getClass().getCreatureStats(player).setHitAttemptActorId(-1);
+                }
+
+                const MWWorld::Ptr playerHitAttemptActor = MWBase::Environment::get().getWorld()->searchPtrViaActorId(player.getClass().getCreatureStats(player).getHitAttemptActorId());
+
+                if (!playerHitAttemptActor.isInCell())
+                    player.getClass().getCreatureStats(player).setHitAttemptActorId(-1);
 
                 if (!iter->first.getClass().getCreatureStats(iter->first).isDead())
                 {
-                    updateActor(iter->first, duration);
-                    if (MWBase::Environment::get().getWorld()->hasCellChanged())
+                    bool cellChanged = MWBase::Environment::get().getWorld()->hasCellChanged();
+                    MWWorld::Ptr actor = iter->first; // make a copy of the map key to avoid it being invalidated when the player teleports
+                    updateActor(actor, duration);
+                    if (!cellChanged && MWBase::Environment::get().getWorld()->hasCellChanged())
                     {
                         return; // for now abort update of the old cell when cell changes by teleportation magic effect
                                 // a better solution might be to apply cell changes at the end of the frame
@@ -1043,12 +1172,18 @@ namespace MWMechanics
                     }
 
                     if(iter->first.getTypeName() == typeid(ESM::NPC).name())
+                    {
                         updateNpc(iter->first, duration);
+
+                        if (timerUpdateEquippedLight == 0)
+                            updateEquippedLight(iter->first, updateEquippedLightInterval);
+                    }
                 }
             }
 
             timerUpdateAITargets += duration;
             timerUpdateHeadTrack += duration;
+            timerUpdateEquippedLight += duration;
 
             // Looping magic VFX update
             // Note: we need to do this before any of the animations are updated.
@@ -1064,7 +1199,7 @@ namespace MWMechanics
             {
                 if (iter->first != player &&
                         (player.getRefData().getPosition().asVec3() - iter->first.getRefData().getPosition().asVec3()).length2()
-                        > sqrProcessingDistance)
+                        > sqrAiProcessingDistance)
                     continue;
 
                 if (iter->first.getClass().getCreatureStats(iter->first).isParalyzed())
@@ -1143,14 +1278,19 @@ namespace MWMechanics
 
                     for (PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
                     {
+                        MWWorld::Ptr observer = iter->first;
+
                         if (iter->first == player)  // not the player
                             continue;
 
+                        if (observer.getClass().getCreatureStats(observer).isDead())
+                            continue;
+
                         // is the player in range and can they be detected
-                        if ((iter->first.getRefData().getPosition().asVec3() - player.getRefData().getPosition().asVec3()).length2() <= radius*radius
-                            && MWBase::Environment::get().getWorld()->getLOS(player, iter->first))
+                        if ((observer.getRefData().getPosition().asVec3() - player.getRefData().getPosition().asVec3()).length2() <= radius*radius
+                            && MWBase::Environment::get().getWorld()->getLOS(player, observer))
                         {
-                            if (MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, iter->first))
+                            if (MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, observer))
                             {
                                 detected = true;
                                 avoidedNotice = false;
@@ -1202,25 +1342,14 @@ namespace MWMechanics
                     continue;
             }
 
-            if (iter->second->getCharacterController()->kill())
+            CharacterController::KillResult killResult = iter->second->getCharacterController()->kill();
+            if (killResult == CharacterController::Result_DeathAnimStarted)
             {
-                // TODO: It's not known whether the soundgen tags scream, roar, and moan are reliable 
-                // for NPCs since some of the npc death animation files are missing them.
-
                 // Play dying words
+                // Note: It's not known whether the soundgen tags scream, roar, and moan are reliable
+                // for NPCs since some of the npc death animation files are missing them.
                 MWBase::Environment::get().getDialogueManager()->say(iter->first, "hit");
 
-                iter->first.getClass().getCreatureStats(iter->first).notifyDied();
-
-                ++mDeathCount[Misc::StringUtils::lowerCase(iter->first.getCellRef().getRefId())];
-
-                // Make sure spell effects are removed
-                for (PtrActorMap::iterator iter2(mActors.begin());iter2 != mActors.end();++iter2)
-                {
-                    MWMechanics::ActiveSpells& spells = iter2->first.getClass().getCreatureStats(iter2->first).getActiveSpells();
-                    spells.purge(stats.getActorId());
-                }
-
                 // Apply soultrap
                 if (iter->first.getTypeName() == typeid(ESM::Creature).name())
                 {
@@ -1234,18 +1363,95 @@ namespace MWMechanics
                 stats.getActiveSpells().clear();
                 calculateCreatureStatModifiers(iter->first, 0);
 
-                MWBase::Environment::get().getWorld()->enableActorCollision(iter->first, false);
-
                 if (cls.isEssential(iter->first))
                     MWBase::Environment::get().getWindowManager()->messageBox("#{sKilledEssential}");
             }
+            else if (killResult == CharacterController::Result_DeathAnimJustFinished)
+            {
+                iter->first.getClass().getCreatureStats(iter->first).notifyDied();
+
+                ++mDeathCount[Misc::StringUtils::lowerCase(iter->first.getCellRef().getRefId())];
+
+                // Make sure spell effects are removed
+                purgeSpellEffects(stats.getActorId());
+
+                if( iter->first == getPlayer())
+                {
+                    //player's death animation is over
+                    MWBase::Environment::get().getStateManager()->askLoadRecent();
+                }
+                else
+                {
+                    // NPC death animation is over, disable actor collision
+                    MWBase::Environment::get().getWorld()->enableActorCollision(iter->first, false);
+                }
+
+                // Play Death Music if it was the player dying
+                if(iter->first == getPlayer())
+                    MWBase::Environment::get().getSoundManager()->streamMusic("Special/MW_Death.mp3");
+            }
         }
     }
 
-    void Actors::restoreDynamicStats(bool sleep)
+    void Actors::cleanupSummonedCreature (MWMechanics::CreatureStats& casterStats, int creatureActorId)
     {
-        for(PtrActorMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
+        MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(creatureActorId);
+        if (!ptr.isEmpty())
+        {
+            MWBase::Environment::get().getWorld()->deleteObject(ptr);
+
+            const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
+                    .search("VFX_Summon_End");
+            if (fx)
+                MWBase::Environment::get().getWorld()->spawnEffect("meshes\\" + fx->mModel,
+                    "", ptr.getRefData().getPosition().asVec3());
+        }
+        else if (creatureActorId != -1)
+        {
+            // We didn't find the creature. It's probably in an inactive cell.
+            // Add to graveyard so we can delete it when the cell becomes active.
+            std::vector<int>& graveyard = casterStats.getSummonedCreatureGraveyard();
+            graveyard.push_back(creatureActorId);
+        }
+
+        purgeSpellEffects(creatureActorId);
+    }
+
+    void Actors::purgeSpellEffects(int casterActorId)
+    {
+        for (PtrActorMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
+        {
+            MWMechanics::ActiveSpells& spells = iter->first.getClass().getCreatureStats(iter->first).getActiveSpells();
+            spells.purge(casterActorId);
+        }
+    }
+
+    void Actors::rest(bool sleep)
+    {
+        float duration = 3600.f / MWBase::Environment::get().getWorld()->getTimeScaleFactor();
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+
+        for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+        {
+            if (iter->first.getClass().getCreatureStats(iter->first).isDead())
+                continue;
+
             restoreDynamicStats(iter->first, sleep);
+
+            if ((!iter->first.getRefData().getBaseNode()) ||
+                    (player.getRefData().getPosition().asVec3() - iter->first.getRefData().getPosition().asVec3()).length2() > sqrAiProcessingDistance)
+                continue;
+
+            adjustMagicEffects (iter->first);
+            if (iter->first.getClass().getCreatureStats(iter->first).needToRecalcDynamicStats())
+                calculateDynamicStats (iter->first);
+
+            calculateCreatureStatModifiers (iter->first, duration);
+            if (iter->first.getClass().isNpc())
+                calculateNpcStatModifiers(iter->first, duration);
+        }
+
+        fastForwardAi();
     }
 
     int Actors::getHoursToRest(const MWWorld::Ptr &ptr) const
@@ -1281,12 +1487,12 @@ namespace MWMechanics
             iter->second->getCharacterController()->forceStateUpdate();
     }
 
-    bool Actors::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number)
+    bool Actors::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number, bool persist)
     {
         PtrActorMap::iterator iter = mActors.find(ptr);
         if(iter != mActors.end())
         {
-            return iter->second->getCharacterController()->playGroup(groupName, mode, number);
+            return iter->second->getCharacterController()->playGroup(groupName, mode, number, persist);
         }
         else
         {
@@ -1309,6 +1515,12 @@ namespace MWMechanics
         return false;
     }
 
+    void Actors::persistAnimationStates()
+    {
+        for (PtrActorMap::iterator iter = mActors.begin(); iter != mActors.end(); ++iter)
+            iter->second->getCharacterController()->persistAnimationState();
+    }
+
     void Actors::getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out)
     {
         for (PtrActorMap::iterator iter = mActors.begin(); iter != mActors.end(); ++iter)
@@ -1324,18 +1536,36 @@ namespace MWMechanics
         for(PtrActorMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
         {
             const MWWorld::Class &cls = iter->first.getClass();
-            CreatureStats &stats = cls.getCreatureStats(iter->first);
+            const CreatureStats &stats = cls.getCreatureStats(iter->first);
             if (stats.isDead())
                 continue;
 
-            // An actor counts as following if AiFollow or AiEscort is the current AiPackage, or there are only Combat packages before the AiFollow/AiEscort package
+            // An actor counts as siding with this actor if Follow or Escort is the current AI package, or there are only Combat packages before the Follow/Escort package
             for (std::list<MWMechanics::AiPackage*>::const_iterator it = stats.getAiSequence().begin(); it != stats.getAiSequence().end(); ++it)
             {
                 if ((*it)->sideWithTarget() && (*it)->getTarget() == actor)
+                {
                     list.push_back(iter->first);
+                    break;
+                }
                 else if ((*it)->getTypeId() != MWMechanics::AiPackage::TypeIdCombat)
                     break;
             }
+            // Actors that are targeted by this actor's Follow or Escort packages also side with them
+            if (actor != getPlayer())
+            {
+                const CreatureStats &stats2 = actor.getClass().getCreatureStats(actor);
+                for (std::list<MWMechanics::AiPackage*>::const_iterator it2 = stats2.getAiSequence().begin(); it2 != stats2.getAiSequence().end(); ++it2)
+                {
+                    if ((*it2)->sideWithTarget() && !(*it2)->getTarget().isEmpty())
+                    {
+                        list.push_back((*it2)->getTarget());
+                        break;
+                    }
+                    else if ((*it2)->getTypeId() != MWMechanics::AiPackage::TypeIdCombat)
+                        break;
+                }
+            }
         }
         return list;
     }
@@ -1362,6 +1592,20 @@ namespace MWMechanics
         return list;
     }
 
+    void Actors::getActorsFollowing(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out) {
+        std::list<MWWorld::Ptr> followers = getActorsFollowing(actor);
+        for(std::list<MWWorld::Ptr>::iterator it = followers.begin();it != followers.end();++it)
+            if (out.insert(*it).second)
+                getActorsFollowing(*it, out);
+    }
+
+    void Actors::getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out) {
+        std::list<MWWorld::Ptr> followers = getActorsSidingWith(actor);
+        for(std::list<MWWorld::Ptr>::iterator it = followers.begin();it != followers.end();++it)
+            if (out.insert(*it).second)
+                getActorsSidingWith(*it, out);
+    }
+
     std::list<int> Actors::getActorsFollowingIndices(const MWWorld::Ptr &actor)
     {
         std::list<int> list;
@@ -1377,7 +1621,7 @@ namespace MWMechanics
             {
                 if ((*it)->getTypeId() == MWMechanics::AiPackage::TypeIdFollow)
                 {
-                    MWWorld::Ptr followTarget = static_cast<MWMechanics::AiFollow*>(*it)->getTarget();
+                    MWWorld::Ptr followTarget = (*it)->getTarget();
                     if (followTarget.isEmpty())
                         continue;
                     if (followTarget == actor)
@@ -1395,19 +1639,40 @@ namespace MWMechanics
         std::list<MWWorld::Ptr> list;
         std::vector<MWWorld::Ptr> neighbors;
         osg::Vec3f position (actor.getRefData().getPosition().asVec3());
-        getObjectsInRange(position,
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fAlarmRadius")->getFloat(),
-            neighbors); //only care about those within the alarm disance
-        for(std::vector<MWWorld::Ptr>::iterator iter(neighbors.begin());iter != neighbors.end();++iter)
+        getObjectsInRange(position, aiProcessingDistance, neighbors);
+        for(std::vector<MWWorld::Ptr>::const_iterator iter(neighbors.begin());iter != neighbors.end();++iter)
         {
             const MWWorld::Class &cls = iter->getClass();
-            CreatureStats &stats = cls.getCreatureStats(*iter);
-            if (!stats.isDead() && stats.getAiSequence().isInCombat(actor))
+            const CreatureStats &stats = cls.getCreatureStats(*iter);
+            if (stats.isDead() || *iter == actor)
+                continue;
+            if (stats.getAiSequence().isInCombat(actor))
                 list.push_front(*iter);
         }
         return list;
     }
 
+    std::list<MWWorld::Ptr> Actors::getEnemiesNearby(const MWWorld::Ptr& actor)
+    {
+        std::list<MWWorld::Ptr> list;
+        std::vector<MWWorld::Ptr> neighbors;
+        osg::Vec3f position (actor.getRefData().getPosition().asVec3());
+        getObjectsInRange(position, aiProcessingDistance, neighbors);
+
+        std::list<MWWorld::Ptr> followers = getActorsFollowing(actor);
+        for(std::vector<MWWorld::Ptr>::const_iterator iter(neighbors.begin());iter != neighbors.end();++iter)
+        {
+            const CreatureStats &stats = iter->getClass().getCreatureStats(*iter);
+            if (stats.isDead() || *iter == actor || iter->getClass().isPureWaterCreature(*iter))
+                continue;
+            const bool isFollower = std::find(followers.begin(), followers.end(), *iter) != followers.end();
+            if (stats.getAiSequence().isInCombat(actor) || (MWBase::Environment::get().getMechanicsManager()->isAggressive(*iter, actor) && !isFollower))
+                list.push_back(*iter);
+        }
+        return list;
+    }
+
+
     void Actors::write (ESM::ESMWriter& writer, Loading::Listener& listener) const
     {
         writer.startRecord(ESM::REC_DCOU);
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 0bdf611d2..20aef4c17 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -7,9 +7,10 @@
 #include <map>
 #include <list>
 
-#include "movement.hpp"
 #include "../mwbase/world.hpp"
 
+#include "movement.hpp"
+
 namespace MWWorld
 {
     class Ptr;
@@ -19,6 +20,7 @@ namespace MWWorld
 namespace MWMechanics
 {
     class Actor;
+    class CreatureStats;
 
     class Actors
     {
@@ -43,6 +45,8 @@ namespace MWMechanics
 
             void killDeadActors ();
 
+            void purgeSpellEffects (int casterActorId);
+
         public:
 
             Actors();
@@ -89,8 +93,8 @@ namespace MWMechanics
             void updateHeadTracking(const MWWorld::Ptr& actor, const MWWorld::Ptr& targetActor,
                                             MWWorld::Ptr& headTrackTarget, float& sqrHeadTrackDistance);
 
-            void restoreDynamicStats(bool sleep);
-            ///< If the player is sleeping, this should be called every hour.
+            void rest(bool sleep);
+            ///< Update actors while the player is waiting or sleeping. This should be called every hour.
 
             void restoreDynamicStats(const MWWorld::Ptr& actor, bool sleep);
 
@@ -105,17 +109,25 @@ namespace MWMechanics
 
         void forceStateUpdate(const MWWorld::Ptr &ptr);
 
-        bool playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number);
+        bool playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number, bool persist=false);
         void skipAnimation(const MWWorld::Ptr& ptr);
         bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName);
+        void persistAnimationStates();
 
             void getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out);
 
+            void cleanupSummonedCreature (CreatureStats& casterStats, int creatureActorId);
+
             ///Returns the list of actors which are siding with the given actor in fights
             /**ie AiFollow or AiEscort is active and the target is the actor **/
             std::list<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor);
             std::list<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor);
 
+            /// Recursive version of getActorsFollowing
+            void getActorsFollowing(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out);
+            /// Recursive version of getActorsSidingWith
+            void getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out);
+
             /// Get the list of AiFollow::mFollowIndex for all actors following this target
             std::list<int> getActorsFollowingIndices(const MWWorld::Ptr& actor);
 
@@ -123,6 +135,9 @@ namespace MWMechanics
             /**ie AiCombat is active and the target is the actor **/
             std::list<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor);
 
+            /// Unlike getActorsFighting, also returns actors that *would* fight the given actor if they saw him.
+            std::list<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor);
+
             void write (ESM::ESMWriter& writer, Loading::Listener& listener) const;
 
             void readRecord (ESM::ESMReader& reader, uint32_t type);
diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index 8761ca37f..b1426a4c1 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -5,70 +5,67 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
-
 #include "../mwworld/class.hpp"
 
+#include "creaturestats.hpp"
 #include "steering.hpp"
 #include "movement.hpp"
 
-MWMechanics::AiActivate::AiActivate(const std::string &objectId)
-    : mObjectId(objectId)
-{
-}
-MWMechanics::AiActivate *MWMechanics::AiActivate::clone() const
+namespace MWMechanics
 {
-    return new AiActivate(*this);
-}
-bool MWMechanics::AiActivate::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
-{
-    ESM::Position pos = actor.getRefData().getPosition(); //position of the actor
-    const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mObjectId, false); //The target to follow
+    AiActivate::AiActivate(const std::string &objectId)
+        : mObjectId(objectId)
+    {
+    }
 
-    actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing);
+    AiActivate *MWMechanics::AiActivate::clone() const
+    {
+        return new AiActivate(*this);
+    }
+
+    bool AiActivate::execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
+    {
+        const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mObjectId, false); //The target to follow
+
+        actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing);
 
-    if(target == MWWorld::Ptr() ||
-        !target.getRefData().getCount() || !target.getRefData().isEnabled()  // Really we should be checking whether the target is currently registered
-                                                                            // with the MechanicsManager
+        if (target == MWWorld::Ptr() ||
+            !target.getRefData().getCount() || !target.getRefData().isEnabled()  // Really we should check whether the target is currently registered
+                                                                                // with the MechanicsManager
             )
         return true;   //Target doesn't exist
 
-    //Set the target desition from the actor
-    ESM::Pathgrid::Point dest = target.getRefData().getPosition().pos;
+        //Set the target destination for the actor
+        ESM::Pathgrid::Point dest = target.getRefData().getPosition().pos;
 
-    if(distance(dest, pos.pos[0], pos.pos[1], pos.pos[2]) < 200) { //Stop when you get close
-        actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
-        MWWorld::Ptr target = MWBase::Environment::get().getWorld()->getPtr(mObjectId,false);
+        if (pathTo(actor, dest, duration, MWBase::Environment::get().getWorld()->getMaxActivationDistance())) //Stop when you get in activation range
+        {
+            // activate when reached
+            MWBase::Environment::get().getWorld()->activate(target, actor);
+            return true;
+        }
 
-        MWBase::Environment::get().getWorld()->activate(target, actor);
-
-        return true;
-    }
-    else {
-        pathTo(actor, dest, duration); //Go to the destination
+        return false;
     }
 
-    return false;
-}
-
-int MWMechanics::AiActivate::getTypeId() const
-{
-    return TypeIdActivate;
-}
-
-void MWMechanics::AiActivate::writeState(ESM::AiSequence::AiSequence &sequence) const
-{
-    std::auto_ptr<ESM::AiSequence::AiActivate> activate(new ESM::AiSequence::AiActivate());
-    activate->mTargetId = mObjectId;
+    int AiActivate::getTypeId() const
+    {
+        return TypeIdActivate;
+    }
 
-    ESM::AiSequence::AiPackageContainer package;
-    package.mType = ESM::AiSequence::Ai_Activate;
-    package.mPackage = activate.release();
-    sequence.mPackages.push_back(package);
-}
+    void AiActivate::writeState(ESM::AiSequence::AiSequence &sequence) const
+    {
+        std::auto_ptr<ESM::AiSequence::AiActivate> activate(new ESM::AiSequence::AiActivate());
+        activate->mTargetId = mObjectId;
 
-MWMechanics::AiActivate::AiActivate(const ESM::AiSequence::AiActivate *activate)
-    : mObjectId(activate->mTargetId)
-{
+        ESM::AiSequence::AiPackageContainer package;
+        package.mType = ESM::AiSequence::Ai_Activate;
+        package.mPackage = activate.release();
+        sequence.mPackages.push_back(package);
+    }
 
+    AiActivate::AiActivate(const ESM::AiSequence::AiActivate *activate)
+        : mObjectId(activate->mTargetId)
+    {
+    }
 }
diff --git a/apps/openmw/mwmechanics/aiactivate.hpp b/apps/openmw/mwmechanics/aiactivate.hpp
index 2ca985be9..8de4be69f 100644
--- a/apps/openmw/mwmechanics/aiactivate.hpp
+++ b/apps/openmw/mwmechanics/aiactivate.hpp
@@ -2,6 +2,7 @@
 #define GAME_MWMECHANICS_AIACTIVATE_H
 
 #include "aipackage.hpp"
+
 #include <string>
 
 #include "pathfinding.hpp"
diff --git a/apps/openmw/mwmechanics/aiavoiddoor.cpp b/apps/openmw/mwmechanics/aiavoiddoor.cpp
index 100b666e8..bb03ff53b 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.cpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.cpp
@@ -3,12 +3,12 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+
 #include "../mwworld/class.hpp"
+
 #include "creaturestats.hpp"
 #include "movement.hpp"
 #include "actorutil.hpp"
-
-
 #include "steering.hpp"
 
 MWMechanics::AiAvoidDoor::AiAvoidDoor(const MWWorld::ConstPtr& doorPtr)
diff --git a/apps/openmw/mwmechanics/aiavoiddoor.hpp b/apps/openmw/mwmechanics/aiavoiddoor.hpp
index 41c41b1f5..7344a1797 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.hpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.hpp
@@ -2,11 +2,15 @@
 #define GAME_MWMECHANICS_AIAVOIDDOOR_H
 
 #include "aipackage.hpp"
+
 #include <string>
-#include "pathfinding.hpp"
+
 #include <components/esm/defs.hpp>
+
 #include "../mwworld/class.hpp"
 
+#include "pathfinding.hpp"
+
 namespace MWMechanics
 {
     /// \brief AiPackage to have an actor avoid an opening door
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 3aeeedad1..17005f235 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -9,6 +9,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/dialoguemanager.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwrender/animation.hpp"
 
@@ -16,58 +17,19 @@
 #include "steering.hpp"
 #include "movement.hpp"
 #include "character.hpp"
-
 #include "aicombataction.hpp"
 #include "combat.hpp"
+#include "coordinateconverter.hpp"
+#include "actorutil.hpp"
 
 namespace
 {
 
     //chooses an attack depending on probability to avoid uniformity
-    ESM::Weapon::AttackType chooseBestAttack(const ESM::Weapon* weapon, MWMechanics::Movement &movement);
+    std::string chooseBestAttack(const ESM::Weapon* weapon);
 
     osg::Vec3f AimDirToMovingTarget(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, const osg::Vec3f& vLastTargetPos,
         float duration, int weapType, float strength);
-
-    float getZAngleToDir(const osg::Vec3f& dir)
-    {
-        return std::atan2(dir.x(), dir.y());
-    }
-
-    float getXAngleToDir(const osg::Vec3f& dir)
-    {
-        return -std::asin(dir.z() / dir.length());
-    }
-
-    const float REACTION_INTERVAL = 0.25f;
-
-    const float PATHFIND_Z_REACH = 50.0f;
-    // distance at which actor pays more attention to decide whether to shortcut or stick to pathgrid
-    const float PATHFIND_CAUTION_DIST = 500.0f;
-    // distance after which actor (failed previously to shortcut) will try again
-    const float PATHFIND_SHORTCUT_RETRY_DIST = 300.0f;
-
-    // cast up-down ray with some offset from actor position to check for pits/obstacles on the way to target;
-    // magnitude of pits/obstacles is defined by PATHFIND_Z_REACH
-    bool checkWayIsClear(const osg::Vec3f& from, const osg::Vec3f& to, float offsetXY)
-    {
-        if((to - from).length() >= PATHFIND_CAUTION_DIST || std::abs(from.z() - to.z()) <= PATHFIND_Z_REACH)
-        {
-            osg::Vec3f dir = to - from;
-            dir.z() = 0;
-            dir.normalize();
-            float verticalOffset = 200; // instead of '200' here we want the height of the actor
-            osg::Vec3f _from = from + dir*offsetXY + osg::Vec3f(0,0,1) * verticalOffset;
-
-            // cast up-down ray and find height in world space of hit
-            float h = _from.z() - MWBase::Environment::get().getWorld()->getDistToNearestRayHit(_from, osg::Vec3f(0,0,-1), verticalOffset + PATHFIND_Z_REACH + 1);
-
-            if(std::abs(from.z() - h) <= PATHFIND_Z_REACH)
-                return true;
-        }
-
-        return false;
-    }
 }
 
 namespace MWMechanics
@@ -81,7 +43,7 @@ namespace MWMechanics
         float mTimerCombatMove;
         bool mReadyToAttack;
         bool mAttack;
-        bool mFollowTarget;
+        float mAttackRange;
         bool mCombatMove;
         osg::Vec3f mLastTargetPos;
         const MWWorld::CellStore* mCell;
@@ -90,33 +52,54 @@ namespace MWMechanics
         float mStrength;
         bool mForceNoShortcut;
         ESM::Position mShortcutFailPos;
-        osg::Vec3f mLastActorPos;
         MWMechanics::Movement mMovement;
+
+        enum FleeState
+        {
+            FleeState_None,
+            FleeState_Idle,
+            FleeState_RunBlindly,
+            FleeState_RunToDestination
+        };
+        FleeState mFleeState;
+        bool mLOS;
+        float mUpdateLOSTimer;
+        float mFleeBlindRunTimer;
+        ESM::Pathgrid::Point mFleeDest;
         
         AiCombatStorage():
-        mAttackCooldown(0),
-        mTimerReact(0),
-        mTimerCombatMove(0),
+        mAttackCooldown(0.0f),
+        mTimerReact(AI_REACTION_TIME),
+        mTimerCombatMove(0.0f),
         mReadyToAttack(false),
         mAttack(false),
-        mFollowTarget(false),
+        mAttackRange(0.0f),
         mCombatMove(false),
         mLastTargetPos(0,0,0),
         mCell(NULL),
         mCurrentAction(),
-        mActionCooldown(0),
+        mActionCooldown(0.0f),
         mStrength(),
         mForceNoShortcut(false),
-        mLastActorPos(0,0,0),
-        mMovement(){}    
-
-        void startCombatMove(bool isNpc, bool isDistantCombat, float distToTarget, float rangeAttack);
+        mShortcutFailPos(),
+        mMovement(),
+        mFleeState(FleeState_None),
+        mLOS(false),
+        mUpdateLOSTimer(0.0f),
+        mFleeBlindRunTimer(0.0f)
+        {}
+
+        void startCombatMove(bool isDistantCombat, float distToTarget, float rangeAttack, const MWWorld::Ptr& actor, const MWWorld::Ptr& target);
         void updateCombatMove(float duration);
         void stopCombatMove();
         void startAttackIfReady(const MWWorld::Ptr& actor, CharacterController& characterController, 
             const ESM::Weapon* weapon, bool distantCombat);
         void updateAttack(CharacterController& characterController);
         void stopAttack();
+
+        void startFleeing();
+        void stopFleeing();
+        bool isFleeing();
     };
     
     AiCombat::AiCombat(const MWWorld::Ptr& actor) :
@@ -176,9 +159,10 @@ namespace MWMechanics
      *
      * TODO:
      *
-     * Use the Observer Pattern to co-ordinate attacks, provide intelligence on
+     * Use the observer pattern to coordinate attacks, provide intelligence on
      * whether the target was hit, etc.
      */
+
     bool AiCombat::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
     {
         // get or create temporary storage
@@ -197,36 +181,46 @@ namespace MWMechanics
                 || target.getClass().getCreatureStats(target).isDead())
             return true;
 
-        //Update every frame
-        storage.updateCombatMove(duration);
-        updateActorsMovement(actor, duration, storage.mMovement);
-        storage.updateAttack(characterController);
+        if (!storage.isFleeing())
+        {
+            if (storage.mCurrentAction.get()) // need to wait to init action with its attack range
+            {
+                //Update every frame. UpdateLOS uses a timer, so the LOS check does not happen every frame.
+                updateLOS(actor, target, duration, storage);
+                float targetReachedTolerance = 0.0f;
+                if (storage.mLOS)
+                    targetReachedTolerance = storage.mAttackRange;
+                bool is_target_reached = pathTo(actor, target.getRefData().getPosition().pos, duration, targetReachedTolerance);
+                if (is_target_reached) storage.mReadyToAttack = true;
+            }
+
+            storage.updateCombatMove(duration);
+            if (storage.mReadyToAttack) updateActorsMovement(actor, duration, storage);
+            storage.updateAttack(characterController);
+        }
+        else
+        {
+            updateFleeing(actor, target, duration, storage);
+        }
         storage.mActionCooldown -= duration;
-        
+
         float& timerReact = storage.mTimerReact;
-        if(timerReact < REACTION_INTERVAL)
+        if (timerReact < AI_REACTION_TIME)
         {
             timerReact += duration;
-            return false;
         }
         else
         {
             timerReact = 0;
-            return reactionTimeActions(actor, characterController, storage, target);
+            if (attack(actor, target, storage, characterController))
+                return true;
         }
+
+        return false;
     }
 
-    bool AiCombat::reactionTimeActions(const MWWorld::Ptr& actor, CharacterController& characterController, 
-        AiCombatStorage& storage, MWWorld::Ptr target)
+    bool AiCombat::attack(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, AiCombatStorage& storage, CharacterController& characterController)
     {
-        MWMechanics::Movement& movement = storage.mMovement;
-
-        if (isTargetMagicallyHidden(target))
-        {
-            storage.stopAttack();
-            return false; // TODO: run away instead of doing nothing
-        }
-
         const MWWorld::CellStore*& currentCell = storage.mCell;
         bool cellChange = currentCell && (actor.getCell() != currentCell);
         if(!currentCell || cellChange)
@@ -234,112 +228,68 @@ namespace MWMechanics
             currentCell = actor.getCell();
         }
 
+        bool forceFlee = false;
+        if (!canFight(actor, target))
+        {
+            storage.stopAttack();
+            characterController.setAttackingOrSpell(false);
+            storage.mActionCooldown = 0.f;
+            // Continue combat if target is player or player follower/escorter and an attack has been attempted
+            const std::list<MWWorld::Ptr>& playerFollowersAndEscorters = MWBase::Environment::get().getMechanicsManager()->getActorsSidingWith(MWMechanics::getPlayer());
+            bool targetSidesWithPlayer = (std::find(playerFollowersAndEscorters.begin(), playerFollowersAndEscorters.end(), target) != playerFollowersAndEscorters.end());
+            if ((target == MWMechanics::getPlayer() || targetSidesWithPlayer)
+                && ((actor.getClass().getCreatureStats(actor).getHitAttemptActorId() == target.getClass().getCreatureStats(target).getActorId())
+                || (target.getClass().getCreatureStats(target).getHitAttemptActorId() == actor.getClass().getCreatureStats(actor).getActorId())))
+                forceFlee = true;
+            else // Otherwise end combat
+                return true;
+        }
+
         const MWWorld::Class& actorClass = actor.getClass();
         actorClass.getCreatureStats(actor).setMovementFlag(CreatureStats::Flag_Run, true);
 
         float& actionCooldown = storage.mActionCooldown;
-        if (actionCooldown > 0)
-            return false;
-
-        float rangeAttack = 0;
-        float rangeFollow = 0;
         boost::shared_ptr<Action>& currentAction = storage.mCurrentAction;
-        if (characterController.readyToPrepareAttack())
-        {
-            currentAction = prepareNextAction(actor, target);
-            actionCooldown = currentAction->getActionCooldown();
-        }
-
-        if (currentAction.get())
-            currentAction->getCombatRange(rangeAttack, rangeFollow);
-
-        // FIXME: consider moving this stuff to ActionWeapon::getCombatRange
-        const ESM::Weapon *weapon = NULL;
-        MWMechanics::WeaponType weaptype = WeapType_None;
-        float weapRange = 1.0f;
 
-        // Get weapon characteristics
-        MWBase::World* world = MWBase::Environment::get().getWorld();
-        if (actorClass.hasInventoryStore(actor))
+        if (!forceFlee)
         {
-            //Get weapon range
-            MWWorld::ContainerStoreIterator weaponSlot =
-                MWMechanics::getActiveWeapon(actorClass.getCreatureStats(actor), actorClass.getInventoryStore(actor), &weaptype);
+            if (actionCooldown > 0)
+                return false;
 
-            if (weaptype == WeapType_HandToHand)
-            {
-                static float fHandToHandReach =
-                    world->getStore().get<ESM::GameSetting>().find("fHandToHandReach")->getFloat();
-                weapRange = fHandToHandReach;
-            }
-            else if (weaptype != WeapType_PickProbe && weaptype != WeapType_Spell && weaptype != WeapType_None)
+            if (characterController.readyToPrepareAttack())
             {
-                // All other WeapTypes are actually weapons, so get<ESM::Weapon> is safe.
-                weapon = weaponSlot->get<ESM::Weapon>()->mBase;
-                weapRange = weapon->mData.mReach;
+                currentAction = prepareNextAction(actor, target);
+                actionCooldown = currentAction->getActionCooldown();
             }
-            weapRange *= 100.0f;
         }
-        else //is creature
+        else
         {
-            weaptype = actorClass.getCreatureStats(actor).getDrawState() == DrawState_Spell ? WeapType_Spell : WeapType_HandToHand;
-            weapRange = 150.0f; //TODO: use true attack range (the same problem in Creature::hit)
+            currentAction.reset(new ActionFlee());
+            actionCooldown = currentAction->getActionCooldown();
         }
 
-        bool distantCombat = false;
-        if (weaptype != WeapType_Spell)
+        if (!currentAction)
+            return false;
+
+        if (storage.isFleeing() != currentAction->isFleeing())
         {
-            // TODO: move to ActionWeapon
-            if (weaptype == WeapType_BowAndArrow || weaptype == WeapType_Crossbow || weaptype == WeapType_Thrown)
+            if (currentAction->isFleeing())
             {
-                rangeAttack = 1000;
-                rangeFollow = 0; // not needed in ranged combat
-                distantCombat = true;
+                storage.startFleeing();
+                MWBase::Environment::get().getDialogueManager()->say(actor, "flee");
+                return false;
             }
             else
-            {
-                rangeAttack = weapRange;
-                rangeFollow = 300;
-            }
-        }
-        else
-        {
-            distantCombat = (rangeAttack > 500);
+                storage.stopFleeing();
         }
 
-        
-        bool& readyToAttack = storage.mReadyToAttack;
-        // start new attack
-        storage.startAttackIfReady(actor, characterController, weapon, distantCombat);
-
-        /*
-         * Some notes on meanings of variables:
-         *
-         * rangeAttack:
-         *
-         *  - Distance where attack using the actor's weapon is possible:
-         *    longer for ranged weapons (obviously?) vs. melee weapons
-         *  - Determined by weapon's reach parameter; hardcoded value
-         *    for ranged weapon and for creatures
-         *  - Once within this distance mFollowTarget is triggered
-         *
-         * rangeFollow:
-         *
-         *  - Applies to melee weapons or hand to hand only (or creatures without
-         *    weapons)
-         *  - Distance a little further away than the actor's weapon reach
-         *    i.e. rangeFollow > rangeAttack for melee weapons
-         *  - Hardcoded value (0 for ranged weapons)
-         *  - Once the target gets beyond this distance mFollowTarget is cleared
-         *    and a path to the target needs to be found
-         *
-         * mFollowTarget:
-         *
-         *  - Once triggered, the actor follows the target with LOS shortcut
-         *    (the shortcut really only applies to cells where pathgrids are
-         *    available, since the default path without pathgrids is direct to
-         *    target even if LOS is not achieved)
-         */
+        bool isRangedCombat = false;
+        float &rangeAttack = storage.mAttackRange;
+
+        rangeAttack = currentAction->getCombatRange(isRangedCombat);
+
+        // Get weapon characteristics
+        const ESM::Weapon* weapon = currentAction->getWeapon();
 
         ESM::Position pos = actor.getRefData().getPosition();
         osg::Vec3f vActorPos(pos.asVec3());
@@ -347,155 +297,149 @@ namespace MWMechanics
 
         osg::Vec3f vAimDir = MWBase::Environment::get().getWorld()->aimToTarget(actor, target);
         float distToTarget = MWBase::Environment::get().getWorld()->getHitDistance(actor, target);
-        
-        osg::Vec3f& lastActorPos = storage.mLastActorPos;
-        bool& followTarget = storage.mFollowTarget;
 
-        bool isStuck = false;
-        float speed = 0.0f;
-        if(movement.mPosition[1] && (lastActorPos - vActorPos).length() < (speed = actorClass.getSpeed(actor)) * REACTION_INTERVAL / 2)
-            isStuck = true;
+        storage.mReadyToAttack = (currentAction->isAttackingOrSpell() && distToTarget <= rangeAttack && storage.mLOS);
 
-        lastActorPos = vActorPos;
-
-        // check if actor can move along z-axis
-        bool canMoveByZ = (actorClass.canSwim(actor) && world->isSwimming(actor))
-            || world->isFlying(actor);
-
-        // can't fight if attacker can't go where target is.  E.g. A fish can't attack person on land.
-        if (distToTarget >= rangeAttack
-                && !actorClass.isNpc() && !MWMechanics::isEnvironmentCompatible(actor, target))
+        if (storage.mReadyToAttack)
         {
-            // TODO: start fleeing?
-            storage.stopAttack();
-            return false;
-        }
-
-        // for distant combat we should know if target is in LOS even if distToTarget < rangeAttack 
-        bool inLOS = distantCombat ? world->getLOS(actor, target) : true;
+            storage.startCombatMove(isRangedCombat, distToTarget, rangeAttack, actor, target);
+            // start new attack
+            storage.startAttackIfReady(actor, characterController, weapon, isRangedCombat);
 
-        // (within attack dist) || (not quite attack dist while following)
-        if(inLOS && (distToTarget < rangeAttack || (distToTarget <= rangeFollow && followTarget && !isStuck)))
-        {
-            mPathFinder.clearPath();
-            //Melee and Close-up combat
-            
-            // getXAngleToDir determines vertical angle to target:
-            // if actor can move along z-axis it will control movement dir
-            // if can't - it will control correct aiming.
-            // note: in getZAngleToDir if we preserve dir.z then horizontal angle can be inaccurate
-            if (distantCombat)
+            if (isRangedCombat)
             {
+                // rotate actor taking into account target movement direction and projectile speed
                 osg::Vec3f& lastTargetPos = storage.mLastTargetPos;
-                vAimDir = AimDirToMovingTarget(actor, target, lastTargetPos, REACTION_INTERVAL, weaptype,
-                    storage.mStrength);
+                vAimDir = AimDirToMovingTarget(actor, target, lastTargetPos, AI_REACTION_TIME, (weapon ? weapon->mData.mType : 0), storage.mStrength);
                 lastTargetPos = vTargetPos;
-                movement.mRotation[0] = getXAngleToDir(vAimDir);
-                movement.mRotation[2] = getZAngleToDir(vAimDir);
-            }
-            else
-            {
-                movement.mRotation[0] = getXAngleToDir(vAimDir);
-                movement.mRotation[2] = getZAngleToDir((vTargetPos-vActorPos)); // using vAimDir results in spastic movements since the head is animated
-            }
 
-            // (not quite attack dist while following)
-            if (followTarget && distToTarget > rangeAttack)
-            {
-                //Close-up combat: just run up on target
-                storage.stopCombatMove();
-                movement.mPosition[1] = 1;
+                storage.mMovement.mRotation[0] = getXAngleToDir(vAimDir);
+                storage.mMovement.mRotation[2] = getZAngleToDir(vAimDir);
             }
-            else // (within attack dist)
+            else
             {
-                storage.startCombatMove(actorClass.isNpc(), distantCombat, distToTarget, rangeAttack);
-
-                readyToAttack = true;
-                //only once got in melee combat, actor is allowed to use close-up shortcutting
-                followTarget = true;
+                storage.mMovement.mRotation[0] = getXAngleToDir(vAimDir);
+                storage.mMovement.mRotation[2] = getZAngleToDir((vTargetPos-vActorPos)); // using vAimDir results in spastic movements since the head is animated
             }
         }
-        else // remote pathfinding
+        return false;
+    }
+
+    void MWMechanics::AiCombat::updateLOS(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float duration, MWMechanics::AiCombatStorage& storage)
+    {
+        static const float LOS_UPDATE_DURATION = 0.5f;
+        if (storage.mUpdateLOSTimer <= 0.f)
         {
-            bool preferShortcut = false;
-            if (!distantCombat) inLOS = world->getLOS(actor, target);
-
-            // check if shortcut is available
-            bool& forceNoShortcut = storage.mForceNoShortcut;
-            ESM::Position& shortcutFailPos = storage.mShortcutFailPos;
-            
-            if(inLOS && (!isStuck || readyToAttack)
-                && (!forceNoShortcut || (shortcutFailPos.asVec3() - vActorPos).length() >= PATHFIND_SHORTCUT_RETRY_DIST))
-            {
-                if(speed == 0.0f) speed = actorClass.getSpeed(actor);
-                // maximum dist before pit/obstacle for actor to avoid them depending on his speed
-                float maxAvoidDist = REACTION_INTERVAL * speed + speed / MAX_VEL_ANGULAR_RADIANS * 2; // *2 - for reliability
-                preferShortcut = checkWayIsClear(vActorPos, vTargetPos, osg::Vec3f(vAimDir.x(), vAimDir.y(), 0).length() > maxAvoidDist*1.5? maxAvoidDist : maxAvoidDist/2);
-            }
+            storage.mLOS = MWBase::Environment::get().getWorld()->getLOS(actor, target);
+            storage.mUpdateLOSTimer = LOS_UPDATE_DURATION;
+        }
+        else
+            storage.mUpdateLOSTimer -= duration;
+    }
 
-            // don't use pathgrid when actor can move in 3 dimensions
-            if (canMoveByZ)
-            {
-                preferShortcut = true;
-                movement.mRotation[0] = getXAngleToDir(vAimDir);
-            }
+    void MWMechanics::AiCombat::updateFleeing(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float duration, MWMechanics::AiCombatStorage& storage)
+    {
+        static const float BLIND_RUN_DURATION = 1.0f;
 
-            if(preferShortcut)
-            {
-                movement.mRotation[2] = getZAngleToDir((vTargetPos-vActorPos));
-                forceNoShortcut = false;
-                shortcutFailPos.pos[0] = shortcutFailPos.pos[1] = shortcutFailPos.pos[2] = 0;
-                mPathFinder.clearPath();
-            }
-            else // if shortcut failed stick to path grid
-            {
-                if(!isStuck && shortcutFailPos.pos[0] == 0.0f && shortcutFailPos.pos[1] == 0.0f && shortcutFailPos.pos[2] == 0.0f)
+        updateLOS(actor, target, duration, storage);
+
+        AiCombatStorage::FleeState& state = storage.mFleeState;
+        switch (state)
+        {
+            case AiCombatStorage::FleeState_None:
+                return;
+
+            case AiCombatStorage::FleeState_Idle:
                 {
-                    forceNoShortcut = true;
-                    shortcutFailPos = pos;
-                }
+                    float triggerDist = getMaxAttackDistance(target);
 
-                followTarget = false;
+                    if (storage.mLOS &&
+                            (triggerDist >= 1000 || getDistanceMinusHalfExtents(actor, target) <= triggerDist))
+                    {
+                        const ESM::Pathgrid* pathgrid =
+                                MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*storage.mCell->getCell());
+
+                        bool runFallback = true;
+
+                        if (pathgrid && !actor.getClass().isPureWaterCreature(actor))
+                        {
+                            ESM::Pathgrid::PointList points;
+                            CoordinateConverter coords(storage.mCell->getCell());
+
+                            osg::Vec3f localPos = actor.getRefData().getPosition().asVec3();
+                            coords.toLocal(localPos);
+
+                            int closestPointIndex = PathFinder::GetClosestPoint(pathgrid, localPos);
+                            for (int i = 0; i < static_cast<int>(pathgrid->mPoints.size()); i++)
+                            {
+                                if (i != closestPointIndex && storage.mCell->isPointConnected(closestPointIndex, i))
+                                {
+                                    points.push_back(pathgrid->mPoints[static_cast<size_t>(i)]);
+                                }
+                            }
+
+                            if (!points.empty())
+                            {
+                                ESM::Pathgrid::Point dest = points[Misc::Rng::rollDice(points.size())];
+                                coords.toWorld(dest);
+
+                                state = AiCombatStorage::FleeState_RunToDestination;
+                                storage.mFleeDest = ESM::Pathgrid::Point(dest.mX, dest.mY, dest.mZ);
+
+                                runFallback = false;
+                            }
+                        }
+
+                        if (runFallback)
+                        {
+                            state = AiCombatStorage::FleeState_RunBlindly;
+                            storage.mFleeBlindRunTimer = 0.0f;
+                        }
+                    }
+                }
+                break;
 
-                buildNewPath(actor, target);
+            case AiCombatStorage::FleeState_RunBlindly:
+                {
+                    // timer to prevent twitchy movement that can be observed in vanilla MW
+                    if (storage.mFleeBlindRunTimer < BLIND_RUN_DURATION)
+                    {
+                        storage.mFleeBlindRunTimer += duration;
 
-                // should always return a path (even if it's just go straight on target.)
-                assert(mPathFinder.isPathConstructed());
-            }
+                        storage.mMovement.mRotation[2] = osg::PI + getZAngleToDir(target.getRefData().getPosition().asVec3()-actor.getRefData().getPosition().asVec3());
+                        storage.mMovement.mPosition[1] = 1;
+                        updateActorsMovement(actor, duration, storage);
+                    }
+                    else
+                        state = AiCombatStorage::FleeState_Idle;
+                }
+                break;
 
-            if (readyToAttack)
-            {
-                // to stop possible sideway moving after target moved out of attack range
-                storage.stopCombatMove();
-                readyToAttack = false;
-            }
-            movement.mPosition[1] = 1;
-        }
+            case AiCombatStorage::FleeState_RunToDestination:
+                {
+                    static const float fFleeDistance = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fFleeDistance")->getFloat();
 
-        return false;
+                    float dist = (actor.getRefData().getPosition().asVec3() - target.getRefData().getPosition().asVec3()).length();
+                    if ((dist > fFleeDistance && !storage.mLOS)
+                            || pathTo(actor, storage.mFleeDest, duration))
+                    {
+                        state = AiCombatStorage::FleeState_Idle;
+                    }
+                }
+                break;
+        };
     }
 
-    void AiCombat::updateActorsMovement(const MWWorld::Ptr& actor, float duration, MWMechanics::Movement& desiredMovement)
+    void AiCombat::updateActorsMovement(const MWWorld::Ptr& actor, float duration, AiCombatStorage& storage)
     {
+        // apply combat movement
         MWMechanics::Movement& actorMovementSettings = actor.getClass().getMovementSettings(actor);
-        if (mPathFinder.isPathConstructed())
-        {
-            const ESM::Position& pos = actor.getRefData().getPosition();
-            if (mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1]))
-            {
-                actorMovementSettings.mPosition[1] = 0;
-            }
-            else
-            {
-                evadeObstacles(actor, duration, pos);
-            }
-        }
-        else
-        {
-            actorMovementSettings = desiredMovement;
-            rotateActorOnAxis(actor, 2, actorMovementSettings, desiredMovement);
-            rotateActorOnAxis(actor, 0, actorMovementSettings, desiredMovement);
-        }
+        actorMovementSettings.mPosition[0] = storage.mMovement.mPosition[0];
+        actorMovementSettings.mPosition[1] = storage.mMovement.mPosition[1];
+        actorMovementSettings.mPosition[2] = storage.mMovement.mPosition[2];
+
+        rotateActorOnAxis(actor, 2, actorMovementSettings, storage.mMovement);
+        rotateActorOnAxis(actor, 0, actorMovementSettings, storage.mMovement);
     }
 
     void AiCombat::rotateActorOnAxis(const MWWorld::Ptr& actor, int axis, 
@@ -513,35 +457,6 @@ namespace MWMechanics
         }
     }
 
-    bool AiCombat::doesPathNeedRecalc(ESM::Pathgrid::Point dest, const ESM::Cell *cell)
-    {
-        if (!mPathFinder.getPath().empty())
-        {
-            osg::Vec3f currPathTarget(PathFinder::MakeOsgVec3(mPathFinder.getPath().back()));
-            osg::Vec3f newPathTarget = PathFinder::MakeOsgVec3(dest);
-            float dist = (newPathTarget - currPathTarget).length();
-            float targetPosThreshold = (cell->isExterior()) ? 300.0f : 100.0f;
-            return dist > targetPosThreshold;
-        }
-        else
-        {
-            // necessarily construct a new path
-            return true;
-        }
-    }
-
-    void AiCombat::buildNewPath(const MWWorld::Ptr& actor, const MWWorld::Ptr& target)
-    {
-        ESM::Pathgrid::Point newPathTarget = PathFinder::MakePathgridPoint(target.getRefData().getPosition());
-
-        //construct new path only if target has moved away more than on [targetPosThreshold]
-        if (doesPathNeedRecalc(newPathTarget, actor.getCell()->getCell()))
-        {
-            ESM::Pathgrid::Point start(PathFinder::MakePathgridPoint(actor.getRefData().getPosition()));
-            mPathFinder.buildSyncedPath(start, newPathTarget, actor.getCell(), false);
-        }
-    }
-
     int AiCombat::getTypeId() const
     {
         return TypeIdCombat;
@@ -557,7 +472,6 @@ namespace MWMechanics
         return MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
     }
 
-
     AiCombat *MWMechanics::AiCombat::clone() const
     {
         return new AiCombat(*this);
@@ -574,25 +488,49 @@ namespace MWMechanics
         sequence.mPackages.push_back(package);
     }
 
-    void AiCombatStorage::startCombatMove(bool isNpc, bool isDistantCombat, float distToTarget, float rangeAttack)
+    void AiCombatStorage::startCombatMove(bool isDistantCombat, float distToTarget, float rangeAttack, const MWWorld::Ptr& actor, const MWWorld::Ptr& target)
     {
         if (mMovement.mPosition[0] || mMovement.mPosition[1])
         {
             mTimerCombatMove = 0.1f + 0.1f * Misc::Rng::rollClosedProbability();
             mCombatMove = true;
         }
-        // only NPCs are smart enough to use dodge movements
-        else if (isNpc && (!isDistantCombat || (distToTarget < rangeAttack / 2)))
+        // dodge movements (for NPCs and bipedal creatures)
+        else if (actor.getClass().isBipedal(actor))
         {
-            //apply sideway movement (kind of dodging) with some probability
-            if (Misc::Rng::rollClosedProbability() < 0.25)
+            // get the range of the target's weapon
+            float rangeAttackOfTarget = 0.f;
+            bool isRangedCombat = false;
+            MWWorld::Ptr targetWeapon = MWWorld::Ptr();         
+            const MWWorld::Class& targetClass = target.getClass();
+
+            if (targetClass.hasInventoryStore(target))
             {
-                mMovement.mPosition[0] = Misc::Rng::rollProbability() < 0.5 ? 1.0f : -1.0f;
+                MWMechanics::WeaponType weapType = WeapType_None;
+                MWWorld::ContainerStoreIterator weaponSlot =
+                    MWMechanics::getActiveWeapon(targetClass.getCreatureStats(target), targetClass.getInventoryStore(target), &weapType);
+                if (weapType != WeapType_PickProbe && weapType != WeapType_Spell && weapType != WeapType_None && weapType != WeapType_HandToHand)
+                    targetWeapon = *weaponSlot;
+            }
+
+            boost::shared_ptr<Action> targetWeaponAction (new ActionWeapon(targetWeapon));
+
+            if (targetWeaponAction.get())
+                rangeAttackOfTarget = targetWeaponAction->getCombatRange(isRangedCombat);
+              
+            // apply sideway movement (kind of dodging) with some probability
+            // if actor is within range of target's weapon
+            if (distToTarget <= rangeAttackOfTarget && Misc::Rng::rollClosedProbability() < 0.25)
+            {
+                mMovement.mPosition[0] = Misc::Rng::rollProbability() < 0.5 ? 1.0f : -1.0f; // to the left/right
                 mTimerCombatMove = 0.05f + 0.15f * Misc::Rng::rollClosedProbability();
                 mCombatMove = true;
             }
         }
 
+        // Below behavior for backing up during ranged combat differs from vanilla.
+        // Vanilla is observed as backing up only as far as fCombatDistance or
+        // opponent's weapon range, or not backing up if opponent is also using a ranged weapon
         if (isDistantCombat && distToTarget < rangeAttack / 4)
         {
             mMovement.mPosition[1] = -1;
@@ -629,7 +567,7 @@ namespace MWMechanics
                 characterController.setAttackingOrSpell(true);
 
                 if (!distantCombat)
-                    chooseBestAttack(weapon, mMovement);
+                    characterController.setAIAttackType(chooseBestAttack(weapon));
 
                 mStrength = Misc::Rng::rollClosedProbability();
 
@@ -650,7 +588,7 @@ namespace MWMechanics
                 mAttackCooldown = std::min(baseDelay + 0.01 * Misc::Rng::roll0to99(), baseDelay + 0.9);
             }
             else
-                mAttackCooldown -= REACTION_INTERVAL;
+                mAttackCooldown -= AI_REACTION_TIME;
         }
     }
 
@@ -671,38 +609,37 @@ namespace MWMechanics
         mReadyToAttack = false;
         mAttack = false;
     }
+
+    void AiCombatStorage::startFleeing()
+    {
+        stopFleeing();
+        mFleeState = FleeState_Idle;
+    }
+
+    void AiCombatStorage::stopFleeing()
+    {
+        mMovement.mPosition[0] = 0;
+        mMovement.mPosition[1] = 0;
+        mMovement.mPosition[2] = 0;
+        mFleeState = FleeState_None;
+        mFleeDest = ESM::Pathgrid::Point(0, 0, 0);
+    }
+
+    bool AiCombatStorage::isFleeing()
+    {
+        return mFleeState != FleeState_None;
+    }
 }
 
 
 namespace
 {
 
-ESM::Weapon::AttackType chooseBestAttack(const ESM::Weapon* weapon, MWMechanics::Movement &movement)
+std::string chooseBestAttack(const ESM::Weapon* weapon)
 {
-    ESM::Weapon::AttackType attackType;
+    std::string attackType;
 
-    if (weapon == NULL)
-    {
-        //hand-to-hand deal equal damage for each type
-        float roll = Misc::Rng::rollClosedProbability();
-        if(roll <= 0.333f)  //side punch
-        {
-            movement.mPosition[0] = Misc::Rng::rollClosedProbability() ? 1.0f : -1.0f;
-            movement.mPosition[1] = 0;
-            attackType = ESM::Weapon::AT_Slash;
-        }
-        else if(roll <= 0.666f) //forward punch
-        {
-            movement.mPosition[1] = 1;
-            attackType = ESM::Weapon::AT_Thrust;
-        }
-        else
-        {
-            movement.mPosition[1] = movement.mPosition[0] = 0;
-            attackType = ESM::Weapon::AT_Chop;
-        }
-    }
-    else
+    if (weapon != NULL)
     {
         //the more damage attackType deals the more probability it has
         int slash = (weapon->mData.mSlash[0] + weapon->mData.mSlash[1])/2;
@@ -711,22 +648,14 @@ ESM::Weapon::AttackType chooseBestAttack(const ESM::Weapon* weapon, MWMechanics:
 
         float roll = Misc::Rng::rollClosedProbability() * (slash + chop + thrust);
         if(roll <= slash)
-        {
-            movement.mPosition[0] = (Misc::Rng::rollClosedProbability() < 0.5f) ? 1.0f : -1.0f;
-            movement.mPosition[1] = 0;
-            attackType = ESM::Weapon::AT_Slash;
-        }
+            attackType = "slash";
         else if(roll <= (slash + thrust))
-        {
-            movement.mPosition[1] = 1;
-            attackType = ESM::Weapon::AT_Thrust;
-        }
+            attackType = "thrust";
         else
-        {
-            movement.mPosition[1] = movement.mPosition[0] = 0;
-            attackType = ESM::Weapon::AT_Chop;
-        }
+            attackType = "chop";
     }
+    else
+        MWMechanics::CharacterController::setAttackTypeRandomly(attackType);
 
     return attackType;
 }
diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp
index 2b364001f..fbe864ca0 100644
--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@@ -3,16 +3,15 @@
 
 #include "aipackage.hpp"
 
-#include "pathfinding.hpp"
-
-#include "movement.hpp"
-#include "obstacle.hpp"
+#include <boost/shared_ptr.hpp>
 
 #include "../mwworld/cellstore.hpp" // for Doors
 
 #include "../mwbase/world.hpp"
 
-#include <boost/shared_ptr.hpp>
+#include "pathfinding.hpp"
+#include "movement.hpp"
+#include "obstacle.hpp"
 
 namespace ESM
 {
@@ -56,19 +55,19 @@ namespace MWMechanics
             virtual bool canCancel() const { return false; }
             virtual bool shouldCancelPreviousAi() const { return false; }
 
-        protected:
-            virtual bool doesPathNeedRecalc(ESM::Pathgrid::Point dest, const ESM::Cell *cell);
-
         private:
 
             int mTargetActorId;
 
-            void buildNewPath(const MWWorld::Ptr& actor, const MWWorld::Ptr& target);
-            bool reactionTimeActions(const MWWorld::Ptr& actor, CharacterController& characterController,
-                AiCombatStorage& storage, MWWorld::Ptr target);
+            /// Returns true if combat should end
+            bool attack(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, AiCombatStorage& storage, CharacterController& characterController);
+
+            void updateLOS(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float duration, AiCombatStorage& storage);
+
+            void updateFleeing(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float duration, AiCombatStorage& storage);
 
             /// Transfer desired movement (from AiCombatStorage) to Actor
-            void updateActorsMovement(const MWWorld::Ptr& actor, float duration, MWMechanics::Movement& movement);
+            void updateActorsMovement(const MWWorld::Ptr& actor, float duration, AiCombatStorage& storage);
             void rotateActorOnAxis(const MWWorld::Ptr& actor, int axis, 
                 MWMechanics::Movement& actorMovementSettings, MWMechanics::Movement& desiredMovement);
     };
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index cee2aae9c..cc1434d52 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -1,18 +1,21 @@
 #include "aicombataction.hpp"
 
+#include <components/esm/loadench.hpp>
+#include <components/esm/loadmgef.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/actionequip.hpp"
+#include "../mwworld/cellstore.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/spellcasting.hpp"
-
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadmgef.hpp>
+#include "npcstats.hpp"
+#include "spellcasting.hpp"
+#include "combat.hpp"
 
 namespace
 {
@@ -40,23 +43,21 @@ int getRangeTypes (const ESM::EffectList& effects)
     return types;
 }
 
-void suggestCombatRange(int rangeTypes, float& rangeAttack, float& rangeFollow)
+float suggestCombatRange(int rangeTypes)
 {
     if (rangeTypes & Touch)
     {
-        rangeAttack = 100.f;
-        rangeFollow = 300.f;
+        static const float fCombatDistance = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fCombatDistance")->getFloat();
+        return fCombatDistance;
     }
     else if (rangeTypes & Target)
     {
-        rangeAttack = 1000.f;
-        rangeFollow = 0.f;
+        return 1000.f;
     }
     else
     {
         // For Self spells, distance doesn't matter, so back away slightly to avoid enemy hits
-        rangeAttack = 600.f;
-        rangeFollow = 0.f;
+        return 600.f;
     }
 }
 
@@ -109,6 +110,10 @@ namespace MWMechanics
             return 0.f;
 
         float rating=0.f;
+        float bonus=0.f;
+
+        if (weapon->mData.mType >= ESM::Weapon::MarksmanBow && weapon->mData.mType <= ESM::Weapon::MarksmanThrown)
+            bonus+=1.5f;
 
         if (weapon->mData.mType >= ESM::Weapon::MarksmanBow)
         {
@@ -160,7 +165,7 @@ namespace MWMechanics
         if (skill != -1)
             rating *= actor.getClass().getSkill(actor, skill) / 100.f;
 
-        return rating;
+        return rating + bonus;
     }
 
     float rateSpell(const ESM::Spell *spell, const MWWorld::Ptr &actor, const MWWorld::Ptr& enemy)
@@ -421,13 +426,18 @@ namespace MWMechanics
             MWWorld::InventoryStore& inv = actor.getClass().getInventoryStore(actor);
             inv.setSelectedEnchantItem(inv.end());
         }
+
+        const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(mSpellId);
+        MWBase::Environment::get().getWorld()->preloadEffects(&spell->mEffects);
     }
 
-    void ActionSpell::getCombatRange(float& rangeAttack, float& rangeFollow)
+    float ActionSpell::getCombatRange (bool& isRanged) const
     {
         const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(mSpellId);
         int types = getRangeTypes(spell->mEffects);
-        suggestCombatRange(types, rangeAttack, rangeFollow);
+
+        isRanged = (types & Target);
+        return suggestCombatRange(types);
     }
 
     void ActionEnchantedItem::prepare(const MWWorld::Ptr &actor)
@@ -437,18 +447,17 @@ namespace MWMechanics
         actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Spell);
     }
 
-    void ActionEnchantedItem::getCombatRange(float& rangeAttack, float& rangeFollow)
+    float ActionEnchantedItem::getCombatRange(bool& isRanged) const
     {
         const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(mItem->getClass().getEnchantment(*mItem));
         int types = getRangeTypes(enchantment->mEffects);
-        suggestCombatRange(types, rangeAttack, rangeFollow);
+        return suggestCombatRange(types);
     }
 
-    void ActionPotion::getCombatRange(float& rangeAttack, float& rangeFollow)
+    float ActionPotion::getCombatRange(bool& isRanged) const
     {
         // distance doesn't matter, so back away slightly to avoid enemy hits
-        rangeAttack = 600.f;
-        rangeFollow = 0.f;
+        return 600.f;
     }
 
     void ActionPotion::prepare(const MWWorld::Ptr &actor)
@@ -478,9 +487,35 @@ namespace MWMechanics
         actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Weapon);
     }
 
-    void ActionWeapon::getCombatRange(float& rangeAttack, float& rangeFollow)
+    float ActionWeapon::getCombatRange(bool& isRanged) const
     {
-        // Already done in AiCombat itself
+        isRanged = false;
+
+        static const float fCombatDistance = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fCombatDistance")->getFloat();
+
+        if (mWeapon.isEmpty())
+        {
+            static float fHandToHandReach =
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fHandToHandReach")->getFloat();
+            return fHandToHandReach * fCombatDistance;
+        }
+
+        const ESM::Weapon* weapon = mWeapon.get<ESM::Weapon>()->mBase;
+
+        if (weapon->mData.mType >= ESM::Weapon::MarksmanBow)
+        {
+            isRanged = true;
+            return 1000.f;
+        }
+        else
+            return weapon->mData.mReach * fCombatDistance;
+    }
+
+    const ESM::Weapon* ActionWeapon::getWeapon() const
+    {
+        if (mWeapon.isEmpty())
+            return NULL;
+        return mWeapon.get<ESM::Weapon>()->mBase;
     }
 
     boost::shared_ptr<Action> prepareNextAction(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy)
@@ -488,6 +523,7 @@ namespace MWMechanics
         Spells& spells = actor.getClass().getCreatureStats(actor).getSpells();
 
         float bestActionRating = 0.f;
+        float antiFleeRating = 0.f;
         // Default to hand-to-hand combat
         boost::shared_ptr<Action> bestAction (new ActionWeapon(MWWorld::Ptr()));
         if (actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
@@ -507,6 +543,7 @@ namespace MWMechanics
                 {
                     bestActionRating = rating;
                     bestAction.reset(new ActionPotion(*it));
+                    antiFleeRating = std::numeric_limits<float>::max();
                 }
             }
 
@@ -517,6 +554,7 @@ namespace MWMechanics
                 {
                     bestActionRating = rating;
                     bestAction.reset(new ActionEnchantedItem(it));
+                    antiFleeRating = std::numeric_limits<float>::max();
                 }
             }
 
@@ -564,6 +602,7 @@ namespace MWMechanics
 
                     bestActionRating = rating;
                     bestAction.reset(new ActionWeapon(*it, ammo));
+                    antiFleeRating = vanillaRateWeaponAndAmmo(*it, ammo, actor, enemy);
                 }
             }
         }
@@ -577,13 +616,308 @@ namespace MWMechanics
             {
                 bestActionRating = rating;
                 bestAction.reset(new ActionSpell(spell->mId));
+                antiFleeRating = vanillaRateSpell(spell, actor, enemy);
             }
         }
 
+        if (makeFleeDecision(actor, enemy, antiFleeRating))
+            bestAction.reset(new ActionFlee());
+
         if (bestAction.get())
             bestAction->prepare(actor);
 
         return bestAction;
     }
 
+
+    float getDistanceMinusHalfExtents(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, bool minusZDist)
+    {
+        osg::Vec3f actor1Pos = actor1.getRefData().getPosition().asVec3();
+        osg::Vec3f actor2Pos = actor2.getRefData().getPosition().asVec3();
+
+        float dist = (actor1Pos - actor2Pos).length();
+
+        if (minusZDist)
+            dist -= std::abs(actor1Pos.z() - actor2Pos.z());
+
+        return (dist
+                - MWBase::Environment::get().getWorld()->getHalfExtents(actor1).y()
+                - MWBase::Environment::get().getWorld()->getHalfExtents(actor2).y());
+    }
+
+    float getMaxAttackDistance(const MWWorld::Ptr& actor)
+    {
+        const CreatureStats& stats = actor.getClass().getCreatureStats(actor);
+        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+
+        std::string selectedSpellId = stats.getSpells().getSelectedSpell();
+        MWWorld::Ptr selectedEnchItem;
+
+        MWWorld::Ptr activeWeapon, activeAmmo;
+        if (actor.getClass().hasInventoryStore(actor))
+        {
+            MWWorld::InventoryStore& invStore = actor.getClass().getInventoryStore(actor);
+
+            MWWorld::ContainerStoreIterator item = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+            if (item != invStore.end() && item.getType() == MWWorld::ContainerStore::Type_Weapon)
+                activeWeapon = *item;
+
+            item = invStore.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
+            if (item != invStore.end() && item.getType() == MWWorld::ContainerStore::Type_Weapon)
+                activeAmmo = *item;
+
+            if (invStore.getSelectedEnchantItem() != invStore.end())
+                selectedEnchItem = *invStore.getSelectedEnchantItem();
+        }
+
+        float dist = 1.0f;
+        if (activeWeapon.isEmpty() && !selectedSpellId.empty() && !selectedEnchItem.isEmpty())
+        {
+            static const float fHandToHandReach = gmst.find("fHandToHandReach")->getFloat();
+            dist = fHandToHandReach;
+        }
+        else if (stats.getDrawState() == MWMechanics::DrawState_Spell)
+        {
+            dist = 1.0f;
+            if (!selectedSpellId.empty())
+            {
+                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(selectedSpellId);
+                for (std::vector<ESM::ENAMstruct>::const_iterator effectIt =
+                     spell->mEffects.mList.begin(); effectIt != spell->mEffects.mList.end(); ++effectIt)
+                {
+                    if (effectIt->mArea == ESM::RT_Target)
+                    {
+                        const ESM::MagicEffect* effect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectIt->mEffectID);
+                        dist = effect->mData.mSpeed;
+                        break;
+                    }
+                }
+            }
+            else if (!selectedEnchItem.isEmpty())
+            {
+                std::string enchId = selectedEnchItem.getClass().getEnchantment(selectedEnchItem);
+                if (!enchId.empty())
+                {
+                    const ESM::Enchantment* ench = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(enchId);
+                    for (std::vector<ESM::ENAMstruct>::const_iterator effectIt =
+                         ench->mEffects.mList.begin(); effectIt != ench->mEffects.mList.end(); ++effectIt)
+                    {
+                        if (effectIt->mArea == ESM::RT_Target)
+                        {
+                            const ESM::MagicEffect* effect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectIt->mEffectID);
+                            dist = effect->mData.mSpeed;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            static const float fTargetSpellMaxSpeed = gmst.find("fTargetSpellMaxSpeed")->getFloat();
+            dist *= std::max(1000.0f, fTargetSpellMaxSpeed);
+        }
+        else if (!activeWeapon.isEmpty())
+        {
+            const ESM::Weapon* esmWeap = activeWeapon.get<ESM::Weapon>()->mBase;
+            if (esmWeap->mData.mType >= ESM::Weapon::MarksmanBow)
+            {
+                static const float fTargetSpellMaxSpeed = gmst.find("fProjectileMaxSpeed")->getFloat();
+                dist = fTargetSpellMaxSpeed;
+                if (!activeAmmo.isEmpty())
+                {
+                    const ESM::Weapon* esmAmmo = activeAmmo.get<ESM::Weapon>()->mBase;
+                    dist *= esmAmmo->mData.mSpeed;
+                }
+            }
+            else if (esmWeap->mData.mReach > 1)
+            {
+                dist = esmWeap->mData.mReach;
+            }
+        }
+
+        dist = (dist > 0.f) ? dist : 1.0f;
+
+        static const float fCombatDistance = gmst.find("fCombatDistance")->getFloat();
+        static const float fCombatDistanceWerewolfMod = gmst.find("fCombatDistanceWerewolfMod")->getFloat();
+
+        float combatDistance = fCombatDistance;
+        if (actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
+            combatDistance *= (fCombatDistanceWerewolfMod + 1.0f);
+
+        if (dist < combatDistance)
+            dist *= combatDistance;
+
+        return dist;
+    }
+
+    bool canFight(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
+    {
+        ESM::Position actorPos = actor.getRefData().getPosition();
+        ESM::Position enemyPos = enemy.getRefData().getPosition();
+
+        const CreatureStats& enemyStats = enemy.getClass().getCreatureStats(enemy);
+        if (enemyStats.getMagicEffects().get(ESM::MagicEffect::Invisibility).getMagnitude() > 0
+                || enemyStats.getMagicEffects().get(ESM::MagicEffect::Chameleon).getMagnitude() > 0)
+        {
+            if (!MWBase::Environment::get().getMechanicsManager()->awarenessCheck(enemy, actor))
+                return false;
+        }
+
+        if (actor.getClass().isPureWaterCreature(actor))
+        {
+            if (!MWBase::Environment::get().getWorld()->isWading(enemy))
+                return false;
+        }
+
+        float atDist = getMaxAttackDistance(actor);
+        if (atDist > getDistanceMinusHalfExtents(actor, enemy)
+                && atDist > std::abs(actorPos.pos[2] - enemyPos.pos[2]))
+        {
+            if (MWBase::Environment::get().getWorld()->getLOS(actor, enemy))
+                return true;
+        }
+
+        if (actor.getClass().isPureFlyingCreature(actor) || actor.getClass().isPureLandCreature(actor))
+        {
+            if (MWBase::Environment::get().getWorld()->isSwimming(enemy))
+                return false;
+        }
+
+        if (actor.getClass().isBipedal(actor) || !actor.getClass().canFly(actor))
+        {
+            if (enemy.getClass().getCreatureStats(enemy).getMagicEffects().get(ESM::MagicEffect::Levitate).getMagnitude() > 0)
+            {
+                float attackDistance = getMaxAttackDistance(actor);
+                if ((attackDistance + actorPos.pos[2]) < enemyPos.pos[2])
+                {
+                    if (enemy.getCell()->isExterior())
+                    {
+                        if (attackDistance < (enemyPos.pos[2] - MWBase::Environment::get().getWorld()->getTerrainHeightAt(enemyPos.asVec3())))
+                            return false;
+                    }
+                }
+            }
+        }
+
+        if (!actor.getClass().canWalk(actor) && !actor.getClass().isBipedal(actor))
+            return true;
+
+        if (actor.getClass().getCreatureStats(actor).getMagicEffects().get(ESM::MagicEffect::Levitate).getMagnitude() > 0)
+            return true;
+
+        if (MWBase::Environment::get().getWorld()->isSwimming(actor))
+            return true;
+
+        if (getDistanceMinusHalfExtents(actor, enemy, true) <= 0.0f)
+            return false;
+
+        return true;
+    }
+
+    float vanillaRateSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
+    {
+        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+
+        static const float fAIMagicSpellMult = gmst.find("fAIMagicSpellMult")->getFloat();
+        static const float fAIRangeMagicSpellMult = gmst.find("fAIRangeMagicSpellMult")->getFloat();
+
+        float mult = fAIMagicSpellMult;
+
+        for (std::vector<ESM::ENAMstruct>::const_iterator effectIt =
+             spell->mEffects.mList.begin(); effectIt != spell->mEffects.mList.end(); ++effectIt)
+        {
+            if (effectIt->mArea == ESM::RT_Target)
+            {
+                if (!MWBase::Environment::get().getWorld()->isSwimming(enemy))
+                    mult = fAIRangeMagicSpellMult;
+                else
+                    mult = 0.0f;
+                break;
+            }
+        }
+
+        return MWMechanics::getSpellSuccessChance(spell, actor) * mult;
+    }
+
+    float vanillaRateWeaponAndAmmo(const MWWorld::Ptr& weapon, const MWWorld::Ptr& ammo, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
+    {
+        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+
+        static const float fAIMeleeWeaponMult = gmst.find("fAIMeleeWeaponMult")->getFloat();
+        static const float fAIMeleeArmorMult = gmst.find("fAIMeleeArmorMult")->getFloat();
+        static const float fAIRangeMeleeWeaponMult = gmst.find("fAIRangeMeleeWeaponMult")->getFloat();
+
+        if (weapon.isEmpty())
+            return 0.f;
+
+        float skillMult = actor.getClass().getSkill(actor, weapon.getClass().getEquipmentSkill(weapon)) * 0.01f;
+        float chopMult = fAIMeleeWeaponMult;
+        float bonusDamage = 0.f;
+
+        const ESM::Weapon* esmWeap = weapon.get<ESM::Weapon>()->mBase;
+
+        if (esmWeap->mData.mType >= ESM::Weapon::MarksmanBow)
+        {
+            if (!ammo.isEmpty() && !MWBase::Environment::get().getWorld()->isSwimming(enemy))
+            {
+                bonusDamage = ammo.get<ESM::Weapon>()->mBase->mData.mChop[1];
+                chopMult = fAIRangeMeleeWeaponMult;
+            }
+            else
+                chopMult = 0.f;
+        }
+
+        float chopRating = (esmWeap->mData.mChop[1] + bonusDamage) * skillMult * chopMult;
+        float slashRating = esmWeap->mData.mSlash[1] * skillMult * fAIMeleeWeaponMult;
+        float thrustRating = esmWeap->mData.mThrust[1] * skillMult * fAIMeleeWeaponMult;
+
+        return actor.getClass().getArmorRating(actor) * fAIMeleeArmorMult
+                    + std::max(std::max(chopRating, slashRating), thrustRating);
+    }
+
+    float vanillaRateFlee(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
+    {
+        const CreatureStats& stats = actor.getClass().getCreatureStats(actor);
+        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+
+        int flee = stats.getAiSetting(CreatureStats::AI_Flee).getModified();
+        if (flee >= 100)
+            return flee;
+
+        static const float fAIFleeHealthMult = gmst.find("fAIFleeHealthMult")->getFloat();
+        static const float fAIFleeFleeMult = gmst.find("fAIFleeFleeMult")->getFloat();
+
+        float healthPercentage = (stats.getHealth().getModified() == 0.0f)
+                                    ? 1.0f : stats.getHealth().getCurrent() / stats.getHealth().getModified();
+        float rating = (1.0f - healthPercentage) * fAIFleeHealthMult + flee * fAIFleeFleeMult;
+
+        static const int iWereWolfLevelToAttack = gmst.find("iWereWolfLevelToAttack")->getInt();
+
+        if (enemy.getClass().isNpc() && enemy.getClass().getNpcStats(enemy).isWerewolf() && stats.getLevel() < iWereWolfLevelToAttack)
+        {
+            static const int iWereWolfFleeMod = gmst.find("iWereWolfFleeMod")->getInt();
+            rating = iWereWolfFleeMod;
+        }
+
+        if (rating != 0.0f)
+            rating += getFightDistanceBias(actor, enemy);
+
+        return rating;
+    }
+
+    bool makeFleeDecision(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, float antiFleeRating)
+    {
+        float fleeRating = vanillaRateFlee(actor, enemy);
+        if (fleeRating < 100.0f)
+            fleeRating = 0.0f;
+
+        if (fleeRating > antiFleeRating)
+            return true;
+
+        // Run away after summoning a creature if we have nothing to use but fists.
+        if (antiFleeRating == 0.0f && !actor.getClass().getCreatureStats(actor).getSummonedCreatureMap().empty())
+            return true;
+
+        return false;
+    }
+
 }
diff --git a/apps/openmw/mwmechanics/aicombataction.hpp b/apps/openmw/mwmechanics/aicombataction.hpp
index 6f5cbfbc2..0f1f7dd5b 100644
--- a/apps/openmw/mwmechanics/aicombataction.hpp
+++ b/apps/openmw/mwmechanics/aicombataction.hpp
@@ -3,11 +3,11 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include <components/esm/loadspel.hpp>
+
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/containerstore.hpp"
 
-#include <components/esm/loadspel.hpp>
-
 namespace MWMechanics
 {
 
@@ -16,8 +16,22 @@ namespace MWMechanics
     public:
         virtual ~Action() {}
         virtual void prepare(const MWWorld::Ptr& actor) = 0;
-        virtual void getCombatRange (float& rangeAttack, float& rangeFollow) = 0;
+        virtual float getCombatRange (bool& isRanged) const = 0;
         virtual float getActionCooldown() { return 0.f; }
+        virtual const ESM::Weapon* getWeapon() const { return NULL; };
+        virtual bool isAttackingOrSpell() const { return true; }
+        virtual bool isFleeing() const { return false; }
+    };
+
+    class ActionFlee : public Action
+    {
+    public:
+        ActionFlee() {}
+        virtual void prepare(const MWWorld::Ptr& actor) {}
+        virtual float getCombatRange (bool& isRanged) const { return 0.0f; }
+        virtual float getActionCooldown() { return 3.0f; }
+        virtual bool isAttackingOrSpell() const { return false; }
+        virtual bool isFleeing() const { return true; }
     };
 
     class ActionSpell : public Action
@@ -28,7 +42,7 @@ namespace MWMechanics
         /// Sets the given spell as selected on the actor's spell list.
         virtual void prepare(const MWWorld::Ptr& actor);
 
-        virtual void getCombatRange (float& rangeAttack, float& rangeFollow);
+        virtual float getCombatRange (bool& isRanged) const;
     };
 
     class ActionEnchantedItem : public Action
@@ -38,7 +52,7 @@ namespace MWMechanics
         MWWorld::ContainerStoreIterator mItem;
         /// Sets the given item as selected enchanted item in the actor's InventoryStore.
         virtual void prepare(const MWWorld::Ptr& actor);
-        virtual void getCombatRange (float& rangeAttack, float& rangeFollow);
+        virtual float getCombatRange (bool& isRanged) const;
 
         /// Since this action has no animation, apply a small cool down for using it
         virtual float getActionCooldown() { return 1.f; }
@@ -51,7 +65,8 @@ namespace MWMechanics
         MWWorld::Ptr mPotion;
         /// Drinks the given potion.
         virtual void prepare(const MWWorld::Ptr& actor);
-        virtual void getCombatRange (float& rangeAttack, float& rangeFollow);
+        virtual float getCombatRange (bool& isRanged) const;
+        virtual bool isAttackingOrSpell() const { return false; }
 
         /// Since this action has no animation, apply a small cool down for using it
         virtual float getActionCooldown() { return 1.f; }
@@ -69,7 +84,8 @@ namespace MWMechanics
             : mAmmunition(ammo), mWeapon(weapon) {}
         /// Equips the given weapon.
         virtual void prepare(const MWWorld::Ptr& actor);
-        virtual void getCombatRange (float& rangeAttack, float& rangeFollow);
+        virtual float getCombatRange (bool& isRanged) const;
+        virtual const ESM::Weapon* getWeapon() const;
     };
 
     float rateSpell (const ESM::Spell* spell, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
@@ -85,6 +101,15 @@ namespace MWMechanics
     float rateEffects (const ESM::EffectList& list, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
 
     boost::shared_ptr<Action> prepareNextAction (const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
+
+    float getDistanceMinusHalfExtents(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, bool minusZDist=false);
+    float getMaxAttackDistance(const MWWorld::Ptr& actor);
+    bool canFight(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
+
+    float vanillaRateSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
+    float vanillaRateWeaponAndAmmo(const MWWorld::Ptr& weapon, const MWWorld::Ptr& ammo, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
+    float vanillaRateFlee(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
+    bool makeFleeDecision(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, float antiFleeRating);
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index fffab8d77..4c9b5fd4f 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -10,13 +10,11 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
-
+#include "creaturestats.hpp"
 #include "steering.hpp"
 #include "movement.hpp"
 
 /*
-    TODO: Test vanilla behavior on passing x0, y0, and z0 with duration of anything including 0.
     TODO: Different behavior for AIEscort a d x y z and AIEscortCell a c d x y z.
     TODO: Take account for actors being in different cells.
 */
@@ -24,29 +22,19 @@
 namespace MWMechanics
 {
     AiEscort::AiEscort(const std::string &actorId, int duration, float x, float y, float z)
-    : mActorId(actorId), mX(x), mY(y), mZ(z), mRemainingDuration(static_cast<float>(duration))
+    : mActorId(actorId), mX(x), mY(y), mZ(z), mDuration(duration), mRemainingDuration(static_cast<float>(duration))
     , mCellX(std::numeric_limits<int>::max())
     , mCellY(std::numeric_limits<int>::max())
     {
         mMaxDist = 450;
-
-        // The CS Help File states that if a duration is given, the AI package will run for that long
-        // BUT if a location is givin, it "trumps" the duration so it will simply escort to that location.
-        if(mX != 0 || mY != 0 || mZ != 0)
-            mRemainingDuration = 0;
     }
 
     AiEscort::AiEscort(const std::string &actorId, const std::string &cellId,int duration, float x, float y, float z)
-    : mActorId(actorId), mCellId(cellId), mX(x), mY(y), mZ(z), mRemainingDuration(static_cast<float>(duration))
+    : mActorId(actorId), mCellId(cellId), mX(x), mY(y), mZ(z), mDuration(duration), mRemainingDuration(static_cast<float>(duration))
     , mCellX(std::numeric_limits<int>::max())
     , mCellY(std::numeric_limits<int>::max())
     {
         mMaxDist = 450;
-
-        // The CS Help File states that if a duration is given, the AI package will run for that long
-        // BUT if a location is given, it "trumps" the duration so it will simply escort to that location.
-        if(mX != 0 || mY != 0 || mZ != 0)
-            mRemainingDuration = 0;
     }
 
     AiEscort::AiEscort(const ESM::AiSequence::AiEscort *escort)
@@ -56,6 +44,12 @@ namespace MWMechanics
         , mCellX(std::numeric_limits<int>::max())
         , mCellY(std::numeric_limits<int>::max())
     {
+        // mDuration isn't saved in the save file, so just giving it "1" for now if the package has a duration.
+        // The exact value of mDuration only matters for repeating packages.
+        if (mRemainingDuration > 0) // Previously mRemainingDuration could be negative even when mDuration was 0. Checking for > 0 should fix old saves.
+            mDuration = 1;
+        else
+            mDuration = 0;
     }
 
 
@@ -68,11 +62,14 @@ namespace MWMechanics
     {
         // If AiEscort has ran for as long or longer then the duration specified
         // and the duration is not infinite, the package is complete.
-        if(mRemainingDuration != 0)
+        if (mDuration > 0)
         {
-            mRemainingDuration -= duration;
-            if (duration <= 0)
+            mRemainingDuration -= ((duration*MWBase::Environment::get().getWorld()->getTimeScaleFactor()) / 3600);
+            if (mRemainingDuration <= 0)
+            {
+                mRemainingDuration = mDuration;
                 return true;
+            }
         }
 
         if (!mCellId.empty() && mCellId != actor.getCell()->getCell()->getCellId().mWorldspace)
@@ -93,19 +90,22 @@ namespace MWMechanics
             (differenceBetween[0] * differenceBetween[0]) + (differenceBetween[1] * differenceBetween[1]) + (differenceBetween[2] *
                 differenceBetween[2]);
 
-        if(distanceBetweenResult <= mMaxDist * mMaxDist)
+        if (distanceBetweenResult <= mMaxDist * mMaxDist)
         {
             ESM::Pathgrid::Point point(static_cast<int>(mX), static_cast<int>(mY), static_cast<int>(mZ));
             point.mAutogenerated = 0;
             point.mConnectionNum = 0;
             point.mUnknown = 0;
-            if(pathTo(actor,point,duration)) //Returns true on path complete
+            if (pathTo(actor,point,duration)) //Returns true on path complete
+            {
+                mRemainingDuration = mDuration;
                 return true;
+            }
             mMaxDist = 450;
         }
         else
         {
-            // Stop moving if the player is to far away
+            // Stop moving if the player is too far away
             MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(actor, "idle3", 0, 1);
             actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
             mMaxDist = 250;
@@ -119,7 +119,7 @@ namespace MWMechanics
         return TypeIdEscort;
     }
 
-    MWWorld::Ptr AiEscort::getTarget()
+    MWWorld::Ptr AiEscort::getTarget() const
     {
         return MWBase::Environment::get().getWorld()->getPtr(mActorId, false);
     }
@@ -139,5 +139,12 @@ namespace MWMechanics
         package.mPackage = escort.release();
         sequence.mPackages.push_back(package);
     }
+
+    void AiEscort::fastForward(const MWWorld::Ptr& actor, AiState &state)
+    {
+        // Update duration counter if this package has a duration
+        if (mDuration > 0)
+            mRemainingDuration--;
+    }
 }
 
diff --git a/apps/openmw/mwmechanics/aiescort.hpp b/apps/openmw/mwmechanics/aiescort.hpp
index cdb0f7936..719582271 100644
--- a/apps/openmw/mwmechanics/aiescort.hpp
+++ b/apps/openmw/mwmechanics/aiescort.hpp
@@ -2,6 +2,7 @@
 #define GAME_MWMECHANICS_AIESCORT_H
 
 #include "aipackage.hpp"
+
 #include <string>
 
 #include "pathfinding.hpp"
@@ -37,11 +38,13 @@ namespace MWMechanics
 
             virtual int getTypeId() const;
 
-            MWWorld::Ptr getTarget();
+            MWWorld::Ptr getTarget() const;
             virtual bool sideWithTarget() const { return true; }
 
             void writeState(ESM::AiSequence::AiSequence &sequence) const;
 
+            void fastForward(const MWWorld::Ptr& actor, AiState& state);
+
         private:
             std::string mActorId;
             std::string mCellId;
@@ -49,7 +52,8 @@ namespace MWMechanics
             float mY;
             float mZ;
             float mMaxDist;
-            float mRemainingDuration; // In seconds
+            float mDuration; // In hours
+            float mRemainingDuration; // In hours
 
             int mCellX;
             int mCellY;
diff --git a/apps/openmw/mwmechanics/aiface.cpp b/apps/openmw/mwmechanics/aiface.cpp
new file mode 100644
index 000000000..7d15cabf2
--- /dev/null
+++ b/apps/openmw/mwmechanics/aiface.cpp
@@ -0,0 +1,31 @@
+#include "aiface.hpp"
+
+#include "../mwbase/world.hpp"
+
+#include "steering.hpp"
+
+MWMechanics::AiFace::AiFace(float targetX, float targetY)
+    : mTargetX(targetX), mTargetY(targetY)
+{
+}
+
+MWMechanics::AiPackage *MWMechanics::AiFace::clone() const
+{
+    return new AiFace(*this);
+}
+
+bool MWMechanics::AiFace::execute(const MWWorld::Ptr& actor, MWMechanics::CharacterController& /*characterController*/, MWMechanics::AiState& /*state*/, float /*duration*/)
+{
+    osg::Vec3f dir = osg::Vec3f(mTargetX, mTargetY, 0) - actor.getRefData().getPosition().asVec3();
+    return zTurn(actor, std::atan2(dir.x(), dir.y()), osg::DegreesToRadians(3.f));
+}
+
+int MWMechanics::AiFace::getTypeId() const
+{
+    return AiPackage::TypeIdFace;
+}
+
+unsigned int MWMechanics::AiFace::getPriority() const
+{
+    return 2;
+}
diff --git a/apps/openmw/mwmechanics/aiface.hpp b/apps/openmw/mwmechanics/aiface.hpp
new file mode 100644
index 000000000..099e5d237
--- /dev/null
+++ b/apps/openmw/mwmechanics/aiface.hpp
@@ -0,0 +1,29 @@
+#ifndef GAME_MWMECHANICS_AIFACE_H
+#define GAME_MWMECHANICS_AIFACE_H
+
+#include "aipackage.hpp"
+
+namespace MWMechanics
+{
+    /// AiPackage which makes an actor face a certain direction.
+    class AiFace : public AiPackage {
+        public:
+            AiFace(float targetX, float targetY);
+
+            virtual AiPackage *clone() const;
+
+            virtual bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration);
+
+            virtual int getTypeId() const;
+
+            virtual unsigned int getPriority() const;
+
+            virtual bool canCancel() const { return false; }
+            virtual bool shouldCancelPreviousAi() const { return false; }
+
+        private:
+            float mTargetX, mTargetY;
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index 1430d42f2..9d79d4ba9 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -6,11 +6,12 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+
 #include "creaturestats.hpp"
 #include "movement.hpp"
-
 #include "steering.hpp"
 
 namespace MWMechanics
@@ -28,21 +29,21 @@ struct AiFollowStorage : AiTemporaryBase
 int AiFollow::mFollowIndexCounter = 0;
 
 AiFollow::AiFollow(const std::string &actorId,float duration, float x, float y, float z)
-: mAlwaysFollow(false), mCommanded(false), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
+: mAlwaysFollow(false), mCommanded(false), mDuration(duration), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
 , mActorRefId(actorId), mActorId(-1), mCellId(""), mActive(false), mFollowIndex(mFollowIndexCounter++)
 {
 }
+
 AiFollow::AiFollow(const std::string &actorId,const std::string &cellId,float duration, float x, float y, float z)
-: mAlwaysFollow(false), mCommanded(false), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
+: mAlwaysFollow(false), mCommanded(false), mDuration(duration), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
 , mActorRefId(actorId), mActorId(-1), mCellId(cellId), mActive(false), mFollowIndex(mFollowIndexCounter++)
 {
 }
 
 AiFollow::AiFollow(const std::string &actorId, bool commanded)
-: mAlwaysFollow(true), mCommanded(commanded), mRemainingDuration(0), mX(0), mY(0), mZ(0)
+: mAlwaysFollow(true), mCommanded(commanded), mDuration(0), mRemainingDuration(0), mX(0), mY(0), mZ(0)
 , mActorRefId(actorId), mActorId(-1), mCellId(""), mActive(false), mFollowIndex(mFollowIndexCounter++)
 {
-
 }
 
 AiFollow::AiFollow(const ESM::AiSequence::AiFollow *follow)
@@ -51,7 +52,12 @@ AiFollow::AiFollow(const ESM::AiSequence::AiFollow *follow)
     , mActorRefId(follow->mTargetId), mActorId(-1)
     , mCellId(follow->mCellId), mActive(follow->mActive), mFollowIndex(mFollowIndexCounter++)
 {
-
+// mDuration isn't saved in the save file, so just giving it "1" for now if the package had a duration.
+// The exact value of mDuration only matters for repeating packages.
+    if (mRemainingDuration > 0) // Previously mRemainingDuration could be negative even when mDuration was 0. Checking for > 0 should fix old saves.
+       mDuration = 1;
+    else
+       mDuration = 0;
 }
 
 bool AiFollow::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
@@ -98,28 +104,31 @@ bool AiFollow::execute (const MWWorld::Ptr& actor, CharacterController& characte
         ++i;
     }
 
-    if(!mAlwaysFollow) //Update if you only follow for a bit
+    if (!mAlwaysFollow) //Update if you only follow for a bit
     {
          //Check if we've run out of time
-        if (mRemainingDuration != 0)
+        if (mDuration > 0)
         {
-            mRemainingDuration -= duration;
-            if (duration <= 0)
+            mRemainingDuration -= ((duration*MWBase::Environment::get().getWorld()->getTimeScaleFactor()) / 3600);
+            if (mRemainingDuration <= 0)
+            {
+                mRemainingDuration = mDuration;
                 return true;
+            }
         }
 
-        if((pos.pos[0]-mX)*(pos.pos[0]-mX) +
+        if ((pos.pos[0]-mX)*(pos.pos[0]-mX) +
             (pos.pos[1]-mY)*(pos.pos[1]-mY) +
             (pos.pos[2]-mZ)*(pos.pos[2]-mZ) < followDistance*followDistance) //Close-ish to final position
         {
-            if(actor.getCell()->isExterior()) //Outside?
+            if (actor.getCell()->isExterior()) //Outside?
             {
-                if(mCellId == "") //No cell to travel to
+                if (mCellId == "") //No cell to travel to
                     return true;
             }
             else
             {
-                if(mCellId == actor.getCell()->getCell()->mName) //Cell to travel to
+                if (mCellId == actor.getCell()->getCell()->mName) //Cell to travel to
                     return true;
             }
         }
@@ -128,35 +137,24 @@ bool AiFollow::execute (const MWWorld::Ptr& actor, CharacterController& characte
     //Set the target destination from the actor
     ESM::Pathgrid::Point dest = target.getRefData().getPosition().pos;
 
-    float dist = distance(dest, pos.pos[0], pos.pos[1], pos.pos[2]);
-
-    if (storage.mMoving)  //Stop when you get close
-        storage.mMoving = (dist > followDistance);
-    else
+    if (!storage.mMoving) 
     {
-        const float threshold = 10;
-        storage.mMoving = (dist > followDistance + threshold);
+        const float threshold = 10; // to avoid constant switching between moving/stopping
+        followDistance += threshold;
     }
 
-    if(!storage.mMoving)
-    {
-        actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
+    storage.mMoving = !pathTo(actor, dest, duration, followDistance); // Go to the destination
 
-        // turn towards target anyway
-        float directionX = target.getRefData().getPosition().pos[0] - actor.getRefData().getPosition().pos[0];
-        float directionY = target.getRefData().getPosition().pos[1] - actor.getRefData().getPosition().pos[1];
-        zTurn(actor, std::atan2(directionX,directionY), osg::DegreesToRadians(5.f));
-    }
-    else
+    if (storage.mMoving)
     {
-        pathTo(actor, dest, duration); //Go to the destination
-    }
+        //Check if you're far away
+        float dist = distance(dest, pos.pos[0], pos.pos[1], pos.pos[2]);
 
-    //Check if you're far away
-    if(dist > 450)
-        actor.getClass().getCreatureStats(actor).setMovementFlag(MWMechanics::CreatureStats::Flag_Run, true); //Make NPC run
-    else if(dist  < 325) //Have a bit of a dead zone, otherwise npc will constantly flip between running and not when right on the edge of the running threshhold
-        actor.getClass().getCreatureStats(actor).setMovementFlag(MWMechanics::CreatureStats::Flag_Run, false); //make NPC walk
+        if (dist > 450)
+            actor.getClass().getCreatureStats(actor).setMovementFlag(MWMechanics::CreatureStats::Flag_Run, true); //Make NPC run
+        else if (dist < 325) //Have a bit of a dead zone, otherwise npc will constantly flip between running and not when right on the edge of the running threshold
+            actor.getClass().getCreatureStats(actor).setMovementFlag(MWMechanics::CreatureStats::Flag_Run, false); //make NPC walk
+    }
 
     return false;
 }
@@ -200,7 +198,7 @@ void AiFollow::writeState(ESM::AiSequence::AiSequence &sequence) const
     sequence.mPackages.push_back(package);
 }
 
-MWWorld::Ptr AiFollow::getTarget()
+MWWorld::Ptr AiFollow::getTarget() const
 {
     if (mActorId == -2)
         return MWWorld::Ptr();
@@ -228,4 +226,11 @@ int AiFollow::getFollowIndex() const
     return mFollowIndex;
 }
 
+void AiFollow::fastForward(const MWWorld::Ptr& actor, AiState &state)
+{
+    // Update duration counter if this package has a duration
+    if (mDuration > 0)
+        mRemainingDuration--;
+}
+
 }
diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp
index 017ea7122..051a4a2ce 100644
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@@ -2,10 +2,13 @@
 #define GAME_MWMECHANICS_AIFOLLOW_H
 
 #include "aipackage.hpp"
+
 #include <string>
-#include "pathfinding.hpp"
+
 #include <components/esm/defs.hpp>
 
+#include "pathfinding.hpp"
+
 namespace ESM
 {
 namespace AiSequence
@@ -31,9 +34,10 @@ namespace MWMechanics
 
             AiFollow(const ESM::AiSequence::AiFollow* follow);
 
-            MWWorld::Ptr getTarget();
+            MWWorld::Ptr getTarget() const;
             virtual bool sideWithTarget() const { return true; }
             virtual bool followTargetThroughDoors() const { return true; }
+            virtual bool shouldCancelPreviousAi() const { return !mCommanded; }
 
             virtual AiFollow *clone() const;
 
@@ -50,17 +54,20 @@ namespace MWMechanics
 
             int getFollowIndex() const;
 
+            void fastForward(const MWWorld::Ptr& actor, AiState& state);
+
         private:
             /// This will make the actor always follow.
             /** Thus ignoring mDuration and mX,mY,mZ (used for summoned creatures). **/
             bool mAlwaysFollow;
             bool mCommanded;
-            float mRemainingDuration; // Seconds
+            float mDuration; // Hours
+            float mRemainingDuration; // Hours
             float mX;
             float mY;
             float mZ;
             std::string mActorRefId;
-            int mActorId;
+            mutable int mActorId;
             std::string mCellId;
             bool mActive; // have we spotted the target?
             int mFollowIndex;
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 58ba7dfe8..abdc57042 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -8,19 +8,30 @@
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+
+#include "../mwworld/action.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+
 #include "creaturestats.hpp"
 #include "movement.hpp"
-#include "../mwworld/action.hpp"
-
 #include "steering.hpp"
 #include "actorutil.hpp"
 #include "coordinateconverter.hpp"
 
+#include <osg/Quat>
+
 MWMechanics::AiPackage::~AiPackage() {}
 
-MWWorld::Ptr MWMechanics::AiPackage::getTarget()
+MWMechanics::AiPackage::AiPackage() : 
+    mTimer(AI_REACTION_TIME + 1.0f), // to force initial pathbuild
+    mRotateOnTheRunChecks(0),
+    mIsShortcutting(false),
+    mShortcutProhibited(false), mShortcutFailPos()
+{
+}
+
+MWWorld::Ptr MWMechanics::AiPackage::getTarget() const
 {
     return MWWorld::Ptr();
 }
@@ -45,14 +56,25 @@ bool MWMechanics::AiPackage::shouldCancelPreviousAi() const
     return true;
 }
 
-MWMechanics::AiPackage::AiPackage() : mTimer(0.26f) { //mTimer starts at .26 to force initial pathbuild
-
+bool MWMechanics::AiPackage::getRepeat() const
+{
+    return false;
 }
 
+void MWMechanics::AiPackage::reset()
+{
+    // reset all members
+    mTimer = AI_REACTION_TIME + 1.0f;
+    mIsShortcutting = false;
+    mShortcutProhibited = false;
+    mShortcutFailPos = ESM::Pathgrid::Point();
+
+    mPathFinder.clearPath();
+    mObstacleCheck.clear();
+}
 
-bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, ESM::Pathgrid::Point dest, float duration)
+bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const ESM::Pathgrid::Point& dest, float duration, float destTolerance)
 {
-    //Update various Timers
     mTimer += duration; //Update timer
 
     ESM::Position pos = actor.getRefData().getPosition(); //position of the actor
@@ -67,38 +89,79 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, ESM::Pathgrid::Po
         return false;
     }
 
-    //***********************
-    /// Checks if you can't get to the end position at all, adds end position to end of path
-    /// Rebuilds path every quarter of a second, in case the target has moved
-    //***********************
-    if(mTimer > 0.25)
+    // handle path building and shortcutting
+    ESM::Pathgrid::Point start = pos.pos;
+
+    float distToTarget = distance(start, dest);
+    bool isDestReached = (distToTarget <= destTolerance);
+
+    if (!isDestReached && mTimer > AI_REACTION_TIME)
     {
-        const ESM::Cell *cell = actor.getCell()->getCell();
-        if (doesPathNeedRecalc(dest, cell)) { //Only rebuild path if it's moved
-            mPathFinder.buildSyncedPath(pos.pos, dest, actor.getCell(), true); //Rebuild path, in case the target has moved
-            mPrevDest = dest;
-        }
+        bool wasShortcutting = mIsShortcutting;
+        bool destInLOS = false;
+        if (getTypeId() != TypeIdWander) // prohibit shortcuts for AiWander
+            mIsShortcutting = shortcutPath(start, dest, actor, &destInLOS); // try to shortcut first
 
-        if(!mPathFinder.getPath().empty()) //Path has points in it
+        if (!mIsShortcutting)
         {
-            ESM::Pathgrid::Point lastPos = mPathFinder.getPath().back(); //Get the end of the proposed path
+            if (wasShortcutting || doesPathNeedRecalc(dest, actor.getCell())) // if need to rebuild path
+            {
+                mPathFinder.buildSyncedPath(start, dest, actor.getCell());
+                mRotateOnTheRunChecks = 3;
+
+                // give priority to go directly on target if there is minimal opportunity
+                if (destInLOS && mPathFinder.getPath().size() > 1)
+                {
+                    // get point just before dest
+                    std::list<ESM::Pathgrid::Point>::const_iterator pPointBeforeDest = mPathFinder.getPath().end();
+                    --pPointBeforeDest;
+                    --pPointBeforeDest;
 
-            if(distance(dest, lastPos) > 100) //End of the path is far from the destination
-                mPathFinder.addPointToPath(dest); //Adds the final destination to the path, to try to get to where you want to go
+                    // if start point is closer to the target then last point of path (excluding target itself) then go straight on the target
+                    if (distance(start, dest) <= distance(dest, *pPointBeforeDest))
+                    {
+                        mPathFinder.clearPath();
+                        mPathFinder.addPointToPath(dest);
+                    }
+                }
+            }
+
+            if (!mPathFinder.getPath().empty()) //Path has points in it
+            {
+                ESM::Pathgrid::Point lastPos = mPathFinder.getPath().back(); //Get the end of the proposed path
+
+                if(distance(dest, lastPos) > 100) //End of the path is far from the destination
+                    mPathFinder.addPointToPath(dest); //Adds the final destination to the path, to try to get to where you want to go
+            }
         }
 
         mTimer = 0;
     }
 
-    //************************
-    /// Checks if you aren't moving; attempts to unstick you
-    //************************
-    if(mPathFinder.checkPathCompleted(pos.pos[0],pos.pos[1])) //Path finished?
+    if (isDestReached || mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1])) // if path is finished
+    {
+        // turn to destination point
+        zTurn(actor, getZAngleToPoint(start, dest));
+        smoothTurn(actor, getXAngleToPoint(start, dest), 0);
         return true;
+    }
     else
     {
+        if (mRotateOnTheRunChecks == 0
+            || isReachableRotatingOnTheRun(actor, *mPathFinder.getPath().begin())) // to prevent circling around a path point
+        {
+            actor.getClass().getMovementSettings(actor).mPosition[1] = 1; // move to the target
+            if (mRotateOnTheRunChecks > 0) mRotateOnTheRunChecks--;
+        }
+
+        // handle obstacles on the way
         evadeObstacles(actor, duration, pos);
     }
+
+    // turn to next path point by X,Z axes
+    zTurn(actor, mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]));
+    smoothTurn(actor, mPathFinder.getXAngleToNext(pos.pos[0], pos.pos[1], pos.pos[2]), 0);
+
     return false;
 }
 
@@ -107,30 +170,106 @@ void MWMechanics::AiPackage::evadeObstacles(const MWWorld::Ptr& actor, float dur
     zTurn(actor, mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]));
 
     MWMechanics::Movement& movement = actor.getClass().getMovementSettings(actor);
-    if (mObstacleCheck.check(actor, duration))
+
+    // check if stuck due to obstacles
+    if (!mObstacleCheck.check(actor, duration)) return;
+
+    // first check if obstacle is a door
+    MWWorld::Ptr door = getNearbyDoor(actor); // NOTE: checks interior cells only
+    if (door != MWWorld::Ptr())
     {
-        // first check if we're walking into a door
-        MWWorld::Ptr door = getNearbyDoor(actor);
-        if (door != MWWorld::Ptr()) // NOTE: checks interior cells only
+        // note: AiWander currently does not open doors
+        if (getTypeId() != TypeIdWander && !door.getCellRef().getTeleport() && door.getCellRef().getTrap().empty()
+                && door.getCellRef().getLockLevel() <= 0 && door.getClass().getDoorState(door) == 0)
         {
-            if (!door.getCellRef().getTeleport() && door.getCellRef().getTrap().empty()
-                    && door.getCellRef().getLockLevel() <= 0 && door.getClass().getDoorState(door) == 0) {
-                MWBase::Environment::get().getWorld()->activateDoor(door, 1);
-            }
+            MWBase::Environment::get().getWorld()->activateDoor(door, 1);
         }
-        else // probably walking into another NPC
+    }
+    else // any other obstacle (NPC, crate, etc.)
+    {
+        mObstacleCheck.takeEvasiveAction(movement);
+    }
+}
+
+bool MWMechanics::AiPackage::shortcutPath(const ESM::Pathgrid::Point& startPoint, const ESM::Pathgrid::Point& endPoint, const MWWorld::Ptr& actor, bool *destInLOS)
+{
+    const MWWorld::Class& actorClass = actor.getClass();
+    MWBase::World* world = MWBase::Environment::get().getWorld();
+
+    // check if actor can move along z-axis
+    bool actorCanMoveByZ = (actorClass.canSwim(actor) && MWBase::Environment::get().getWorld()->isSwimming(actor))
+        || world->isFlying(actor);
+
+    // don't use pathgrid when actor can move in 3 dimensions
+    bool isPathClear = actorCanMoveByZ;
+
+    if (!isPathClear
+        && (!mShortcutProhibited || (PathFinder::MakeOsgVec3(mShortcutFailPos) - PathFinder::MakeOsgVec3(startPoint)).length() >= PATHFIND_SHORTCUT_RETRY_DIST))
+    {
+        // check if target is clearly visible
+        isPathClear = !MWBase::Environment::get().getWorld()->castRay(
+            static_cast<float>(startPoint.mX), static_cast<float>(startPoint.mY), static_cast<float>(startPoint.mZ),
+            static_cast<float>(endPoint.mX), static_cast<float>(endPoint.mY), static_cast<float>(endPoint.mZ));
+
+        if (destInLOS != NULL) *destInLOS = isPathClear;
+
+        if (!isPathClear)
+            return false;
+
+        // check if an actor can move along the shortcut path
+        isPathClear = checkWayIsClearForActor(startPoint, endPoint, actor);
+    }
+
+    if (isPathClear) // can shortcut the path
+    {
+        mPathFinder.clearPath();
+        mPathFinder.addPointToPath(endPoint);
+        return true;
+    }
+
+    return false;
+}
+
+bool MWMechanics::AiPackage::checkWayIsClearForActor(const ESM::Pathgrid::Point& startPoint, const ESM::Pathgrid::Point& endPoint, const MWWorld::Ptr& actor)
+{
+    bool actorCanMoveByZ = (actor.getClass().canSwim(actor) && MWBase::Environment::get().getWorld()->isSwimming(actor))
+        || MWBase::Environment::get().getWorld()->isFlying(actor);
+
+    if (actorCanMoveByZ)
+        return true;
+
+    float actorSpeed = actor.getClass().getSpeed(actor);
+    float maxAvoidDist = AI_REACTION_TIME * actorSpeed + actorSpeed / MAX_VEL_ANGULAR_RADIANS * 2; // *2 - for reliability
+    osg::Vec3f::value_type distToTarget = osg::Vec3f(static_cast<float>(endPoint.mX), static_cast<float>(endPoint.mY), 0).length();
+
+    float offsetXY = distToTarget > maxAvoidDist*1.5? maxAvoidDist : maxAvoidDist/2;
+
+    bool isClear = checkWayIsClear(PathFinder::MakeOsgVec3(startPoint), PathFinder::MakeOsgVec3(endPoint), offsetXY);
+
+    // update shortcut prohibit state
+    if (isClear)
+    {
+        if (mShortcutProhibited)
         {
-            mObstacleCheck.takeEvasiveAction(movement);
+            mShortcutProhibited = false;
+            mShortcutFailPos = ESM::Pathgrid::Point();
         }
     }
-    else { //Not stuck, so reset things
-        movement.mPosition[1] = 1; //Just run forward
+    if (!isClear)
+    {
+        if (mShortcutFailPos.mX == 0 && mShortcutFailPos.mY == 0 && mShortcutFailPos.mZ == 0)
+        {
+            mShortcutProhibited = true;
+            mShortcutFailPos = startPoint;
+        }
     }
+
+    return isClear;
 }
 
-bool MWMechanics::AiPackage::doesPathNeedRecalc(ESM::Pathgrid::Point dest, const ESM::Cell *cell)
+bool MWMechanics::AiPackage::doesPathNeedRecalc(const ESM::Pathgrid::Point& newDest, const MWWorld::CellStore* currentCell)
 {
-    return distance(mPrevDest, dest) > 10;
+    return mPathFinder.getPath().empty() || (distance(mPathFinder.getPath().back(), newDest) > 10) || mPathFinder.getPathCell() != currentCell;
 }
 
 bool MWMechanics::AiPackage::isTargetMagicallyHidden(const MWWorld::Ptr& target)
@@ -163,3 +302,32 @@ bool MWMechanics::AiPackage::isNearInactiveCell(const ESM::Position& actorPos)
         return false;
     }
 }
+
+bool MWMechanics::AiPackage::isReachableRotatingOnTheRun(const MWWorld::Ptr& actor, const ESM::Pathgrid::Point& dest)
+{
+    // get actor's shortest radius for moving in circle
+    float speed = actor.getClass().getSpeed(actor);
+    speed += speed * 0.1f; // 10% real speed inaccuracy
+    float radius = speed / MAX_VEL_ANGULAR_RADIANS;
+
+    // get radius direction to the center
+    const float* rot = actor.getRefData().getPosition().rot;
+    osg::Quat quatRot(rot[0], -osg::X_AXIS, rot[1], -osg::Y_AXIS, rot[2], -osg::Z_AXIS);
+    osg::Vec3f dir = quatRot * osg::Y_AXIS; // actor's orientation direction is a tangent to circle
+    osg::Vec3f radiusDir = dir ^ osg::Z_AXIS; // radius is perpendicular to a tangent
+    radiusDir.normalize();
+    radiusDir *= radius;
+    
+    // pick up the nearest center candidate
+    osg::Vec3f dest_ = PathFinder::MakeOsgVec3(dest);
+    osg::Vec3f pos = actor.getRefData().getPosition().asVec3();
+    osg::Vec3f center1 = pos - radiusDir;
+    osg::Vec3f center2 = pos + radiusDir;
+    osg::Vec3f center = (center1 - dest_).length2() < (center2 - dest_).length2() ? center1 : center2;
+
+    float distToDest = (center - dest_).length();
+
+    // if pathpoint is reachable for the actor rotating on the run:
+    // no points of actor's circle should be farther from the center than destination point
+    return (radius <= distToDest);
+}
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 72bb4487c..5e23e085e 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -1,9 +1,9 @@
 #ifndef GAME_MWMECHANICS_AIPACKAGE_H
 #define GAME_MWMECHANICS_AIPACKAGE_H
 
-#include "pathfinding.hpp"
 #include <components/esm/defs.hpp>
 
+#include "pathfinding.hpp"
 #include "obstacle.hpp"
 #include "aistate.hpp"
 
@@ -24,6 +24,7 @@ namespace ESM
 
 namespace MWMechanics
 {
+    const float AI_REACTION_TIME = 0.25f;
 
     class CharacterController;
 
@@ -31,7 +32,7 @@ namespace MWMechanics
     class AiPackage
     {
         public:
-            ///Enumerates the various AITypes availible.
+            ///Enumerates the various AITypes available
             enum TypeId {
                 TypeIdNone = -1,
                 TypeIdWander = 0,
@@ -40,10 +41,12 @@ namespace MWMechanics
                 TypeIdFollow = 3,
                 TypeIdActivate = 4,
 
-                // These 3 are not really handled as Ai Packages in the MW engine
+                // These 4 are not really handled as Ai Packages in the MW engine
+                // For compatibility do *not* return these in the getCurrentAiPackage script function..
                 TypeIdCombat = 5,
                 TypeIdPursue = 6,
-                TypeIdAvoidDoor = 7
+                TypeIdAvoidDoor = 7,
+                TypeIdFace = 8
             };
 
             ///Default constructor
@@ -72,7 +75,7 @@ namespace MWMechanics
             virtual void fastForward(const MWWorld::Ptr& actor, AiState& state) {}
 
             /// Get the target actor the AI is targeted at (not applicable to all AI packages, default return empty Ptr)
-            virtual MWWorld::Ptr getTarget();
+            virtual MWWorld::Ptr getTarget() const;
 
             /// Return true if having this AiPackage makes the actor side with the target in fights (default false)
             virtual bool sideWithTarget() const;
@@ -86,14 +89,32 @@ namespace MWMechanics
             /// Upon adding this Ai package, should the Ai Sequence attempt to cancel previous Ai packages (default true)?
             virtual bool shouldCancelPreviousAi() const;
 
+            /// Return true if this package should repeat. Currently only used for Wander packages.
+            virtual bool getRepeat() const;
+
+            /// Reset pathfinding state
+            void reset();
+
             bool isTargetMagicallyHidden(const MWWorld::Ptr& target);
 
+            /// Return if actor's rotation speed is sufficient to rotate to the destination pathpoint on the run. Otherwise actor should rotate while standing.
+            static bool isReachableRotatingOnTheRun(const MWWorld::Ptr& actor, const ESM::Pathgrid::Point& dest);
+
         protected:
-            /// Causes the actor to attempt to walk to the specified location
+            /// Handles path building and shortcutting with obstacles avoiding
             /** \return If the actor has arrived at his destination **/
-            bool pathTo(const MWWorld::Ptr& actor, ESM::Pathgrid::Point dest, float duration);
+            bool pathTo(const MWWorld::Ptr& actor, const ESM::Pathgrid::Point& dest, float duration, float destTolerance = 0.0f);
 
-            virtual bool doesPathNeedRecalc(ESM::Pathgrid::Point dest, const ESM::Cell *cell);
+            /// Check if there aren't any obstacles along the path to make shortcut possible
+            /// If a shortcut is possible then path will be cleared and filled with the destination point.
+            /// \param destInLOS If not NULL function will return ray cast check result
+            /// \return If can shortcut the path
+            bool shortcutPath(const ESM::Pathgrid::Point& startPoint, const ESM::Pathgrid::Point& endPoint, const MWWorld::Ptr& actor, bool *destInLOS);
+
+            /// Check if the way to the destination is clear, taking into account actor speed
+            bool checkWayIsClearForActor(const ESM::Pathgrid::Point& startPoint, const ESM::Pathgrid::Point& endPoint, const MWWorld::Ptr& actor);
+
+            virtual bool doesPathNeedRecalc(const ESM::Pathgrid::Point& newDest, const MWWorld::CellStore* currentCell);
 
             void evadeObstacles(const MWWorld::Ptr& actor, float duration, const ESM::Position& pos);
 
@@ -103,11 +124,16 @@ namespace MWMechanics
 
             float mTimer;
 
-            ESM::Pathgrid::Point mPrevDest;
+            osg::Vec3f mLastActorPos;
+
+            short mRotateOnTheRunChecks; // attempts to check rotation to the pathpoint on the run possibility
+
+            bool mIsShortcutting;   // if shortcutting at the moment
+            bool mShortcutProhibited; // shortcutting may be prohibited after unsuccessful attempt
+            ESM::Pathgrid::Point mShortcutFailPos; // position of last shortcut fail
 
         private:
             bool isNearInactiveCell(const ESM::Position& actorPos);
-
     };
 }
 
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index 055801fde..2b218de03 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -8,8 +8,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/action.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
-
 #include "movement.hpp"
 #include "creaturestats.hpp"
 
@@ -35,7 +33,6 @@ bool AiPursue::execute (const MWWorld::Ptr& actor, CharacterController& characte
     if(actor.getClass().getCreatureStats(actor).isDead())
         return true;
 
-    ESM::Position pos = actor.getRefData().getPosition(); //position of the actor
     const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId); //The target to follow
 
     if(target == MWWorld::Ptr() || !target.getRefData().getCount() || !target.getRefData().isEnabled()  // Really we should be checking whether the target is currently registered
@@ -54,14 +51,10 @@ bool AiPursue::execute (const MWWorld::Ptr& actor, CharacterController& characte
     //Set the target desition from the actor
     ESM::Pathgrid::Point dest = target.getRefData().getPosition().pos;
 
-    if(distance(dest, pos.pos[0], pos.pos[1], pos.pos[2]) < 100) { //Stop when you get close
-        actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
-        target.getClass().activate(target,actor).get()->execute(actor); //Arrest player
+    if (pathTo(actor, dest, duration, 100)) {
+        target.getClass().activate(target,actor).get()->execute(actor); //Arrest player when reached
         return true;
     }
-    else {
-        pathTo(actor, dest, duration); //Go to the destination
-    }
 
     actor.getClass().getCreatureStats(actor).setMovementFlag(MWMechanics::CreatureStats::Flag_Run, true); //Make NPC run
 
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 04ac96b11..84c8eca49 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -1,10 +1,15 @@
 #include "aisequence.hpp"
 
 #include <limits>
+#include <iostream>
+
+#include <components/esm/aisequence.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "aipackage.hpp"
 #include "aistate.hpp"
-
 #include "aiwander.hpp"
 #include "aiescort.hpp"
 #include "aitravel.hpp"
@@ -14,11 +19,6 @@
 #include "aipursue.hpp"
 #include "actorutil.hpp"
 
-#include <components/esm/aisequence.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
 namespace MWMechanics
 {
 
@@ -29,13 +29,14 @@ void AiSequence::copy (const AiSequence& sequence)
         mPackages.push_back ((*iter)->clone());
 }
 
-AiSequence::AiSequence() : mDone (false), mLastAiPackage(-1) {}
+AiSequence::AiSequence() : mDone (false), mRepeat(false), mLastAiPackage(-1) {}
 
 AiSequence::AiSequence (const AiSequence& sequence)
 {
     copy (sequence);
     mDone = sequence.mDone;
     mLastAiPackage = sequence.mLastAiPackage;
+    mRepeat = sequence.mRepeat;
 }
 
 AiSequence& AiSequence::operator= (const AiSequence& sequence)
@@ -68,13 +69,23 @@ bool AiSequence::getCombatTarget(MWWorld::Ptr &targetActor) const
 {
     if (getTypeId() != AiPackage::TypeIdCombat)
         return false;
-    const AiCombat *combat = static_cast<const AiCombat *>(mPackages.front());
     
-    targetActor = combat->getTarget();
+    targetActor = mPackages.front()->getTarget();
 
     return !targetActor.isEmpty();
 }
 
+bool AiSequence::getCombatTargets(std::vector<MWWorld::Ptr> &targetActors) const
+{
+    for (std::list<AiPackage*>::const_iterator it = mPackages.begin(); it != mPackages.end(); ++it)
+    {
+        if ((*it)->getTypeId() == MWMechanics::AiPackage::TypeIdCombat)
+            targetActors.push_back((*it)->getTarget());
+    }
+
+    return !targetActors.empty();
+}
+
 std::list<AiPackage*>::const_iterator AiSequence::begin() const
 {
     return mPackages.begin();
@@ -92,6 +103,8 @@ std::list<AiPackage*>::const_iterator AiSequence::erase(std::list<AiPackage*>::c
     {
         if (package == it)
         {
+            AiPackage* packagePtr = *it;
+            delete packagePtr;
             return mPackages.erase(it);
         }
     }
@@ -114,8 +127,7 @@ bool AiSequence::isInCombat(const MWWorld::Ptr &actor) const
     {
         if ((*it)->getTypeId() == AiPackage::TypeIdCombat)
         {
-            const AiCombat *combat = static_cast<const AiCombat *>(*it);
-            if (combat->getTarget() == actor)
+            if ((*it)->getTarget() == actor)
                 return true;
         }
     }
@@ -127,7 +139,10 @@ void AiSequence::stopCombat()
     for(std::list<AiPackage*>::iterator it = mPackages.begin(); it != mPackages.end(); )
     {
         if ((*it)->getTypeId() == AiPackage::TypeIdCombat)
+        {
+            delete *it;
             it = mPackages.erase(it);
+        }
         else
             ++it;
     }
@@ -138,7 +153,10 @@ void AiSequence::stopPursuit()
     for(std::list<AiPackage*>::iterator it = mPackages.begin(); it != mPackages.end(); )
     {
         if ((*it)->getTypeId() == AiPackage::TypeIdPursue)
+        {
+            delete *it;
             it = mPackages.erase(it);
+        }
         else
             ++it;
     }
@@ -149,6 +167,14 @@ bool AiSequence::isPackageDone() const
     return mDone;
 }
 
+bool isActualAiPackage(int packageTypeId)
+{
+    return (packageTypeId != AiPackage::TypeIdCombat
+                   && packageTypeId != AiPackage::TypeIdPursue
+                   && packageTypeId != AiPackage::TypeIdAvoidDoor
+                   && packageTypeId != AiPackage::TypeIdFace);
+}
+
 void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
 {
     if(actor != getPlayer())
@@ -160,10 +186,12 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
         }
 
         MWMechanics::AiPackage* package = mPackages.front();
-        mLastAiPackage = package->getTypeId();
-
+        int packageTypeId = package->getTypeId();
+        // workaround ai packages not being handled as in the vanilla engine
+        if (isActualAiPackage(packageTypeId))
+            mLastAiPackage = packageTypeId;
         // if active package is combat one, choose nearest target
-        if (mLastAiPackage == AiPackage::TypeIdCombat)
+        if (packageTypeId == AiPackage::TypeIdCombat)
         {
             std::list<AiPackage *>::iterator itActualCombat;
 
@@ -210,28 +238,36 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
                 }
 
                 package = mPackages.front();
-                mLastAiPackage = package->getTypeId();
-            }
-            else
-            {
-                mDone = true;
-                return;
             }
         }
 
-        if (package->execute (actor,characterController,state,duration))
+        try
         {
-            // To account for the rare case where AiPackage::execute() queued another AI package
-            // (e.g. AiPursue executing a dialogue script that uses startCombat)
-            std::list<MWMechanics::AiPackage*>::iterator toRemove =
-                    std::find(mPackages.begin(), mPackages.end(), package);
-            mPackages.erase(toRemove);
-            delete package;
-            mDone = true;
+            if (package->execute (actor,characterController,state,duration))
+            {
+                // Put repeating noncombat AI packages on the end of the stack so they can be used again
+                if (isActualAiPackage(packageTypeId) && (mRepeat || package->getRepeat()))
+                {
+                    package->reset();
+                    mPackages.push_back(package->clone());
+                }
+                // To account for the rare case where AiPackage::execute() queued another AI package
+                // (e.g. AiPursue executing a dialogue script that uses startCombat)
+                std::list<MWMechanics::AiPackage*>::iterator toRemove =
+                        std::find(mPackages.begin(), mPackages.end(), package);
+                mPackages.erase(toRemove);
+                delete package;
+                if (isActualAiPackage(packageTypeId))
+                    mDone = true;
+            }
+            else
+            {
+                mDone = false;
+            }
         }
-        else
+        catch (std::exception& e)
         {
-            mDone = false;
+            std::cerr << "Error during AiSequence::execute: " << e.what() << std::endl;
         }
     }
 }
@@ -255,7 +291,7 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor)
         for (std::list<AiPackage *>::const_iterator iter (mPackages.begin()); iter!=mPackages.end(); ++iter)
         {
             if((*iter)->getTypeId() == AiPackage::TypeIdCombat && package.getTypeId() == AiPackage::TypeIdCombat
-                && static_cast<const AiCombat*>(*iter)->getTarget() == static_cast<const AiCombat*>(&package)->getTarget())
+                && (*iter)->getTarget() == (&package)->getTarget())
             {
                 return; // already in combat with this actor
             }
@@ -264,16 +300,24 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor)
         }
     }
 
+    // Stop combat when a non-combat AI package is added
+    if (isActualAiPackage(package.getTypeId()))
+        stopCombat();
+
     // remove previous packages if required
     if (package.shouldCancelPreviousAi())
     {
         for(std::list<AiPackage *>::iterator it = mPackages.begin(); it != mPackages.end();)
         {
             if((*it)->canCancel())
+            {
+                delete *it;
                 it = mPackages.erase(it);
+            }
             else
                 ++it;
         }
+        mRepeat=false;
     }
 
     // insert new package in correct place depending on priority
@@ -286,7 +330,7 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor)
         }
     }
 
-    mPackages.push_front (package.clone());
+    mPackages.push_back (package.clone());
 }
 
 AiPackage* MWMechanics::AiSequence::getActivePackage()
@@ -299,6 +343,10 @@ AiPackage* MWMechanics::AiSequence::getActivePackage()
 
 void AiSequence::fill(const ESM::AIPackageList &list)
 {
+    // If there is more than one package in the list, enable repeating
+    if (!list.mList.empty() && list.mList.begin() != (list.mList.end()-1))
+        mRepeat = true;
+
     for (std::vector<ESM::AIPackage>::const_iterator it = list.mList.begin(); it != list.mList.end(); ++it)
     {
         MWMechanics::AiPackage* package;
@@ -348,63 +396,68 @@ void AiSequence::readState(const ESM::AiSequence::AiSequence &sequence)
     if (!sequence.mPackages.empty())
         clear();
 
+    // If there is more than one non-combat, non-pursue package in the list, enable repeating.
+    int count = 0;
+    for (std::vector<ESM::AiSequence::AiPackageContainer>::const_iterator it = sequence.mPackages.begin();
+         it != sequence.mPackages.end(); ++it)
+    {    
+        if (isActualAiPackage(it->mType))
+            count++;
+    }
+
+    if (count > 1)
+        mRepeat = true;
+
+    // Load packages
     for (std::vector<ESM::AiSequence::AiPackageContainer>::const_iterator it = sequence.mPackages.begin();
          it != sequence.mPackages.end(); ++it)
     {
+        std::auto_ptr<MWMechanics::AiPackage> package (NULL);
         switch (it->mType)
         {
         case ESM::AiSequence::Ai_Wander:
         {
-            MWMechanics::AiWander* wander = new AiWander(
-                        static_cast<ESM::AiSequence::AiWander*>(it->mPackage));
-            mPackages.push_back(wander);
+            package.reset(new AiWander(static_cast<ESM::AiSequence::AiWander*>(it->mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Travel:
         {
-            MWMechanics::AiTravel* travel = new AiTravel(
-                        static_cast<ESM::AiSequence::AiTravel*>(it->mPackage));
-            mPackages.push_back(travel);
+            package.reset(new AiTravel(static_cast<ESM::AiSequence::AiTravel*>(it->mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Escort:
         {
-            MWMechanics::AiEscort* escort = new AiEscort(
-                        static_cast<ESM::AiSequence::AiEscort*>(it->mPackage));
-            mPackages.push_back(escort);
+            package.reset(new AiEscort(static_cast<ESM::AiSequence::AiEscort*>(it->mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Follow:
         {
-            MWMechanics::AiFollow* follow = new AiFollow(
-                        static_cast<ESM::AiSequence::AiFollow*>(it->mPackage));
-            mPackages.push_back(follow);
+            package.reset(new AiFollow(static_cast<ESM::AiSequence::AiFollow*>(it->mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Activate:
         {
-            MWMechanics::AiActivate* activate = new AiActivate(
-                        static_cast<ESM::AiSequence::AiActivate*>(it->mPackage));
-            mPackages.push_back(activate);
+            package.reset(new AiActivate(static_cast<ESM::AiSequence::AiActivate*>(it->mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Combat:
         {
-            MWMechanics::AiCombat* combat = new AiCombat(
-                        static_cast<ESM::AiSequence::AiCombat*>(it->mPackage));
-            mPackages.push_back(combat);
+            package.reset(new AiCombat(static_cast<ESM::AiSequence::AiCombat*>(it->mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Pursue:
         {
-            MWMechanics::AiPursue* pursue = new AiPursue(
-                        static_cast<ESM::AiSequence::AiPursue*>(it->mPackage));
-            mPackages.push_back(pursue);
+            package.reset(new AiPursue(static_cast<ESM::AiSequence::AiPursue*>(it->mPackage)));
             break;
         }
         default:
             break;
         }
+
+        if (!package.get())
+            continue;
+
+        mPackages.push_back(package.release());
     }
 }
 
diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp
index 1eefe7c69..4f8b542a4 100644
--- a/apps/openmw/mwmechanics/aisequence.hpp
+++ b/apps/openmw/mwmechanics/aisequence.hpp
@@ -4,7 +4,6 @@
 #include <list>
 
 #include <components/esm/loadnpc.hpp>
-//#include "aistate.hpp"
 
 namespace MWWorld
 {
@@ -40,6 +39,9 @@ namespace MWMechanics
             ///Finished with top AIPackage, set for one frame
             bool mDone;
 
+            ///Does this AI sequence repeat (repeating of Wander packages handled separately)
+            bool mRepeat;
+
             ///Copy AiSequence
             void copy (const AiSequence& sequence);
 
@@ -77,6 +79,9 @@ namespace MWMechanics
             /// Return true and assign target if combat package is currently active, return false otherwise
             bool getCombatTarget (MWWorld::Ptr &targetActor) const;
 
+            /// Return true and assign targets for all combat packages, or return false if there are no combat packages
+            bool getCombatTargets(std::vector<MWWorld::Ptr> &targetActors) const;
+
             /// Is there any combat package?
             bool isInCombat () const;
 
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 1585a3007..7cef7aff1 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -30,15 +30,11 @@ namespace MWMechanics
 {
     AiTravel::AiTravel(float x, float y, float z)
     : mX(x),mY(y),mZ(z)
-    , mCellX(std::numeric_limits<int>::max())
-    , mCellY(std::numeric_limits<int>::max())
     {
     }
 
     AiTravel::AiTravel(const ESM::AiSequence::AiTravel *travel)
         : mX(travel->mData.mX), mY(travel->mData.mY), mZ(travel->mData.mZ)
-        , mCellX(std::numeric_limits<int>::max())
-        , mCellY(std::numeric_limits<int>::max())
     {
 
     }
@@ -66,18 +62,6 @@ namespace MWMechanics
         return false;
     }
 
-    bool AiTravel::doesPathNeedRecalc(ESM::Pathgrid::Point dest, const ESM::Cell *cell)
-    {
-        bool cellChange = cell->mData.mX != mCellX || cell->mData.mY != mCellY;
-        if (!mPathFinder.isPathConstructed() || cellChange)
-        {
-            mCellX = cell->mData.mX;
-            mCellY = cell->mData.mY;
-            return true;
-        }
-        return false;
-    }
-
     int AiTravel::getTypeId() const
     {
         return TypeIdTravel;
diff --git a/apps/openmw/mwmechanics/aitravel.hpp b/apps/openmw/mwmechanics/aitravel.hpp
index 9f263fd46..8c75bded1 100644
--- a/apps/openmw/mwmechanics/aitravel.hpp
+++ b/apps/openmw/mwmechanics/aitravel.hpp
@@ -34,17 +34,10 @@ namespace MWMechanics
 
             virtual int getTypeId() const;
 
-        protected:
-            virtual bool doesPathNeedRecalc(ESM::Pathgrid::Point dest, const ESM::Cell *cell);
-
         private:
             float mX;
             float mY;
             float mZ;
-
-            int mCellX;
-            int mCellY;
-
     };
 }
 
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 8231e572e..73ddce4b4 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -29,7 +29,6 @@ namespace MWMechanics
 {
     static const int COUNT_BEFORE_RESET = 10;
     static const float DOOR_CHECK_INTERVAL = 1.5f;
-    static const float REACTION_INTERVAL = 0.25f;
     static const int GREETING_SHOULD_START = 4; //how many reaction intervals should pass before NPC can greet player
     static const int GREETING_SHOULD_END = 10;
 
@@ -67,11 +66,25 @@ namespace MWMechanics
 
         // AiWander states
         AiWander::WanderState mState;
+
+        bool mIsWanderingManually;
+        bool mCanWanderAlongPathGrid;
         
         unsigned short mIdleAnimation;
         std::vector<unsigned short> mBadIdles; // Idle animations that when called cause errors
 
-        PathFinder mPathFinder;
+        // do we need to calculate allowed nodes based on mDistance
+        bool mPopulateAvailableNodes;
+
+        // allowed pathgrid nodes based on mDistance from the spawn point
+        // in local coordinates of mCell
+        std::vector<ESM::Pathgrid::Point> mAllowedNodes;
+
+        ESM::Pathgrid::Point mCurrentNode;
+        bool mTrimCurrentNode;
+
+        float mDoorCheckDuration;
+        int mStuckCount;
         
         AiWanderStorage():
             mTargetAngleRadians(0),
@@ -81,14 +94,26 @@ namespace MWMechanics
             mGreetingTimer(0),
             mCell(NULL),
             mState(AiWander::Wander_ChooseAction),
+            mIsWanderingManually(false),
+            mCanWanderAlongPathGrid(true),
             mIdleAnimation(0),
-            mBadIdles()
+            mBadIdles(),
+            mPopulateAvailableNodes(true),
+            mAllowedNodes(),
+            mTrimCurrentNode(false),
+            mDoorCheckDuration(0), // TODO: maybe no longer needed
+            mStuckCount(0)
             {};
+
+        void setState(const AiWander::WanderState wanderState, const bool isManualWander = false) {
+            mState = wanderState;
+            mIsWanderingManually = isManualWander;
+        }
     };
     
     AiWander::AiWander(int distance, int duration, int timeOfDay, const std::vector<unsigned char>& idle, bool repeat):
-        mDistance(distance), mDuration(duration), mTimeOfDay(timeOfDay), mIdle(idle), mRepeat(repeat)
-      , mStoredInitialActorPosition(false)
+        mDistance(distance), mDuration(duration), mRemainingDuration(duration), mTimeOfDay(timeOfDay), mIdle(idle),
+        mRepeat(repeat), mStoredInitialActorPosition(false)
     {
         mIdle.resize(8, 0);
         init();
@@ -98,11 +123,6 @@ namespace MWMechanics
     {
         // NOTE: mDistance and mDuration must be set already
 
-
-        mStuckCount = 0;// TODO: maybe no longer needed
-        mDoorCheckDuration = 0;
-        mTrimCurrentNode = false;
-
         mHasReturnPosition = false;
         mReturnPosition = osg::Vec3f(0,0,0);
 
@@ -110,13 +130,6 @@ namespace MWMechanics
             mDistance = 0;
         if(mDuration < 0)
             mDuration = 0;
-        if(mDuration == 0)
-            mTimeOfDay = 0;
-
-        mStartTime = MWBase::Environment::get().getWorld()->getTimeStamp();
-
-        mPopulateAvailableNodes = true;
-
     }
 
     AiPackage * MWMechanics::AiWander::clone() const
@@ -178,7 +191,6 @@ namespace MWMechanics
     {
         // get or create temporary storage
         AiWanderStorage& storage = state.get<AiWanderStorage>();
-        
 
         const MWWorld::CellStore*& currentCell = storage.mCell;
         MWMechanics::CreatureStats& cStats = actor.getClass().getCreatureStats(actor);
@@ -188,10 +200,13 @@ namespace MWMechanics
         bool cellChange = currentCell && (actor.getCell() != currentCell);
         if(!currentCell || cellChange)
         {
+            stopWalking(actor, storage);
             currentCell = actor.getCell();
-            mPopulateAvailableNodes = true;
+            storage.mPopulateAvailableNodes = true;
         }
 
+        mRemainingDuration -= ((duration*MWBase::Environment::get().getWorld()->getTimeScaleFactor()) / 3600);
+
         cStats.setDrawState(DrawState_Nothing);
         cStats.setMovementFlag(CreatureStats::Flag_Run, false);
 
@@ -203,32 +218,59 @@ namespace MWMechanics
 
         float& lastReaction = storage.mReaction;
         lastReaction += duration;
-        if (REACTION_INTERVAL <= lastReaction)
+        if (AI_REACTION_TIME <= lastReaction)
         {
             lastReaction = 0;
-            return reactionTimeActions(actor, storage, currentCell, cellChange, pos);
+            return reactionTimeActions(actor, storage, currentCell, cellChange, pos, duration);
         }
         else
             return false;
     }
 
     bool AiWander::reactionTimeActions(const MWWorld::Ptr& actor, AiWanderStorage& storage,
-        const MWWorld::CellStore*& currentCell, bool cellChange, ESM::Position& pos)
+        const MWWorld::CellStore*& currentCell, bool cellChange, ESM::Position& pos, float duration)
     {
+        if (mDistance <= 0)
+            storage.mCanWanderAlongPathGrid = false;
+
         if (isPackageCompleted(actor, storage))
         {
+            // Reset package so it can be used again
+            mRemainingDuration=mDuration;
+            init();
             return true;
         }
 
+        if (!mStoredInitialActorPosition)
+        {
+            mInitialActorPosition = actor.getRefData().getPosition().asVec3();
+            mStoredInitialActorPosition = true;
+        }
+
         // Initialization to discover & store allowed node points for this actor.
-        if (mPopulateAvailableNodes)
+        if (storage.mPopulateAvailableNodes)
         {
-            getAllowedNodes(actor, currentCell->getCell());
+            getAllowedNodes(actor, currentCell->getCell(), storage);
         }
 
         // Actor becomes stationary - see above URL's for previous research
-        if(mAllowedNodes.empty())
-            mDistance = 0;
+        // If a creature or an NPC with a wander distance and no pathgrid is available,
+        // randomly idle or wander around near spawn point
+        if(storage.mAllowedNodes.empty() && mDistance > 0 && !storage.mIsWanderingManually) {
+            // Typically want to idle for a short time before the next wander
+            if (Misc::Rng::rollDice(100) >= 96) {
+                wanderNearStart(actor, storage, mDistance);
+            } else {
+                storage.setState(Wander_IdleNow);
+            }
+        } else if (storage.mAllowedNodes.empty() && !storage.mIsWanderingManually) {
+            storage.mCanWanderAlongPathGrid = false;
+        }
+
+        // If Wandering manually and hit an obstacle, stop
+        if (storage.mIsWanderingManually && mObstacleCheck.check(actor, duration, 2.0f)) {
+            completeManualWalking(actor, storage);
+        }
 
         // Don't try to move if you are in a new cell (ie: positioncell command called) but still play idles.
         if(mDistance && cellChange)
@@ -250,39 +292,38 @@ namespace MWMechanics
             playGreetingIfPlayerGetsTooClose(actor, storage);
         }
 
-        if ((wanderState == Wander_MoveNow) && mDistance)
+        if ((wanderState == Wander_MoveNow) && storage.mCanWanderAlongPathGrid)
         {
             // Construct a new path if there isn't one
-            if(!storage.mPathFinder.isPathConstructed())
+            if(!mPathFinder.isPathConstructed())
             {
-                if (mAllowedNodes.size())
+                if (!storage.mAllowedNodes.empty())
                 {
                     setPathToAnAllowedNode(actor, storage, pos);
                 }
             } 
+        } else if (storage.mIsWanderingManually && mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1], DESTINATION_TOLERANCE)) {
+            completeManualWalking(actor, storage);
         }
 
         return false; // AiWander package not yet completed
     }
 
+    bool AiWander::getRepeat() const
+    { 
+         return mRepeat; 
+    }
+
+
     bool AiWander::isPackageCompleted(const MWWorld::Ptr& actor, AiWanderStorage& storage)
     {
         if (mDuration)
         {
-            // End package if duration is complete or mid-night hits:
-            MWWorld::TimeStamp currentTime = MWBase::Environment::get().getWorld()->getTimeStamp();
-            if ((currentTime.getHour() >= mStartTime.getHour() + mDuration) ||
-                (int(currentTime.getHour()) == 0 && currentTime.getDay() != mStartTime.getDay()))
+            // End package if duration is complete
+            if (mRemainingDuration <= 0)
             {
-                if (!mRepeat)
-                {
                     stopWalking(actor, storage);
                     return true;
-                }
-                else
-                {
-                    mStartTime = currentTime;
-                }
             }
         }
         // if get here, not yet completed
@@ -291,23 +332,84 @@ namespace MWMechanics
 
     void AiWander::returnToStartLocation(const MWWorld::Ptr& actor, AiWanderStorage& storage, ESM::Position& pos)
     {
-        if (!storage.mPathFinder.isPathConstructed())
+        if (!mPathFinder.isPathConstructed())
         {
             ESM::Pathgrid::Point dest(PathFinder::MakePathgridPoint(mReturnPosition));
 
-            // actor position is already in world co-ordinates
+            // actor position is already in world coordinates
             ESM::Pathgrid::Point start(PathFinder::MakePathgridPoint(pos));
 
             // don't take shortcuts for wandering
-            storage.mPathFinder.buildSyncedPath(start, dest, actor.getCell(), false);
+            mPathFinder.buildSyncedPath(start, dest, actor.getCell());
 
-            if (storage.mPathFinder.isPathConstructed())
+            if (mPathFinder.isPathConstructed())
             {
-                storage.mState = Wander_Walking;
+                storage.setState(Wander_Walking);
             }
         }
     }
 
+    /*
+     * Commands actor to walk to a random location near original spawn location.
+     */
+    void AiWander::wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance) {
+        const ESM::Pathgrid::Point currentPosition = actor.getRefData().getPosition().pos;
+        const osg::Vec3f currentPositionVec3f = osg::Vec3f(currentPosition.mX, currentPosition.mY, currentPosition.mZ);
+
+        std::size_t attempts = 10; // If a unit can't wander out of water, don't want to hang here
+        osg::Vec3f destination;
+        ESM::Pathgrid::Point destinationPosition;
+        bool isWaterCreature = actor.getClass().isPureWaterCreature(actor);
+        do {
+            // Determine a random location within radius of original position
+            const float pi = 3.14159265359f;
+            const float wanderRadius = Misc::Rng::rollClosedProbability() * wanderDistance;
+            const float randomDirection = Misc::Rng::rollClosedProbability() * 2.0f * pi;
+            const float destinationX = mInitialActorPosition.x() + wanderRadius * std::cos(randomDirection);
+            const float destinationY = mInitialActorPosition.y() + wanderRadius * std::sin(randomDirection);
+            const float destinationZ = mInitialActorPosition.z();
+            destinationPosition = ESM::Pathgrid::Point(destinationX, destinationY, destinationZ);
+            destination = osg::Vec3f(destinationX, destinationY, destinationZ);
+
+            // Check if land creature will walk onto water or if water creature will swim onto land
+            if ((!isWaterCreature && !destinationIsAtWater(actor, destination)) ||
+                (isWaterCreature && !destinationThroughGround(currentPositionVec3f, destination))) {
+                mPathFinder.buildSyncedPath(currentPosition, destinationPosition, actor.getCell());
+                mPathFinder.addPointToPath(destinationPosition);
+
+                if (mPathFinder.isPathConstructed())
+                {
+                    storage.setState(Wander_Walking, true);
+                }
+                return;
+            }
+        } while (--attempts);
+    }
+
+    /*
+     * Returns true if the position provided is above water.
+     */
+    bool AiWander::destinationIsAtWater(const MWWorld::Ptr &actor, const osg::Vec3f& destination) {
+        float heightToGroundOrWater = MWBase::Environment::get().getWorld()->getDistToNearestRayHit(destination, osg::Vec3f(0,0,-1), 1000.0, true);
+        osg::Vec3f positionBelowSurface = destination;
+        positionBelowSurface[2] = positionBelowSurface[2] - heightToGroundOrWater - 1.0f;
+        return MWBase::Environment::get().getWorld()->isUnderwater(actor.getCell(), positionBelowSurface);
+    }
+
+    /*
+     * Returns true if the start to end point travels through a collision point (land).
+     */
+    bool AiWander::destinationThroughGround(const osg::Vec3f& startPoint, const osg::Vec3f& destination) {
+        return MWBase::Environment::get().getWorld()->castRay(startPoint.x(), startPoint.y(), startPoint.z(),
+                                                              destination.x(), destination.y(), destination.z());
+    }
+
+    void AiWander::completeManualWalking(const MWWorld::Ptr &actor, AiWanderStorage &storage) {
+        stopWalking(actor, storage);
+        mObstacleCheck.clear();
+        storage.setState(Wander_IdleNow);
+    }
+
     void AiWander::doPerFrameActionsForState(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage, ESM::Position& pos)
     {
         switch (storage.mState)
@@ -337,15 +439,15 @@ namespace MWMechanics
     void AiWander::onIdleStatePerFrameActions(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage)
     {
         // Check if an idle actor is  too close to a door - if so start walking
-        mDoorCheckDuration += duration;
-        if (mDoorCheckDuration >= DOOR_CHECK_INTERVAL)
+        storage.mDoorCheckDuration += duration;
+        if (storage.mDoorCheckDuration >= DOOR_CHECK_INTERVAL)
         {
-            mDoorCheckDuration = 0;    // restart timer
+            storage.mDoorCheckDuration = 0;    // restart timer
             if (mDistance &&            // actor is not intended to be stationary
                 proximityToDoor(actor, MIN_DIST_TO_DOOR_SQUARED*1.6f*1.6f)) // NOTE: checks interior cells only
             {
-                storage.mState = Wander_MoveNow;
-                mTrimCurrentNode = false; // just in case
+                storage.setState(Wander_MoveNow);
+                storage.mTrimCurrentNode = false; // just in case
                 return;
             }
         }
@@ -364,18 +466,18 @@ namespace MWMechanics
         GreetingState& greetingState = storage.mSaidGreeting;
         if (!checkIdle(actor, storage.mIdleAnimation) && (greetingState == Greet_Done || greetingState == Greet_None))
         {
-            storage.mState = Wander_ChooseAction;
+            storage.setState(Wander_ChooseAction);
         }
     }
 
     void AiWander::onWalkingStatePerFrameActions(const MWWorld::Ptr& actor, 
         float duration, AiWanderStorage& storage, ESM::Position& pos)
     {
-        // Are we there yet?
-        if (storage.mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1], DESTINATION_TOLERANCE))
+        // Is there no destination or are we there yet?
+        if ((!mPathFinder.isPathConstructed()) || pathTo(actor, mPathFinder.getPath().back(), duration, DESTINATION_TOLERANCE))
         {
             stopWalking(actor, storage);
-            storage.mState = Wander_ChooseAction;
+            storage.setState(Wander_ChooseAction);
             mHasReturnPosition = false;
         }
         else
@@ -393,7 +495,7 @@ namespace MWMechanics
 
         if (!idleAnimation && mDistance)
         {
-            storage.mState = Wander_MoveNow;
+            storage.setState(Wander_MoveNow);
             return;
         }
         if(idleAnimation)
@@ -403,56 +505,42 @@ namespace MWMechanics
                 if(!playIdle(actor, idleAnimation))
                 {
                     storage.mBadIdles.push_back(idleAnimation);
-                    storage.mState = Wander_ChooseAction;
+                    storage.setState(Wander_ChooseAction);
                     return;
                 }
             }
         }
-        // Recreate vanilla (broken?) behavior of resetting start time of AIWander:
-        mStartTime = MWBase::Environment::get().getWorld()->getTimeStamp();
-        storage.mState = Wander_IdleNow;
+
+        storage.setState(Wander_IdleNow);
     }
 
     void AiWander::evadeObstacles(const MWWorld::Ptr& actor, AiWanderStorage& storage, float duration, ESM::Position& pos)
     {
-        // turn towards the next point in mPath
-        zTurn(actor, storage.mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]));
-
-        MWMechanics::Movement& movement = actor.getClass().getMovementSettings(actor);
-        if (mObstacleCheck.check(actor, duration))
+        if (mObstacleCheck.isEvading())
         {
             // first check if we're walking into a door
             if (proximityToDoor(actor)) // NOTE: checks interior cells only
             {
                 // remove allowed points then select another random destination
-                mTrimCurrentNode = true;
-                trimAllowedNodes(mAllowedNodes, storage.mPathFinder);
+                storage.mTrimCurrentNode = true;
+                trimAllowedNodes(storage.mAllowedNodes, mPathFinder);
                 mObstacleCheck.clear();
-                storage.mPathFinder.clearPath();
-                storage.mState = Wander_MoveNow;
-            }
-            else // probably walking into another NPC
-            {
-                // TODO: diagonal should have same animation as walk forward
-                //       but doesn't seem to do that?
-                mObstacleCheck.takeEvasiveAction(movement);
+                mPathFinder.clearPath();
+                storage.setState(Wander_MoveNow);
             }
-            mStuckCount++;  // TODO: maybe no longer needed
-        }
-        else
-        {
-            movement.mPosition[1] = 1;
+
+           storage.mStuckCount++;  // TODO: maybe no longer needed
         }
 
         // if stuck for sufficiently long, act like current location was the destination
-        if (mStuckCount >= COUNT_BEFORE_RESET) // something has gone wrong, reset
+        if (storage.mStuckCount >= COUNT_BEFORE_RESET) // something has gone wrong, reset
         {
             //std::cout << "Reset \""<< cls.getName(actor) << "\"" << std::endl;
             mObstacleCheck.clear();
 
             stopWalking(actor, storage);
-            storage.mState = Wander_ChooseAction;
-            mStuckCount = 0;
+            storage.setState(Wander_ChooseAction);
+            storage.mStuckCount = 0;
         }
     }
 
@@ -526,7 +614,7 @@ namespace MWMechanics
             {
                 stopWalking(actor, storage);
                 mObstacleCheck.clear();
-                storage.mState = Wander_IdleNow;
+                storage.setState(Wander_IdleNow);
             }
 
             turnActorToFacePlayer(actorPos, playerPos, storage);
@@ -557,33 +645,33 @@ namespace MWMechanics
 
     void AiWander::setPathToAnAllowedNode(const MWWorld::Ptr& actor, AiWanderStorage& storage, const ESM::Position& actorPos)
     {
-        unsigned int randNode = Misc::Rng::rollDice(mAllowedNodes.size());
-        ESM::Pathgrid::Point dest(mAllowedNodes[randNode]);
+        unsigned int randNode = Misc::Rng::rollDice(storage.mAllowedNodes.size());
+        ESM::Pathgrid::Point dest(storage.mAllowedNodes[randNode]);
         ToWorldCoordinates(dest, storage.mCell->getCell());
 
-        // actor position is already in world co-ordinates
+        // actor position is already in world coordinates
         ESM::Pathgrid::Point start(PathFinder::MakePathgridPoint(actorPos));
 
         // don't take shortcuts for wandering
-        storage.mPathFinder.buildSyncedPath(start, dest, actor.getCell(), false);
+        mPathFinder.buildSyncedPath(start, dest, actor.getCell());
 
-        if (storage.mPathFinder.isPathConstructed())
+        if (mPathFinder.isPathConstructed())
         {
             // Remove this node as an option and add back the previously used node (stops NPC from picking the same node):
-            ESM::Pathgrid::Point temp = mAllowedNodes[randNode];
-            mAllowedNodes.erase(mAllowedNodes.begin() + randNode);
+            ESM::Pathgrid::Point temp = storage.mAllowedNodes[randNode];
+            storage.mAllowedNodes.erase(storage.mAllowedNodes.begin() + randNode);
             // check if mCurrentNode was taken out of mAllowedNodes
-            if (mTrimCurrentNode && mAllowedNodes.size() > 1)
-                mTrimCurrentNode = false;
+            if (storage.mTrimCurrentNode && storage.mAllowedNodes.size() > 1)
+                storage.mTrimCurrentNode = false;
             else
-                mAllowedNodes.push_back(mCurrentNode);
-            mCurrentNode = temp;
+                storage.mAllowedNodes.push_back(storage.mCurrentNode);
+            storage.mCurrentNode = temp;
 
-            storage.mState = Wander_Walking;
+            storage.setState(Wander_Walking);
         }
         // Choose a different node and delete this one from possible nodes because it is uncreachable:
         else
-            mAllowedNodes.erase(mAllowedNodes.begin() + randNode);
+            storage.mAllowedNodes.erase(storage.mAllowedNodes.begin() + randNode);
     }
 
     void AiWander::ToWorldCoordinates(ESM::Pathgrid::Point& point, const ESM::Cell * cell)
@@ -605,8 +693,8 @@ namespace MWMechanics
             ESM::Pathgrid::Point pt = paths.back();
             for(unsigned int j = 0; j < nodes.size(); j++)
             {
-                // FIXME: doesn't hadle a door with the same X/Y
-                //        co-ordinates but with a different Z
+                // FIXME: doesn't handle a door with the same X/Y
+                //        coordinates but with a different Z
                 if(nodes[j].mX == pt.mX && nodes[j].mY == pt.mY)
                 {
                     nodes.erase(nodes.begin() + j);
@@ -624,7 +712,7 @@ namespace MWMechanics
 
     void AiWander::stopWalking(const MWWorld::Ptr& actor, AiWanderStorage& storage)
     {
-        storage.mPathFinder.clearPath();
+        mPathFinder.clearPath();
         actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
     }
 
@@ -687,20 +775,22 @@ namespace MWMechanics
 
     void AiWander::fastForward(const MWWorld::Ptr& actor, AiState &state)
     {
+        // Update duration counter
+        mRemainingDuration--;
         if (mDistance == 0)
             return;
 
-        if (mPopulateAvailableNodes)
-            getAllowedNodes(actor, actor.getCell()->getCell());
+        AiWanderStorage& storage = state.get<AiWanderStorage>();
+        if (storage.mPopulateAvailableNodes)
+            getAllowedNodes(actor, actor.getCell()->getCell(), storage);
 
-        if (mAllowedNodes.empty())
+        if (storage.mAllowedNodes.empty())
             return;
 
+        int index = Misc::Rng::rollDice(storage.mAllowedNodes.size());
+        ESM::Pathgrid::Point dest = storage.mAllowedNodes[index];
         state.moveIn(new AiWanderStorage());
 
-        int index = Misc::Rng::rollDice(mAllowedNodes.size());
-        ESM::Pathgrid::Point dest = mAllowedNodes[index];
-
         dest.mX += OffsetToPreventOvercrowding();
         dest.mY += OffsetToPreventOvercrowding();
         ToWorldCoordinates(dest, actor.getCell()->getCell());
@@ -708,90 +798,87 @@ namespace MWMechanics
         MWBase::Environment::get().getWorld()->moveObject(actor, static_cast<float>(dest.mX), 
             static_cast<float>(dest.mY), static_cast<float>(dest.mZ));
         actor.getClass().adjustPosition(actor, false);
-
-        // may have changed cell
-        mPopulateAvailableNodes = true;
     }
 
     int AiWander::OffsetToPreventOvercrowding()
     {
-        return static_cast<int>(DESTINATION_TOLERANCE * (Misc::Rng::rollProbability() * 2.0f - 1.0f));
+        return static_cast<int>(20 * (Misc::Rng::rollProbability() * 2.0f - 1.0f));
     }
 
-    void AiWander::getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell)
+    void AiWander::getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell, AiWanderStorage& storage)
     {
-        if (!mStoredInitialActorPosition)
-        {
-            mInitialActorPosition = actor.getRefData().getPosition().asVec3();
-            mStoredInitialActorPosition = true;
-        }
-
         // infrequently used, therefore no benefit in caching it as a member
         const ESM::Pathgrid *
             pathgrid = MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*cell);
+        const MWWorld::CellStore* cellStore = actor.getCell();
 
-        mAllowedNodes.clear();
+        storage.mAllowedNodes.clear();
 
         // If there is no path this actor doesn't go anywhere. See:
         // https://forum.openmw.org/viewtopic.php?t=1556
         // http://www.fliggerty.com/phpBB3/viewtopic.php?f=30&t=5833
         // Note: In order to wander, need at least two points.
         if(!pathgrid || (pathgrid->mPoints.size() < 2))
-            mDistance = 0;
+            storage.mCanWanderAlongPathGrid = false;
 
         // A distance value passed into the constructor indicates how far the
         // actor can  wander from the spawn position.  AiWander assumes that
         // pathgrid points are available, and uses them to randomly select wander
         // destinations within the allowed set of pathgrid points (nodes).
         // ... pathgrids don't usually include water, so swimmers ignore them
-        if (mDistance && !actor.getClass().isPureWaterCreature(actor))
+        if (mDistance && storage.mCanWanderAlongPathGrid && !actor.getClass().isPureWaterCreature(actor))
         {
-            // get NPC's position in local (i.e. cell) co-ordinates
+            // get NPC's position in local (i.e. cell) coordinates
             osg::Vec3f npcPos(mInitialActorPosition);
             CoordinateConverter(cell).toLocal(npcPos);
+            
+            // Find closest pathgrid point
+            int closestPointIndex = PathFinder::GetClosestPoint(pathgrid, npcPos);
 
             // mAllowedNodes for this actor with pathgrid point indexes based on mDistance
-            // NOTE: mPoints and mAllowedNodes are in local co-ordinates
+            // and if the point is connected to the closest current point
+            // NOTE: mPoints and mAllowedNodes are in local coordinates
             int pointIndex = 0;
             for(unsigned int counter = 0; counter < pathgrid->mPoints.size(); counter++)
             {
                 osg::Vec3f nodePos(PathFinder::MakeOsgVec3(pathgrid->mPoints[counter]));
-                if((npcPos - nodePos).length2() <= mDistance * mDistance)
+                if((npcPos - nodePos).length2() <= mDistance * mDistance &&
+                   cellStore->isPointConnected(closestPointIndex, counter))
                 {
-                    mAllowedNodes.push_back(pathgrid->mPoints[counter]);
+                    storage.mAllowedNodes.push_back(pathgrid->mPoints[counter]);
                     pointIndex = counter;
                 }
             }
-            if (mAllowedNodes.size() == 1)
+            if (storage.mAllowedNodes.size() == 1)
             {
-                AddNonPathGridAllowedPoints(npcPos, pathgrid, pointIndex);
+                AddNonPathGridAllowedPoints(npcPos, pathgrid, pointIndex, storage);
             }
-            if(!mAllowedNodes.empty())
+            if(!storage.mAllowedNodes.empty())
             {
-                SetCurrentNodeToClosestAllowedNode(npcPos);
+                SetCurrentNodeToClosestAllowedNode(npcPos, storage);
             }
         }
 
-        mPopulateAvailableNodes = false;
+        storage.mPopulateAvailableNodes = false;
     }
 
     // When only one path grid point in wander distance, 
     // additional points for NPC to wander to are:
     // 1. NPC's initial location
     // 2. Partway along the path between the point and its connected points.
-    void AiWander::AddNonPathGridAllowedPoints(osg::Vec3f npcPos, const ESM::Pathgrid * pathGrid, int pointIndex)
+    void AiWander::AddNonPathGridAllowedPoints(osg::Vec3f npcPos, const ESM::Pathgrid * pathGrid, int pointIndex, AiWanderStorage& storage)
     {
-        mAllowedNodes.push_back(PathFinder::MakePathgridPoint(npcPos));
+        storage.mAllowedNodes.push_back(PathFinder::MakePathgridPoint(npcPos));
         for (std::vector<ESM::Pathgrid::Edge>::const_iterator it = pathGrid->mEdges.begin(); it != pathGrid->mEdges.end(); ++it)
         {
             if (it->mV0 == pointIndex)
             {
-                AddPointBetweenPathGridPoints(pathGrid->mPoints[it->mV0], pathGrid->mPoints[it->mV1]);
+                AddPointBetweenPathGridPoints(pathGrid->mPoints[it->mV0], pathGrid->mPoints[it->mV1], storage);
             }
         }
     }
 
-    void AiWander::AddPointBetweenPathGridPoints(const ESM::Pathgrid::Point& start, const ESM::Pathgrid::Point& end)
+    void AiWander::AddPointBetweenPathGridPoints(const ESM::Pathgrid::Point& start, const ESM::Pathgrid::Point& end, AiWanderStorage& storage)
     {
         osg::Vec3f vectorStart = PathFinder::MakeOsgVec3(start);
         osg::Vec3f delta = PathFinder::MakeOsgVec3(end) - vectorStart;
@@ -803,16 +890,16 @@ namespace MWMechanics
         // must not travel longer than distance between waypoints or NPC goes past waypoint
         distance = std::min(distance, static_cast<int>(length));
         delta *= distance;
-        mAllowedNodes.push_back(PathFinder::MakePathgridPoint(vectorStart + delta));
+        storage.mAllowedNodes.push_back(PathFinder::MakePathgridPoint(vectorStart + delta));
     }
 
-    void AiWander::SetCurrentNodeToClosestAllowedNode(osg::Vec3f npcPos)
+    void AiWander::SetCurrentNodeToClosestAllowedNode(osg::Vec3f npcPos, AiWanderStorage& storage)
     {
         float distanceToClosestNode = std::numeric_limits<float>::max();
         unsigned int index = 0;
-        for (unsigned int counterThree = 0; counterThree < mAllowedNodes.size(); counterThree++)
+        for (unsigned int counterThree = 0; counterThree < storage.mAllowedNodes.size(); counterThree++)
         {
-            osg::Vec3f nodePos(PathFinder::MakeOsgVec3(mAllowedNodes[counterThree]));
+            osg::Vec3f nodePos(PathFinder::MakeOsgVec3(storage.mAllowedNodes[counterThree]));
             float tempDist = (npcPos - nodePos).length2();
             if (tempDist < distanceToClosestNode)
             {
@@ -820,17 +907,23 @@ namespace MWMechanics
                 distanceToClosestNode = tempDist;
             }
         }
-        mCurrentNode = mAllowedNodes[index];
-        mAllowedNodes.erase(mAllowedNodes.begin() + index);
+        storage.mCurrentNode = storage.mAllowedNodes[index];
+        storage.mAllowedNodes.erase(storage.mAllowedNodes.begin() + index);
     }
 
     void AiWander::writeState(ESM::AiSequence::AiSequence &sequence) const
     {
+        float remainingDuration;
+        if (mRemainingDuration > 0 && mRemainingDuration < 24)
+            remainingDuration = mRemainingDuration;
+        else
+            remainingDuration = mDuration;
+
         std::auto_ptr<ESM::AiSequence::AiWander> wander(new ESM::AiSequence::AiWander());
         wander->mData.mDistance = mDistance;
         wander->mData.mDuration = mDuration;
         wander->mData.mTimeOfDay = mTimeOfDay;
-        wander->mStartTime = mStartTime.toEsm();
+        wander->mDurationData.mRemainingDuration = remainingDuration;
         assert (mIdle.size() == 8);
         for (int i=0; i<8; ++i)
             wander->mData.mIdle[i] = mIdle[i];
@@ -848,15 +941,18 @@ namespace MWMechanics
     AiWander::AiWander (const ESM::AiSequence::AiWander* wander)
         : mDistance(wander->mData.mDistance)
         , mDuration(wander->mData.mDuration)
+        , mRemainingDuration(wander->mDurationData.mRemainingDuration)
         , mTimeOfDay(wander->mData.mTimeOfDay)
         , mRepeat(wander->mData.mShouldRepeat != 0)
         , mStoredInitialActorPosition(wander->mStoredInitialActorPosition)
-        , mStartTime(MWWorld::TimeStamp(wander->mStartTime))
     {
         if (mStoredInitialActorPosition)
             mInitialActorPosition = wander->mInitialActorPosition;
         for (int i=0; i<8; ++i)
             mIdle.push_back(wander->mData.mIdle[i]);
+        if (mRemainingDuration <= 0 || mRemainingDuration >= 24)
+            mRemainingDuration = mDuration;
+
 
         init();
     }
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 683c04bb0..f9b03ca5e 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -5,12 +5,10 @@
 
 #include <vector>
 
-#include "pathfinding.hpp"
-#include "obstacle.hpp"
-
 #include "../mwworld/timestamp.hpp"
 
-
+#include "pathfinding.hpp"
+#include "obstacle.hpp"
 #include "aistate.hpp"
 
 namespace ESM
@@ -23,9 +21,7 @@ namespace ESM
 }
 
 namespace MWMechanics
-{    
-    
-    
+{       
     struct AiWanderStorage;
 
     /// \brief Causes the Actor to wander within a specified range
@@ -35,15 +31,13 @@ namespace MWMechanics
             /// Constructor
             /** \param distance Max distance the ACtor will wander
                 \param duration Time, in hours, that this package will be preformed
-                \param timeOfDay Start time of the package, if it has a duration. Currently unimplemented
+                \param timeOfDay Currently unimplemented. Not functional in the original engine.
                 \param idle Chances of each idle to play (9 in total)
                 \param repeat Repeat wander or not **/
             AiWander(int distance, int duration, int timeOfDay, const std::vector<unsigned char>& idle, bool repeat);
 
             AiWander (const ESM::AiSequence::AiWander* wander);
 
-            
-
             virtual AiPackage *clone() const;
 
             virtual bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration);
@@ -58,6 +52,8 @@ namespace MWMechanics
 
             virtual void fastForward(const MWWorld::Ptr& actor, AiState& state);
             
+            bool getRepeat() const;
+            
             enum GreetingState {
                 Greet_None,
                 Greet_InProgress,
@@ -70,10 +66,10 @@ namespace MWMechanics
                 Wander_MoveNow,
                 Wander_Walking
             };
+
         private:
             // NOTE: mDistance and mDuration must be set already
             void init();
-            
             void stopWalking(const MWWorld::Ptr& actor, AiWanderStorage& storage);
 
             /// Have the given actor play an idle animation
@@ -91,52 +87,30 @@ namespace MWMechanics
             void onWalkingStatePerFrameActions(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage, ESM::Position& pos);
             void onChooseActionStatePerFrameActions(const MWWorld::Ptr& actor, AiWanderStorage& storage);
             bool reactionTimeActions(const MWWorld::Ptr& actor, AiWanderStorage& storage,
-                const MWWorld::CellStore*& currentCell, bool cellChange, ESM::Position& pos);
+                const MWWorld::CellStore*& currentCell, bool cellChange, ESM::Position& pos, float duration);
             bool isPackageCompleted(const MWWorld::Ptr& actor, AiWanderStorage& storage);
             void returnToStartLocation(const MWWorld::Ptr& actor, AiWanderStorage& storage, ESM::Position& pos);
+            void wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance);
+            bool destinationIsAtWater(const MWWorld::Ptr &actor, const osg::Vec3f& destination);
+            bool destinationThroughGround(const osg::Vec3f& startPoint, const osg::Vec3f& destination);
+            void completeManualWalking(const MWWorld::Ptr &actor, AiWanderStorage &storage);
 
             int mDistance; // how far the actor can wander from the spawn point
             int mDuration;
+            float mRemainingDuration;
             int mTimeOfDay;
             std::vector<unsigned char> mIdle;
             bool mRepeat;
-            
 
             bool mHasReturnPosition; // NOTE: Could be removed if mReturnPosition was initialized to actor position,
                                     // if we had the actor in the AiWander constructor...
             osg::Vec3f mReturnPosition;
-
             osg::Vec3f mInitialActorPosition;
             bool mStoredInitialActorPosition;
 
-           
-
-            // do we need to calculate allowed nodes based on mDistance
-            bool mPopulateAvailableNodes;
-
-
-            
-
-            MWWorld::TimeStamp mStartTime;
-
-            // allowed pathgrid nodes based on mDistance from the spawn point
-            // in local coordinates of mCell
-            // FIXME: move to AiWanderStorage
-            std::vector<ESM::Pathgrid::Point> mAllowedNodes;
-
-            void getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell);
-
-            // FIXME: move to AiWanderStorage
-            ESM::Pathgrid::Point mCurrentNode;
-            bool mTrimCurrentNode;
-            void trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes,
-                                  const PathFinder& pathfinder);
-
+            void getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell, AiWanderStorage& storage);
 
-            // FIXME: move to AiWanderStorage
-//             ObstacleCheck mObstacleCheck;
-            float mDoorCheckDuration;
-            int mStuckCount;
+            void trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes, const PathFinder& pathfinder);
 
             // constants for converting idleSelect values into groupNames
             enum GroupIndex
@@ -145,22 +119,20 @@ namespace MWMechanics
                 GroupIndex_MaxIdle = 9
             };
 
-            /// convert point from local (i.e. cell) to world co-ordinates
+            /// convert point from local (i.e. cell) to world coordinates
             void ToWorldCoordinates(ESM::Pathgrid::Point& point, const ESM::Cell * cell);
 
-            void SetCurrentNodeToClosestAllowedNode(osg::Vec3f npcPos);
+            void SetCurrentNodeToClosestAllowedNode(osg::Vec3f npcPos, AiWanderStorage& storage);
 
-            void AddNonPathGridAllowedPoints(osg::Vec3f npcPos, const ESM::Pathgrid * pathGrid, int pointIndex);
+            void AddNonPathGridAllowedPoints(osg::Vec3f npcPos, const ESM::Pathgrid * pathGrid, int pointIndex, AiWanderStorage& storage);
 
-            void AddPointBetweenPathGridPoints(const ESM::Pathgrid::Point& start, const ESM::Pathgrid::Point& end);
+            void AddPointBetweenPathGridPoints(const ESM::Pathgrid::Point& start, const ESM::Pathgrid::Point& end, AiWanderStorage& storage);
 
             /// lookup table for converting idleSelect value to groupName
             static const std::string sIdleSelectToGroupName[GroupIndex_MaxIdle - GroupIndex_MinIdle + 1];
 
             static int OffsetToPreventOvercrowding();
-    };
-    
-    
+    }; 
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index d02376d23..783bbf573 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -15,7 +15,6 @@
 #include <components/esm/loadgmst.hpp>
 #include <components/esm/loadmgef.hpp>
 
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
@@ -74,7 +73,7 @@ void MWMechanics::Alchemy::applyTools (int flags, float& value) const
     bool duration = !(flags & ESM::MagicEffect::NoDuration);
     bool negative = (flags & ESM::MagicEffect::Harmful) != 0;
 
-    int tool = negative ? ESM::Apparatus::Retort : ESM::Apparatus::Albemic;
+    int tool = negative ? ESM::Apparatus::Alembic : ESM::Apparatus::Retort;
 
     int setup = 0;
 
diff --git a/apps/openmw/mwmechanics/autocalcspell.cpp b/apps/openmw/mwmechanics/autocalcspell.cpp
index b798ff5dc..af814edb0 100644
--- a/apps/openmw/mwmechanics/autocalcspell.cpp
+++ b/apps/openmw/mwmechanics/autocalcspell.cpp
@@ -141,6 +141,79 @@ namespace MWMechanics
         return selectedSpells;
     }
 
+    std::vector<std::string> autoCalcPlayerSpells(const int* actorSkills, const int* actorAttributes, const ESM::Race* race)
+    {
+        const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
+
+        static const float fPCbaseMagickaMult = esmStore.get<ESM::GameSetting>().find("fPCbaseMagickaMult")->getFloat();
+
+        float baseMagicka = fPCbaseMagickaMult * actorAttributes[ESM::Attribute::Intelligence];
+        bool reachedLimit = false;
+        const ESM::Spell* weakestSpell = NULL;
+        int minCost = INT_MAX;
+
+        std::vector<std::string> selectedSpells;
+
+
+        const MWWorld::Store<ESM::Spell> &spells =
+            esmStore.get<ESM::Spell>();
+        for (MWWorld::Store<ESM::Spell>::iterator iter = spells.begin(); iter != spells.end(); ++iter)
+        {
+            const ESM::Spell* spell = &*iter;
+
+            if (spell->mData.mType != ESM::Spell::ST_Spell)
+                continue;
+            if (!(spell->mData.mFlags & ESM::Spell::F_PCStart))
+                continue;
+            if (reachedLimit && spell->mData.mCost <= minCost)
+                continue;
+            if (race && std::find(race->mPowers.mList.begin(), race->mPowers.mList.end(), spell->mId) != race->mPowers.mList.end())
+                continue;
+            if (baseMagicka < spell->mData.mCost)
+                continue;
+
+            static const float fAutoPCSpellChance = esmStore.get<ESM::GameSetting>().find("fAutoPCSpellChance")->getFloat();
+            if (calcAutoCastChance(spell, actorSkills, actorAttributes, -1) < fAutoPCSpellChance)
+                continue;
+
+            if (!attrSkillCheck(spell, actorSkills, actorAttributes))
+                continue;
+
+            selectedSpells.push_back(spell->mId);
+
+            if (reachedLimit)
+            {
+                std::vector<std::string>::iterator it = std::find(selectedSpells.begin(), selectedSpells.end(), weakestSpell->mId);
+                if (it != selectedSpells.end())
+                    selectedSpells.erase(it);
+
+                minCost = INT_MAX;
+                for (std::vector<std::string>::iterator weakIt = selectedSpells.begin(); weakIt != selectedSpells.end(); ++weakIt)
+                {
+                    const ESM::Spell* testSpell = esmStore.get<ESM::Spell>().find(*weakIt);
+                    if (testSpell->mData.mCost < minCost)
+                    {
+                        minCost = testSpell->mData.mCost;
+                        weakestSpell = testSpell;
+                    }
+                }
+            }
+            else
+            {
+                if (spell->mData.mCost < minCost)
+                {
+                    weakestSpell = spell;
+                    minCost = weakestSpell->mData.mCost;
+                }
+                static const unsigned int iAutoPCSpellMax = esmStore.get<ESM::GameSetting>().find("iAutoPCSpellMax")->getInt();
+                if (selectedSpells.size() == iAutoPCSpellMax)
+                    reachedLimit = true;
+            }
+        }
+
+        return selectedSpells;
+    }
+
     bool attrSkillCheck (const ESM::Spell* spell, const int* actorSkills, const int* actorAttributes)
     {
         const std::vector<ESM::ENAMstruct>& effects = spell->mEffects.mList;
diff --git a/apps/openmw/mwmechanics/autocalcspell.hpp b/apps/openmw/mwmechanics/autocalcspell.hpp
index 1912c75c4..6bf3e834b 100644
--- a/apps/openmw/mwmechanics/autocalcspell.hpp
+++ b/apps/openmw/mwmechanics/autocalcspell.hpp
@@ -16,6 +16,8 @@ namespace MWMechanics
 
 std::vector<std::string> autoCalcNpcSpells(const int* actorSkills, const int* actorAttributes, const ESM::Race* race);
 
+std::vector<std::string> autoCalcPlayerSpells(const int* actorSkills, const int* actorAttributes, const ESM::Race* race);
+
 // Helpers
 
 bool attrSkillCheck (const ESM::Spell* spell, const int* actorSkills, const int* actorAttributes);
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 67707d028..d35ddb8be 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -21,32 +21,34 @@
 
 #include <iostream>
 
-
-#include "movement.hpp"
-#include "npcstats.hpp"
-#include "creaturestats.hpp"
-#include "security.hpp"
-#include "actorutil.hpp"
-
 #include <components/misc/rng.hpp>
 
 #include <components/settings/settings.hpp>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/LocalPlayer.hpp"
+
 #include "../mwrender/animation.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/statemanager.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/player.hpp"
 
+#include "movement.hpp"
+#include "npcstats.hpp"
+#include "creaturestats.hpp"
+#include "security.hpp"
+#include "actorutil.hpp"
+#include "spellcasting.hpp"
+
 namespace
 {
 
@@ -71,12 +73,14 @@ std::string getBestAttack (const ESM::Weapon* weapon)
     int slash = (weapon->mData.mSlash[0] + weapon->mData.mSlash[1])/2;
     int chop = (weapon->mData.mChop[0] + weapon->mData.mChop[1])/2;
     int thrust = (weapon->mData.mThrust[0] + weapon->mData.mThrust[1])/2;
-    if (slash >= chop && slash >= thrust)
+    if (slash == chop && slash == thrust)
         return "slash";
-    else if (chop >= slash && chop >= thrust)
-        return "chop";
-    else
+    else if (thrust >= chop && thrust >= slash)
         return "thrust";
+    else if (slash >= chop && slash >= thrust)
+        return "slash";
+    else
+        return "chop";
 }
 
 // Converts a movement Run state to its equivalent Walk state.
@@ -227,7 +231,7 @@ public:
     { return weap.type == type; }
 };
 
-std::string CharacterController::chooseRandomGroup (const std::string& prefix, int* num)
+std::string CharacterController::chooseRandomGroup (const std::string& prefix, int* num) const
 {
     int numAnims=0;
     while (mAnimation->hasAnimation(prefix + toString(numAnims+1)))
@@ -239,90 +243,88 @@ std::string CharacterController::chooseRandomGroup (const std::string& prefix, i
     return prefix + toString(roll);
 }
 
-void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force)
+void CharacterController::refreshHitRecoilAnims()
 {
-    // hit recoils/knockdown animations handling
-    if(mPtr.getClass().isActor())
+    bool recovery = mPtr.getClass().getCreatureStats(mPtr).getHitRecovery();
+    bool knockdown = mPtr.getClass().getCreatureStats(mPtr).getKnockedDown();
+    bool block = mPtr.getClass().getCreatureStats(mPtr).getBlock();
+    if(mHitState == CharState_None)
     {
-        bool recovery = mPtr.getClass().getCreatureStats(mPtr).getHitRecovery();
-        bool knockdown = mPtr.getClass().getCreatureStats(mPtr).getKnockedDown();
-        bool block = mPtr.getClass().getCreatureStats(mPtr).getBlock();
-        if(mHitState == CharState_None)
+        if ((mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() < 0
+                || mPtr.getClass().getCreatureStats(mPtr).getFatigue().getBase() == 0)
+                && mAnimation->hasAnimation("knockout"))
         {
-            if ((mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() < 0
-                    || mPtr.getClass().getCreatureStats(mPtr).getFatigue().getBase() == 0)
-                    && mAnimation->hasAnimation("knockout"))
-            {
-                mHitState = CharState_KnockOut;
-                mCurrentHit = "knockout";
-                mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, false, 1, "start", "stop", 0.0f, ~0ul);
-                mPtr.getClass().getCreatureStats(mPtr).setKnockedDown(true);
-            }
-            else if(knockdown && mAnimation->hasAnimation("knockdown"))
-            {
-                mHitState = CharState_KnockDown;
-                mCurrentHit = "knockdown";
-                mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
-            }
-            else if (recovery)
-            {
-                std::string anim = chooseRandomGroup("hit");
-                if (mAnimation->hasAnimation(anim))
-                {
-                    mHitState = CharState_Hit;
-                    mCurrentHit = anim;
-                    mAnimation->play(mCurrentHit, Priority_Hit, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
-                }
-            }
-            else if (block && mAnimation->hasAnimation("shield"))
-            {
-                mHitState = CharState_Block;
-                mCurrentHit = "shield";
-                MWRender::Animation::AnimPriority priorityBlock (Priority_Hit);
-                priorityBlock[MWRender::Animation::BoneGroup_LeftArm] = Priority_Block;
-                mAnimation->play(mCurrentHit, priorityBlock, MWRender::Animation::BlendMask_All, true, 1, "block start", "block stop", 0.0f, 0);
-            }
-
-            // Cancel upper body animations
-            if (mHitState == CharState_KnockDown || mHitState == CharState_KnockOut)
+            mHitState = CharState_KnockOut;
+            mCurrentHit = "knockout";
+            mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, false, 1, "start", "stop", 0.0f, ~0ul);
+            mPtr.getClass().getCreatureStats(mPtr).setKnockedDown(true);
+        }
+        else if(knockdown && mAnimation->hasAnimation("knockdown"))
+        {
+            mHitState = CharState_KnockDown;
+            mCurrentHit = "knockdown";
+            mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
+        }
+        else if (recovery)
+        {
+            std::string anim = chooseRandomGroup("hit");
+            if (mAnimation->hasAnimation(anim))
             {
-                if (mUpperBodyState > UpperCharState_WeapEquiped)
-                {
-                    mAnimation->disable(mCurrentWeapon);
-                    mUpperBodyState = UpperCharState_WeapEquiped;
-                }
-                else if (mUpperBodyState > UpperCharState_Nothing && mUpperBodyState < UpperCharState_WeapEquiped)
-                {
-                    mAnimation->disable(mCurrentWeapon);
-                    mUpperBodyState = UpperCharState_Nothing;
-                }
+                mHitState = CharState_Hit;
+                mCurrentHit = anim;
+                mAnimation->play(mCurrentHit, Priority_Hit, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
             }
         }
-        else if(!mAnimation->isPlaying(mCurrentHit))
+        else if (block && mAnimation->hasAnimation("shield"))
         {
-            mCurrentHit.erase();
-            if (knockdown)
-                mPtr.getClass().getCreatureStats(mPtr).setKnockedDown(false);
-            if (recovery)
-                mPtr.getClass().getCreatureStats(mPtr).setHitRecovery(false);
-            if (block)
-                mPtr.getClass().getCreatureStats(mPtr).setBlock(false);
-            mHitState = CharState_None;
+            mHitState = CharState_Block;
+            mCurrentHit = "shield";
+            MWRender::Animation::AnimPriority priorityBlock (Priority_Hit);
+            priorityBlock[MWRender::Animation::BoneGroup_LeftArm] = Priority_Block;
+            mAnimation->play(mCurrentHit, priorityBlock, MWRender::Animation::BlendMask_All, true, 1, "block start", "block stop", 0.0f, 0);
         }
-        else if (mHitState == CharState_KnockOut && mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() > 0)
+
+        // Cancel upper body animations
+        if (mHitState == CharState_KnockDown || mHitState == CharState_KnockOut)
         {
-            mHitState = CharState_KnockDown;
-            mAnimation->disable(mCurrentHit);
-            mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "loop stop", "stop", 0.0f, 0);
+            if (mUpperBodyState > UpperCharState_WeapEquiped)
+            {
+                mAnimation->disable(mCurrentWeapon);
+                mUpperBodyState = UpperCharState_WeapEquiped;
+            }
+            else if (mUpperBodyState > UpperCharState_Nothing && mUpperBodyState < UpperCharState_WeapEquiped)
+            {
+                mAnimation->disable(mCurrentWeapon);
+                mUpperBodyState = UpperCharState_Nothing;
+            }
         }
     }
+    else if(!mAnimation->isPlaying(mCurrentHit))
+    {
+        mCurrentHit.erase();
+        if (knockdown)
+            mPtr.getClass().getCreatureStats(mPtr).setKnockedDown(false);
+        if (recovery)
+            mPtr.getClass().getCreatureStats(mPtr).setHitRecovery(false);
+        if (block)
+            mPtr.getClass().getCreatureStats(mPtr).setBlock(false);
+        mHitState = CharState_None;
+    }
+    else if (mHitState == CharState_KnockOut && mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() > 0)
+    {
+        mHitState = CharState_KnockDown;
+        mAnimation->disable(mCurrentHit);
+        mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "loop stop", "stop", 0.0f, 0);
+    }
+    if (mHitState != CharState_None)
+        mIdleState = CharState_None;
+}
 
-    const WeaponInfo *weap = std::find_if(sWeaponTypeList, sWeaponTypeListEnd, FindWeaponType(mWeaponType));
-    if (!mPtr.getClass().isBipedal(mPtr))
-        weap = sWeaponTypeListEnd;
-
+void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState jump, bool force)
+{
     if(force || jump != mJumpState)
     {
+        mIdleState = CharState_None;
         bool startAtLoop = (jump == mJumpState);
         mJumpState = jump;
 
@@ -359,9 +361,13 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
                              1.0f, "loop stop", "stop", 0.0f, 0);
         }
     }
+}
 
+void CharacterController::refreshMovementAnims(const WeaponInfo* weap, CharacterState movement, bool force)
+{
     if(force || movement != mMovementState)
     {
+        mIdleState = CharState_None;
         mMovementState = movement;
 
         std::string movementAnimName;
@@ -464,56 +470,80 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
             }
 
             mAnimation->play(mCurrentMovement, Priority_Movement, movemask, false,
-                             1.f, ((mode!=2)?"start":"loop start"), "stop", 0.0f, ~0ul);
+                             1.f, ((mode!=2)?"start":"loop start"), "stop", 0.0f, ~0ul, true);
         }
     }
+}
 
-    // idle handled last as it can depend on the other states
-    // FIXME: if one of the below states is close to their last animation frame (i.e. will be disabled in the coming update),
-    // the idle animation should be displayed
-    if ((mUpperBodyState != UpperCharState_Nothing
-            || (mMovementState != CharState_None && mMovementState != CharState_TurnLeft && mMovementState != CharState_TurnRight)
-            || mHitState != CharState_None)
-            && !mPtr.getClass().isBipedal(mPtr))
-        idle = CharState_None;
-
-    if(force || idle != mIdleState)
+void CharacterController::refreshIdleAnims(const WeaponInfo* weap, CharacterState idle, bool force)
+{
+    if(force || idle != mIdleState ||
+        ((idle == mIdleState) && !mAnimation->isPlaying(mCurrentIdle) && mAnimQueue.empty()))
     {
         mIdleState = idle;
+        size_t numLoops = ~0ul;
 
-        std::string idle;
+        std::string idleGroup;
         MWRender::Animation::AnimPriority idlePriority (Priority_Default);
         // Only play "idleswim" or "idlesneak" if they exist. Otherwise, fallback to
         // "idle"+weapon or "idle".
         if(mIdleState == CharState_IdleSwim && mAnimation->hasAnimation("idleswim"))
         {
-            idle = "idleswim";
+            idleGroup = "idleswim";
             idlePriority = Priority_SwimIdle;
         }
         else if(mIdleState == CharState_IdleSneak && mAnimation->hasAnimation("idlesneak"))
         {
-            idle = "idlesneak";
+            idleGroup = "idlesneak";
             idlePriority[MWRender::Animation::BoneGroup_LowerBody] = Priority_SneakIdleLowerBody;
         }
         else if(mIdleState != CharState_None)
         {
-            idle = "idle";
+            idleGroup = "idle";
             if(weap != sWeaponTypeListEnd)
             {
-                idle += weap->shortgroup;
-                if(!mAnimation->hasAnimation(idle))
-                    idle = "idle";
-            }
+                idleGroup += weap->shortgroup;
+                if(!mAnimation->hasAnimation(idleGroup))
+                    idleGroup = "idle";
+
+                // play until the Loop Stop key 2 to 5 times, then play until the Stop key
+                // this replicates original engine behavior for the "Idle1h" 1st-person animation
+                numLoops = 1 + Misc::Rng::rollDice(4); 
+            }  
         }
 
         mAnimation->disable(mCurrentIdle);
-        mCurrentIdle = idle;
+        mCurrentIdle = idleGroup;
         if(!mCurrentIdle.empty())
             mAnimation->play(mCurrentIdle, idlePriority, MWRender::Animation::BlendMask_All, false,
-                             1.0f, "start", "stop", 0.0f, ~0ul, true);
+                             1.0f, "start", "stop", 0.0f, numLoops, true);
     }
 }
 
+void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force)
+{
+    if (mPtr.getClass().isActor())
+        refreshHitRecoilAnims();
+
+    const WeaponInfo *weap = std::find_if(sWeaponTypeList, sWeaponTypeListEnd, FindWeaponType(mWeaponType));
+    if (!mPtr.getClass().isBipedal(mPtr))
+        weap = sWeaponTypeListEnd;
+
+    refreshJumpAnims(weap, jump, force);
+    refreshMovementAnims(weap, movement, force);
+
+    // idle handled last as it can depend on the other states
+    // FIXME: if one of the below states is close to their last animation frame (i.e. will be disabled in the coming update),
+    // the idle animation should be displayed
+    if ((mUpperBodyState != UpperCharState_Nothing
+            || (mMovementState != CharState_None && mMovementState != CharState_TurnLeft && mMovementState != CharState_TurnRight)
+            || mHitState != CharState_None)
+            && !mPtr.getClass().isBipedal(mPtr))
+        idle = CharState_None;
+
+    refreshIdleAnims(weap, idle, force);
+}
+
 
 void getWeaponGroup(WeaponType weaptype, std::string &group)
 {
@@ -546,8 +576,8 @@ MWWorld::ContainerStoreIterator getActiveWeapon(CreatureStats &stats, MWWorld::I
             else if(type == typeid(ESM::Weapon).name())
             {
                 MWWorld::LiveCellRef<ESM::Weapon> *ref = weapon->get<ESM::Weapon>();
-                ESM::Weapon::Type type = (ESM::Weapon::Type)ref->mBase->mData.mType;
-                switch(type)
+                ESM::Weapon::Type weaponType = (ESM::Weapon::Type)ref->mBase->mData.mType;
+                switch(weaponType)
                 {
                     case ESM::Weapon::ShortBladeOneHand:
                     case ESM::Weapon::LongBladeOneHand:
@@ -629,6 +659,13 @@ void CharacterController::playDeath(float startpoint, CharacterState death)
                     false, 1.0f, "start", "stop", startpoint, 0);
 }
 
+CharacterState CharacterController::chooseRandomDeathState() const
+{
+    int selected=0;
+    chooseRandomGroup("death", &selected);
+    return static_cast<CharacterState>(CharState_Death1 + (selected-1));
+}
+
 void CharacterController::playRandomDeath(float startpoint)
 {
     if (mPtr == getPlayer())
@@ -652,9 +689,7 @@ void CharacterController::playRandomDeath(float startpoint)
     }
     else
     {
-        int selected=0;
-        chooseRandomGroup("death", &selected);
-        mDeathState = static_cast<CharacterState>(CharState_Death1 + (selected-1));
+        mDeathState = chooseRandomDeathState();
     }
     playDeath(startpoint, mDeathState);
 }
@@ -664,6 +699,7 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
     , mAnimation(anim)
     , mIdleState(CharState_None)
     , mMovementState(CharState_None)
+    , mMovementAnimSpeed(0.f)
     , mAdjustMovementAnimSpeed(false)
     , mHasMovedInXY(false)
     , mMovementAnimationControlled(true)
@@ -714,10 +750,20 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
             mIdleState = CharState_Idle;
         else
         {
-            // Set the death state, but don't play it yet
-            // We will play it in the first frame, but only if no script set the skipAnim flag
-            mDeathState = static_cast<CharacterState>(CharState_Death1 + mPtr.getClass().getCreatureStats(mPtr).getDeathAnimation());
-            mFloatToSurface = false;
+            const MWMechanics::CreatureStats& cStats = mPtr.getClass().getCreatureStats(mPtr);
+            if (cStats.isDeathAnimationFinished())
+            {
+                // Set the death state, but don't play it yet
+                // We will play it in the first frame, but only if no script set the skipAnim flag
+                signed char deathanim = cStats.getDeathAnimation();
+                if (deathanim == -1)
+                    mDeathState = chooseRandomDeathState();
+                else
+                    mDeathState = static_cast<CharacterState>(CharState_Death1 + deathanim);
+
+                mFloatToSurface = false;
+            }
+            // else: nothing to do, will detect death in the next frame and start playing death animation
         }
     }
     else
@@ -733,12 +779,17 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
         refreshCurrentAnims(mIdleState, mMovementState, mJumpState, true);
 
     mAnimation->runAnimation(0.f);
+
+    unpersistAnimationState();
 }
 
 CharacterController::~CharacterController()
 {
     if (mAnimation)
+    {
+        persistAnimationState();
         mAnimation->setTextKeyListener(NULL);
+    }
 }
 
 void split(const std::string &s, char delim, std::vector<std::string> &elems) {
@@ -756,6 +807,7 @@ void CharacterController::handleTextKey(const std::string &groupname, const std:
     if(evt.compare(0, 7, "sound: ") == 0)
     {
         MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+        sndMgr->stopSound3D(mPtr, evt.substr(7));
         sndMgr->playSound3D(mPtr, evt.substr(7), 1.0f, 1.0f);
         return;
     }
@@ -796,7 +848,10 @@ void CharacterController::handleTextKey(const std::string &groupname, const std:
                                     MWBase::SoundManager::Play_NoPlayerLocal);
             }
             else
+            {
+                sndMgr->stopSound3D(mPtr, sound);
                 sndMgr->playSound3D(mPtr, sound, volume, pitch);
+            }
         }
         return;
     }
@@ -923,34 +978,6 @@ void CharacterController::updateIdleStormState(bool inwater)
     }
 }
 
-void CharacterController::castSpell(const std::string &spellid)
-{
-    static const std::string schools[] = {
-        "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-    };
-
-    const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-    const ESM::Spell *spell = store.get<ESM::Spell>().find(spellid);
-    const ESM::ENAMstruct &effectentry = spell->mEffects.mList.at(0);
-
-    const ESM::MagicEffect *effect;
-    effect = store.get<ESM::MagicEffect>().find(effectentry.mEffectID);
-
-    const ESM::Static* castStatic;
-    if (!effect->mCasting.empty())
-        castStatic = store.get<ESM::Static>().find (effect->mCasting);
-    else
-        castStatic = store.get<ESM::Static>().find ("VFX_DefaultCast");
-
-    mAnimation->addEffect("meshes\\" + castStatic->mModel, effect->mIndex);
-
-    MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-    if(!effect->mCastSound.empty())
-        sndMgr->playSound3D(mPtr, effect->mCastSound, 1.0f, 1.0f);
-    else
-        sndMgr->playSound3D(mPtr, schools[effect->mData.mSchool]+" cast", 1.0f, 1.0f);
-}
-
 bool CharacterController::updateCreatureState()
 {
     const MWWorld::Class &cls = mPtr.getClass();
@@ -982,7 +1009,8 @@ bool CharacterController::updateCreatureState()
                 const std::string spellid = stats.getSpells().getSelectedSpell();
                 if (!spellid.empty() && MWBase::Environment::get().getWorld()->startSpellCast(mPtr))
                 {
-                    castSpell(spellid);
+                    MWMechanics::CastSpell cast(mPtr, NULL);
+                    cast.playSpellCastingEffects(spellid);
 
                     if (!mAnimation->hasAnimation("spellcast"))
                         MWBase::Environment::get().getWorld()->castSpell(mPtr); // No "release" text key to use, so cast immediately
@@ -1026,6 +1054,9 @@ bool CharacterController::updateCreatureState()
                 mUpperBodyState = UpperCharState_StartToMinAttack;
 
                 mAttackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability());
+
+                if (weapType == WeapType_HandToHand)
+                    playSwishSound(0.0f);
             }
         }
 
@@ -1182,10 +1213,10 @@ bool CharacterController::updateWeaponState()
     bool animPlaying;
     if(mAttackingOrSpell)
     {
+        mIdleState = CharState_None;
         if(mUpperBodyState == UpperCharState_WeapEquiped && (mHitState == CharState_None || mHitState == CharState_Block))
         {
             MWBase::Environment::get().getWorld()->breakInvisibility(mPtr);
-            mAttackType.clear();
             if(mWeaponType == WeapType_Spell)
             {
                 // Unset casting flag, otherwise pressing the mouse button down would
@@ -1210,22 +1241,32 @@ bool CharacterController::updateWeaponState()
 
                 if(!spellid.empty() && MWBase::Environment::get().getWorld()->startSpellCast(mPtr))
                 {
-                    castSpell(spellid);
+                    if (mPtr == getPlayer())
+                        mwmp::Main::get().getLocalPlayer()->prepareAttack(mwmp::Attack::MAGIC, true);
 
-                    const ESM::Spell *spell = store.get<ESM::Spell>().find(spellid);
-                    const ESM::ENAMstruct &effectentry = spell->mEffects.mList.at(0);
+                    MWMechanics::CastSpell cast(mPtr, NULL);
+                    cast.playSpellCastingEffects(spellid);
 
+                    const ESM::Spell *spell = store.get<ESM::Spell>().find(spellid);                   
+                    const ESM::ENAMstruct &lastEffect = spell->mEffects.mList.back();
                     const ESM::MagicEffect *effect;
-                    effect = store.get<ESM::MagicEffect>().find(effectentry.mEffectID);
+
+                    effect = store.get<ESM::MagicEffect>().find(lastEffect.mEffectID); // use last effect of list for color of VFX_Hands
 
                     const ESM::Static* castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find ("VFX_Hands");
-                    if (mAnimation->getNode("Bip01 L Hand"))
-                        mAnimation->addEffect("meshes\\" + castStatic->mModel, -1, false, "Bip01 L Hand", effect->mParticle);
 
-                    if (mAnimation->getNode("Bip01 R Hand"))
-                        mAnimation->addEffect("meshes\\" + castStatic->mModel, -1, false, "Bip01 R Hand", effect->mParticle);
+                    for (size_t iter = 0; iter < spell->mEffects.mList.size(); ++iter) // play hands vfx for each effect
+                    {
+                        if (mAnimation->getNode("Bip01 L Hand"))
+                            mAnimation->addEffect("meshes\\" + castStatic->mModel, -1, false, "Bip01 L Hand", effect->mParticle);
+
+                        if (mAnimation->getNode("Bip01 R Hand"))
+                            mAnimation->addEffect("meshes\\" + castStatic->mModel, -1, false, "Bip01 R Hand", effect->mParticle);
+                    }
+
+                    const ESM::ENAMstruct &firstEffect = spell->mEffects.mList.at(0); // first effect used for casting animation
 
-                    switch(effectentry.mRange)
+                    switch(firstEffect.mRange)
                     {
                         case 0: mAttackType = "self"; break;
                         case 1: mAttackType = "touch"; break;
@@ -1272,7 +1313,9 @@ bool CharacterController::updateWeaponState()
                 if(!resultMessage.empty())
                     MWBase::Environment::get().getWindowManager()->messageBox(resultMessage);
                 if(!resultSound.empty())
-                    MWBase::Environment::get().getSoundManager()->playSound(resultSound, 1.0f, 1.0f);
+                    MWBase::Environment::get().getSoundManager()->playSound3D(target,
+                    resultSound, 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx,
+                    MWBase::SoundManager::Play_Normal);
             }
             else if (ammunition)
             {
@@ -1281,14 +1324,26 @@ bool CharacterController::updateWeaponState()
                     mAttackType = "shoot";
                 else
                 {
-                    if(isWeapon && mPtr == getPlayer() &&
-                            Settings::Manager::getBool("best attack", "Game"))
+                    // tes3mp needs player-controlled NPCs to not have their attacks
+                    // cancelled here, so a 2nd condition has been added that should
+                    // return true only for them
+
+                    if(mPtr == getPlayer() || !mPtr.getBase()->canChangeCell)
                     {
-                        MWWorld::ContainerStoreIterator weapon = mPtr.getClass().getInventoryStore(mPtr).getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-                        mAttackType = getBestAttack(weapon->get<ESM::Weapon>()->mBase);
+                        if (isWeapon)
+                        {
+                            if (Settings::Manager::getBool("best attack", "Game"))        
+                            {
+                                MWWorld::ContainerStoreIterator weapon = mPtr.getClass().getInventoryStore(mPtr).getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+                                mAttackType = getBestAttack(weapon->get<ESM::Weapon>()->mBase);
+                            }
+                            else
+                                setAttackTypeBasedOnMovement();
+                        }
+                        else
+                            setAttackTypeRandomly(mAttackType);                       
                     }
-                    else
-                        determineAttackType();
+                    // else if (mPtr != getPlayer()) use mAttackType set by AiCombat
                 }
 
                 mAnimation->play(mCurrentWeapon, priorityWeapon,
@@ -1330,13 +1385,7 @@ bool CharacterController::updateWeaponState()
                 }
                 else
                 {
-                    std::string sound = "SwishM";
-                    if(attackStrength < 0.5f)
-                        sndMgr->playSound3D(mPtr, sound, 1.0f, 0.8f); //Weak attack
-                    else if(attackStrength < 1.0f)
-                        sndMgr->playSound3D(mPtr, sound, 1.0f, 1.0f); //Medium attack
-                    else
-                        sndMgr->playSound3D(mPtr, sound, 1.0f, 1.2f); //Strong attack
+                    playSwishSound(attackStrength);
                 }
             }
             mAttackStrength = attackStrength;
@@ -1504,6 +1553,26 @@ bool CharacterController::updateWeaponState()
     return forcestateupdate;
 }
 
+void CharacterController::updateAnimQueue()
+{
+    if(mAnimQueue.size() > 1)
+    {
+        if(mAnimation->isPlaying(mAnimQueue.front().mGroup) == false)
+        {
+            mAnimation->disable(mAnimQueue.front().mGroup);
+            mAnimQueue.pop_front();
+
+            bool loopfallback = (mAnimQueue.front().mGroup.compare(0,4,"idle") == 0);
+            mAnimation->play(mAnimQueue.front().mGroup, Priority_Default,
+                             MWRender::Animation::BlendMask_All, false,
+                             1.0f, "start", "stop", 0.0f, mAnimQueue.front().mLoopCount, loopfallback);
+        }
+    }
+
+    if(!mAnimQueue.empty())
+        mAnimation->setLoopingEnabled(mAnimQueue.front().mGroup, mAnimQueue.size() <= 1);
+}
+
 void CharacterController::update(float duration)
 {
     MWBase::World *world = MWBase::Environment::get().getWorld();
@@ -1514,20 +1583,7 @@ void CharacterController::update(float duration)
     updateMagicEffects();
 
     if(!cls.isActor())
-    {
-        if(mAnimQueue.size() > 1)
-        {
-            if(mAnimation->isPlaying(mAnimQueue.front().first) == false)
-            {
-                mAnimation->disable(mAnimQueue.front().first);
-                mAnimQueue.pop_front();
-
-                mAnimation->play(mAnimQueue.front().first, Priority_Default,
-                                 MWRender::Animation::BlendMask_All, false,
-                                 1.0f, "start", "stop", 0.0f, mAnimQueue.front().second);
-            }
-        }
-    }
+        updateAnimQueue();
     else if(!cls.getCreatureStats(mPtr).isDead())
     {
         bool onground = world->isOnGround(mPtr);
@@ -1694,14 +1750,12 @@ void CharacterController::update(float duration)
                     cls.skillUsageSucceeded(mPtr, ESM::Skill::Acrobatics, 0);
 
                 // decrease fatigue
-                const MWWorld::Store<ESM::GameSetting> &gmst = world->getStore().get<ESM::GameSetting>();
                 const float fatigueJumpBase = gmst.find("fFatigueJumpBase")->getFloat();
                 const float fatigueJumpMult = gmst.find("fFatigueJumpMult")->getFloat();
                 float normalizedEncumbrance = mPtr.getClass().getNormalizedEncumbrance(mPtr);
                 if (normalizedEncumbrance > 1)
                     normalizedEncumbrance = 1;
                 const float fatigueDecrease = fatigueJumpBase + (1 - normalizedEncumbrance) * fatigueJumpMult;
-                DynamicStat<float> fatigue = cls.getCreatureStats(mPtr).getFatigue();
                 fatigue.setCurrent(fatigue.getCurrent() - fatigueDecrease);
                 cls.getCreatureStats(mPtr).setFatigue(fatigue);
             }
@@ -1723,7 +1777,7 @@ void CharacterController::update(float duration)
                 float realHealthLost = static_cast<float>(healthLost * (1.0f - 0.25f * fatigueTerm));
                 health.setCurrent(health.getCurrent() - realHealthLost);
                 cls.getCreatureStats(mPtr).setHealth(health);
-                cls.onHit(mPtr, realHealthLost, true, MWWorld::Ptr(), MWWorld::Ptr(), true);
+                cls.onHit(mPtr, realHealthLost, true, MWWorld::Ptr(), MWWorld::Ptr(), osg::Vec3f(), true);
 
                 const int acrobaticsSkill = cls.getSkill(mPtr, ESM::Skill::Acrobatics);
                 if (healthLost > (acrobaticsSkill * fatigueTerm))
@@ -1767,7 +1821,7 @@ void CharacterController::update(float duration)
                                          : (sneak ? CharState_SneakBack
                                                   : (isrunning ? CharState_RunBack : CharState_WalkBack)));
             }
-            else if(rot.z() != 0.0f && !inwater && !sneak && !MWBase::Environment::get().getWorld()->isFirstPerson())
+            else if(rot.z() != 0.0f && !inwater && !sneak && !(mPtr == getPlayer() && MWBase::Environment::get().getWorld()->isFirstPerson()))
             {
                 if(rot.z() > 0.0f)
                     movestate = CharState_TurnRight;
@@ -1795,18 +1849,8 @@ void CharacterController::update(float duration)
         {
             idlestate = (inwater ? CharState_IdleSwim : (sneak && !inJump ? CharState_IdleSneak : CharState_Idle));
         }
-        else if(mAnimQueue.size() > 1)
-        {
-            if(mAnimation->isPlaying(mAnimQueue.front().first) == false)
-            {
-                mAnimation->disable(mAnimQueue.front().first);
-                mAnimQueue.pop_front();
-
-                mAnimation->play(mAnimQueue.front().first, Priority_Default,
-                                 MWRender::Animation::BlendMask_All, false,
-                                 1.0f, "start", "stop", 0.0f, mAnimQueue.front().second);
-            }
-        }
+        else
+            updateAnimQueue();
 
         if (!mSkipAnim)
         {
@@ -1838,10 +1882,14 @@ void CharacterController::update(float duration)
         {
             if(mHitState != CharState_KnockDown && mHitState != CharState_KnockOut)
             {
-                world->rotateObject(mPtr, rot.x(), rot.y(), rot.z(), true);
+                if (rot != osg::Vec3f())
+                    world->rotateObject(mPtr, rot.x(), rot.y(), rot.z(), true);
             }
             else //avoid z-rotating for knockdown
-                world->rotateObject(mPtr, rot.x(), rot.y(), 0.0f, true);
+            {
+                if (rot.x() != 0 && rot.y() != 0)
+                    world->rotateObject(mPtr, rot.x(), rot.y(), 0.0f, true);
+            }
 
             if (!mMovementAnimationControlled)
                 world->queueMovement(mPtr, vec);
@@ -1899,7 +1947,7 @@ void CharacterController::update(float duration)
     if (mSkipAnim)
         mAnimation->updateEffects(duration);
 
-    if (mFloatToSurface && cls.isActor() && cls.getCreatureStats(mPtr).isDead())
+    if (mFloatToSurface && cls.isActor() && cls.getCreatureStats(mPtr).isDead() && cls.canSwim(mPtr))
         moved.z() = 1.0;
 
     // Update movement
@@ -1911,8 +1959,75 @@ void CharacterController::update(float duration)
     mAnimation->enableHeadAnimation(cls.isActor() && !cls.getCreatureStats(mPtr).isDead());
 }
 
+void CharacterController::persistAnimationState()
+{
+    ESM::AnimationState& state = mPtr.getRefData().getAnimationState();
+
+    state.mScriptedAnims.clear();
+    for (AnimationQueue::const_iterator iter = mAnimQueue.begin(); iter != mAnimQueue.end(); ++iter)
+    {
+        if (!iter->mPersist)
+            continue;
+
+        ESM::AnimationState::ScriptedAnimation anim;
+        anim.mGroup = iter->mGroup;
+
+        if (iter == mAnimQueue.begin())
+        {
+            anim.mLoopCount = mAnimation->getCurrentLoopCount(anim.mGroup);
+            float complete;
+            mAnimation->getInfo(anim.mGroup, &complete, NULL);
+            anim.mTime = complete;
+        }
+        else
+        {
+            anim.mLoopCount = iter->mLoopCount;
+            anim.mTime = 0.f;
+        }
 
-bool CharacterController::playGroup(const std::string &groupname, int mode, int count)
+        state.mScriptedAnims.push_back(anim);
+    }
+}
+
+void CharacterController::unpersistAnimationState()
+{
+    const ESM::AnimationState& state = mPtr.getRefData().getAnimationState();
+
+    if (!state.mScriptedAnims.empty())
+    {
+        clearAnimQueue();
+        for (ESM::AnimationState::ScriptedAnimations::const_iterator iter = state.mScriptedAnims.begin(); iter != state.mScriptedAnims.end(); ++iter)
+        {
+            AnimationQueueEntry entry;
+            entry.mGroup = iter->mGroup;
+            entry.mLoopCount = iter->mLoopCount;
+            entry.mPersist = true;
+
+            mAnimQueue.push_back(entry);
+        }
+
+        const ESM::AnimationState::ScriptedAnimation& anim = state.mScriptedAnims.front();
+        float complete = anim.mTime;
+        if (anim.mAbsolute)
+        {
+            float start = mAnimation->getTextKeyTime(anim.mGroup+": start");
+            float stop = mAnimation->getTextKeyTime(anim.mGroup+": stop");
+            float time = std::max(start, std::min(stop, anim.mTime));
+            complete = (time - start) / (stop - start);
+        }
+
+        mAnimation->disable(mCurrentIdle);
+        mCurrentIdle.clear();
+        mIdleState = CharState_SpecialIdle;
+
+        bool loopfallback = (mAnimQueue.front().mGroup.compare(0,4,"idle") == 0);
+        mAnimation->play(anim.mGroup,
+                         Priority_Default, MWRender::Animation::BlendMask_All, false, 1.0f,
+                         "start", "stop", complete, anim.mLoopCount, loopfallback);
+    }
+}
+
+bool CharacterController::playGroup(const std::string &groupname, int mode, int count, bool persist)
 {
     if(!mAnimation || !mAnimation->hasAnimation(groupname))
     {
@@ -1921,26 +2036,52 @@ bool CharacterController::playGroup(const std::string &groupname, int mode, int
     }
     else
     {
+        // If the given animation is a looped animation, is already playing
+        // and has not yet reached its Loop Stop key, make it the only animation
+        // in the queue, and retain the loop count from the animation that was
+        // already playing. This emulates observed behavior from the original
+        // engine and allows banners to animate correctly.
+        if (!mAnimQueue.empty() && mAnimQueue.front().mGroup == groupname &&
+            mAnimation->getTextKeyTime(mAnimQueue.front().mGroup+": loop start") >= 0)
+        {
+            float endOfLoop = mAnimation->getTextKeyTime(mAnimQueue.front().mGroup+": loop stop");
+
+            if (endOfLoop < 0) // if no Loop Stop key was found, use the Stop key
+                endOfLoop = mAnimation->getTextKeyTime(mAnimQueue.front().mGroup+": stop");
+
+            if (endOfLoop > 0 && (mAnimation->getCurrentTime(mAnimQueue.front().mGroup) < endOfLoop))
+            {
+                mAnimation->setLoopingEnabled(mAnimQueue.front().mGroup, true);
+                mAnimQueue.resize(1);                    
+                return true;
+            }
+        }
+
         count = std::max(count, 1);
-        if(mode != 0 || mAnimQueue.empty() || !isAnimPlaying(mAnimQueue.front().first))
+
+        AnimationQueueEntry entry;
+        entry.mGroup = groupname;
+        entry.mLoopCount = count-1;
+        entry.mPersist = persist;
+
+        if(mode != 0 || mAnimQueue.empty() || !isAnimPlaying(mAnimQueue.front().mGroup))
         {
             clearAnimQueue();
-            mAnimQueue.push_back(std::make_pair(groupname, count-1));
+            mAnimQueue.push_back(entry);
 
             mAnimation->disable(mCurrentIdle);
             mCurrentIdle.clear();
 
             mIdleState = CharState_SpecialIdle;
+            bool loopfallback = (entry.mGroup.compare(0,4,"idle") == 0);
             mAnimation->play(groupname, Priority_Default,
                              MWRender::Animation::BlendMask_All, false, 1.0f,
-                             ((mode==2) ? "loop start" : "start"), "stop", 0.0f, count-1);
+                             ((mode==2) ? "loop start" : "start"), "stop", 0.0f, count-1, loopfallback);
         }
         else if(mode == 0)
         {
-            if (!mAnimQueue.empty())
-                mAnimation->stopLooping(mAnimQueue.front().first);
             mAnimQueue.resize(1);
-            mAnimQueue.push_back(std::make_pair(groupname, count-1));
+            mAnimQueue.push_back(entry);
         }
     }
     return true;
@@ -1962,7 +2103,7 @@ bool CharacterController::isAnimPlaying(const std::string &groupName)
 void CharacterController::clearAnimQueue()
 {
     if(!mAnimQueue.empty())
-        mAnimation->disable(mAnimQueue.front().first);
+        mAnimation->disable(mAnimQueue.front().mGroup);
     mAnimQueue.clear();
 }
 
@@ -1981,30 +2122,28 @@ void CharacterController::forceStateUpdate()
     mAnimation->runAnimation(0.f);
 }
 
-bool CharacterController::kill()
+CharacterController::KillResult CharacterController::kill()
 {
-    if( isDead() )
+    if (mDeathState == CharState_None)
     {
-        if( mPtr == getPlayer() && !isAnimPlaying(mCurrentDeath) )
-        {
-            //player's death animation is over
-            MWBase::Environment::get().getStateManager()->askLoadRecent();
-        }
-        return false;
-    }
-
-    playRandomDeath();
-
-    mAnimation->disable(mCurrentIdle);
+        playRandomDeath();
 
-    mIdleState = CharState_None;
-    mCurrentIdle.clear();
+        mAnimation->disable(mCurrentIdle);
 
-    // Play Death Music if it was the player dying
-    if(mPtr == getPlayer())
-        MWBase::Environment::get().getSoundManager()->streamMusic("Special/MW_Death.mp3");
+        mIdleState = CharState_None;
+        mCurrentIdle.clear();
+        return Result_DeathAnimStarted;
+    }
 
-    return true;
+    MWMechanics::CreatureStats& cStats = mPtr.getClass().getCreatureStats(mPtr);
+    if (isAnimPlaying(mCurrentDeath))
+        return Result_DeathAnimPlaying;
+    if (!cStats.isDeathAnimationFinished())
+    {
+        cStats.setDeathAnimationFinished(true);
+        return Result_DeathAnimJustFinished;
+    }
+    return Result_DeathAnimFinished;
 }
 
 void CharacterController::resurrect()
@@ -2040,7 +2179,7 @@ void CharacterController::updateMagicEffects()
     if (!mPtr.getClass().isActor())
         return;
     float alpha = 1.f;
-    if (mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Invisibility).getMagnitude())
+    if (mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Invisibility).getModifier()) // Ignore base magnitude (see bug #3555).
     {
         if (mPtr == getPlayer())
             alpha = 0.4f;
@@ -2061,7 +2200,7 @@ void CharacterController::updateMagicEffects()
     mAnimation->setLightEffect(light);
 }
 
-void CharacterController::determineAttackType()
+void CharacterController::setAttackTypeBasedOnMovement()
 {
     float *move = mPtr.getClass().getMovementSettings(mPtr).mPosition;
 
@@ -2097,6 +2236,22 @@ void CharacterController::setAttackingOrSpell(bool attackingOrSpell)
     mAttackingOrSpell = attackingOrSpell;
 }
 
+void CharacterController::setAIAttackType(std::string attackType)
+{
+    mAttackType = attackType;
+}
+
+void CharacterController::setAttackTypeRandomly(std::string& attackType)
+{
+    float random = Misc::Rng::rollProbability();
+    if (random >= 2/3.f)
+        attackType = "thrust";
+    else if (random >= 1/3.f)
+        attackType = "slash";
+    else
+        attackType = "chop";
+}
+
 bool CharacterController::readyToPrepareAttack() const
 {
     return (mHitState == CharState_None || mHitState == CharState_Block)
@@ -2129,6 +2284,19 @@ void CharacterController::setHeadTrackTarget(const MWWorld::ConstPtr &target)
     mHeadTrackTarget = target;
 }
 
+void CharacterController::playSwishSound(float attackStrength)
+{
+    MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+
+    std::string sound = "Weapon Swish";
+    if(attackStrength < 0.5f)
+        sndMgr->playSound3D(mPtr, sound, 1.0f, 0.8f); //Weak attack
+    else if(attackStrength < 1.0f)
+        sndMgr->playSound3D(mPtr, sound, 1.0f, 1.0f); //Medium attack
+    else
+        sndMgr->playSound3D(mPtr, sound, 1.0f, 1.2f); //Strong attack
+}
+
 void CharacterController::updateHeadTracking(float duration)
 {
     const osg::Node* head = mAnimation->getNode("Bip01 Head");
@@ -2140,10 +2308,10 @@ void CharacterController::updateHeadTracking(float duration)
 
     if (!mHeadTrackTarget.isEmpty())
     {
-        osg::MatrixList mats = head->getWorldMatrices();
-        if (mats.empty())
+        osg::NodePathList nodepaths = head->getParentalNodePaths();
+        if (nodepaths.empty())
             return;
-        osg::Matrixf mat = mats[0];
+        osg::Matrixf mat = osg::computeLocalToWorld(nodepaths[0]);
         osg::Vec3f headPos = mat.getTrans();
 
         osg::Vec3f direction;
@@ -2154,9 +2322,9 @@ void CharacterController::updateHeadTracking(float duration)
                 node = anim->getNode("Bip01 Head");
             if (node != NULL)
             {
-                osg::MatrixList mats = node->getWorldMatrices();
-                if (mats.size())
-                    direction = mats[0].getTrans() - headPos;
+                nodepaths = node->getParentalNodePaths();
+                if (!nodepaths.empty())
+                    direction = osg::computeLocalToWorld(nodepaths[0]).getTrans() - headPos;
             }
             else
                 // no head node to look at, fall back to look at center of collision box
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 6db661ca5..f393f0619 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -140,12 +140,20 @@ enum JumpingState {
     JumpState_Landing
 };
 
+struct WeaponInfo;
+
 class CharacterController : public MWRender::Animation::TextKeyListener
 {
     MWWorld::Ptr mPtr;
     MWRender::Animation *mAnimation;
     
-    typedef std::deque<std::pair<std::string,size_t> > AnimationQueue;
+    struct AnimationQueueEntry
+    {
+        std::string mGroup;
+        size_t mLoopCount;
+        bool mPersist;
+    };
+    typedef std::deque<AnimationQueueEntry> AnimationQueue;
     AnimationQueue mAnimQueue;
 
     CharacterState mIdleState;
@@ -189,9 +197,13 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     bool mAttackingOrSpell;
 
-    void determineAttackType();
+    void setAttackTypeBasedOnMovement();
 
     void refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force=false);
+    void refreshHitRecoilAnims();
+    void refreshJumpAnims(const WeaponInfo* weap, JumpingState jump, bool force=false);
+    void refreshMovementAnims(const WeaponInfo* weap, CharacterState movement, bool force=false);
+    void refreshIdleAnims(const WeaponInfo* weap, CharacterState idle, bool force=false);
 
     void clearAnimQueue();
 
@@ -199,18 +211,19 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     bool updateCreatureState();
     void updateIdleStormState(bool inwater);
 
-    void updateHeadTracking(float duration);
+    void updateAnimQueue();
 
-    void castSpell(const std::string& spellid);
+    void updateHeadTracking(float duration);
 
     void updateMagicEffects();
 
     void playDeath(float startpoint, CharacterState death);
+    CharacterState chooseRandomDeathState() const;
     void playRandomDeath(float startpoint = 0.0f);
 
     /// choose a random animation group with \a prefix and numeric suffix
     /// @param num if non-NULL, the chosen animation number will be written here
-    std::string chooseRandomGroup (const std::string& prefix, int* num = NULL);
+    std::string chooseRandomGroup (const std::string& prefix, int* num = NULL) const;
 
     bool updateCarriedLeftVisible(WeaponType weaptype) const;
 
@@ -228,12 +241,21 @@ public:
 
     void update(float duration);
 
-    bool playGroup(const std::string &groupname, int mode, int count);
+    void persistAnimationState();
+    void unpersistAnimationState();
+
+    bool playGroup(const std::string &groupname, int mode, int count, bool persist=false);
     void skipAnim();
     bool isAnimPlaying(const std::string &groupName);
 
-    /// @return false if the character has already been killed before
-    bool kill();
+    enum KillResult
+    {
+        Result_DeathAnimStarted,
+        Result_DeathAnimPlaying,
+        Result_DeathAnimJustFinished,
+        Result_DeathAnimFinished
+    };
+    KillResult kill();
 
     void resurrect();
     bool isDead() const
@@ -246,6 +268,8 @@ public:
     bool isSneaking() const;
 
     void setAttackingOrSpell(bool attackingOrSpell);
+    void setAIAttackType(std::string attackType); // set and used by AiCombat
+    static void setAttackTypeRandomly(std::string& attackType);
 
     bool readyToPrepareAttack() const;
     bool readyToStartAttack() const;
@@ -257,6 +281,8 @@ public:
 
     /// Make this character turn its head towards \a target. To turn off head tracking, pass an empty Ptr.
     void setHeadTrackTarget(const MWWorld::ConstPtr& target);
+
+    void playSwishSound(float attackStrength);
 };
 
     MWWorld::ContainerStoreIterator getActiveWeapon(CreatureStats &stats, MWWorld::InventoryStore &inv, WeaponType *weaptype);
diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index a01dc7079..f034311f9 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -4,21 +4,25 @@
 
 #include <components/sceneutil/positionattitudetransform.hpp>
 
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/Main.hpp"
+#include "../mwmp/DedicatedPlayer.hpp"
+#include "../mwmp/LocalPlayer.hpp"
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
-
-#include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/movement.hpp"
-#include "../mwmechanics/spellcasting.hpp"
-#include "../mwmechanics/difficultyscaling.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwbase/windowmanager.hpp"
+#include "npcstats.hpp"
+#include "movement.hpp"
+#include "spellcasting.hpp"
+#include "difficultyscaling.hpp"
 #include "actorutil.hpp"
 
 namespace
@@ -29,28 +33,28 @@ float signedAngleRadians (const osg::Vec3f& v1, const osg::Vec3f& v2, const osg:
     return std::atan2((normal * (v1 ^ v2)), (v1 * v2));
 }
 
-bool applyEnchantment (const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, const MWWorld::Ptr& object, const osg::Vec3f& hitPosition)
+}
+
+namespace MWMechanics
 {
-    std::string enchantmentName = !object.isEmpty() ? object.getClass().getEnchantment(object) : "";
-    if (!enchantmentName.empty())
+
+    bool applyOnStrikeEnchantment(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, const MWWorld::Ptr& object, const osg::Vec3f& hitPosition, const bool fromProjectile)
     {
-        const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
-                    enchantmentName);
-        if (enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
+        std::string enchantmentName = !object.isEmpty() ? object.getClass().getEnchantment(object) : "";
+        if (!enchantmentName.empty())
         {
-            MWMechanics::CastSpell cast(attacker, victim);
-            cast.mHitPosition = hitPosition;
-            cast.cast(object);
-            return true;
+            const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
+                        enchantmentName);
+            if (enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
+            {
+                MWMechanics::CastSpell cast(attacker, victim, fromProjectile);
+                cast.mHitPosition = hitPosition;
+                cast.cast(object, false);
+                return true;
+            }
         }
+        return false;
     }
-    return false;
-}
-
-}
-
-namespace MWMechanics
-{
 
     bool blockMeleeAttack(const MWWorld::Ptr &attacker, const MWWorld::Ptr &blocker, const MWWorld::Ptr &weapon, float damage, float attackStrength)
     {
@@ -113,8 +117,18 @@ namespace MWMechanics
         int iBlockMinChance = gmst.find("iBlockMinChance")->getInt();
         x = std::min(iBlockMaxChance, std::max(iBlockMinChance, x));
 
-        if (Misc::Rng::roll0to99() < x)
+
+        mwmp::DedicatedPlayer *dedicatedPlayer = mwmp::Players::getPlayer(blocker);
+        bool isDedicated = dedicatedPlayer != NULL;
+        if (attacker == MWMechanics::getPlayer())
+            mwmp::Main::get().getLocalPlayer()->attack.block = false;
+
+        if ((!isDedicated && Misc::Rng::roll0to99() < x) ||
+           (isDedicated && dedicatedPlayer->attack.block == 1))
         {
+            if (attacker == MWMechanics::getPlayer())
+                mwmp::Main::get().getLocalPlayer()->attack.block = true;
+
             // Reduce shield durability by incoming damage
             int shieldhealth = shield->getClass().getItemHealth(*shield);
 
@@ -166,72 +180,76 @@ namespace MWMechanics
             MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicTargetResistsWeapons}");
     }
 
-    void projectileHit(const MWWorld::Ptr &attacker, const MWWorld::Ptr &victim, MWWorld::Ptr weapon, const MWWorld::Ptr &projectile,
+    void projectileHit(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, MWWorld::Ptr weapon, const MWWorld::Ptr& projectile,
                        const osg::Vec3f& hitPosition, float attackStrength)
     {
+        if (mwmp::Main::get().getNetworking()->isDedicatedPlayer(attacker))
+            return;
         MWBase::World *world = MWBase::Environment::get().getWorld();
         const MWWorld::Store<ESM::GameSetting> &gmst = world->getStore().get<ESM::GameSetting>();
 
-        if(victim.isEmpty() || !victim.getClass().isActor() || victim.getClass().getCreatureStats(victim).isDead())
-            // Can't hit non-actors or dead actors
+        bool validVictim = !victim.isEmpty() && victim.getClass().isActor();
+
+        float damage = 0.f;
+        if (validVictim)
         {
-            reduceWeaponCondition(0.f, false, weapon, attacker);
-            return;
-        }
+            if (attacker == getPlayer())
+                MWBase::Environment::get().getWindowManager()->setEnemy(victim);
 
-        if(attacker == getPlayer())
-            MWBase::Environment::get().getWindowManager()->setEnemy(victim);
+            int weaponSkill = ESM::Skill::Marksman;
+            if (!weapon.isEmpty())
+                weaponSkill = weapon.getClass().getEquipmentSkill(weapon);
 
-        int weapskill = ESM::Skill::Marksman;
-        if(!weapon.isEmpty())
-            weapskill = weapon.getClass().getEquipmentSkill(weapon);
+            int skillValue = attacker.getClass().getSkill(attacker, weapon.getClass().getEquipmentSkill(weapon));
 
-        int skillValue = attacker.getClass().getSkill(attacker,
-                                           weapon.getClass().getEquipmentSkill(weapon));
+            if (attacker == MWBase::Environment::get().getWorld()->getPlayerPtr())
+                mwmp::Main::get().getLocalPlayer()->attack.success = true;
 
-        if (Misc::Rng::roll0to99() >= getHitChance(attacker, victim, skillValue))
-        {
-            victim.getClass().onHit(victim, 0.0f, false, projectile, attacker, false);
-            MWMechanics::reduceWeaponCondition(0.f, false, weapon, attacker);
-            return;
-        }
+            if (Misc::Rng::roll0to99() >= getHitChance(attacker, victim, skillValue))
+            {
+                if (attacker == getPlayer())
+                    mwmp::Main::get().getLocalPlayer()->attack.success = false;
+                victim.getClass().onHit(victim, damage, false, projectile, attacker, osg::Vec3f(), false);
+                MWMechanics::reduceWeaponCondition(damage, false, weapon, attacker);
+                return;
+            }
 
+            const unsigned char* attack = weapon.get<ESM::Weapon>()->mBase->mData.mChop;
+            damage = attack[0] + ((attack[1] - attack[0]) * attackStrength); // Bow/crossbow damage
 
-        const unsigned char* attack = weapon.get<ESM::Weapon>()->mBase->mData.mChop;
-        float damage = attack[0] + ((attack[1]-attack[0])*attackStrength); // Bow/crossbow damage
+            // Arrow/bolt damage
+            // NB in case of thrown weapons, we are applying the damage twice since projectile == weapon
+            attack = projectile.get<ESM::Weapon>()->mBase->mData.mChop;
+            damage += attack[0] + ((attack[1] - attack[0]) * attackStrength);
 
-        // Arrow/bolt damage
-        // NB in case of thrown weapons, we are applying the damage twice since projectile == weapon
-        attack = projectile.get<ESM::Weapon>()->mBase->mData.mChop;
-        damage += attack[0] + ((attack[1]-attack[0])*attackStrength);
+            adjustWeaponDamage(damage, weapon, attacker);
 
-        adjustWeaponDamage(damage, weapon, attacker);
-        reduceWeaponCondition(damage, true, weapon, attacker);
+            if(attacker == getPlayer())
+                attacker.getClass().skillUsageSucceeded(attacker, weaponSkill, 0);
 
-        if(attacker == getPlayer())
-            attacker.getClass().skillUsageSucceeded(attacker, weapskill, 0);
+            if (victim.getClass().getCreatureStats(victim).getKnockedDown())
+                damage *= gmst.find("fCombatKODamageMult")->getFloat();
+        }
 
-        if (victim.getClass().getCreatureStats(victim).getKnockedDown())
-            damage *= gmst.find("fCombatKODamageMult")->getFloat();
+        reduceWeaponCondition(damage, validVictim, weapon, attacker);
 
-        // Apply "On hit" effect of the weapon
-        bool appliedEnchantment = applyEnchantment(attacker, victim, weapon, hitPosition);
+        // Apply "On hit" effect of the weapon & projectile
+        bool appliedEnchantment = applyOnStrikeEnchantment(attacker, victim, weapon, hitPosition, true);
         if (weapon != projectile)
-            appliedEnchantment = applyEnchantment(attacker, victim, projectile, hitPosition);
-
-        if (damage > 0)
-            MWBase::Environment::get().getWorld()->spawnBloodEffect(victim, hitPosition);
+            appliedEnchantment = applyOnStrikeEnchantment(attacker, victim, projectile, hitPosition, true);
 
-        // Non-enchanted arrows shot at enemies have a chance to turn up in their inventory
-        if (victim != getPlayer()
-                && !appliedEnchantment)
+        if (validVictim)
         {
-            float fProjectileThrownStoreChance = gmst.find("fProjectileThrownStoreChance")->getFloat();
-            if (Misc::Rng::rollProbability() < fProjectileThrownStoreChance / 100.f)
-                victim.getClass().getContainerStore(victim).add(projectile, 1, victim);
-        }
+            // Non-enchanted arrows shot at enemies have a chance to turn up in their inventory
+            if (victim != getPlayer() && !appliedEnchantment)
+            {
+                float fProjectileThrownStoreChance = gmst.find("fProjectileThrownStoreChance")->getFloat();
+                if (Misc::Rng::rollProbability() < fProjectileThrownStoreChance / 100.f)
+                    victim.getClass().getContainerStore(victim).add(projectile, 1, victim);
+            }
 
-        victim.getClass().onHit(victim, damage, true, projectile, attacker, true);
+            victim.getClass().onHit(victim, damage, true, projectile, attacker, hitPosition, true);
+        }
     }
 
     float getHitChance(const MWWorld::Ptr &attacker, const MWWorld::Ptr &victim, int skillValue)
@@ -435,4 +453,19 @@ namespace MWMechanics
 
         return true;
     }
+
+    float getFightDistanceBias(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2)
+    {
+        osg::Vec3f pos1 (actor1.getRefData().getPosition().asVec3());
+        osg::Vec3f pos2 (actor2.getRefData().getPosition().asVec3());
+
+        float d = (pos1 - pos2).length();
+
+        static const int iFightDistanceBase = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
+                    "iFightDistanceBase")->getInt();
+        static const float fFightDistanceMultiplier = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
+                    "fFightDistanceMultiplier")->getFloat();
+
+        return (iFightDistanceBase - fFightDistanceMultiplier * d);
+    }
 }
diff --git a/apps/openmw/mwmechanics/combat.hpp b/apps/openmw/mwmechanics/combat.hpp
index ca78d7956..12961dc4b 100644
--- a/apps/openmw/mwmechanics/combat.hpp
+++ b/apps/openmw/mwmechanics/combat.hpp
@@ -6,6 +6,9 @@
 namespace MWMechanics
 {
 
+bool applyOnStrikeEnchantment(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, const MWWorld::Ptr& object, const osg::Vec3f& hitPosition,
+                              const bool fromProjectile=false);
+
 /// @return can we block the attack?
 bool blockMeleeAttack (const MWWorld::Ptr& attacker, const MWWorld::Ptr& blocker, const MWWorld::Ptr& weapon, float damage, float attackStrength);
 
@@ -40,6 +43,7 @@ void applyFatigueLoss(const MWWorld::Ptr& attacker, const MWWorld::Ptr& weapon,
 /// e.g. If attacker is a fish, is victim in water? Or, if attacker can't swim, is victim on land?
 bool isEnvironmentCompatible(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim);
 
+float getFightDistanceBias(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2);
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 6933c40a3..31724bcbc 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -17,12 +17,12 @@ namespace MWMechanics
     int CreatureStats::sActorId = 0;
 
     CreatureStats::CreatureStats()
-        : mDrawState (DrawState_Nothing), mDead (false), mDied (false), mMurdered(false), mFriendlyHits (0),
+        : mDrawState (DrawState_Nothing), mDead (false), mDeathAnimationFinished(false), mDied (false), mMurdered(false), mFriendlyHits (0),
           mTalkedTo (false), mAlarmed (false), mAttacked (false),
           mKnockdown(false), mKnockdownOneFrame(false), mKnockdownOverOneFrame(false),
           mHitRecovery(false), mBlock(false), mMovementFlags(0),
-          mFallHeight(0), mRecalcMagicka(false), mLastRestock(0,0), mGoldPool(0), mActorId(-1),
-          mDeathAnimation(0), mLevel (0)
+          mFallHeight(0), mRecalcMagicka(false), mLastRestock(0,0), mGoldPool(0), mActorId(-1), mHitAttemptActorId(-1),
+          mDeathAnimation(-1), mTimeOfDeath(), mLevel (0)
     {
         for (int i=0; i<4; ++i)
             mAiSettings[i] = 0;
@@ -157,7 +157,9 @@ namespace MWMechanics
                 int endurance    = getAttribute(ESM::Attribute::Endurance).getModified();
                 DynamicStat<float> fatigue = getFatigue();
                 float diff = (strength+willpower+agility+endurance) - fatigue.getBase();
-                fatigue.modify(diff);
+                float currentToBaseRatio = (fatigue.getCurrent() / fatigue.getBase());
+                fatigue.setModified(fatigue.getModified() + diff, 0);
+                fatigue.setCurrent(fatigue.getBase() * currentToBaseRatio);
                 setFatigue(fatigue);
             }
         }
@@ -187,6 +189,9 @@ namespace MWMechanics
 
         if (index==0 && mDynamic[index].getCurrent()<1)
         {
+            if (!mDead)
+                mTimeOfDeath = MWBase::Environment::get().getWorld()->getTimeStamp();
+
             mDead = true;
 
             mDynamic[index].setModifier(0);
@@ -233,6 +238,16 @@ namespace MWMechanics
         return mDead;
     }
 
+    bool CreatureStats::isDeathAnimationFinished() const
+    {
+        return mDeathAnimationFinished;
+    }
+
+    void CreatureStats::setDeathAnimationFinished(bool finished)
+    {
+        mDeathAnimationFinished = finished;
+    }
+
     void CreatureStats::notifyDied()
     {
         mDied = true;
@@ -272,6 +287,7 @@ namespace MWMechanics
 
             mDynamic[0].setCurrent(mDynamic[0].getModified());
             mDead = false;
+            mDeathAnimationFinished = false;
         }
     }
 
@@ -355,6 +371,16 @@ namespace MWMechanics
         return mLastHitAttemptObject;
     }
 
+    void CreatureStats::setHitAttemptActorId(int actorId)
+    {
+        mHitAttemptActorId = actorId;
+    }
+
+    int CreatureStats::getHitAttemptActorId() const
+    {
+        return mHitAttemptActorId;
+    }
+
     void CreatureStats::addToFallHeight(float height)
     {
         mFallHeight += height;
@@ -479,6 +505,7 @@ namespace MWMechanics
         state.mGoldPool = mGoldPool;
 
         state.mDead = mDead;
+        state.mDeathAnimationFinished = mDeathAnimationFinished;
         state.mDied = mDied;
         state.mMurdered = mMurdered;
         // The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism
@@ -503,6 +530,8 @@ namespace MWMechanics
         state.mLevel = mLevel;
         state.mActorId = mActorId;
         state.mDeathAnimation = mDeathAnimation;
+        state.mTimeOfDeath = mTimeOfDeath.toEsm();
+        //state.mHitAttemptActorId = mHitAttemptActorId;
 
         mSpells.writeState(state.mSpells);
         mActiveSpells.writeState(state.mActiveSpells);
@@ -529,6 +558,7 @@ namespace MWMechanics
         mGoldPool = state.mGoldPool;
 
         mDead = state.mDead;
+        mDeathAnimationFinished = state.mDeathAnimationFinished;
         mDied = state.mDied;
         mMurdered = state.mMurdered;
         mTalkedTo = state.mTalkedTo;
@@ -549,6 +579,8 @@ namespace MWMechanics
         mLevel = state.mLevel;
         mActorId = state.mActorId;
         mDeathAnimation = state.mDeathAnimation;
+        mTimeOfDeath = MWWorld::TimeStamp(state.mTimeOfDeath);
+        //mHitAttemptActorId = state.mHitAttemptActorId;
 
         mSpells.readState(state.mSpells);
         mActiveSpells.readState(state.mActiveSpells);
@@ -612,16 +644,21 @@ namespace MWMechanics
         esm.getHNT(sActorId, "COUN");
     }
 
-    unsigned char CreatureStats::getDeathAnimation() const
+    signed char CreatureStats::getDeathAnimation() const
     {
         return mDeathAnimation;
     }
 
-    void CreatureStats::setDeathAnimation(unsigned char index)
+    void CreatureStats::setDeathAnimation(signed char index)
     {
         mDeathAnimation = index;
     }
 
+    MWWorld::TimeStamp CreatureStats::getTimeOfDeath() const
+    {
+        return mTimeOfDeath;
+    }
+
     std::map<CreatureStats::SummonKey, int>& CreatureStats::getSummonedCreatureMap()
     {
         return mSummonedCreatures;
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 46c5bab31..057a6f602 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -34,7 +34,8 @@ namespace MWMechanics
         Stat<int> mAiSettings[4];
         AiSequence mAiSequence;
         bool mDead;
-        bool mDied;
+        bool mDeathAnimationFinished;
+        bool mDied; // flag for OnDeath script function
         bool mMurdered;
         int mFriendlyHits;
         bool mTalkedTo;
@@ -61,9 +62,13 @@ namespace MWMechanics
         int mGoldPool;
 
         int mActorId;
+        int mHitAttemptActorId; // Stores an actor that attacked this actor. Only one is stored at a time,
+                                // and it is not changed if a different actor attacks. It is cleared when combat ends.
 
-        // The index of the death animation that was played
-        unsigned char mDeathAnimation;
+        // The index of the death animation that was played, or -1 if none played
+        signed char mDeathAnimation;
+
+        MWWorld::TimeStamp mTimeOfDeath;
 
     public:
         typedef std::pair<int, std::string> SummonKey; // <ESM::MagicEffect index, spell ID>
@@ -159,6 +164,9 @@ namespace MWMechanics
 
         bool isDead() const;
 
+        bool isDeathAnimationFinished() const;
+        void setDeathAnimationFinished(bool finished);
+
         void notifyDied();
 
         bool hasDied() const;
@@ -235,9 +243,11 @@ namespace MWMechanics
         bool getStance (Stance flag) const;
 
         void setLastHitObject(const std::string &objectid);
-        void setLastHitAttemptObject(const std::string &objectid);
         const std::string &getLastHitObject() const;
+        void setLastHitAttemptObject(const std::string &objectid);
         const std::string &getLastHitAttemptObject() const;
+        void setHitAttemptActorId(const int actorId);
+        int getHitAttemptActorId() const;
 
         // Note, this is just a cache to avoid checking the whole container store every frame. We don't need to store it in saves.
         // TODO: Put it somewhere else?
@@ -256,8 +266,10 @@ namespace MWMechanics
         void setGoldPool(int pool);
         int getGoldPool() const;
 
-        unsigned char getDeathAnimation() const;
-        void setDeathAnimation(unsigned char index);
+        signed char getDeathAnimation() const; // -1 means not decided
+        void setDeathAnimation(signed char index);
+
+        MWWorld::TimeStamp getTimeOfDeath() const;
 
         int getActorId();
         ///< Will generate an actor ID, if the actor does not have one yet.
diff --git a/apps/openmw/mwmechanics/difficultyscaling.cpp b/apps/openmw/mwmechanics/difficultyscaling.cpp
index 950fe33cf..693587eda 100644
--- a/apps/openmw/mwmechanics/difficultyscaling.cpp
+++ b/apps/openmw/mwmechanics/difficultyscaling.cpp
@@ -1,11 +1,11 @@
 #include "difficultyscaling.hpp"
 
+#include <components/settings/settings.hpp>
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include <components/settings/settings.hpp>
-
 #include "actorutil.hpp"
 
 float scaleDamage(float damage, const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim)
diff --git a/apps/openmw/mwmechanics/disease.hpp b/apps/openmw/mwmechanics/disease.hpp
index 25bde56ab..5746af2a2 100644
--- a/apps/openmw/mwmechanics/disease.hpp
+++ b/apps/openmw/mwmechanics/disease.hpp
@@ -6,14 +6,15 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
+
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
+
 #include "spells.hpp"
 #include "creaturestats.hpp"
 #include "actorutil.hpp"
 
-
 namespace MWMechanics
 {
 
diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp
index 102e3787a..57ece6a79 100644
--- a/apps/openmw/mwmechanics/enchanting.cpp
+++ b/apps/openmw/mwmechanics/enchanting.cpp
@@ -6,6 +6,7 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
+
 #include "../mwbase/mechanicsmanager.hpp"
 
 #include "creaturestats.hpp"
diff --git a/apps/openmw/mwmechanics/enchanting.hpp b/apps/openmw/mwmechanics/enchanting.hpp
index 2c05d2d2e..a53027bb9 100644
--- a/apps/openmw/mwmechanics/enchanting.hpp
+++ b/apps/openmw/mwmechanics/enchanting.hpp
@@ -1,10 +1,15 @@
 #ifndef GAME_MWMECHANICS_ENCHANTING_H
 #define GAME_MWMECHANICS_ENCHANTING_H
+
 #include <string>
-#include "../mwworld/ptr.hpp"
+
 #include <components/esm/effectlist.hpp>
+
+#include "../mwworld/ptr.hpp"
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+
 namespace MWMechanics
 {
     class Enchanting
diff --git a/apps/openmw/mwmechanics/levelledlist.hpp b/apps/openmw/mwmechanics/levelledlist.hpp
index edfef5358..fb06d8935 100644
--- a/apps/openmw/mwmechanics/levelledlist.hpp
+++ b/apps/openmw/mwmechanics/levelledlist.hpp
@@ -1,16 +1,18 @@
 #ifndef OPENMW_MECHANICS_LEVELLEDLIST_H
 #define OPENMW_MECHANICS_LEVELLEDLIST_H
 
-#include <components/misc/rng.hpp>
-
 #include <iostream>
 
+#include <components/misc/rng.hpp>
+
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/manualref.hpp"
 #include "../mwworld/class.hpp"
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+
 #include "creaturestats.hpp"
 #include "actorutil.hpp"
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 84da270eb..33afc109e 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -11,41 +11,25 @@
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/player.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/dialoguemanager.hpp"
 
-#include "../mwworld/class.hpp"
-#include "../mwworld/player.hpp"
-
-#include "../mwmechanics/aicombat.hpp"
-#include "../mwmechanics/aipursue.hpp"
-
+#include "aicombat.hpp"
+#include "aipursue.hpp"
 #include "spellcasting.hpp"
 #include "autocalcspell.hpp"
 #include "npcstats.hpp"
 #include "actorutil.hpp"
+#include "combat.hpp"
 
 namespace
 {
 
-    float getFightDistanceBias(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2)
-    {
-        osg::Vec3f pos1 (actor1.getRefData().getPosition().asVec3());
-        osg::Vec3f pos2 (actor2.getRefData().getPosition().asVec3());
-
-        float d = (pos1 - pos2).length();
-
-        static const int iFightDistanceBase = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                    "iFightDistanceBase")->getInt();
-        static const float fFightDistanceMultiplier = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                    "fFightDistanceMultiplier")->getFloat();
-
-        return (iFightDistanceBase - fFightDistanceMultiplier * d);
-    }
-
     float getFightDispositionBias(float disposition)
     {
         static const float fFightDispMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
@@ -214,15 +198,6 @@ namespace MWMechanics
         }
 
         // F_PCStart spells
-        static const float fPCbaseMagickaMult = esmStore.get<ESM::GameSetting>().find("fPCbaseMagickaMult")->getFloat();
-
-        float baseMagicka = fPCbaseMagickaMult * creatureStats.getAttribute(ESM::Attribute::Intelligence).getBase();
-        bool reachedLimit = false;
-        const ESM::Spell* weakestSpell = NULL;
-        int minCost = INT_MAX;
-
-        std::vector<std::string> selectedSpells;
-
         const ESM::Race* race = NULL;
         if (mRaceSelected)
             race = esmStore.get<ESM::Race>().find(player->mRace);
@@ -235,61 +210,7 @@ namespace MWMechanics
         for (int i=0; i<ESM::Attribute::Length; ++i)
             attributes[i] = npcStats.getAttribute(i).getBase();
 
-        const MWWorld::Store<ESM::Spell> &spells =
-            esmStore.get<ESM::Spell>();
-        for (MWWorld::Store<ESM::Spell>::iterator iter = spells.begin(); iter != spells.end(); ++iter)
-        {
-            const ESM::Spell* spell = &*iter;
-
-            if (spell->mData.mType != ESM::Spell::ST_Spell)
-                continue;
-            if (!(spell->mData.mFlags & ESM::Spell::F_PCStart))
-                continue;
-            if (reachedLimit && spell->mData.mCost <= minCost)
-                continue;
-            if (race && std::find(race->mPowers.mList.begin(), race->mPowers.mList.end(), spell->mId) != race->mPowers.mList.end())
-                continue;
-            if (baseMagicka < spell->mData.mCost)
-                continue;
-
-            static const float fAutoPCSpellChance = esmStore.get<ESM::GameSetting>().find("fAutoPCSpellChance")->getFloat();
-            if (calcAutoCastChance(spell, skills, attributes, -1) < fAutoPCSpellChance)
-                continue;
-
-            if (!attrSkillCheck(spell, skills, attributes))
-                continue;
-
-            selectedSpells.push_back(spell->mId);
-
-            if (reachedLimit)
-            {
-                std::vector<std::string>::iterator it = std::find(selectedSpells.begin(), selectedSpells.end(), weakestSpell->mId);
-                if (it != selectedSpells.end())
-                    selectedSpells.erase(it);
-
-                minCost = INT_MAX;
-                for (std::vector<std::string>::iterator weakIt = selectedSpells.begin(); weakIt != selectedSpells.end(); ++weakIt)
-                {
-                    const ESM::Spell* testSpell = esmStore.get<ESM::Spell>().find(*weakIt);
-                    if (testSpell->mData.mCost < minCost)
-                    {
-                        minCost = testSpell->mData.mCost;
-                        weakestSpell = testSpell;
-                    }
-                }
-            }
-            else
-            {
-                if (spell->mData.mCost < minCost)
-                {
-                    weakestSpell = spell;
-                    minCost = weakestSpell->mData.mCost;
-                }
-                static const unsigned int iAutoPCSpellMax = esmStore.get<ESM::GameSetting>().find("iAutoPCSpellMax")->getInt();
-                if (selectedSpells.size() == iAutoPCSpellMax)
-                    reachedLimit = true;
-            }
-        }
+        std::vector<std::string> selectedSpells = autoCalcPlayerSpells(skills, attributes, race);
 
         for (std::vector<std::string>::iterator it = selectedSpells.begin(); it != selectedSpells.end(); ++it)
             creatureStats.getSpells().add(*it);
@@ -312,10 +233,10 @@ namespace MWMechanics
     }
 
     MechanicsManager::MechanicsManager()
-    : mWatchedStatsEmpty (true), mUpdatePlayer (true), mClassSelected (false),
+    : mWatchedTimeToStartDrowning(0), mWatchedStatsEmpty (true), mUpdatePlayer (true), mClassSelected (false),
       mRaceSelected (false), mAI(true)
     {
-        //buildPlayer no longer here, needs to be done explicitely after all subsystems are up and running
+        //buildPlayer no longer here, needs to be done explicitly after all subsystems are up and running
     }
 
     void MechanicsManager::add(const MWWorld::Ptr& ptr)
@@ -374,40 +295,40 @@ namespace MWMechanics
             const MWMechanics::NpcStats &stats = mWatched.getClass().getNpcStats(mWatched);
             for(int i = 0;i < ESM::Attribute::Length;++i)
             {
-                if(stats.getAttribute(i) != mWatchedStats.getAttribute(i) || mWatchedStatsEmpty)
+                if(stats.getAttribute(i) != mWatchedAttributes[i] || mWatchedStatsEmpty)
                 {
                     std::stringstream attrname;
                     attrname << "AttribVal"<<(i+1);
 
-                    mWatchedStats.setAttribute(i, stats.getAttribute(i));
+                    mWatchedAttributes[i] = stats.getAttribute(i);
                     winMgr->setValue(attrname.str(), stats.getAttribute(i));
                 }
             }
 
-            if(stats.getHealth() != mWatchedStats.getHealth() || mWatchedStatsEmpty)
+            if(stats.getHealth() != mWatchedHealth || mWatchedStatsEmpty)
             {
                 static const std::string hbar("HBar");
-                mWatchedStats.setHealth(stats.getHealth());
+                mWatchedHealth = stats.getHealth();
                 winMgr->setValue(hbar, stats.getHealth());
             }
-            if(stats.getMagicka() != mWatchedStats.getMagicka() || mWatchedStatsEmpty)
+            if(stats.getMagicka() != mWatchedMagicka || mWatchedStatsEmpty)
             {
                 static const std::string mbar("MBar");
-                mWatchedStats.setMagicka(stats.getMagicka());
+                mWatchedMagicka = stats.getMagicka();
                 winMgr->setValue(mbar, stats.getMagicka());
             }
-            if(stats.getFatigue() != mWatchedStats.getFatigue() || mWatchedStatsEmpty)
+            if(stats.getFatigue() != mWatchedFatigue || mWatchedStatsEmpty)
             {
                 static const std::string fbar("FBar");
-                mWatchedStats.setFatigue(stats.getFatigue());
+                mWatchedFatigue = stats.getFatigue();
                 winMgr->setValue(fbar, stats.getFatigue());
             }
 
-            if(stats.getTimeToStartDrowning() != mWatchedStats.getTimeToStartDrowning())
+            if(stats.getTimeToStartDrowning() != mWatchedTimeToStartDrowning)
             {
                 const float fHoldBreathTime = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
                         .find("fHoldBreathTime")->getFloat();
-                mWatchedStats.setTimeToStartDrowning(stats.getTimeToStartDrowning());
+                mWatchedTimeToStartDrowning = stats.getTimeToStartDrowning();
                 if(stats.getTimeToStartDrowning() >= fHoldBreathTime)
                     winMgr->setDrowningBarVisibility(false);
                 else
@@ -417,22 +338,16 @@ namespace MWMechanics
                 }
             }
 
-            bool update = false;
-
             //Loop over ESM::Skill::SkillEnum
             for(int i = 0; i < ESM::Skill::Length; ++i)
             {
-                if(stats.getSkill(i) != mWatchedStats.getSkill(i) || mWatchedStatsEmpty)
+                if(stats.getSkill(i) != mWatchedSkills[i] || mWatchedStatsEmpty)
                 {
-                    update = true;
-                    mWatchedStats.getSkill(i) = stats.getSkill(i);
+                    mWatchedSkills[i] = stats.getSkill(i);
                     winMgr->setValue((ESM::Skill::SkillEnum)i, stats.getSkill(i));
                 }
             }
 
-            if(update)
-                winMgr->updateSkillArea();
-
             winMgr->setValue("level", stats.getLevel());
 
             mWatchedStatsEmpty = false;
@@ -501,8 +416,7 @@ namespace MWMechanics
 
     void MechanicsManager::rest(bool sleep)
     {
-        mActors.restoreDynamicStats (sleep);
-        mActors.fastForwardAi();
+        mActors.rest(sleep);
     }
 
     int MechanicsManager::getHoursToRest() const
@@ -581,7 +495,7 @@ namespace MWMechanics
         mUpdatePlayer = true;
     }
 
-    int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr)
+    int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange)
     {
         const MWMechanics::NpcStats& npcSkill = ptr.getClass().getNpcStats(ptr);
         float x = static_cast<float>(npcSkill.getBaseDisposition());
@@ -653,6 +567,9 @@ namespace MWMechanics
 
         x += ptr.getClass().getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::Charm).getMagnitude();
 
+        if(addTemporaryDispositionChange)
+          x += MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange();
+
         int effective_disposition = std::max(0,std::min(int(x),100));//, normally clamped to [0..100] when used
         return effective_disposition;
     }
@@ -667,10 +584,9 @@ namespace MWMechanics
         MWWorld::Ptr playerPtr = getPlayer();
         const MWMechanics::NpcStats &playerStats = playerPtr.getClass().getNpcStats(playerPtr);
 
-        // I suppose the temporary disposition change _has_ to be considered here,
+        // I suppose the temporary disposition change (second param to getDerivedDisposition()) _has_ to be considered here,
         // otherwise one would get different prices when exiting and re-entering the dialogue window...
-        int clampedDisposition = std::max(0, std::min(getDerivedDisposition(ptr)
-            + MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange(),100));
+        int clampedDisposition = getDerivedDisposition(ptr);
         float a = static_cast<float>(std::min(playerStats.getSkill(ESM::Skill::Mercantile).getModified(), 100));
         float b = std::min(0.1f * playerStats.getAttribute(ESM::Attribute::Luck).getModified(), 10.f);
         float c = std::min(0.2f * playerStats.getAttribute(ESM::Attribute::Personality).getModified(), 10.f);
@@ -700,8 +616,7 @@ namespace MWMechanics
         return mActors.countDeaths (id);
     }
 
-    void MechanicsManager::getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type,
-        float currentTemporaryDispositionDelta, bool& success, float& tempChange, float& permChange)
+    void MechanicsManager::getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, float& tempChange, float& permChange)
     {
         const MWWorld::Store<ESM::GameSetting> &gmst =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
@@ -717,7 +632,7 @@ namespace MWMechanics
         float playerRating1, playerRating2, playerRating3;
         getPersuasionRatings(playerStats, playerRating1, playerRating2, playerRating3, true);
 
-        int currentDisposition = std::min(100, std::max(0, int(getDerivedDisposition(npc) + currentTemporaryDispositionDelta)));
+        int currentDisposition = getDerivedDisposition(npc);
 
         float d = 1 - 0.02f * abs(currentDisposition - 50);
         float target1 = d * (playerRating1 - npcRating1 + 50);
@@ -844,12 +759,12 @@ namespace MWMechanics
             mActors.forceStateUpdate(ptr);
     }
 
-    bool MechanicsManager::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number)
+    bool MechanicsManager::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number, bool persist)
     {
         if(ptr.getClass().isActor())
-            return mActors.playAnimationGroup(ptr, groupName, mode, number);
+            return mActors.playAnimationGroup(ptr, groupName, mode, number, persist);
         else
-            return mObjects.playAnimationGroup(ptr, groupName, mode, number);
+            return mObjects.playAnimationGroup(ptr, groupName, mode, number, persist);
     }
     void MechanicsManager::skipAnimation(const MWWorld::Ptr& ptr)
     {
@@ -866,6 +781,12 @@ namespace MWMechanics
             return false;
     }
 
+    void MechanicsManager::persistAnimationStates()
+    {
+        mActors.persistAnimationStates();
+        mObjects.persistAnimationStates();
+    }
+
     void MechanicsManager::updateMagicEffects(const MWWorld::Ptr &ptr)
     {
         mActors.updateMagicEffects(ptr);
@@ -927,7 +848,7 @@ namespace MWMechanics
             return true;
         }
 
-        if(MWMechanics::isPlayerInCombat()) {
+        if(MWBase::Environment::get().getWorld()->getPlayer().enemiesNearby()) {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage2}");
             return true;
         }
@@ -1051,18 +972,6 @@ namespace MWMechanics
     }
 
 
-    void getFollowers (const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out)
-    {
-        std::list<MWWorld::Ptr> followers = MWBase::Environment::get().getMechanicsManager()->getActorsSidingWith(actor);
-        for(std::list<MWWorld::Ptr>::iterator it = followers.begin();it != followers.end();++it)
-        {
-            if (out.insert(*it).second)
-            {
-                getFollowers(*it, out);
-            }
-        }
-    }
-
     bool MechanicsManager::commitCrime(const MWWorld::Ptr &player, const MWWorld::Ptr &victim, OffenseType type, int arg, bool victimAware)
     {
         // NOTE: victim may be empty
@@ -1086,7 +995,7 @@ namespace MWMechanics
 
         // get the player's followers / allies (works recursively) that will not report crimes
         std::set<MWWorld::Ptr> playerFollowers;
-        getFollowers(player, playerFollowers);
+        getActorsSidingWith(player, playerFollowers);
 
         // Did anyone see it?
         bool crimeSeen = false;
@@ -1113,6 +1022,11 @@ namespace MWMechanics
                 if (playerFollowers.find(*it) != playerFollowers.end())
                     continue;
 
+                // tes3mp needs player-controlled NPCs to not report crimes committed by other players,
+                // so a condition has been added that should be true only for them
+                if (!it->getBase()->canChangeCell)
+                    continue;
+
                 if (type == OT_Theft || type == OT_Pickpocket)
                     MWBase::Environment::get().getDialogueManager()->say(*it, "thief");
                 else if (type == OT_Trespassing)
@@ -1305,48 +1219,50 @@ namespace MWMechanics
         }
     }
 
-    bool MechanicsManager::actorAttacked(const MWWorld::Ptr &ptr, const MWWorld::Ptr &attacker)
+    bool MechanicsManager::actorAttacked(const MWWorld::Ptr &target, const MWWorld::Ptr &attacker)
     {
-        if (ptr == getPlayer())
+        if (target == getPlayer() || !attacker.getClass().isActor())
             return false;
 
-        std::list<MWWorld::Ptr> followers = getActorsSidingWith(attacker);
-        MWMechanics::CreatureStats& targetStats = ptr.getClass().getCreatureStats(ptr);
-        if (std::find(followers.begin(), followers.end(), ptr) != followers.end())
+        std::list<MWWorld::Ptr> followersAttacker = getActorsSidingWith(attacker);
+
+        MWMechanics::CreatureStats& statsTarget = target.getClass().getCreatureStats(target);
+
+        if (std::find(followersAttacker.begin(), followersAttacker.end(), target) != followersAttacker.end())
         {
-            targetStats.friendlyHit();
+            statsTarget.friendlyHit();
 
-            if (targetStats.getFriendlyHits() < 4)
+            if (statsTarget.getFriendlyHits() < 4)
             {
-                MWBase::Environment::get().getDialogueManager()->say(ptr, "hit");
+                MWBase::Environment::get().getDialogueManager()->say(target, "hit");
                 return false;
             }
         }
 
         // Attacking an NPC that is already in combat with any other NPC is not a crime
-        AiSequence& seq = targetStats.getAiSequence();
+        AiSequence& seq = statsTarget.getAiSequence();
         bool isFightingNpc = false;
         for (std::list<AiPackage*>::const_iterator it = seq.begin(); it != seq.end(); ++it)
         {
             if ((*it)->getTypeId() == AiPackage::TypeIdCombat)
             {
-                MWWorld::Ptr target = static_cast<AiCombat*>(*it)->getTarget();
-                if (!target.isEmpty() && target.getClass().isNpc())
+                MWWorld::Ptr target2 = (*it)->getTarget();
+                if (!target2.isEmpty() && target2.getClass().isNpc())
                     isFightingNpc = true;
             }
         }
 
-        if (ptr.getClass().isNpc() && !attacker.isEmpty() && !seq.isInCombat(attacker)
-                && !isAggressive(ptr, attacker) && !isFightingNpc)
-            commitCrime(attacker, ptr, MWBase::MechanicsManager::OT_Assault);
+        if (target.getClass().isNpc() && !attacker.isEmpty() && !seq.isInCombat(attacker)
+                && !isAggressive(target, attacker) && !isFightingNpc)
+            commitCrime(attacker, target, MWBase::MechanicsManager::OT_Assault);
 
-        if (!attacker.isEmpty() && (attacker.getClass().getCreatureStats(attacker).getAiSequence().isInCombat(ptr)
+        if (!attacker.isEmpty() && (attacker.getClass().getCreatureStats(attacker).getAiSequence().isInCombat(target)
                                     || attacker == getPlayer())
                 && !seq.isInCombat(attacker))
         {
             // Attacker is in combat with us, but we are not in combat with the attacker yet. Time to fight back.
             // Note: accidental or collateral damage attacks are ignored.
-            startCombat(ptr, attacker);
+            startCombat(target, attacker);
         }
 
         return true;
@@ -1456,6 +1372,7 @@ namespace MWMechanics
             // if guard starts combat with player, guards pursuing player should do the same
             if (ptr.getClass().isClass(ptr, "Guard"))
             {
+                ptr.getClass().getCreatureStats(ptr).setHitAttemptActorId(target.getClass().getCreatureStats(target).getActorId()); // Stops guard from ending combat if player is unreachable
                 for (Actors::PtrActorMap::const_iterator iter = mActors.begin(); iter != mActors.end(); ++iter)
                 {
                     if (iter->first.getClass().isClass(iter->first, "Guard"))
@@ -1465,6 +1382,7 @@ namespace MWMechanics
                         {
                             aiSeq.stopPursuit();
                             aiSeq.stack(MWMechanics::AiCombat(target), ptr);
+                            iter->first.getClass().getCreatureStats(iter->first).setHitAttemptActorId(target.getClass().getCreatureStats(target).getActorId()); // Stops guard from ending combat if player is unreachable
                         }
                     }
                 }
@@ -1506,6 +1424,18 @@ namespace MWMechanics
         return mActors.getActorsFighting(actor);
     }
 
+    std::list<MWWorld::Ptr> MechanicsManager::getEnemiesNearby(const MWWorld::Ptr& actor) {
+        return mActors.getEnemiesNearby(actor);
+    }
+
+    void MechanicsManager::getActorsFollowing(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) {
+        mActors.getActorsFollowing(actor, out);
+    }
+
+    void MechanicsManager::getActorsSidingWith(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) {
+        mActors.getActorsSidingWith(actor, out);
+    }
+
     int MechanicsManager::countSavedGameRecords() const
     {
         return 1 // Death counter
@@ -1539,13 +1469,15 @@ namespace MWMechanics
     {
         mActors.clear();
         mStolenItems.clear();
+        mClassSelected = false;
+        mRaceSelected = false;
     }
 
     bool MechanicsManager::isAggressive(const MWWorld::Ptr &ptr, const MWWorld::Ptr &target)
     {
         int disposition = 50;
         if (ptr.getClass().isNpc())
-            disposition = getDerivedDisposition(ptr);
+            disposition = getDerivedDisposition(ptr, false);
 
         int fight = std::max(0, ptr.getClass().getCreatureStats(ptr).getAiSetting(CreatureStats::AI_Fight).getModified()
                 + static_cast<int>(getFightDistanceBias(ptr, target) + getFightDispositionBias(static_cast<float>(disposition))));
@@ -1569,16 +1501,7 @@ namespace MWMechanics
         MWWorld::Ptr player = getPlayer();
         CreatureStats& stats = player.getClass().getCreatureStats(player);
         if (stats.isDead())
-        {
-            MWMechanics::DynamicStat<float> stat (stats.getHealth());
-
-            if (stat.getModified()<1)
-            {
-                stat.setModified(1, 0);
-                stats.setHealth(stat);
-            }
             stats.resurrect();
-        }
     }
 
     bool MechanicsManager::isReadyToBlock(const MWWorld::Ptr &ptr) const
@@ -1607,27 +1530,23 @@ namespace MWMechanics
                 player->restoreSkillsAttributes();
         }
 
-        // Equipped items other than WerewolfRobe may reference bones that do not even
-        // exist with the werewolf object root, so make sure to unequip all items
-        // *before* we become a werewolf.
-        MWWorld::InventoryStore& invStore = actor.getClass().getInventoryStore(actor);
-        invStore.unequipAll(actor);
-
         // Werewolfs can not cast spells, so we need to unset the prepared spell if there is one.
         if (npcStats.getDrawState() == MWMechanics::DrawState_Spell)
             npcStats.setDrawState(MWMechanics::DrawState_Nothing);
 
         npcStats.setWerewolf(werewolf);
 
+        MWWorld::InventoryStore &inv = actor.getClass().getInventoryStore(actor);
+
         if(werewolf)
         {
-            MWWorld::InventoryStore &inv = actor.getClass().getInventoryStore(actor);
-
+            inv.unequipAll(actor);
             inv.equip(MWWorld::InventoryStore::Slot_Robe, inv.ContainerStore::add("werewolfrobe", 1, actor), actor);
         }
         else
         {
-            actor.getClass().getContainerStore(actor).remove("werewolfrobe", 1, actor);
+            inv.unequipSlot(MWWorld::InventoryStore::Slot_Robe, actor);
+            inv.ContainerStore::remove("werewolfrobe", 1, actor);
         }
 
         if(actor == player->getPlayer())
@@ -1693,4 +1612,9 @@ namespace MWMechanics
         stats.getSkill(ESM::Skill::Acrobatics).setBase(gmst.find("fWerewolfAcrobatics")->getInt());
     }
 
+    void MechanicsManager::cleanupSummonedCreature(const MWWorld::Ptr &caster, int creatureActorId)
+    {
+        mActors.cleanupSummonedCreature(caster.getClass().getCreatureStats(caster), creatureActorId);
+    }
+
 }
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index fb29c07ea..ed06f58c5 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -20,7 +20,16 @@ namespace MWMechanics
     class MechanicsManager : public MWBase::MechanicsManager
     {
             MWWorld::Ptr mWatched;
-            NpcStats mWatchedStats;
+
+            AttributeValue mWatchedAttributes[8];
+            SkillValue mWatchedSkills[27];
+
+            DynamicStat<float> mWatchedHealth;
+            DynamicStat<float> mWatchedMagicka;
+            DynamicStat<float> mWatchedFatigue;
+
+            float mWatchedTimeToStartDrowning;
+
             bool mWatchedStatsEmpty;
             bool mUpdatePlayer;
             bool mClassSelected;
@@ -92,15 +101,13 @@ namespace MWMechanics
             virtual int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying);
             ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
 
-            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr);
+            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange = true);
             ///< Calculate the diposition of an NPC toward the player.
 
             virtual int countDeaths (const std::string& id) const;
             ///< Return the number of deaths for actors with the given ID.
 
-            virtual void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type,
-                float currentTemporaryDispositionDelta, bool& success, float& tempChange, float& permChange);
-            void toLower(std::string npcFaction);
+            virtual void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, float& tempChange, float& permChange);
             ///< Perform a persuasion action on NPC
 
             /// Check if \a observer is potentially aware of \a ptr. Does not do a line of sight check!
@@ -139,9 +146,10 @@ namespace MWMechanics
 
             /// Attempt to play an animation group
             /// @return Success or error
-            virtual bool playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number);
+            virtual bool playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number, bool persist=false);
             virtual void skipAnimation(const MWWorld::Ptr& ptr);
             virtual bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string &groupName);
+            virtual void persistAnimationStates();
 
             /// Update magic effects for an actor. Usually done automatically once per frame, but if we're currently
             /// paused we may want to do it manually (after equipping permanent enchantment)
@@ -155,6 +163,12 @@ namespace MWMechanics
             virtual std::list<int> getActorsFollowingIndices(const MWWorld::Ptr& actor);
 
             virtual std::list<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor);
+            virtual std::list<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor);
+
+            /// Recursive version of getActorsFollowing
+            virtual void getActorsFollowing(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out);
+            /// Recursive version of getActorsSidingWith
+            virtual void getActorsSidingWith(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out);
 
             virtual bool toggleAI();
             virtual bool isAIActive();
@@ -190,6 +204,8 @@ namespace MWMechanics
             virtual void setWerewolf(const MWWorld::Ptr& actor, bool werewolf);
             virtual void applyWerewolfAcrobatics(const MWWorld::Ptr& actor);
 
+            virtual void cleanupSummonedCreature(const MWWorld::Ptr& caster, int creatureActorId);
+
         private:
             void reportCrime (const MWWorld::Ptr& ptr, const MWWorld::Ptr& victim,
                                       OffenseType type, int arg=0);
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 10d603ff1..f0994f509 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -34,6 +34,7 @@ MWMechanics::NpcStats::NpcStats()
     , mIsWerewolf(false)
 {
     mSkillIncreases.resize (ESM::Attribute::Length, 0);
+    mSpecIncreases.resize(3, 0);
 }
 
 int MWMechanics::NpcStats::getBaseDisposition() const
@@ -82,8 +83,8 @@ void MWMechanics::NpcStats::raiseRank(const std::string &faction)
     if (it != mFactionRank.end())
     {
         // Does the next rank exist?
-        const ESM::Faction* faction = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(lower);
-        if (it->second+1 < 10 && !faction->mRanks[it->second+1].empty())
+        const ESM::Faction* factionPtr = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(lower);
+        if (it->second+1 < 10 && !factionPtr->mRanks[it->second+1].empty())
             it->second += 1;
     }
 }
@@ -255,6 +256,8 @@ void MWMechanics::NpcStats::increaseSkill(int skillIndex, const ESM::Class &clas
         MWBase::Environment::get().getWorld ()->getStore ().get<ESM::Skill>().find(skillIndex);
     mSkillIncreases[skill->mData.mAttribute] += increase;
 
+    mSpecIncreases[skill->mData.mSpecialization] += gmst.find("iLevelupSpecialization")->getInt();
+
     // Play sound & skill progress notification
     /// \todo check if character is the player, if levelling is ever implemented for NPCs
     MWBase::Environment::get().getSoundManager ()->playSound ("skillraise", 1, 1);
@@ -281,6 +284,24 @@ int MWMechanics::NpcStats::getLevelProgress () const
     return mLevelProgress;
 }
 
+// Added by tes3mp
+void MWMechanics::NpcStats::setLevelProgress(int value)
+{
+    mLevelProgress = value;
+}
+
+// Added by tes3mp
+int MWMechanics::NpcStats::getSkillIncrease(int attribute) const
+{
+    return mSkillIncreases[attribute];
+}
+
+// Added by tes3mp
+void MWMechanics::NpcStats::setSkillIncrease(int attribute, int value)
+{
+    mSkillIncreases[attribute] = value;
+}
+
 void MWMechanics::NpcStats::levelUp()
 {
     const MWWorld::Store<ESM::GameSetting> &gmst =
@@ -326,6 +347,11 @@ int MWMechanics::NpcStats::getLevelupAttributeMultiplier(int attribute) const
     return MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(gmst.str())->getInt();
 }
 
+int MWMechanics::NpcStats::getSkillIncreasesForSpecialization(int spec) const
+{
+    return mSpecIncreases[spec];
+}
+
 void MWMechanics::NpcStats::flagAsUsed (const std::string& id)
 {
     mUsedIds.insert (id);
@@ -469,6 +495,9 @@ void MWMechanics::NpcStats::writeState (ESM::NpcStats& state) const
     for (int i=0; i<ESM::Attribute::Length; ++i)
         state.mSkillIncrease[i] = mSkillIncreases[i];
 
+    for (int i=0; i<3; ++i)
+        state.mSpecIncreases[i] = mSpecIncreases[i];
+
     std::copy (mUsedIds.begin(), mUsedIds.end(), std::back_inserter (state.mUsedIds));
 
     state.mTimeToStartDrowning = mTimeToStartDrowning;
@@ -508,6 +537,9 @@ void MWMechanics::NpcStats::readState (const ESM::NpcStats& state)
     for (int i=0; i<ESM::Attribute::Length; ++i)
         mSkillIncreases[i] = state.mSkillIncrease[i];
 
+    for (int i=0; i<3; ++i)
+        mSpecIncreases[i] = state.mSpecIncreases[i];
+
     for (std::vector<std::string>::const_iterator iter (state.mUsedIds.begin());
         iter!=state.mUsedIds.end(); ++iter)
         if (store.find (*iter))
diff --git a/apps/openmw/mwmechanics/npcstats.hpp b/apps/openmw/mwmechanics/npcstats.hpp
index 8a98b1d1d..42aa2ca1e 100644
--- a/apps/openmw/mwmechanics/npcstats.hpp
+++ b/apps/openmw/mwmechanics/npcstats.hpp
@@ -34,7 +34,8 @@ namespace MWMechanics
             std::set<std::string> mExpelled;
             std::map<std::string, int> mFactionReputation;
             int mLevelProgress; // 0-10
-            std::vector<int> mSkillIncreases; // number of skill increases for each attribute
+            std::vector<int> mSkillIncreases; // number of skill increases for each attribute (resets after leveling up)
+            std::vector<int> mSpecIncreases; // number of skill increases for each specialization (accumulates throughout the entire game)
             std::set<std::string> mUsedIds;
             // ---------------------------------------------------------------------------
 
@@ -83,9 +84,15 @@ namespace MWMechanics
             void increaseSkill (int skillIndex, const ESM::Class& class_, bool preserveProgress);
 
             int getLevelProgress() const;
+            void setLevelProgress(int value); // Added by tes3mp
+
+            int getSkillIncrease(int attribute) const; // Added by tes3mp
+            void setSkillIncrease(int attribute, int value); // Added by tes3mp
 
             int getLevelupAttributeMultiplier(int attribute) const;
 
+            int getSkillIncreasesForSpecialization(int spec) const;
+
             void levelUp();
 
             void updateHealth();
diff --git a/apps/openmw/mwmechanics/objects.cpp b/apps/openmw/mwmechanics/objects.cpp
index 94b552a38..139825c21 100644
--- a/apps/openmw/mwmechanics/objects.cpp
+++ b/apps/openmw/mwmechanics/objects.cpp
@@ -2,11 +2,11 @@
 
 #include <iostream>
 
-#include "movement.hpp"
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
+#include "movement.hpp"
+
 namespace MWMechanics
 {
 
@@ -79,12 +79,12 @@ void Objects::update(float duration, bool paused)
     }
 }
 
-bool Objects::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number)
+bool Objects::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number, bool persist)
 {
     PtrControllerMap::iterator iter = mObjects.find(ptr);
     if(iter != mObjects.end())
     {
-        return iter->second->playGroup(groupName, mode, number);
+        return iter->second->playGroup(groupName, mode, number, persist);
     }
     else
     {
@@ -99,6 +99,12 @@ void Objects::skipAnimation(const MWWorld::Ptr& ptr)
         iter->second->skipAnim();
 }
 
+void Objects::persistAnimationStates()
+{
+    for (PtrControllerMap::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter)
+        iter->second->persistAnimationState();
+}
+
 void Objects::getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out)
 {
     for (PtrControllerMap::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter)
diff --git a/apps/openmw/mwmechanics/objects.hpp b/apps/openmw/mwmechanics/objects.hpp
index 07e00675c..1efebafbe 100644
--- a/apps/openmw/mwmechanics/objects.hpp
+++ b/apps/openmw/mwmechanics/objects.hpp
@@ -38,8 +38,9 @@ namespace MWMechanics
         void update(float duration, bool paused);
         ///< Update object animations
 
-        bool playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number);
+        bool playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number, bool persist=false);
         void skipAnimation(const MWWorld::Ptr& ptr);
+        void persistAnimationStates();
 
         void getObjectsInRange (const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out);
     };
diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp
index 5815d8cbe..5d99fe723 100644
--- a/apps/openmw/mwmechanics/obstacle.cpp
+++ b/apps/openmw/mwmechanics/obstacle.cpp
@@ -93,6 +93,11 @@ namespace MWMechanics
         return mWalkState == State_Norm;
     }
 
+    bool ObstacleCheck::isEvading() const
+    {
+        return mWalkState == State_Evade;
+    }
+
     /*
      * input   - actor, duration (time since last check)
      * output  - true if evasive action needs to be taken
@@ -115,19 +120,15 @@ namespace MWMechanics
      * u = how long to move sideways
      *
      */
-    bool ObstacleCheck::check(const MWWorld::Ptr& actor, float duration)
+    bool ObstacleCheck::check(const MWWorld::Ptr& actor, float duration, float scaleMinimumDistance)
     {
         const MWWorld::Class& cls = actor.getClass();
         ESM::Position pos = actor.getRefData().getPosition();
 
-        // actors can move at most 60 fps (the physics framerate).
-        // the max() can be removed if we implement physics interpolation.
-        float movementDuration = std::max(1/60.f, duration);
-
         if(mDistSameSpot == -1)
-            mDistSameSpot = DIST_SAME_SPOT * cls.getSpeed(actor);
+            mDistSameSpot = DIST_SAME_SPOT * cls.getSpeed(actor) * scaleMinimumDistance;
 
-        float distSameSpot = mDistSameSpot * movementDuration;
+        float distSameSpot = mDistSameSpot * duration;
 
         bool samePosition =  (osg::Vec2f(pos.pos[0], pos.pos[1]) - osg::Vec2f(mPrevX, mPrevY)).length2() <  distSameSpot * distSameSpot;
 
diff --git a/apps/openmw/mwmechanics/obstacle.hpp b/apps/openmw/mwmechanics/obstacle.hpp
index 98cc4e7a0..1d7cf1e0e 100644
--- a/apps/openmw/mwmechanics/obstacle.hpp
+++ b/apps/openmw/mwmechanics/obstacle.hpp
@@ -19,7 +19,7 @@ namespace MWMechanics
     bool proximityToDoor(const MWWorld::Ptr& actor,
                          float minSqr = MIN_DIST_TO_DOOR_SQUARED);
 
-    /// Returns door pointer within range. No guarentee is given as too which one
+    /// Returns door pointer within range. No guarantee is given as to which one
     /** \return Pointer to the door, or NULL if none exists **/
     MWWorld::Ptr getNearbyDoor(const MWWorld::Ptr& actor,
                          float minSqr = MIN_DIST_TO_DOOR_SQUARED);
@@ -33,10 +33,11 @@ namespace MWMechanics
             void clear();
 
             bool isNormalState() const;
+            bool isEvading() const;
 
             // Returns true if there is an obstacle and an evasive action
             // should be taken
-            bool check(const MWWorld::Ptr& actor, float duration);
+            bool check(const MWWorld::Ptr& actor, float duration, float scaleMinimumDistance = 1.0f);
 
             // change direction to try to fix "stuck" actor
             void takeEvasiveAction(MWMechanics::Movement& actorMovement);
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index dbe20fdc0..b0bdce8f1 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -1,4 +1,5 @@
 #include "pathfinding.hpp"
+
 #include <limits>
 
 #include "../mwbase/world.hpp"
@@ -6,47 +7,11 @@
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/cellstore.hpp"
+
 #include "coordinateconverter.hpp"
 
 namespace
 {
-    // Slightly cheaper version for comparisons.
-    // Caller needs to be careful for very short distances (i.e. less than 1)
-    // or when accumuating the results i.e. (a + b)^2 != a^2 + b^2
-    //
-    float distanceSquared(ESM::Pathgrid::Point point, const osg::Vec3f& pos)
-    {
-        return (MWMechanics::PathFinder::MakeOsgVec3(point) - pos).length2();
-    }
-
-    // Return the closest pathgrid point index from the specified position co
-    // -ordinates.  NOTE: Does not check if there is a sensible way to get there
-    // (e.g. a cliff in front).
-    //
-    // NOTE: pos is expected to be in local co-ordinates, as is grid->mPoints
-    //
-    int getClosestPoint(const ESM::Pathgrid* grid, const osg::Vec3f& pos)
-    {
-        assert(grid && !grid->mPoints.empty());
-
-        float distanceBetween = distanceSquared(grid->mPoints[0], pos);
-        int closestIndex = 0;
-
-        // TODO: if this full scan causes performance problems mapping pathgrid
-        //       points to a quadtree may help
-        for(unsigned int counter = 1; counter < grid->mPoints.size(); counter++)
-        {
-            float potentialDistBetween = distanceSquared(grid->mPoints[counter], pos);
-            if(potentialDistBetween < distanceBetween)
-            {
-                distanceBetween = potentialDistBetween;
-                closestIndex = counter;
-            }
-        }
-
-        return closestIndex;
-    }
-
     // Chooses a reachable end pathgrid point.  start is assumed reachable.
     std::pair<int, bool> getClosestReachablePoint(const ESM::Pathgrid* grid,
                                                   const MWWorld::CellStore *cell,
@@ -62,7 +27,7 @@ namespace
         //       points to a quadtree may help
         for(unsigned int counter = 0; counter < grid->mPoints.size(); counter++)
         {
-            float potentialDistBetween = distanceSquared(grid->mPoints[counter], pos);
+            float potentialDistBetween = MWMechanics::PathFinder::DistanceSquared(grid->mPoints[counter], pos);
             if (potentialDistBetween < closestDistanceReachable)
             {
                 // found a closer one
@@ -117,6 +82,43 @@ namespace MWMechanics
         return sqrt(x * x + y * y + z * z);
     }
 
+    float getZAngleToDir(const osg::Vec3f& dir)
+    {
+        return std::atan2(dir.x(), dir.y());
+    }
+
+    float getXAngleToDir(const osg::Vec3f& dir)
+    {
+        float dirLen = dir.length();
+        return (dirLen != 0) ? -std::asin(dir.z() / dirLen) : 0;
+    }
+
+    float getZAngleToPoint(const ESM::Pathgrid::Point &origin, const ESM::Pathgrid::Point &dest)
+    {
+        osg::Vec3f dir = PathFinder::MakeOsgVec3(dest) - PathFinder::MakeOsgVec3(origin);
+        return getZAngleToDir(dir);
+    }
+
+    float getXAngleToPoint(const ESM::Pathgrid::Point &origin, const ESM::Pathgrid::Point &dest)
+    {
+        osg::Vec3f dir = PathFinder::MakeOsgVec3(dest) - PathFinder::MakeOsgVec3(origin);
+        return getXAngleToDir(dir);
+    }
+
+    bool checkWayIsClear(const osg::Vec3f& from, const osg::Vec3f& to, float offsetXY)
+    {
+        osg::Vec3f dir = to - from;
+        dir.z() = 0;
+        dir.normalize();
+        float verticalOffset = 200; // instead of '200' here we want the height of the actor
+        osg::Vec3f _from = from + dir*offsetXY + osg::Z_AXIS * verticalOffset;
+
+        // cast up-down ray and find height of hit in world space
+        float h = _from.z() - MWBase::Environment::get().getWorld()->getDistToNearestRayHit(_from, -osg::Z_AXIS, verticalOffset + PATHFIND_Z_REACH + 1);
+
+        return (std::abs(from.z() - h) <= PATHFIND_Z_REACH);
+    }
+
     PathFinder::PathFinder()
         : mPathgrid(NULL),
           mCell(NULL)
@@ -137,7 +139,7 @@ namespace MWMechanics
      * NOTE: It may be desirable to simply go directly to the endPoint if for
      *       example there are no pathgrids in this cell.
      *
-     * NOTE: startPoint & endPoint are in world co-ordinates
+     * NOTE: startPoint & endPoint are in world coordinates
      *
      * Updates mPath using aStarSearch() or ray test (if shortcut allowed).
      * mPath consists of pathgrid points, except the last element which is
@@ -146,7 +148,7 @@ namespace MWMechanics
      * pathgrid point (e.g. wander) then it may be worth while to call
      * pop_back() to remove the redundant entry.
      *
-     * NOTE: co-ordinates must be converted prior to calling getClosestPoint()
+     * NOTE: coordinates must be converted prior to calling GetClosestPoint()
      *
      *    |
      *    |       cell
@@ -162,28 +164,15 @@ namespace MWMechanics
      *    +-----------------------------
      *
      *    i = x value of cell itself (multiply by ESM::Land::REAL_SIZE to convert)
-     *    j = @.x in local co-ordinates (i.e. within the cell)
-     *    k = @.x in world co-ordinates
+     *    j = @.x in local coordinates (i.e. within the cell)
+     *    k = @.x in world coordinates
      */
     void PathFinder::buildPath(const ESM::Pathgrid::Point &startPoint,
                                const ESM::Pathgrid::Point &endPoint,
-                               const MWWorld::CellStore* cell,
-                               bool allowShortcuts)
+                               const MWWorld::CellStore* cell)
     {
         mPath.clear();
 
-        if(allowShortcuts)
-        {
-            // if there's a ray cast hit, can't take a direct path
-            if (!MWBase::Environment::get().getWorld()->castRay(
-                static_cast<float>(startPoint.mX), static_cast<float>(startPoint.mY), static_cast<float>(startPoint.mZ),
-                static_cast<float>(endPoint.mX), static_cast<float>(endPoint.mY), static_cast<float>(endPoint.mZ)))
-            {
-                mPath.push_back(endPoint);
-                return;
-            }
-        }
-
         if(mCell != cell || !mPathgrid)
         {
             mCell = cell;
@@ -199,16 +188,16 @@ namespace MWMechanics
             return;
         }
 
-        // NOTE: getClosestPoint expects local co-ordinates
+        // NOTE: GetClosestPoint expects local coordinates
         CoordinateConverter converter(mCell->getCell());
 
-        // NOTE: It is possible that getClosestPoint returns a pathgrind point index
+        // NOTE: It is possible that GetClosestPoint returns a pathgrind point index
         //       that is unreachable in some situations. e.g. actor is standing
         //       outside an area enclosed by walls, but there is a pathgrid
         //       point right behind the wall that is closer than any pathgrid
         //       point outside the wall
         osg::Vec3f startPointInLocalCoords(converter.toLocalVec3(startPoint));
-        int startNode = getClosestPoint(mPathgrid, startPointInLocalCoords);
+        int startNode = GetClosestPoint(mPathgrid, startPointInLocalCoords);
 
         osg::Vec3f endPointInLocalCoords(converter.toLocalVec3(endPoint));
         std::pair<int, bool> endNode = getClosestReachablePoint(mPathgrid, cell,
@@ -218,8 +207,8 @@ namespace MWMechanics
         // if it's shorter for actor to travel from start to end, than to travel from either
         // start or end to nearest pathgrid point, just travel from start to end.
         float startToEndLength2 = (endPointInLocalCoords - startPointInLocalCoords).length2();
-        float endTolastNodeLength2 = distanceSquared(mPathgrid->mPoints[endNode.first], endPointInLocalCoords);
-        float startTo1stNodeLength2 = distanceSquared(mPathgrid->mPoints[startNode], startPointInLocalCoords);
+        float endTolastNodeLength2 = DistanceSquared(mPathgrid->mPoints[endNode.first], endPointInLocalCoords);
+        float startTo1stNodeLength2 = DistanceSquared(mPathgrid->mPoints[startNode], startPointInLocalCoords);
         if ((startToEndLength2 < startTo1stNodeLength2) || (startToEndLength2 < endTolastNodeLength2))
         {
             mPath.push_back(endPoint);
@@ -241,7 +230,7 @@ namespace MWMechanics
         {
             mPath = mCell->aStarSearch(startNode, endNode.first);
 
-            // convert supplied path to world co-ordinates
+            // convert supplied path to world coordinates
             for (std::list<ESM::Pathgrid::Point>::iterator iter(mPath.begin()); iter != mPath.end(); ++iter)
             {
                 converter.toWorld(*iter);
@@ -278,6 +267,19 @@ namespace MWMechanics
         return std::atan2(directionX, directionY);
     }
 
+    float PathFinder::getXAngleToNext(float x, float y, float z) const
+    {
+        // This should never happen (programmers should have an if statement checking
+        // isPathConstructed that prevents this call if otherwise).
+        if(mPath.empty())
+            return 0.;
+
+        const ESM::Pathgrid::Point &nextPoint = *mPath.begin();
+        osg::Vec3f dir = MakeOsgVec3(nextPoint) - osg::Vec3f(x,y,z);
+
+        return getXAngleToDir(dir);
+    }
+
     bool PathFinder::checkPathCompleted(float x, float y, float tolerance)
     {
         if(mPath.empty())
@@ -299,19 +301,18 @@ namespace MWMechanics
     // see header for the rationale
     void PathFinder::buildSyncedPath(const ESM::Pathgrid::Point &startPoint,
         const ESM::Pathgrid::Point &endPoint,
-        const MWWorld::CellStore* cell,
-        bool allowShortcuts)
+        const MWWorld::CellStore* cell)
     {
         if (mPath.size() < 2)
         {
             // if path has one point, then it's the destination.
             // don't need to worry about bad path for this case
-            buildPath(startPoint, endPoint, cell, allowShortcuts);
+            buildPath(startPoint, endPoint, cell);
         }
         else
         {
             const ESM::Pathgrid::Point oldStart(*getPath().begin());
-            buildPath(startPoint, endPoint, cell, allowShortcuts);
+            buildPath(startPoint, endPoint, cell);
             if (mPath.size() >= 2)
             {
                 // if 2nd waypoint of new path == 1st waypoint of old, 
@@ -327,4 +328,8 @@ namespace MWMechanics
         }
     }
 
+    const MWWorld::CellStore* PathFinder::getPathCell() const
+    {
+        return mCell;
+    }
 }
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 1765a5cc5..945a7f927 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -1,9 +1,11 @@
 #ifndef GAME_MWMECHANICS_PATHFINDING_H
 #define GAME_MWMECHANICS_PATHFINDING_H
 
+#include <list>
+#include <cassert>
+
 #include <components/esm/defs.hpp>
 #include <components/esm/loadpgrd.hpp>
-#include <list>
 
 namespace MWWorld
 {
@@ -14,6 +16,20 @@ namespace MWMechanics
 {
     float distance(const ESM::Pathgrid::Point& point, float x, float y, float);
     float distance(const ESM::Pathgrid::Point& a, const ESM::Pathgrid::Point& b);
+    float getZAngleToDir(const osg::Vec3f& dir);
+    float getXAngleToDir(const osg::Vec3f& dir);
+    float getZAngleToPoint(const ESM::Pathgrid::Point &origin, const ESM::Pathgrid::Point &dest);
+    float getXAngleToPoint(const ESM::Pathgrid::Point &origin, const ESM::Pathgrid::Point &dest);
+
+     const float PATHFIND_Z_REACH = 50.0f;
+    //static const float sMaxSlope = 49.0f; // duplicate as in physicssystem
+    // distance after which actor (failed previously to shortcut) will try again
+    const float PATHFIND_SHORTCUT_RETRY_DIST = 300.0f;
+
+    // cast up-down ray with some offset from actor position to check for pits/obstacles on the way to target;
+    // magnitude of pits/obstacles is defined by PATHFIND_Z_REACH
+    bool checkWayIsClear(const osg::Vec3f& from, const osg::Vec3f& to, float offsetXY);
+
     class PathFinder
     {
         public:
@@ -37,12 +53,17 @@ namespace MWMechanics
 
             void clearPath();
 
+            void buildPath(const ESM::Pathgrid::Point &startPoint, const ESM::Pathgrid::Point &endPoint,
+                           const MWWorld::CellStore* cell);
+
             bool checkPathCompleted(float x, float y, float tolerance = PathTolerance);
             ///< \Returns true if we are within \a tolerance units of the last path point.
 
             /// In radians
             float getZAngleToNext(float x, float y) const;
 
+            float getXAngleToNext(float x, float y, float z) const;
+
             bool isPathConstructed() const
             {
                 return !mPath.empty();
@@ -58,17 +79,19 @@ namespace MWMechanics
                 return mPath;
             }
 
+            const MWWorld::CellStore* getPathCell() const;
+
             /** Synchronize new path with old one to avoid visiting 1 waypoint 2 times
             @note
                 BuildPath() takes closest PathGrid point to NPC as first point of path.
-                This is undesireable if NPC has just passed a Pathgrid point, as this
+                This is undesirable if NPC has just passed a Pathgrid point, as this
                 makes the 2nd point of the new path == the 1st point of old path.
                 Which results in NPC "running in a circle" back to the just passed waypoint.
              */
             void buildSyncedPath(const ESM::Pathgrid::Point &startPoint, const ESM::Pathgrid::Point &endPoint,
-                const MWWorld::CellStore* cell, bool allowShortcuts = true);
+                const MWWorld::CellStore* cell);
 
-            void addPointToPath(ESM::Pathgrid::Point &point)
+            void addPointToPath(const ESM::Pathgrid::Point &point)
             {
                 mPath.push_back(point);
             }
@@ -89,11 +112,45 @@ namespace MWMechanics
             {
                 return osg::Vec3f(static_cast<float>(p.mX), static_cast<float>(p.mY), static_cast<float>(p.mZ));
             }
+            
+            // Slightly cheaper version for comparisons.
+            // Caller needs to be careful for very short distances (i.e. less than 1)
+            // or when accumuating the results i.e. (a + b)^2 != a^2 + b^2
+            //
+            static float DistanceSquared(ESM::Pathgrid::Point point, const osg::Vec3f& pos)
+            {
+                return (MWMechanics::PathFinder::MakeOsgVec3(point) - pos).length2();
+            }
 
-        private:
-            void buildPath(const ESM::Pathgrid::Point &startPoint, const ESM::Pathgrid::Point &endPoint,
-                const MWWorld::CellStore* cell, bool allowShortcuts = true);
+            // Return the closest pathgrid point index from the specified position
+            // coordinates.  NOTE: Does not check if there is a sensible way to get there
+            // (e.g. a cliff in front).
+            //
+            // NOTE: pos is expected to be in local coordinates, as is grid->mPoints
+            //
+            static int GetClosestPoint(const ESM::Pathgrid* grid, const osg::Vec3f& pos)
+            {
+                assert(grid && !grid->mPoints.empty());
+
+                float distanceBetween = DistanceSquared(grid->mPoints[0], pos);
+                int closestIndex = 0;
+
+                // TODO: if this full scan causes performance problems mapping pathgrid
+                //       points to a quadtree may help
+                for(unsigned int counter = 1; counter < grid->mPoints.size(); counter++)
+                {
+                    float potentialDistBetween = DistanceSquared(grid->mPoints[counter], pos);
+                    if(potentialDistBetween < distanceBetween)
+                    {
+                        distanceBetween = potentialDistBetween;
+                        closestIndex = counter;
+                    }
+                }
+
+                return closestIndex;
+            }
 
+        private:
             std::list<ESM::Pathgrid::Point> mPath;
 
             const ESM::Pathgrid *mPathgrid;
diff --git a/apps/openmw/mwmechanics/pathgrid.cpp b/apps/openmw/mwmechanics/pathgrid.cpp
index 871baecdc..c557beadd 100644
--- a/apps/openmw/mwmechanics/pathgrid.cpp
+++ b/apps/openmw/mwmechanics/pathgrid.cpp
@@ -225,7 +225,7 @@ namespace MWMechanics
      * Should be possible to make this MT safe.
      *
      * Returns path which may be empty.  path contains pathgrid points in local
-     * cell co-ordinates (indoors) or world co-ordinates (external).
+     * cell coordinates (indoors) or world coordinates (external).
      *
      * Input params:
      *   start, goal - pathgrid point indexes (for this cell)
@@ -239,7 +239,7 @@ namespace MWMechanics
      * TODO: An intersting exercise might be to cache the paths created for a
      *       start/goal pair.  To cache the results the paths need to be in
      *       pathgrid points form (currently they are converted to world
-     *       co-ordinates).  Essentially trading speed w/ memory.
+     *       coordinates).  Essentially trading speed w/ memory.
      */
     std::list<ESM::Pathgrid::Point> PathgridGraph::aStarSearch(const int start,
                                                                const int goal) const
@@ -312,7 +312,7 @@ namespace MWMechanics
         if(current != goal)
             return path; // for some reason couldn't build a path
 
-        // reconstruct path to return, using local co-ordinates
+        // reconstruct path to return, using local coordinates
         while(graphParent[current] != -1)
         {
             path.push_front(mPathgrid->mPoints[current]);
diff --git a/apps/openmw/mwmechanics/pathgrid.hpp b/apps/openmw/mwmechanics/pathgrid.hpp
index 67fbacded..d90cb47cd 100644
--- a/apps/openmw/mwmechanics/pathgrid.hpp
+++ b/apps/openmw/mwmechanics/pathgrid.hpp
@@ -1,9 +1,10 @@
 #ifndef GAME_MWMECHANICS_PATHGRID_H
 #define GAME_MWMECHANICS_PATHGRID_H
 
-#include <components/esm/loadpgrd.hpp>
 #include <list>
 
+#include <components/esm/loadpgrd.hpp>
+
 namespace ESM
 {
     struct Cell;
@@ -29,7 +30,7 @@ namespace MWMechanics
 
             // the input parameters are pathgrid point indexes
             // the output list is in local (internal cells) or world (external
-            // cells) co-ordinates
+            // cells) coordinates
             //
             // NOTE: if start equals end an empty path is returned
             std::list<ESM::Pathgrid::Point> aStarSearch(const int start,
diff --git a/apps/openmw/mwmechanics/repair.cpp b/apps/openmw/mwmechanics/repair.cpp
index 581ba3a84..9b48f5fcb 100644
--- a/apps/openmw/mwmechanics/repair.cpp
+++ b/apps/openmw/mwmechanics/repair.cpp
@@ -83,7 +83,6 @@ void Repair::repair(const MWWorld::Ptr &itemToRepair)
     // tool used up?
     if (mTool.getCellRef().getCharge() == 0)
     {
-        MWWorld::Ptr player = getPlayer();
         MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
 
         store.remove(mTool, 1, player);
diff --git a/apps/openmw/mwmechanics/security.cpp b/apps/openmw/mwmechanics/security.cpp
index 97878db87..39434be0d 100644
--- a/apps/openmw/mwmechanics/security.cpp
+++ b/apps/openmw/mwmechanics/security.cpp
@@ -1,5 +1,11 @@
 #include "security.hpp"
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/WorldEvent.hpp"
+
+#include "../mwworld/cellstore.hpp"
+
 #include <components/misc/rng.hpp>
 
 #include "../mwworld/class.hpp"
@@ -52,6 +58,17 @@ namespace MWMechanics
             MWBase::Environment::get().getMechanicsManager()->objectOpened(mActor, lock);
             if (Misc::Rng::roll0to99() <= x)
             {
+                // Added by tes3mp
+                mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+                worldEvent->cell = *lock.getCell()->getCell();
+
+                mwmp::WorldObject worldObject;
+                worldObject.refId = lock.getCellRef().getRefId();
+                worldObject.refNumIndex = lock.getCellRef().getRefNum().mIndex;
+                worldEvent->addObject(worldObject);
+                
+                mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_UNLOCK)->Send(worldEvent);
+
                 lock.getClass().unlock(lock);
                 resultMessage = "#{sLockSuccess}";
                 resultSound = "Open Lock";
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 4c5138835..fde0869ef 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -2,11 +2,16 @@
 
 #include <cfloat>
 #include <limits>
+#include <iomanip>
 
 #include <boost/format.hpp>
 
 #include <components/misc/rng.hpp>
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/DedicatedPlayer.hpp"
+#include "../mwmp/LocalPlayer.hpp"
+
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -19,61 +24,17 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
-
 #include "../mwworld/inventorystore.hpp"
 
 #include "../mwrender/animation.hpp"
 
 #include "magiceffects.hpp"
 #include "npcstats.hpp"
-#include "summoning.hpp"
 #include "actorutil.hpp"
-
-namespace
-{
-
-    /// Get projectile properties (model, sound and speed) for a spell with the given effects
-    /// If \a model is empty, the spell has no ranged effects and should not spawn a projectile.
-    void getProjectileInfo (const ESM::EffectList& effects, std::string& model, std::string& sound, float& speed)
-    {
-        for (std::vector<ESM::ENAMstruct>::const_iterator iter (effects.mList.begin());
-            iter!=effects.mList.end(); ++iter)
-        {
-            if (iter->mRange != ESM::RT_Target)
-                continue;
-
-            const ESM::MagicEffect *magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find (
-                iter->mEffectID);
-
-            model = magicEffect->mBolt;
-            if (model.empty())
-                model = "VFX_DefaultBolt";
-
-            static const std::string schools[] = {
-                "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-            };
-            if (!magicEffect->mBoltSound.empty())
-                sound = magicEffect->mBoltSound;
-            else
-                sound = schools[magicEffect->mData.mSchool] + " bolt";
-
-            speed = magicEffect->mData.mSpeed;
-            break;
-        }
-    }
-
-    void applyDynamicStatsEffect(int attribute, const MWWorld::Ptr& target, float magnitude)
-    {
-        MWMechanics::DynamicStat<float> value = target.getClass().getCreatureStats(target).getDynamic(attribute);
-        value.setCurrent(value.getCurrent()+magnitude, attribute == 2);
-        target.getClass().getCreatureStats(target).setDynamic(attribute, value);
-    }
-
-}
+#include "aifollow.hpp"
 
 namespace MWMechanics
 {
-
     ESM::Skill::SkillEnum spellSchoolToSkill(int school)
     {
         std::map<int, ESM::Skill::SkillEnum> schoolSkillMap; // maps spell school to skill id
@@ -138,8 +99,6 @@ namespace MWMechanics
         int actorLuck = stats.getAttribute(ESM::Attribute::Luck).getModified();
 
         float castChance = (lowestSkill - spell->mData.mCost + castBonus + 0.2f * actorWillpower + 0.1f * actorLuck) * stats.getFatigueTerm();
-        if (MWBase::Environment::get().getWorld()->getGodModeState() && actor == getPlayer())
-            castChance = 100;
 
         if (!cap)
             return std::max(0.f, castChance);
@@ -267,8 +226,8 @@ namespace MWMechanics
         return 1 - resistance / 100.f;
     }
 
-    /// Check if the given affect can be applied to the target. If \a castByPlayer, emits a message box on failure.
-    bool checkEffectTarget (int effectId, const MWWorld::Ptr& target, bool castByPlayer)
+    /// Check if the given effect can be applied to the target. If \a castByPlayer, emits a message box on failure.
+    bool checkEffectTarget (int effectId, const MWWorld::Ptr& target, const MWWorld::Ptr& caster, bool castByPlayer)
     {
         switch (effectId)
         {
@@ -300,24 +259,52 @@ namespace MWMechanics
                     return false;
                 }
                 break;
-        }
+            case ESM::MagicEffect::WaterWalking:
+                if (target.getClass().isPureWaterCreature(target) && MWBase::Environment::get().getWorld()->isSwimming(target))
+                    return false;
+
+                MWBase::World *world = MWBase::Environment::get().getWorld();
 
+                if (!world->isWaterWalkingCastableOnTarget(target))
+                {
+                    if (castByPlayer && caster == target)
+                        MWBase::Environment::get().getWindowManager()->messageBox ("#{sMagicInvalidEffect}");
+                    return false;
+                }
+                break;
+        }
         return true;
     }
 
-    CastSpell::CastSpell(const MWWorld::Ptr &caster, const MWWorld::Ptr &target)
+    CastSpell::CastSpell(const MWWorld::Ptr &caster, const MWWorld::Ptr &target, const bool fromProjectile)
         : mCaster(caster)
         , mTarget(target)
         , mStack(false)
         , mHitPosition(0,0,0)
         , mAlwaysSucceed(false)
+        , mFromProjectile(fromProjectile)
     {
     }
 
+    void CastSpell::launchMagicBolt (const ESM::EffectList& effects)
+    {        
+        osg::Vec3f fallbackDirection (0,1,0);     
+
+        // Fall back to a "caster to target" direction if we have no other means of determining it
+        // (e.g. when cast by a non-actor)
+        if (!mTarget.isEmpty())
+            fallbackDirection =
+                osg::Vec3f(mTarget.getRefData().getPosition().asVec3())-
+                osg::Vec3f(mCaster.getRefData().getPosition().asVec3());
+            
+        MWBase::Environment::get().getWorld()->launchMagicBolt(mId, false, effects,
+                                                   mCaster, mSourceName, fallbackDirection);
+    }
+
     void CastSpell::inflict(const MWWorld::Ptr &target, const MWWorld::Ptr &caster,
                             const ESM::EffectList &effects, ESM::RangeType range, bool reflected, bool exploded)
     {
-        if (target.getClass().isActor() && target.getClass().getCreatureStats(target).isDead())
+        if (!target.isEmpty() && target.getClass().isActor() && target.getClass().getCreatureStats(target).isDead())
             return;
 
         // If none of the effects need to apply, we can early-out
@@ -335,7 +322,7 @@ namespace MWMechanics
             return;
 
         const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search (mId);
-        if (spell && (spell->mData.mType == ESM::Spell::ST_Disease || spell->mData.mType == ESM::Spell::ST_Blight))
+        if (spell && !target.isEmpty() && (spell->mData.mType == ESM::Spell::ST_Disease || spell->mData.mType == ESM::Spell::ST_Blight))
         {
             int requiredResistance = (spell->mData.mType == ESM::Spell::ST_Disease) ?
                 ESM::MagicEffect::ResistCommonDisease
@@ -353,20 +340,26 @@ namespace MWMechanics
 
         ESM::EffectList reflectedEffects;
         std::vector<ActiveSpells::ActiveEffect> appliedLastingEffects;
-        bool firstAppliedEffect = true;
-        bool anyHarmfulEffect = false;
 
         // HACK: cache target's magic effects here, and add any applied effects to it. Use the cached effects for determining resistance.
         // This is required for Weakness effects in a spell to apply to any subsequent effects in the spell.
         // Otherwise, they'd only apply after the whole spell was added.
         MagicEffects targetEffects;
-        if (target.getClass().isActor())
+        if (!target.isEmpty() && target.getClass().isActor())
             targetEffects += target.getClass().getCreatureStats(target).getMagicEffects();
 
         bool castByPlayer = (!caster.isEmpty() && caster == getPlayer());
 
+        ActiveSpells targetSpells;
+        if (!target.isEmpty() && target.getClass().isActor())
+            targetSpells = target.getClass().getCreatureStats(target).getActiveSpells();
+
+        bool canCastAnEffect = false;    // For bound equipment.If this remains false
+                                         // throughout the iteration of this spell's 
+                                         // effects, we display a "can't re-cast" message
+
         for (std::vector<ESM::ENAMstruct>::const_iterator effectIt (effects.mList.begin());
-            effectIt!=effects.mList.end(); ++effectIt)
+             !target.isEmpty() && effectIt != effects.mList.end(); ++effectIt)
         {
             if (effectIt->mRange != range)
                 continue;
@@ -375,7 +368,17 @@ namespace MWMechanics
                 MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find (
                 effectIt->mEffectID);
 
-            if (!checkEffectTarget(effectIt->mEffectID, target, castByPlayer))
+            // Re-casting a bound equipment effect has no effect if the spell is still active
+            if (magicEffect->mData.mFlags & ESM::MagicEffect::NonRecastable && targetSpells.isSpellActive(mId))
+            {
+                if (effectIt == (effects.mList.end() - 1) && !canCastAnEffect && castByPlayer)
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicCannotRecast}");
+                continue;
+            }
+            else
+                canCastAnEffect = true;
+
+            if (!checkEffectTarget(effectIt->mEffectID, target, caster, castByPlayer))
                 continue;
 
             // caster needs to be an actor for linked effects (e.g. Absorb)
@@ -412,17 +415,11 @@ namespace MWMechanics
             float magnitudeMult = 1;
             if (magicEffect->mData.mFlags & ESM::MagicEffect::Harmful && target.getClass().isActor())
             {
-                anyHarmfulEffect = true;
-
-                if (absorbed) // Absorbed, and we know there was a harmful effect (figuring that out is the only reason we are in this loop)
-                    break;
-
-                // If player is attempting to cast a harmful spell, show the target's HP bar
-                if (castByPlayer && target != caster)
-                    MWBase::Environment::get().getWindowManager()->setEnemy(target);
+                if (absorbed)
+                    continue;
 
                 // Try reflecting
-                if (!reflected && magnitudeMult > 0 && !caster.isEmpty() && caster != target && !(magicEffect->mData.mFlags & ESM::MagicEffect::Unreflectable))
+                if (!reflected && !caster.isEmpty() && caster != target && !(magicEffect->mData.mFlags & ESM::MagicEffect::Unreflectable))
                 {
                     float reflect = target.getClass().getCreatureStats(target).getMagicEffects().get(ESM::MagicEffect::Reflect).getMagnitude();
                     bool isReflected = (Misc::Rng::roll0to99() < reflect);
@@ -432,23 +429,28 @@ namespace MWMechanics
                         MWBase::Environment::get().getWorld()->getAnimation(target)->addEffect(
                                     "meshes\\" + reflectStatic->mModel, ESM::MagicEffect::Reflect, false, "");
                         reflectedEffects.mList.push_back(*effectIt);
-                        magnitudeMult = 0;
+                        continue;
                     }
                 }
 
                 // Try resisting
-                if (magnitudeMult > 0 && target.getClass().isActor())
+                magnitudeMult = MWMechanics::getEffectMultiplier(effectIt->mEffectID, target, caster, spell, &targetEffects);
+                if (magnitudeMult == 0)
                 {
-                    magnitudeMult = MWMechanics::getEffectMultiplier(effectIt->mEffectID, target, caster, spell, &targetEffects);
-                    if (magnitudeMult == 0)
-                    {
-                        // Fully resisted, show message
-                        if (target == getPlayer())
-                            MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicPCResisted}");
-                        else if (castByPlayer)
-                            MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicTargetResisted}");
-                    }
+                    // Fully resisted, show message
+                    if (target == getPlayer())
+                        MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicPCResisted}");
+                    else if (castByPlayer)
+                        MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicTargetResisted}");
                 }
+
+                // If player is attempting to cast a harmful spell, show the target's HP bar
+                if (castByPlayer && target != caster)
+                    MWBase::Environment::get().getWindowManager()->setEnemy(target);
+
+                // Notify the target actor they've been hit
+                if (target != caster && !caster.isEmpty())
+                    target.getClass().onHit(target, 0.0f, true, MWWorld::Ptr(), caster, osg::Vec3f(), true);
             }
 
             if (magnitudeMult > 0 && !absorbed)
@@ -482,28 +484,40 @@ namespace MWMechanics
                         ActiveSpells::ActiveEffect effect;
                         effect.mEffectId = effectIt->mEffectID;
                         effect.mArg = MWMechanics::EffectKey(*effectIt).mArg;
-                        effect.mDuration = static_cast<float>(effectIt->mDuration);
+                        if (!hasDuration)
+                            effect.mDuration = 1.0f;
+                        else
+                            effect.mDuration = static_cast<float>(effectIt->mDuration);
                         effect.mMagnitude = magnitude;
 
                         targetEffects.add(MWMechanics::EffectKey(*effectIt), MWMechanics::EffectParam(effect.mMagnitude));
 
                         appliedLastingEffects.push_back(effect);
 
+                        // Command spells should have their effect, including taking the target out of combat, each time the spell successfully affects the target
+                        if (((effectIt->mEffectID == ESM::MagicEffect::CommandHumanoid && target.getClass().isNpc())
+                        || (effectIt->mEffectID == ESM::MagicEffect::CommandCreature && target.getTypeName() == typeid(ESM::Creature).name()))
+                        && !caster.isEmpty() && caster.getClass().isActor() && target != getPlayer() && magnitude >= target.getClass().getCreatureStats(target).getLevel())
+                        {
+                            MWMechanics::AiFollow package(caster.getCellRef().getRefId(), true);
+                            target.getClass().getCreatureStats(target).getAiSequence().stack(package, target);
+                        }
+
                         // For absorb effects, also apply the effect to the caster - but with a negative
-                        // magnitude, since we're transfering stats from the target to the caster
+                        // magnitude, since we're transferring stats from the target to the caster
                         if (!caster.isEmpty() && caster.getClass().isActor())
                         {
                             for (int i=0; i<5; ++i)
                             {
                                 if (effectIt->mEffectID == ESM::MagicEffect::AbsorbAttribute+i)
                                 {
-                                    std::vector<ActiveSpells::ActiveEffect> effects;
+                                    std::vector<ActiveSpells::ActiveEffect> absorbEffects;
                                     ActiveSpells::ActiveEffect effect_ = effect;
                                     effect_.mMagnitude *= -1;
-                                    effects.push_back(effect_);
+                                    absorbEffects.push_back(effect_);
                                     // Also make sure to set casterActorId = target, so that the effect on the caster gets purged when the target dies
                                     caster.getClass().getCreatureStats(caster).getActiveSpells().addSpell("", true,
-                                                effects, mSourceName, target.getClass().getCreatureStats(target).getActorId());
+                                                absorbEffects, mSourceName, target.getClass().getCreatureStats(target).getActorId());
                                 }
                             }
                         }
@@ -514,30 +528,25 @@ namespace MWMechanics
                 if (isSummoningEffect(effectIt->mEffectID) && !target.isEmpty() && target.getClass().isActor())
                 {
                     CreatureStats& targetStats = target.getClass().getCreatureStats(target);
-                    std::map<CreatureStats::SummonKey, int>::iterator found = targetStats.getSummonedCreatureMap().find(std::make_pair(effectIt->mEffectID, mId));
-                    if (found != targetStats.getSummonedCreatureMap().end())
+                    std::map<CreatureStats::SummonKey, int>::iterator findCreature = targetStats.getSummonedCreatureMap().find(std::make_pair(effectIt->mEffectID, mId));
+                    if (findCreature != targetStats.getSummonedCreatureMap().end())
                     {
-                        cleanupSummonedCreature(targetStats, found->second);
-                        targetStats.getSummonedCreatureMap().erase(found);
+                        MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(target, findCreature->second);
+                        targetStats.getSummonedCreatureMap().erase(findCreature);
                     }
                 }
 
                 if (target.getClass().isActor() || magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration)
                 {
-                    // Play sound, only for the first effect
-                    if (firstAppliedEffect)
-                    {
-                        static const std::string schools[] = {
-                            "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-                        };
+                    static const std::string schools[] = {
+                        "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
+                    };
 
-                        MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-                        if(!magicEffect->mHitSound.empty())
-                            sndMgr->playSound3D(target, magicEffect->mHitSound, 1.0f, 1.0f);
-                        else
-                            sndMgr->playSound3D(target, schools[magicEffect->mData.mSchool]+" hit", 1.0f, 1.0f);
-                        firstAppliedEffect = false;
-                    }
+                    MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+                    if(!magicEffect->mHitSound.empty())
+                        sndMgr->playSound3D(target, magicEffect->mHitSound, 1.0f, 1.0f);
+                    else
+                        sndMgr->playSound3D(target, schools[magicEffect->mData.mSchool]+" hit", 1.0f, 1.0f);
 
                     // Add VFX
                     const ESM::Static* castStatic;
@@ -546,34 +555,34 @@ namespace MWMechanics
                     else
                         castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find ("VFX_DefaultHit");
 
+                    std::string texture = magicEffect->mParticle;
+
                     // TODO: VFX are no longer active after saving/reloading the game
                     bool loop = (magicEffect->mData.mFlags & ESM::MagicEffect::ContinuousVfx) != 0;
                     // Note: in case of non actor, a free effect should be fine as well
                     MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(target);
                     if (anim)
-                        anim->addEffect("meshes\\" + castStatic->mModel, magicEffect->mIndex, loop, "");
+                        anim->addEffect("meshes\\" + castStatic->mModel, magicEffect->mIndex, loop, "", texture);
                 }
             }
         }
 
         if (!exploded)
-            MWBase::Environment::get().getWorld()->explodeSpell(mHitPosition, effects, caster, target, range, mId, mSourceName);
+            MWBase::Environment::get().getWorld()->explodeSpell(mHitPosition, effects, caster, target, range, mId, mSourceName, mFromProjectile);
 
-        if (!reflectedEffects.mList.empty())
-            inflict(caster, target, reflectedEffects, range, true, exploded);
+        if (!target.isEmpty()) {
+            if (!reflectedEffects.mList.empty())
+                inflict(caster, target, reflectedEffects, range, true, exploded);
 
-        if (!appliedLastingEffects.empty())
-        {
-            int casterActorId = -1;
-            if (!caster.isEmpty() && caster.getClass().isActor())
-                casterActorId = caster.getClass().getCreatureStats(caster).getActorId();
-            target.getClass().getCreatureStats(target).getActiveSpells().addSpell(mId, mStack, appliedLastingEffects,
-                                                                                  mSourceName, casterActorId);
+            if (!appliedLastingEffects.empty())
+            {
+                int casterActorId = -1;
+                if (!caster.isEmpty() && caster.getClass().isActor())
+                    casterActorId = caster.getClass().getCreatureStats(caster).getActorId();
+                target.getClass().getCreatureStats(target).getActiveSpells().addSpell(mId, mStack, appliedLastingEffects,
+                                                                                      mSourceName, casterActorId);
+            }
         }
-
-        // Notify the target actor they've been hit
-        if (anyHarmfulEffect && target.getClass().isActor() && target != caster && !caster.isEmpty() && caster.getClass().isActor())
-            target.getClass().onHit(target, 0.f, true, MWWorld::Ptr(), caster, true);
     }
 
     bool CastSpell::applyInstantEffect(const MWWorld::Ptr &target, const MWWorld::Ptr &caster, const MWMechanics::EffectKey& effect, float magnitude)
@@ -583,6 +592,10 @@ namespace MWMechanics
         {
             if (effectId == ESM::MagicEffect::Lock)
             {
+                const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+                const ESM::MagicEffect *magiceffect = store.get<ESM::MagicEffect>().find(effectId);
+                MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(target);     
+                animation->addSpellCastGlow(magiceffect);
                 if (target.getCellRef().getLockLevel() < magnitude) //If the door is not already locked to a higher value, lock it to spell magnitude
                 {
                     if (caster == getPlayer())
@@ -593,6 +606,10 @@ namespace MWMechanics
             }
             else if (effectId == ESM::MagicEffect::Open)
             {
+                const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+                const ESM::MagicEffect *magiceffect = store.get<ESM::MagicEffect>().find(effectId);
+                MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(target);     
+                animation->addSpellCastGlow(magiceffect);
                 if (target.getCellRef().getLockLevel() <= magnitude)
                 {
                     if (target.getCellRef().getLockLevel() > 0)
@@ -611,47 +628,35 @@ namespace MWMechanics
                 return true;
             }
         }
-        else if (target.getClass().isActor())
+        else if (target.getClass().isActor() && effectId == ESM::MagicEffect::Dispel)
         {
-            switch (effectId)
-            {
-            case ESM::MagicEffect::CurePoison:
-                target.getClass().getCreatureStats(target).getActiveSpells().purgeEffect(ESM::MagicEffect::Poison);
-                return true;
-            case ESM::MagicEffect::CureParalyzation:
-                target.getClass().getCreatureStats(target).getActiveSpells().purgeEffect(ESM::MagicEffect::Paralyze);
-                return true;
-            case ESM::MagicEffect::CureCommonDisease:
-                target.getClass().getCreatureStats(target).getSpells().purgeCommonDisease();
-                return true;
-            case ESM::MagicEffect::CureBlightDisease:
-                target.getClass().getCreatureStats(target).getSpells().purgeBlightDisease();
-                return true;
-            case ESM::MagicEffect::CureCorprusDisease:
-                target.getClass().getCreatureStats(target).getSpells().purgeCorprusDisease();
-                return true;
-            case ESM::MagicEffect::Dispel:
-                target.getClass().getCreatureStats(target).getActiveSpells().purgeAll(magnitude);
-                return true;
-            case ESM::MagicEffect::RemoveCurse:
-                target.getClass().getCreatureStats(target).getSpells().purgeCurses();
-                return true;
-            }
-
-            if (target != getPlayer())
-                return false;
+            target.getClass().getCreatureStats(target).getActiveSpells().purgeAll(magnitude);
+            return true;
+        }
+        else if (target.getClass().isActor() && target == getPlayer())
+        {
+            MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(mCaster);
 
             if (effectId == ESM::MagicEffect::DivineIntervention)
             {
                 MWBase::Environment::get().getWorld()->teleportToClosestMarker(target, "divinemarker");
+                anim->removeEffect(ESM::MagicEffect::DivineIntervention);
+                const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
+                    .search("VFX_Summon_end");
+                if (fx)
+                    anim->addEffect("meshes\\" + fx->mModel, -1);
                 return true;
             }
             else if (effectId == ESM::MagicEffect::AlmsiviIntervention)
             {
                 MWBase::Environment::get().getWorld()->teleportToClosestMarker(target, "templemarker");
+                anim->removeEffect(ESM::MagicEffect::AlmsiviIntervention);
+                const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
+                    .search("VFX_Summon_end");
+                if (fx)
+                    anim->addEffect("meshes\\" + fx->mModel, -1);
                 return true;
             }
-
             else if (effectId == ESM::MagicEffect::Mark)
             {
                 MWBase::Environment::get().getWorld()->getPlayer().markPosition(
@@ -669,6 +674,7 @@ namespace MWMechanics
                     MWWorld::ActionTeleport action(markedCell->isExterior() ? "" : markedCell->getCell()->mName,
                                             markedPosition, false);
                     action.execute(target);
+                    anim->removeEffect(ESM::MagicEffect::Recall);
                 }
                 return true;
             }
@@ -694,7 +700,7 @@ namespace MWMechanics
         throw std::runtime_error("ID type cannot be casted");
     }
 
-    bool CastSpell::cast(const MWWorld::Ptr &item)
+    bool CastSpell::cast(const MWWorld::Ptr &item, bool launchProjectile)
     {
         std::string enchantmentName = item.getClass().getEnchantment(item);
         if (enchantmentName.empty())
@@ -705,7 +711,7 @@ namespace MWMechanics
 
         const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(enchantmentName);
 
-        mStack = (enchantment->mData.mType == ESM::Enchantment::CastOnce);
+        mStack = false;
 
         // Check if there's enough charge left
         if (enchantment->mData.mType == ESM::Enchantment::WhenUsed || enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
@@ -756,20 +762,20 @@ namespace MWMechanics
 
         inflict(mCaster, mCaster, enchantment->mEffects, ESM::RT_Self);
 
-        if (!mTarget.isEmpty())
+        bool isProjectile = false;
+        if (item.getTypeName() == typeid(ESM::Weapon).name())
         {
-            inflict(mTarget, mCaster, enchantment->mEffects, ESM::RT_Touch);
+            const MWWorld::LiveCellRef<ESM::Weapon> *ref = item.get<ESM::Weapon>();
+            isProjectile = ref->mBase->mData.mType == ESM::Weapon::Arrow || ref->mBase->mData.mType == ESM::Weapon::Bolt || ref->mBase->mData.mType == ESM::Weapon::MarksmanThrown;
         }
 
-        std::string projectileModel;
-        std::string sound;
-        float speed = 0;
-        getProjectileInfo(enchantment->mEffects, projectileModel, sound, speed);
-        if (!projectileModel.empty())
-            MWBase::Environment::get().getWorld()->launchMagicBolt(projectileModel, sound, mId, speed,
-                                                               false, enchantment->mEffects, mCaster, mSourceName,
-                                                                   // Not needed, enchantments can only be cast by actors
-                                                                   osg::Vec3f(1,0,0));
+        if (isProjectile || !mTarget.isEmpty())
+            inflict(mTarget, mCaster, enchantment->mEffects, ESM::RT_Touch);
+
+        if (launchProjectile)
+            launchMagicBolt(enchantment->mEffects);
+        else if (isProjectile || !mTarget.isEmpty())
+            inflict(mTarget, mCaster, enchantment->mEffects, ESM::RT_Target);
 
         return true;
     }
@@ -812,11 +818,27 @@ namespace MWMechanics
             bool fail = false;
 
             // Check success
-            float successChance = getSpellSuccessChance(spell, mCaster);
-            if (Misc::Rng::roll0to99() >= successChance)
+
+            // Major change done by tes3mp:
+            // Instead of checking whether the caster is a player or an NPC,
+            // check whether it's the LocalPlayer or a DedicatedPlayer and calculate
+            // calculate the success chance in clients' LocalPlayer::prepareAttack()
+            // TODO: Make this make sense for NPCs too
+            // TODO: See if LocalPlayer being the target and having godmode on
+            // can be accounted for like it is in OpenMW's corresponding code
+            mwmp::DedicatedPlayer *dedicatedPlayer = mwmp::Players::getPlayer(mCaster);
+            bool isDedicated = dedicatedPlayer != NULL;
+
+            if (isDedicated)
+                dedicatedPlayer->attack.pressed = false;
+
+            if ((!isDedicated && !mwmp::Main::get().getLocalPlayer()->attack.success) ||
+                (isDedicated && dedicatedPlayer->attack.success == 0))
             {
                 if (mCaster == getPlayer())
+                {
                     MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicSkillFail}");
+                }
                 fail = true;
             }
 
@@ -840,32 +862,17 @@ namespace MWMechanics
         if (mCaster == getPlayer() && spellIncreasesSkill(spell))
             mCaster.getClass().skillUsageSucceeded(mCaster,
                 spellSchoolToSkill(school), 0);
+    
+        // A non-actor doesn't play its spell cast effects from a character controller, so play them here
+        if (!mCaster.getClass().isActor())
+            playSpellCastingEffects(mId);
 
         inflict(mCaster, mCaster, spell->mEffects, ESM::RT_Self);
 
         if (!mTarget.isEmpty())
-        {
             inflict(mTarget, mCaster, spell->mEffects, ESM::RT_Touch);
-        }
-
 
-        std::string projectileModel;
-        std::string sound;
-        float speed = 0;
-        getProjectileInfo(spell->mEffects, projectileModel, sound, speed);
-        if (!projectileModel.empty())
-        {
-            osg::Vec3f fallbackDirection (0,1,0);
-            // Fall back to a "caster to target" direction if we have no other means of determining it
-            // (e.g. when cast by a non-actor)
-            if (!mTarget.isEmpty())
-                fallbackDirection =
-                   osg::Vec3f(mTarget.getRefData().getPosition().asVec3())-
-                   osg::Vec3f(mCaster.getRefData().getPosition().asVec3());
-
-            MWBase::Environment::get().getWorld()->launchMagicBolt(projectileModel, sound, mId, speed,
-                       false, spell->mEffects, mCaster, mSourceName, fallbackDirection);
-        }
+        launchMagicBolt(spell->mEffects);
 
         return true;
     }
@@ -934,6 +941,48 @@ namespace MWMechanics
         return true;
     }
 
+    void CastSpell::playSpellCastingEffects(const std::string &spellid){
+       
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+        const ESM::Spell *spell = store.get<ESM::Spell>().find(spellid);
+
+        for (std::vector<ESM::ENAMstruct>::const_iterator iter = spell->mEffects.mList.begin();
+            iter != spell->mEffects.mList.end(); ++iter)
+        {
+            const ESM::MagicEffect *effect;
+            effect = store.get<ESM::MagicEffect>().find(iter->mEffectID);
+
+            MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(mCaster);
+
+            if (animation && mCaster.getClass().isActor()) // TODO: Non-actors should also create a spell cast vfx even if they are disabled (animation == NULL)
+            {
+                const ESM::Static* castStatic;
+
+                if (!effect->mCasting.empty())
+                    castStatic = store.get<ESM::Static>().find (effect->mCasting);
+                else
+                    castStatic = store.get<ESM::Static>().find ("VFX_DefaultCast");
+
+                std::string texture = effect->mParticle;
+
+                animation->addEffect("meshes\\" + castStatic->mModel, effect->mIndex, false, "", texture);
+            }
+
+            if (animation && !mCaster.getClass().isActor())
+                animation->addSpellCastGlow(effect);
+
+            static const std::string schools[] = {
+                "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
+            };
+
+            MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+            if(!effect->mCastSound.empty())
+                sndMgr->playSound3D(mCaster, effect->mCastSound, 1.0f, 1.0f);
+            else
+                sndMgr->playSound3D(mCaster, schools[effect->mData.mSchool]+" cast", 1.0f, 1.0f);
+        }
+    }
+
     int getEffectiveEnchantmentCastCost(float castCost, const MWWorld::Ptr &actor)
     {
         /*
@@ -972,8 +1021,10 @@ namespace MWMechanics
                 if (charge == 0)
                     return false;
 
-                // FIXME: charge should be a float, not int so that damage < 1 per frame can be applied.
-                // This was also a bug in the original engine.
+                // Store remainder of disintegrate amount (automatically subtracted if > 1)
+                item->getCellRef().applyChargeRemainderToBeSubtracted(disintegrate - std::floor(disintegrate));
+
+                charge = item->getClass().getItemHealth(*item);
                 charge -=
                         std::min(static_cast<int>(disintegrate),
                                  charge);
@@ -1001,10 +1052,10 @@ namespace MWMechanics
         creatureStats.setDynamic(index, stat);
     }
 
-    void effectTick(CreatureStats& creatureStats, const MWWorld::Ptr& actor, const EffectKey &effectKey, float magnitude)
+    bool effectTick(CreatureStats& creatureStats, const MWWorld::Ptr& actor, const EffectKey &effectKey, float magnitude)
     {
         if (magnitude == 0.f)
-            return;
+            return false;
 
         bool receivedMagicDamage = false;
 
@@ -1115,10 +1166,67 @@ namespace MWMechanics
             break;
         }
 
+        case ESM::MagicEffect::CurePoison:
+            actor.getClass().getCreatureStats(actor).getActiveSpells().purgeEffect(ESM::MagicEffect::Poison);
+            break;
+        case ESM::MagicEffect::CureParalyzation:
+            actor.getClass().getCreatureStats(actor).getActiveSpells().purgeEffect(ESM::MagicEffect::Paralyze);
+            break;
+        case ESM::MagicEffect::CureCommonDisease:
+            actor.getClass().getCreatureStats(actor).getSpells().purgeCommonDisease();
+            break;
+        case ESM::MagicEffect::CureBlightDisease:
+            actor.getClass().getCreatureStats(actor).getSpells().purgeBlightDisease();
+            break;
+        case ESM::MagicEffect::CureCorprusDisease:
+            actor.getClass().getCreatureStats(actor).getSpells().purgeCorprusDisease();
+            break;
+        case ESM::MagicEffect::RemoveCurse:
+            actor.getClass().getCreatureStats(actor).getSpells().purgeCurses();
+            break;
+        default:
+            return false;
         }
 
         if (receivedMagicDamage && actor == getPlayer())
             MWBase::Environment::get().getWindowManager()->activateHitOverlay(false);
+        return true;
+    }
+
+    std::string getSummonedCreature(int effectId)
+    {
+        static std::map<int, std::string> summonMap;
+        if (summonMap.empty())
+        {
+            summonMap[ESM::MagicEffect::SummonAncestralGhost] = "sMagicAncestralGhostID";
+            summonMap[ESM::MagicEffect::SummonBonelord] = "sMagicBonelordID";
+            summonMap[ESM::MagicEffect::SummonBonewalker] = "sMagicLeastBonewalkerID";
+            summonMap[ESM::MagicEffect::SummonCenturionSphere] = "sMagicCenturionSphereID";
+            summonMap[ESM::MagicEffect::SummonClannfear] = "sMagicClannfearID";
+            summonMap[ESM::MagicEffect::SummonDaedroth] = "sMagicDaedrothID";
+            summonMap[ESM::MagicEffect::SummonDremora] = "sMagicDremoraID";
+            summonMap[ESM::MagicEffect::SummonFabricant] = "sMagicFabricantID";
+            summonMap[ESM::MagicEffect::SummonFlameAtronach] = "sMagicFlameAtronachID";
+            summonMap[ESM::MagicEffect::SummonFrostAtronach] = "sMagicFrostAtronachID";
+            summonMap[ESM::MagicEffect::SummonGoldenSaint] = "sMagicGoldenSaintID";
+            summonMap[ESM::MagicEffect::SummonGreaterBonewalker] = "sMagicGreaterBonewalkerID";
+            summonMap[ESM::MagicEffect::SummonHunger] = "sMagicHungerID";
+            summonMap[ESM::MagicEffect::SummonScamp] = "sMagicScampID";
+            summonMap[ESM::MagicEffect::SummonSkeletalMinion] = "sMagicSkeletalMinionID";
+            summonMap[ESM::MagicEffect::SummonStormAtronach] = "sMagicStormAtronachID";
+            summonMap[ESM::MagicEffect::SummonWingedTwilight] = "sMagicWingedTwilightID";
+            summonMap[ESM::MagicEffect::SummonWolf] = "sMagicCreature01ID";
+            summonMap[ESM::MagicEffect::SummonBear] = "sMagicCreature02ID";
+            summonMap[ESM::MagicEffect::SummonBonewolf] = "sMagicCreature03ID";
+            summonMap[ESM::MagicEffect::SummonCreature04] = "sMagicCreature04ID";
+            summonMap[ESM::MagicEffect::SummonCreature05] = "sMagicCreature05ID";
+        }
+
+        std::map<int, std::string>::const_iterator it = summonMap.find(effectId);
+        if (it == summonMap.end())
+            return std::string();
+        else
+            return MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(it->second)->getString();
     }
 
 }
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index 5b48bd4a8..8e48681b6 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -1,10 +1,10 @@
 #ifndef MWMECHANICS_SPELLSUCCESS_H
 #define MWMECHANICS_SPELLSUCCESS_H
 
-#include "../mwworld/ptr.hpp"
-
 #include <components/esm/loadskil.hpp>
 
+#include "../mwworld/ptr.hpp"
+
 namespace ESM
 {
     struct Spell;
@@ -59,9 +59,15 @@ namespace MWMechanics
     float getEffectMultiplier(short effectId, const MWWorld::Ptr& actor, const MWWorld::Ptr& caster,
                               const ESM::Spell* spell = NULL, const MagicEffects* effects = NULL);
 
+    bool checkEffectTarget (int effectId, const MWWorld::Ptr& target, const MWWorld::Ptr& caster, bool castByPlayer);
+
     int getEffectiveEnchantmentCastCost (float castCost, const MWWorld::Ptr& actor);
 
-    void effectTick(CreatureStats& creatureStats, const MWWorld::Ptr& actor, const MWMechanics::EffectKey& effectKey, float magnitude);
+    /// Apply a magic effect that is applied in tick intervals until its remaining time ends or it is removed
+    /// @return Was the effect a tickable effect with a magnitude?
+    bool effectTick(CreatureStats& creatureStats, const MWWorld::Ptr& actor, const MWMechanics::EffectKey& effectKey, float magnitude);
+
+    std::string getSummonedCreature(int effectId);
 
     class CastSpell
     {
@@ -74,14 +80,16 @@ namespace MWMechanics
         std::string mSourceName; // Display name for spell, potion, etc
         osg::Vec3f mHitPosition; // Used for spawning area orb
         bool mAlwaysSucceed; // Always succeed spells casted by NPCs/creatures regardless of their chance (default: false)
+        bool mFromProjectile; // True if spell is cast by enchantment of some projectile (arrow, bolt or thrown weapon)
 
     public:
-        CastSpell(const MWWorld::Ptr& caster, const MWWorld::Ptr& target);
+        CastSpell(const MWWorld::Ptr& caster, const MWWorld::Ptr& target, const bool fromProjectile=false);
 
         bool cast (const ESM::Spell* spell);
 
         /// @note mCaster must be an actor
-        bool cast (const MWWorld::Ptr& item);
+        /// @param launchProjectile If set to false, "on target" effects are directly applied instead of being launched as projectile originating from the caster.
+        bool cast (const MWWorld::Ptr& item, bool launchProjectile=true);
 
         /// @note mCaster must be an NPC
         bool cast (const ESM::Ingredient* ingredient);
@@ -91,6 +99,11 @@ namespace MWMechanics
         /// @note Auto detects if spell, ingredient or potion
         bool cast (const std::string& id);
 
+        void playSpellCastingEffects(const std::string &spellid);
+
+        /// Launch a bolt with the given effects.
+        void launchMagicBolt (const ESM::EffectList& effects);
+
         /// @note \a target can be any type of object, not just actors.
         /// @note \a caster can be any type of object, or even an empty object.
         void inflict (const MWWorld::Ptr& target, const MWWorld::Ptr& caster,
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 2f87d0446..ff397f69d 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -15,6 +15,11 @@
 
 namespace MWMechanics
 {
+    Spells::Spells()
+        : mSpellsChanged(false)
+    {
+    }
+
     Spells::TIterator Spells::begin() const
     {
         return mSpells.begin();
@@ -30,6 +35,44 @@ namespace MWMechanics
         return MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(id);
     }
 
+    void Spells::rebuildEffects() const
+    {
+        mEffects = MagicEffects();
+        mSourcedEffects.clear();
+
+        for (TIterator iter = mSpells.begin(); iter!=mSpells.end(); ++iter)
+        {
+            const ESM::Spell *spell = iter->first;
+
+            if (spell->mData.mType==ESM::Spell::ST_Ability || spell->mData.mType==ESM::Spell::ST_Blight ||
+                spell->mData.mType==ESM::Spell::ST_Disease || spell->mData.mType==ESM::Spell::ST_Curse)
+            {
+                int i=0;
+                for (std::vector<ESM::ENAMstruct>::const_iterator it = spell->mEffects.mList.begin(); it != spell->mEffects.mList.end(); ++it)
+                {
+                    if (iter->second.mPurgedEffects.find(i) != iter->second.mPurgedEffects.end())
+                        continue; // effect was purged
+
+                    float random = 1.f;
+                    if (iter->second.mEffectRands.find(i) != iter->second.mEffectRands.end())
+                        random = iter->second.mEffectRands.at(i);
+
+                    float magnitude = it->mMagnMin + (it->mMagnMax - it->mMagnMin) * random;
+                    mEffects.add (*it, magnitude);
+                    mSourcedEffects[spell].add(MWMechanics::EffectKey(*it), magnitude);
+
+                    ++i;
+                }
+            }
+        }
+
+        for (std::map<SpellKey, MagicEffects>::const_iterator it = mPermanentSpellEffects.begin(); it != mPermanentSpellEffects.end(); ++it)
+        {
+            mEffects += it->second;
+            mSourcedEffects[it->first] += it->second;
+        }
+    }
+
     bool Spells::hasSpell(const std::string &spell) const
     {
         return hasSpell(getSpell(spell));
@@ -66,7 +109,10 @@ namespace MWMechanics
                 mCorprusSpells[spell] = corprus;
             }
 
-            mSpells.insert (std::make_pair (spell, random));
+            SpellParams params;
+            params.mEffectRands = random;
+            mSpells.insert (std::make_pair (spell, params));
+            mSpellsChanged = true;
         }
     }
 
@@ -102,7 +148,10 @@ namespace MWMechanics
         }
 
         if (iter!=mSpells.end())
+        {
             mSpells.erase (iter);
+            mSpellsChanged = true;
+        }
 
         if (spellId==mSelectedSpell)
             mSelectedSpell.clear();
@@ -110,41 +159,17 @@ namespace MWMechanics
 
     MagicEffects Spells::getMagicEffects() const
     {
-        // TODO: These are recalculated every frame, no need to do that
-
-        MagicEffects effects;
-
-        for (TIterator iter = mSpells.begin(); iter!=mSpells.end(); ++iter)
-        {
-            const ESM::Spell *spell = iter->first;
-
-            if (spell->mData.mType==ESM::Spell::ST_Ability || spell->mData.mType==ESM::Spell::ST_Blight ||
-                spell->mData.mType==ESM::Spell::ST_Disease || spell->mData.mType==ESM::Spell::ST_Curse)
-            {
-                int i=0;
-                for (std::vector<ESM::ENAMstruct>::const_iterator it = spell->mEffects.mList.begin(); it != spell->mEffects.mList.end(); ++it)
-                {
-                    float random = 1.f;
-                    if (iter->second.find(i) != iter->second.end())
-                        random = iter->second.at(i);
-
-                    effects.add (*it, it->mMagnMin + (it->mMagnMax - it->mMagnMin) * random);
-                    ++i;
-                }
-            }
+        if (mSpellsChanged) {
+            rebuildEffects();
+            mSpellsChanged = false;
         }
-
-        for (std::map<SpellKey, MagicEffects>::const_iterator it = mPermanentSpellEffects.begin(); it != mPermanentSpellEffects.end(); ++it)
-        {
-            effects += it->second;
-        }
-
-        return effects;
+        return mEffects;
     }
 
     void Spells::clear()
     {
         mSpells.clear();
+        mSpellsChanged = true;
     }
 
     void Spells::setSelectedSpell (const std::string& spellId)
@@ -200,7 +225,10 @@ namespace MWMechanics
         {
             const ESM::Spell *spell = iter->first;
             if (spell->mData.mType == ESM::Spell::ST_Disease)
+            {
                 mSpells.erase(iter++);
+                mSpellsChanged = true;
+            }
             else
                 ++iter;
         }
@@ -212,7 +240,10 @@ namespace MWMechanics
         {
             const ESM::Spell *spell = iter->first;
             if (spell->mData.mType == ESM::Spell::ST_Blight && !hasCorprusEffect(spell))
+            {
                 mSpells.erase(iter++);
+                mSpellsChanged = true;
+            }
             else
                 ++iter;
         }
@@ -224,7 +255,10 @@ namespace MWMechanics
         {
             const ESM::Spell *spell = iter->first;
             if (hasCorprusEffect(spell))
+            {
                 mSpells.erase(iter++);
+                mSpellsChanged = true;
+            }
             else
                 ++iter;
         }
@@ -236,7 +270,10 @@ namespace MWMechanics
         {
             const ESM::Spell *spell = iter->first;
             if (spell->mData.mType == ESM::Spell::ST_Curse)
+            {
                 mSpells.erase(iter++);
+                mSpellsChanged = true;
+            }
             else
                 ++iter;
         }
@@ -244,27 +281,19 @@ namespace MWMechanics
 
     void Spells::visitEffectSources(EffectSourceVisitor &visitor) const
     {
-        for (TIterator it = begin(); it != end(); ++it)
-        {
-            const ESM::Spell* spell = it->first;
+        if (mSpellsChanged) {
+            rebuildEffects();
+            mSpellsChanged = false;
+        }
 
-            // these are the spell types that are permanently in effect
-            if (!(spell->mData.mType == ESM::Spell::ST_Ability)
-                    && !(spell->mData.mType == ESM::Spell::ST_Disease)
-                    && !(spell->mData.mType == ESM::Spell::ST_Curse)
-                    && !(spell->mData.mType == ESM::Spell::ST_Blight))
-                continue;
-            const ESM::EffectList& list = spell->mEffects;
-            int i=0;
-            for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = list.mList.begin();
-                 effectIt != list.mList.end(); ++effectIt, ++i)
+        for (std::map<SpellKey, MagicEffects>::const_iterator it = mSourcedEffects.begin();
+             it != mSourcedEffects.end(); ++it)
+        {
+            const ESM::Spell * spell = it->first;
+            for (MagicEffects::Collection::const_iterator effectIt = it->second.begin();
+                 effectIt != it->second.end(); ++effectIt)
             {
-                float random = 1.f;
-                if (it->second.find(i) != it->second.end())
-                    random = it->second.at(i);
-
-                float magnitude = effectIt->mMagnMin + (effectIt->mMagnMax - effectIt->mMagnMin) * random;
-                visitor.visit(MWMechanics::EffectKey(*effectIt), spell->mName, spell->mId, -1, magnitude);
+                visitor.visit(effectIt->first, spell->mName, spell->mId, -1, effectIt->second.getMagnitude());
             }
         }
     }
@@ -283,12 +312,13 @@ namespace MWMechanics
             if ((effectIt->mEffectID != ESM::MagicEffect::Corprus) && (magicEffect->mData.mFlags & ESM::MagicEffect::UncappedDamage)) // APPLIED_ONCE
             {
                 float random = 1.f;
-                if (mSpells[spell].find(i) != mSpells[spell].end())
-                    random = mSpells[spell].at(i);
+                if (mSpells[spell].mEffectRands.find(i) != mSpells[spell].mEffectRands.end())
+                    random = mSpells[spell].mEffectRands.at(i);
 
                 float magnitude = effectIt->mMagnMin + (effectIt->mMagnMax - effectIt->mMagnMin) * random;
                 magnitude *= std::max(1, mCorprusSpells[spell].mWorsenings);
                 mPermanentSpellEffects[spell].add(MWMechanics::EffectKey(*effectIt), MWMechanics::EffectParam(magnitude));
+                mSpellsChanged = true;
             }
         }
     }
@@ -310,6 +340,42 @@ namespace MWMechanics
         return mCorprusSpells;
     }
 
+    void Spells::purgeEffect(int effectId)
+    {
+        for (TContainer::iterator spellIt = mSpells.begin(); spellIt != mSpells.end(); ++spellIt)
+        {
+            int i = 0;
+            for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = spellIt->first->mEffects.mList.begin(); effectIt != spellIt->first->mEffects.mList.end(); ++effectIt)
+            {
+                if (effectIt->mEffectID == effectId)
+                {
+                    spellIt->second.mPurgedEffects.insert(i);
+                    mSpellsChanged = true;
+                }
+                ++i;
+            }
+        }
+    }
+
+    void Spells::purgeEffect(int effectId, const std::string & sourceId)
+    {
+        const ESM::Spell * spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(sourceId);
+        TContainer::iterator spellIt = mSpells.find(spell);
+        if (spellIt == mSpells.end())
+            return;
+
+        int i = 0;
+        for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = spellIt->first->mEffects.mList.begin(); effectIt != spellIt->first->mEffects.mList.end(); ++effectIt)
+        {
+            if (effectIt->mEffectID == effectId)
+            {
+                spellIt->second.mPurgedEffects.insert(i);
+                mSpellsChanged = true;
+            }
+            ++i;
+        }
+    }
+
     bool Spells::canUsePower(const ESM::Spell* spell) const
     {
         std::map<SpellKey, MWWorld::TimeStamp>::const_iterator it = mUsedPowers.find(spell);
@@ -332,7 +398,8 @@ namespace MWMechanics
             const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(it->first);
             if (spell)
             {
-                mSpells[spell] = it->second;
+                mSpells[spell].mEffectRands = it->second.mEffectRands;
+                mSpells[spell].mPurgedEffects = it->second.mPurgedEffects;
 
                 if (it->first == state.mSelectedSpell)
                     mSelectedSpell = it->first;
@@ -370,12 +437,19 @@ namespace MWMechanics
             mCorprusSpells[spell].mWorsenings = state.mCorprusSpells.at(it->first).mWorsenings;
             mCorprusSpells[spell].mNextWorsening = MWWorld::TimeStamp(state.mCorprusSpells.at(it->first).mNextWorsening);
         }
+
+        mSpellsChanged = true;
     }
 
     void Spells::writeState(ESM::SpellState &state) const
     {
         for (TContainer::const_iterator it = mSpells.begin(); it != mSpells.end(); ++it)
-            state.mSpells.insert(std::make_pair(it->first->mId, it->second));
+        {
+            ESM::SpellState::SpellParams params;
+            params.mEffectRands = it->second.mEffectRands;
+            params.mPurgedEffects = it->second.mPurgedEffects;
+            state.mSpells.insert(std::make_pair(it->first->mId, params));
+        }
 
         state.mSelectedSpell = mSelectedSpell;
 
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index a46988c4c..c1705b38a 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -3,6 +3,7 @@
 
 #include <map>
 #include <string>
+#include <set>
 
 #include <components/misc/stringops.hpp>
 
@@ -32,8 +33,12 @@ namespace MWMechanics
         public:
 
             typedef const ESM::Spell* SpellKey;
+            struct SpellParams {
+                std::map<int, float> mEffectRands; // <effect index, normalised random magnitude>
+                std::set<int> mPurgedEffects; // indices of purged effects
+            };
 
-            typedef std::map<SpellKey, std::map<int, float> > TContainer; // ID, <effect index, normalised random magnitude>
+            typedef std::map<SpellKey, SpellParams> TContainer;
             typedef TContainer::const_iterator TIterator;
 
             struct CorprusStats
@@ -45,7 +50,6 @@ namespace MWMechanics
             };
 
         private:
-
             TContainer mSpells;
 
             // spell-tied effects that will be applied even after removing the spell (currently used to keep positive effects when corprus is removed)
@@ -58,15 +62,24 @@ namespace MWMechanics
 
             std::map<SpellKey, CorprusStats> mCorprusSpells;
 
+            mutable bool mSpellsChanged;
+            mutable MagicEffects mEffects;
+            mutable std::map<SpellKey, MagicEffects> mSourcedEffects;
+            void rebuildEffects() const;
+
             /// Get spell from ID, throws exception if not found
             const ESM::Spell* getSpell(const std::string& id) const;
 
         public:
+            Spells();
 
             void worsenCorprus(const ESM::Spell* spell);
             static bool hasCorprusEffect(const ESM::Spell *spell);
             const std::map<SpellKey, CorprusStats> & getCorprusSpells() const;
 
+            void purgeEffect(int effectId);
+            void purgeEffect(int effectId, const std::string & sourceId);
+
             bool canUsePower (const ESM::Spell* spell) const;
             void usePower (const ESM::Spell* spell);
 
diff --git a/apps/openmw/mwmechanics/stat.cpp b/apps/openmw/mwmechanics/stat.cpp
index 6eb5e0246..cf1f228c0 100644
--- a/apps/openmw/mwmechanics/stat.cpp
+++ b/apps/openmw/mwmechanics/stat.cpp
@@ -33,18 +33,6 @@ namespace MWMechanics
         mBase = mModified = value;
     }
     template<typename T>
-    void Stat<T>::modify(const T& diff)
-    {
-        mBase += diff;
-        if(mBase >= static_cast<T>(0))
-            mModified += diff;
-        else
-        {
-            mModified += diff - mBase;
-            mBase = static_cast<T>(0);
-        }
-    }
-    template<typename T>
     void Stat<T>::setBase (const T& value)
     {
         T diff = value - mBase;
@@ -139,12 +127,6 @@ namespace MWMechanics
             mCurrent = getModified();
     }
     template<typename T>
-    void DynamicStat<T>::modify (const T& diff, bool allowCurrentDecreaseBelowZero)
-    {
-        mStatic.modify (diff);
-        setCurrent (getCurrent()+diff, allowCurrentDecreaseBelowZero);
-    }
-    template<typename T>
     void DynamicStat<T>::setCurrent (const T& value, bool allowDecreaseBelowZero)
     {
         if (value > mCurrent)
diff --git a/apps/openmw/mwmechanics/stat.hpp b/apps/openmw/mwmechanics/stat.hpp
index c075f5fa7..5b5800634 100644
--- a/apps/openmw/mwmechanics/stat.hpp
+++ b/apps/openmw/mwmechanics/stat.hpp
@@ -32,7 +32,6 @@ namespace MWMechanics
 
             /// Set base and modified to \a value.
             void set (const T& value);
-            void modify(const T& diff);
 
             /// Set base and adjust modified accordingly.
             void setBase (const T& value);
@@ -85,9 +84,6 @@ namespace MWMechanics
             /// Set modified value an adjust base accordingly.
             void setModified (T value, const T& min, const T& max = std::numeric_limits<T>::max());
 
-            /// Change modified relatively.
-            void modify (const T& diff, bool allowCurrentDecreaseBelowZero=false);
-
             void setCurrent (const T& value, bool allowDecreaseBelowZero = false);
             void setModifier (const T& modifier, bool allowCurrentDecreaseBelowZero=false);
 
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index 636e19907..e4a825efc 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -4,8 +4,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-
-#include "../mwmechanics/spellcasting.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
@@ -14,37 +13,13 @@
 
 #include "../mwrender/animation.hpp"
 
+#include "spellcasting.hpp"
 #include "creaturestats.hpp"
 #include "aifollow.hpp"
 
-
 namespace MWMechanics
 {
 
-    void cleanupSummonedCreature (MWMechanics::CreatureStats& casterStats, int creatureActorId)
-    {
-        MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(creatureActorId);
-        if (!ptr.isEmpty())
-        {
-            // TODO: Show death animation before deleting? We shouldn't allow looting the corpse while the animation
-            // plays though, which is a rather lame exploit in vanilla.
-            MWBase::Environment::get().getWorld()->deleteObject(ptr);
-
-            const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
-                    .search("VFX_Summon_End");
-            if (fx)
-                MWBase::Environment::get().getWorld()->spawnEffect("meshes\\" + fx->mModel,
-                    "", ptr.getRefData().getPosition().asVec3());
-        }
-        else if (creatureActorId != -1)
-        {
-            // We didn't find the creature. It's probably in an inactive cell.
-            // Add to graveyard so we can delete it when the cell becomes active.
-            std::vector<int>& graveyard = casterStats.getSummonedCreatureGraveyard();
-            graveyard.push_back(creatureActorId);
-        }
-    }
-
     UpdateSummonedCreatures::UpdateSummonedCreatures(const MWWorld::Ptr &actor)
         : mActor(actor)
     {
@@ -63,34 +38,9 @@ namespace MWMechanics
         }
     }
 
-    void UpdateSummonedCreatures::finish()
+    void UpdateSummonedCreatures::process()
     {
-        static std::map<int, std::string> summonMap;
-        if (summonMap.empty())
-        {
-            summonMap[ESM::MagicEffect::SummonAncestralGhost] = "sMagicAncestralGhostID";
-            summonMap[ESM::MagicEffect::SummonBonelord] = "sMagicBonelordID";
-            summonMap[ESM::MagicEffect::SummonBonewalker] = "sMagicLeastBonewalkerID";
-            summonMap[ESM::MagicEffect::SummonCenturionSphere] = "sMagicCenturionSphereID";
-            summonMap[ESM::MagicEffect::SummonClannfear] = "sMagicClannfearID";
-            summonMap[ESM::MagicEffect::SummonDaedroth] = "sMagicDaedrothID";
-            summonMap[ESM::MagicEffect::SummonDremora] = "sMagicDremoraID";
-            summonMap[ESM::MagicEffect::SummonFabricant] = "sMagicFabricantID";
-            summonMap[ESM::MagicEffect::SummonFlameAtronach] = "sMagicFlameAtronachID";
-            summonMap[ESM::MagicEffect::SummonFrostAtronach] = "sMagicFrostAtronachID";
-            summonMap[ESM::MagicEffect::SummonGoldenSaint] = "sMagicGoldenSaintID";
-            summonMap[ESM::MagicEffect::SummonGreaterBonewalker] = "sMagicGreaterBonewalkerID";
-            summonMap[ESM::MagicEffect::SummonHunger] = "sMagicHungerID";
-            summonMap[ESM::MagicEffect::SummonScamp] = "sMagicScampID";
-            summonMap[ESM::MagicEffect::SummonSkeletalMinion] = "sMagicSkeletalMinionID";
-            summonMap[ESM::MagicEffect::SummonStormAtronach] = "sMagicStormAtronachID";
-            summonMap[ESM::MagicEffect::SummonWingedTwilight] = "sMagicWingedTwilightID";
-            summonMap[ESM::MagicEffect::SummonWolf] = "sMagicCreature01ID";
-            summonMap[ESM::MagicEffect::SummonBear] = "sMagicCreature02ID";
-            summonMap[ESM::MagicEffect::SummonBonewolf] = "sMagicCreature03ID";
-            summonMap[ESM::MagicEffect::SummonCreature04] = "sMagicCreature04ID";
-            summonMap[ESM::MagicEffect::SummonCreature05] = "sMagicCreature05ID";
-        }
+
 
         MWMechanics::CreatureStats& creatureStats = mActor.getClass().getCreatureStats(mActor);
 
@@ -102,7 +52,7 @@ namespace MWMechanics
             if (!found)
             {
                 // Effect has ended
-                cleanupSummonedCreature(creatureStats, it->second);
+                MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(mActor, it->second);
                 creatureMap.erase(it++);
                 continue;
             }
@@ -114,31 +64,13 @@ namespace MWMechanics
             bool found = creatureMap.find(std::make_pair(it->first, it->second)) != creatureMap.end();
             if (!found)
             {
-                ESM::Position ipos = mActor.getRefData().getPosition();
-                osg::Vec3f pos(ipos.asVec3());
-
-                osg::Quat rot (-ipos.rot[2], osg::Vec3f(0,0,1));
-                const float distance = 50;
-                pos = pos + (rot * osg::Vec3f(0,1,0)) * distance;
-                ipos.pos[0] = pos.x();
-                ipos.pos[1] = pos.y();
-                ipos.pos[2] = pos.z();
-                ipos.rot[0] = 0;
-                ipos.rot[1] = 0;
-                ipos.rot[2] = 0;
-
-                const std::string& creatureGmst = summonMap[it->first];
-                std::string creatureID =
-                        MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(creatureGmst)->getString();
-
+                std::string creatureID = getSummonedCreature(it->first);
                 if (!creatureID.empty())
                 {
-                    MWWorld::CellStore* store = mActor.getCell();
                     int creatureActorId = -1;
                     try
                     {
                         MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), creatureID, 1);
-                        ref.getPtr().getCellRef().setPosition(ipos);
 
                         MWMechanics::CreatureStats& summonedCreatureStats = ref.getPtr().getClass().getCreatureStats(ref.getPtr());
 
@@ -147,7 +79,7 @@ namespace MWMechanics
                         summonedCreatureStats.getAiSequence().stack(package, ref.getPtr());
                         creatureActorId = summonedCreatureStats.getActorId();
 
-                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),store,ipos);
+                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(), mActor, mActor.getCell(), 0, 120.f);
 
                         MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(placed);
                         if (anim)
@@ -172,14 +104,14 @@ namespace MWMechanics
         for (std::map<CreatureStats::SummonKey, int>::iterator it = creatureMap.begin(); it != creatureMap.end(); )
         {
             MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(it->second);
-            if (!ptr.isEmpty() && ptr.getClass().getCreatureStats(ptr).isDead())
+            if (!ptr.isEmpty() && ptr.getClass().getCreatureStats(ptr).isDead() && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished())
             {
                 // Purge the magic effect so a new creature can be summoned if desired
                 creatureStats.getActiveSpells().purgeEffect(it->first.first, it->first.second);
                 if (mActor.getClass().hasInventoryStore(ptr))
                     mActor.getClass().getInventoryStore(mActor).purgeEffect(it->first.first, it->first.second);
 
-                cleanupSummonedCreature(creatureStats, it->second);
+                MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(mActor, it->second);
                 creatureMap.erase(it++);
             }
             else
diff --git a/apps/openmw/mwmechanics/summoning.hpp b/apps/openmw/mwmechanics/summoning.hpp
index 8e418cdeb..b2a3c60ea 100644
--- a/apps/openmw/mwmechanics/summoning.hpp
+++ b/apps/openmw/mwmechanics/summoning.hpp
@@ -3,9 +3,10 @@
 
 #include <set>
 
-#include "magiceffects.hpp"
 #include "../mwworld/ptr.hpp"
 
+#include "magiceffects.hpp"
+
 namespace MWMechanics
 {
 
@@ -21,7 +22,7 @@ namespace MWMechanics
                             float magnitude, float remainingTime = -1, float totalTime = -1);
 
         /// To call after all effect sources have been visited
-        void finish();
+        void process();
 
     private:
         MWWorld::Ptr mActor;
@@ -29,8 +30,6 @@ namespace MWMechanics
         std::set<std::pair<int, std::string> > mActiveEffects;
     };
 
-    void cleanupSummonedCreature (MWMechanics::CreatureStats& casterStats, int creatureActorId);
-
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/trading.cpp b/apps/openmw/mwmechanics/trading.cpp
new file mode 100644
index 000000000..469b454df
--- /dev/null
+++ b/apps/openmw/mwmechanics/trading.cpp
@@ -0,0 +1,84 @@
+#include "trading.hpp"
+
+#include <components/misc/rng.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
+
+#include "creaturestats.hpp"
+
+namespace MWMechanics
+{
+    Trading::Trading() {}
+
+    bool Trading::haggle(const MWWorld::Ptr& player, const MWWorld::Ptr& merchant, int playerOffer, int merchantOffer)
+    {
+        // accept if merchant offer is better than player offer
+        if ( playerOffer <= merchantOffer ) {
+            return true;
+        }
+
+        // reject if npc is a creature
+        if ( merchant.getTypeName() != typeid(ESM::NPC).name() ) {
+            return false;
+        }
+
+        const MWWorld::Store<ESM::GameSetting> &gmst =
+            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+
+        // Is the player buying?
+        bool buying = (merchantOffer < 0);
+
+        int a = std::abs(merchantOffer);
+        int b = std::abs(playerOffer);
+        int d = (buying)
+            ? int(100 * (a - b) / a)
+            : int(100 * (b - a) / a);
+
+        int clampedDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(merchant);
+
+        const MWMechanics::CreatureStats &merchantStats = merchant.getClass().getCreatureStats(merchant);
+        const MWMechanics::CreatureStats &playerStats = player.getClass().getCreatureStats(player);
+
+        float a1 = static_cast<float>(player.getClass().getSkill(player, ESM::Skill::Mercantile));
+        float b1 = 0.1f * playerStats.getAttribute(ESM::Attribute::Luck).getModified();
+        float c1 = 0.2f * playerStats.getAttribute(ESM::Attribute::Personality).getModified();
+        float d1 = static_cast<float>(merchant.getClass().getSkill(merchant, ESM::Skill::Mercantile));
+        float e1 = 0.1f * merchantStats.getAttribute(ESM::Attribute::Luck).getModified();
+        float f1 = 0.2f * merchantStats.getAttribute(ESM::Attribute::Personality).getModified();
+
+        float dispositionTerm = gmst.find("fDispositionMod")->getFloat() * (clampedDisposition - 50);
+        float pcTerm = (dispositionTerm - 50 + a1 + b1 + c1) * playerStats.getFatigueTerm();
+        float npcTerm = (d1 + e1 + f1) * merchantStats.getFatigueTerm();
+        float x = gmst.find("fBargainOfferMulti")->getFloat() * d
+            + gmst.find("fBargainOfferBase")->getFloat()
+            + std::abs(int(pcTerm - npcTerm));
+
+        int roll = Misc::Rng::rollDice(100) + 1;
+
+        // reject if roll fails
+        // (or if player tries to buy things and get money)
+        if ( roll > x || (merchantOffer < 0 && 0 < playerOffer) ) {
+            return false;
+        }
+
+        // apply skill gain on successful barter
+        float skillGain = 0.f;
+        int finalPrice = std::abs(playerOffer);
+        int initialMerchantOffer = std::abs(merchantOffer);
+
+        if ( !buying && (finalPrice > initialMerchantOffer) ) {
+            skillGain = floor(100.f * (finalPrice - initialMerchantOffer) / finalPrice);
+        }
+        else if ( buying && (finalPrice < initialMerchantOffer) ) {
+            skillGain = floor(100.f * (initialMerchantOffer - finalPrice) / initialMerchantOffer);
+        }
+        player.getClass().skillUsageSucceeded(player, ESM::Skill::Mercantile, 0, skillGain);
+
+        return true;
+    }
+}
diff --git a/apps/openmw/mwmechanics/trading.hpp b/apps/openmw/mwmechanics/trading.hpp
new file mode 100644
index 000000000..e006370dd
--- /dev/null
+++ b/apps/openmw/mwmechanics/trading.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_MECHANICS_TRADING_H
+#define OPENMW_MECHANICS_TRADING_H
+
+#include "../mwworld/ptr.hpp"
+
+namespace MWMechanics
+{
+    class Trading
+    {
+    public:
+        Trading();
+
+        bool haggle(const MWWorld::Ptr& player, const MWWorld::Ptr& merchant, int playerOffer, int merchantOffer);
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwmp/DedicatedPlayer.cpp b/apps/openmw/mwmp/DedicatedPlayer.cpp
new file mode 100644
index 000000000..463f092f5
--- /dev/null
+++ b/apps/openmw/mwmp/DedicatedPlayer.cpp
@@ -0,0 +1,513 @@
+//
+// Created by koncord on 02.01.16.
+//
+
+#include "DedicatedPlayer.hpp"
+#include "../mwmechanics/aitravel.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwstate/statemanagerimp.hpp"
+#include "../mwinput/inputmanagerimp.hpp"
+#include "../mwgui/windowmanagerimp.hpp"
+#include "../mwworld/worldimp.hpp"
+#include "../mwworld/player.hpp"
+#include "../mwworld/customdata.hpp"
+#include "../mwclass/npc.hpp"
+#include "../mwmechanics/actor.hpp"
+#include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/mechanicsmanagerimp.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/action.hpp"
+#include "Main.hpp"
+#include "GUIController.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include <boost/algorithm/clamp.hpp>
+#include <components/openmw-mp/Log.hpp>
+using namespace mwmp;
+using namespace std;
+
+std::map<RakNet::RakNetGUID, DedicatedPlayer *> Players::players;
+
+DedicatedPlayer::DedicatedPlayer(RakNet::RakNetGUID guid) : BasePlayer(guid)
+{
+    attack.pressed = 0;
+    creatureStats.mDead = false;
+    movementFlags = 0;
+}
+DedicatedPlayer::~DedicatedPlayer()
+{
+
+}
+
+MWWorld::Ptr DedicatedPlayer::getPtr()
+{
+    return ptr;
+}
+
+void Players::createPlayer(RakNet::RakNetGUID guid)
+{
+    LOG_APPEND(Log::LOG_INFO, "%s", "- Setting up character info");
+
+    MWBase::World *world = MWBase::Environment::get().getWorld();
+    MWWorld::Ptr player = world->getPlayerPtr();
+
+    ESM::NPC npc = *player.get<ESM::NPC>()->mBase;
+    DedicatedPlayer *dedicPlayer = players[guid];
+
+    npc.mRace = dedicPlayer->npc.mRace;
+    npc.mHead = dedicPlayer->npc.mHead;
+    npc.mHair = dedicPlayer->npc.mHair;
+    npc.mClass = dedicPlayer->npc.mClass;
+    npc.mName = dedicPlayer->npc.mName;
+    npc.mFlags = dedicPlayer->npc.mFlags;
+
+    if (dedicPlayer->state == 0)
+    {
+        npc.mId = "Dedicated Player";
+
+        std::string recid = world->createRecord(npc)->mId;
+
+        dedicPlayer->reference = new MWWorld::ManualRef(world->getStore(), recid, 1);
+    }
+
+    // Temporarily spawn or move player to exterior 0,0 whenever setting base info
+    ESM::Position spawnPos;
+    spawnPos.pos[0] = spawnPos.pos[1] = spawnPos.pos[2] = 0;
+    MWWorld::CellStore *cellStore = world->getExterior(0, 0);
+
+    if (dedicPlayer->state == 0)
+    {
+        LOG_APPEND(Log::LOG_INFO, "- Creating new reference pointer for %s",
+            dedicPlayer->npc.mName.c_str());
+
+        MWWorld::Ptr tmp = world->placeObject(dedicPlayer->reference->getPtr(), cellStore, spawnPos);
+
+        dedicPlayer->ptr.mCell = tmp.mCell;
+        dedicPlayer->ptr.mRef = tmp.mRef;
+
+        dedicPlayer->cell = *dedicPlayer->ptr.getCell()->getCell();
+        dedicPlayer->position = dedicPlayer->ptr.getRefData().getPosition();
+    }
+    else
+    {
+        LOG_APPEND(Log::LOG_INFO, "- Updating reference pointer for %s",
+            dedicPlayer->npc.mName.c_str());
+
+        dedicPlayer->ptr.getBase()->canChangeCell = true;
+        dedicPlayer->updatePtr(world->moveObject(dedicPlayer->ptr, cellStore, spawnPos.pos[0], spawnPos.pos[1], spawnPos.pos[2]));
+
+        npc.mId = players[guid]->ptr.get<ESM::NPC>()->mBase->mId;
+
+        MWWorld::ESMStore *store = const_cast<MWWorld::ESMStore *>(&world->getStore());
+        MWWorld::Store<ESM::NPC> *esm_store = const_cast<MWWorld::Store<ESM::NPC> *> (&store->get<ESM::NPC>());
+
+        esm_store->insert(npc);
+
+        dedicPlayer->updateCell();
+
+        ESM::CustomMarker mEditingMarker = Main::get().getGUIController()->CreateMarker(guid);
+        dedicPlayer->marker = mEditingMarker;
+        dedicPlayer->setMarkerState(true);
+    }
+
+    dedicPlayer->guid = guid;
+    dedicPlayer->state = 2;
+
+    // Give this new character a fatigue of at least 1 so it doesn't spawn
+    // on the ground
+    dedicPlayer->creatureStats.mDynamic[2].mBase = 1;
+
+    world->enable(players[guid]->ptr);
+}
+
+
+void Players::cleanUp()
+{
+    for (std::map <RakNet::RakNetGUID, DedicatedPlayer *>::iterator it = players.begin(); it != players.end(); it++)
+        delete it->second;
+}
+
+void Players::disconnectPlayer(RakNet::RakNetGUID guid)
+{
+    if (players[guid]->state > 1)
+    {
+        players[guid]->state = 1;
+
+        // Remove player's marker
+        players[guid]->setMarkerState(false);
+
+        MWBase::World *world = MWBase::Environment::get().getWorld();
+        world->disable(players[guid]->getPtr());
+
+        // Move player to exterior 0,0
+        ESM::Position newPos;
+        newPos.pos[0] = newPos.pos[1] = newPos.pos[2] = 0;
+        MWWorld::CellStore *cellStore = world->getExterior(0, 0);
+
+        players[guid]->getPtr().getBase()->canChangeCell = true;
+        world->moveObject(players[guid]->getPtr(), cellStore, newPos.pos[0], newPos.pos[1], newPos.pos[2]);
+    }
+}
+
+DedicatedPlayer *Players::getPlayer(RakNet::RakNetGUID guid)
+{
+    return players[guid];
+}
+
+MWWorld::Ptr DedicatedPlayer::getLiveCellPtr()
+{
+    return reference->getPtr();
+}
+
+MWWorld::ManualRef *DedicatedPlayer::getRef()
+{
+    return reference;
+}
+
+ESM::Position Slerp(ESM::Position start, ESM::Position end, float percent)
+{
+    // dot product - the cosine of the angle between 2 vectors.
+    float dot = start.asVec3() * end.asVec3();
+    // clamp it to be in the range of Acos()
+    // This may be unnecessary, but floating point
+    // precision can be a fickle mistress.
+    dot = boost::algorithm::clamp(dot, -1.0f, 1.0f);
+    // acos(dot) returns the angle between start and end,
+    // And multiplying that by percent returns the angle between
+    // start and the final result.
+    float theta = acos(dot) * percent;
+    osg::Vec3f relativeVec = end.asVec3() - start.asVec3() * dot;
+    relativeVec.normalize(); // Orthonormal basis
+
+    // result
+    osg::Vec3f tmp ((start.asVec3() * cos(theta)) + (relativeVec * sin(theta)));
+    ESM::Position result;
+
+    result.pos[0] = tmp.x();
+    result.pos[1] = tmp.y();
+    result.pos[2] = tmp.z();
+
+    result.rot[0] = start.rot[0];
+    result.rot[1] = start.rot[1];
+    result.rot[2] = result.rot[2];
+    return result;
+}
+
+osg::Vec3f Lerp(osg::Vec3f start, osg::Vec3f end, float percent)
+{
+    osg::Vec3f p(percent, percent, percent);
+
+    return (start + osg::componentMultiply(p, (end - start)));
+}
+
+void DedicatedPlayer::move(float dt)
+{
+    if (state != 2) return;
+
+    ESM::Position refPos = ptr.getRefData().getPosition();
+    MWBase::World *world = MWBase::Environment::get().getWorld();
+
+
+    {
+        osg::Vec3f lerp = Lerp(refPos.asVec3(), position.asVec3(), dt * 15);
+        refPos.pos[0] = lerp.x();
+        refPos.pos[1] = lerp.y();
+        refPos.pos[2] = lerp.z();
+        world->moveObject(ptr, refPos.pos[0], refPos.pos[1], refPos.pos[2]);
+    }
+
+    MWMechanics::Movement *move = &ptr.getClass().getMovementSettings(ptr);
+    move->mPosition[0] = direction.pos[0];
+    move->mPosition[1] = direction.pos[1];
+    move->mPosition[2] = direction.pos[2];
+
+    world->rotateObject(ptr, position.rot[0], position.rot[1], position.rot[2]);
+}
+
+void Players::update(float dt)
+{
+    for (std::map <RakNet::RakNetGUID, DedicatedPlayer *>::iterator it = players.begin(); it != players.end(); it++)
+    {
+        DedicatedPlayer *pl = it->second;
+        if (pl == 0) continue;
+
+        MWMechanics::NpcStats *ptrNpcStats = &pl->ptr.getClass().getNpcStats(pl->getPtr());
+
+        MWMechanics::DynamicStat<float> value;
+
+        if (pl->creatureStats.mDead)
+        {
+            value.readState(pl->creatureStats.mDynamic[0]);
+            ptrNpcStats->setHealth(value);
+            continue;
+        }
+
+        value.readState(pl->creatureStats.mDynamic[0]);
+        ptrNpcStats->setHealth(value);
+        value.readState(pl->creatureStats.mDynamic[1]);
+        ptrNpcStats->setMagicka(value);
+        value.readState(pl->creatureStats.mDynamic[2]);
+        ptrNpcStats->setFatigue(value);
+
+        if (ptrNpcStats->isDead())
+            ptrNpcStats->resurrect();
+
+
+        ptrNpcStats->setAttacked(false);
+
+        ptrNpcStats->getAiSequence().stopCombat();
+
+        ptrNpcStats->setAlarmed(false);
+        ptrNpcStats->setAiSetting(MWMechanics::CreatureStats::AI_Alarm, 0);
+        ptrNpcStats->setAiSetting(MWMechanics::CreatureStats::AI_Fight, 0);
+        ptrNpcStats->setAiSetting(MWMechanics::CreatureStats::AI_Flee, 0);
+        ptrNpcStats->setAiSetting(MWMechanics::CreatureStats::AI_Hello, 0);
+
+        ptrNpcStats->setBaseDisposition(255);
+        pl->move(dt);
+        pl->updateDrawState();
+    }
+}
+
+void DedicatedPlayer::updatePtr(MWWorld::Ptr newPtr)
+{
+    ptr.mCell = newPtr.mCell;
+    ptr.mRef = newPtr.mRef;
+    ptr.mContainerStore = newPtr.mContainerStore;
+
+    // Disallow this player's reference from moving across cells until
+    // the correct packet is sent by the player
+    ptr.getBase()->canChangeCell = false;
+}
+
+
+DedicatedPlayer *Players::newPlayer(RakNet::RakNetGUID guid)
+{
+    LOG_APPEND(Log::LOG_INFO, "- Creating new DedicatedPlayer with guid %lu",
+        guid.g);
+
+    players[guid] = new DedicatedPlayer(guid);
+    players[guid]->state = 0;
+    return players[guid];
+}
+
+void DedicatedPlayer::updateEquipment()
+{
+    MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
+    for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+    {
+        MWWorld::ContainerStoreIterator it = invStore.getSlot(slot);
+
+        const string &dedicItem = equipedItems[slot].refId;
+        std::string item = "";
+        bool equal = false;
+        if (it != invStore.end())
+        {
+            item = it->getCellRef().getRefId();
+            if (!Misc::StringUtils::ciEqual(item, dedicItem)) // if other item equiped
+            {
+                MWWorld::ContainerStore &store = ptr.getClass().getContainerStore(ptr);
+                store.remove(item, store.count(item), ptr);
+            }
+            else
+                equal = true;
+        }
+
+        if (dedicItem.empty() || equal)
+            continue;
+
+        const int count = equipedItems[slot].count;
+        ptr.getClass().getContainerStore(ptr).add(dedicItem, count, ptr);
+
+        for (MWWorld::ContainerStoreIterator it2 = invStore.begin(); it2 != invStore.end(); ++it2)
+        {
+            if (::Misc::StringUtils::ciEqual(it2->getCellRef().getRefId(), dedicItem)) // equip item
+            {
+                boost::shared_ptr<MWWorld::Action> action = it2->getClass().use(*it2);
+                action->execute(ptr);
+                break;
+            }
+        }
+    }
+}
+
+const std::string DedicatedPlayer::getAnim()
+{
+    static string anim;
+    static string animDir;
+    static string animWeap;
+
+    MWMechanics::NpcStats *npcStats = &ptr.getClass().getNpcStats(ptr);
+
+    if (movementFlags & MWMechanics::CreatureStats::Flag_Run)
+        anim = "run";
+    else if (movementFlags & MWMechanics::CreatureStats::Flag_Sneak)
+        anim = "sneak";
+    else
+        anim = "walk";
+
+    if (movementAnim != 0)
+    {
+
+        if (movementAnim == 3)
+            animDir = "forward";
+        else if (movementAnim == 4)
+            animDir = "back";
+        else if (movementAnim == 2)
+            animDir = "left";
+        else if (movementAnim == 1)
+            animDir = "right";
+    }
+    else
+    {
+        anim = "idle";
+        animDir = "";
+    }
+
+    if (npcStats->getDrawState() == MWMechanics::DrawState_Weapon)
+    {
+        MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
+        MWWorld::ContainerStoreIterator weaponSlot = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+
+        if (weaponSlot != invStore.end() && weaponSlot->getTypeName() == typeid(ESM::Weapon).name())
+        {
+            int type = weaponSlot->get<ESM::Weapon>()->mBase->mData.mType;
+            if (type == ESM::Weapon::ShortBladeOneHand ||
+                type == ESM::Weapon::LongBladeOneHand ||
+                type == ESM::Weapon::BluntOneHand ||
+                type == ESM::Weapon::AxeOneHand /*||
+                type == ESM::Weapon::MarksmanThrown ||
+                type == ESM::Weapon::MarksmanCrossbow ||
+                type == ESM::Weapon::MarksmanBow*/)
+                animWeap = "1h";
+            else if (type == ESM::Weapon::LongBladeTwoHand ||
+                    type == ESM::Weapon::BluntTwoClose ||
+                    type == ESM::Weapon::AxeTwoHand)
+                animWeap = "2c";
+            else if (type == ESM::Weapon::BluntTwoWide ||
+                    type == ESM::Weapon::SpearTwoWide)
+                animWeap = "2w";
+        }
+        else
+            animWeap = "hh";
+    }
+    else if (movementAnim == 0 && npcStats->getDrawState() == MWMechanics::DrawState_Spell)
+        animWeap = "spell";
+    else
+        animWeap = "";
+
+    return (anim + animDir + animWeap);
+}
+
+DedicatedPlayer *Players::getPlayer(const MWWorld::Ptr &ptr)
+{
+    std::map <RakNet::RakNetGUID, DedicatedPlayer *>::iterator it = players.begin();
+
+    for (; it != players.end(); it++)
+    {
+        if (it->second == 0 || it->second->getPtr().mRef == 0)
+            continue;
+        string refid = ptr.getCellRef().getRefId();
+        if (it->second->getPtr().getCellRef().getRefId() == refid)
+            return it->second;
+    }
+    return 0;
+}
+
+void DedicatedPlayer::updateDrawState()
+{
+
+    using namespace MWMechanics;
+    if (drawState == 0)
+        ptr.getClass().getNpcStats(ptr).setDrawState(DrawState_Nothing);
+    else if (drawState == 1)
+        ptr.getClass().getNpcStats(ptr).setDrawState(DrawState_Weapon);
+    else if (drawState == 2)
+        ptr.getClass().getNpcStats(ptr).setDrawState(DrawState_Spell);
+
+    MWMechanics::NpcStats *ptrNpcStats = &ptr.getClass().getNpcStats(ptr);
+    ptrNpcStats->setMovementFlag(CreatureStats::Flag_Run, (movementFlags & CreatureStats::Flag_Run) != 0);
+    ptrNpcStats->setMovementFlag(CreatureStats::Flag_Sneak, (movementFlags & CreatureStats::Flag_Sneak) != 0);
+    ptrNpcStats->setMovementFlag(CreatureStats::Flag_ForceJump, (movementFlags & CreatureStats::Flag_ForceJump) != 0);
+    ptrNpcStats->setMovementFlag(CreatureStats::Flag_ForceMoveJump, (movementFlags & CreatureStats::Flag_ForceMoveJump) != 0);
+}
+
+void DedicatedPlayer::updateCell()
+{
+    // Prevent cell update when player hasn't been instantiated yet
+    if (state == 0)
+        return;
+
+    MWBase::World *world = MWBase::Environment::get().getWorld();
+    MWWorld::CellStore *cellStore;
+
+
+    LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Server says %s (%s) moved to %s",
+        ptr.getBase()->mRef.getRefId().c_str(),
+        this->npc.mName.c_str(),
+        cell.getDescription().c_str());
+
+    try
+    {
+        if (cell.isExterior())
+            cellStore = world->getExterior(cell.mData.mX, cell.mData.mY);
+        else
+            cellStore = world->getInterior(cell.mName);
+    }
+    // If the intended cell doesn't exist on this client, use ToddTest as a replacement
+    catch (std::exception&)
+    {
+        cellStore = world->getInterior("ToddTest");
+        LOG_APPEND(Log::LOG_INFO, "%s", "- Cell doesn't exist on this client");
+    }
+
+    if (!cellStore) return;
+
+    // Allow this player's reference to move across a cell now that a manual cell
+    // update has been called
+    ptr.getBase()->canChangeCell = true;
+    updatePtr(world->moveObject(ptr, cellStore, position.pos[0], position.pos[1], position.pos[2]));
+}
+
+
+void DedicatedPlayer::updateMarker()
+{
+    if (!markerEnabled)
+        return;
+
+    GUIController *gui = Main::get().getGUIController();
+
+    if (gui->mPlayerMarkers.contains(marker))
+    {
+        gui->mPlayerMarkers.deleteMarker(marker);
+        marker = gui->CreateMarker(guid);
+        gui->mPlayerMarkers.addMarker(marker);
+    }
+    else
+        gui->mPlayerMarkers.addMarker(marker, true);
+}
+
+void DedicatedPlayer::removeMarker()
+{
+    if (!markerEnabled)
+        return;
+
+    markerEnabled = false;
+    Main::get().getGUIController()->mPlayerMarkers.deleteMarker(marker);
+}
+
+void DedicatedPlayer::setMarkerState(bool state)
+{
+    if (state)
+    {
+        markerEnabled = true;
+        updateMarker();
+    }
+    else
+        removeMarker();
+}
+
+void DedicatedPlayer::updateActor(MWMechanics::Actor *actor)
+{
+    actor->getCharacterController()->setAttackingOrSpell(attack.pressed);
+}
diff --git a/apps/openmw/mwmp/DedicatedPlayer.hpp b/apps/openmw/mwmp/DedicatedPlayer.hpp
new file mode 100644
index 000000000..f9606f279
--- /dev/null
+++ b/apps/openmw/mwmp/DedicatedPlayer.hpp
@@ -0,0 +1,72 @@
+//
+// Created by koncord on 02.01.16.
+//
+
+#ifndef OPENMW_PLAYER_HPP
+#define OPENMW_PLAYER_HPP
+
+#include <components/esm/loadnpc.hpp>
+#include "../mwworld/manualref.hpp"
+#include <map>
+#include "../mwmechanics/aisequence.hpp"
+#include <RakNetTypes.h>
+
+#include <components/openmw-mp/Base/BasePlayer.hpp>
+#include <components/esm/custommarkerstate.hpp>
+
+namespace MWMechanics
+{
+    class Actor;
+}
+
+namespace mwmp
+{
+    struct DedicatedPlayer;
+
+    class Players
+    {
+    public:
+        static DedicatedPlayer *newPlayer(RakNet::RakNetGUID guid);
+        static void createPlayer(RakNet::RakNetGUID guid);
+        static void disconnectPlayer(RakNet::RakNetGUID guid);
+        static void cleanUp();
+        static DedicatedPlayer *getPlayer(RakNet::RakNetGUID guid);
+        static DedicatedPlayer *getPlayer(const MWWorld::Ptr &ptr);
+        static void update(float dt);
+    private:
+        static std::map<RakNet::RakNetGUID, DedicatedPlayer *> players;
+    };
+
+    class DedicatedPlayer : public BasePlayer
+    {
+        friend class Players;
+    public:
+
+        MWWorld::Ptr getPtr();
+        MWWorld::Ptr getLiveCellPtr();
+        MWWorld::ManualRef* getRef();
+        void move(float dt);
+        void updateDrawState();
+        void updateEquipment();
+
+        void updateCell();
+
+        void updateMarker();
+        void removeMarker();
+        void setMarkerState(bool state);
+        void updateActor(MWMechanics::Actor *actor);
+    private:
+        DedicatedPlayer(RakNet::RakNetGUID guid);
+        virtual ~DedicatedPlayer();
+        void updatePtr(MWWorld::Ptr newPtr);
+        const std::string getAnim();
+        int state;
+        MWWorld::ManualRef* reference;
+
+        MWWorld::Ptr ptr;
+
+        ESM::CustomMarker marker;
+        bool markerEnabled;
+    };
+}
+#endif //OPENMW_PLAYER_HPP
diff --git a/apps/openmw/mwmp/GUIChat.cpp b/apps/openmw/mwmp/GUIChat.cpp
new file mode 100644
index 000000000..79b9a079b
--- /dev/null
+++ b/apps/openmw/mwmp/GUIChat.cpp
@@ -0,0 +1,244 @@
+//
+// Created by koncord on 04.03.16.
+//
+
+#include "GUIChat.hpp"
+
+#include <MyGUI_EditBox.h>
+#include "../mwbase/environment.hpp"
+#include "../mwgui/windowmanagerimp.hpp"
+#include "../mwinput/inputmanagerimp.hpp"
+#include <MyGUI_InputManager.h>
+#include <components/openmw-mp/Log.hpp>
+
+#include "Networking.hpp"
+#include "Main.hpp"
+#include "LocalPlayer.hpp"
+
+#include "GUIController.hpp"
+
+
+namespace mwmp
+{
+    GUIChat::GUIChat(int x, int y, int w, int h)
+            : WindowBase("openmw_console.layout")
+    {
+        setCoord(x, y, w, h);
+
+        getWidget(mCommandLine, "edit_Command");
+        getWidget(mHistory, "list_History");
+
+        // Set up the command line box
+        mCommandLine->eventEditSelectAccept +=
+                newDelegate(this, &GUIChat::acceptCommand);
+        mCommandLine->eventKeyButtonPressed +=
+                newDelegate(this, &GUIChat::keyPress);
+
+        setTitle("Chat");
+
+        mHistory->setOverflowToTheLeft(true);
+        mHistory->setEditWordWrap(true);
+
+        windowState = 0;
+        mCommandLine->setVisible(0);
+        delay = 3; // 3 sec.
+    }
+
+    void GUIChat::open()
+    {
+        // Give keyboard focus to the combo box whenever the console is
+        // turned on
+        SetEditState(0);
+        windowState = CHAT_ENABLED;
+    }
+
+    void GUIChat::close()
+    {
+        // Apparently, hidden widgets can retain key focus
+        // Remove for MyGUI 3.2.2
+        windowState = CHAT_DISABLED;
+        SetEditState(0);
+    }
+
+    void GUIChat::exit()
+    {
+        //WindowBase::exit();
+    }
+
+    void GUIChat::acceptCommand(MyGUI::EditBox *_sender)
+    {
+        const std::string &cm = mCommandLine->getOnlyText();
+        
+        // If they enter nothing, then it should be canceled.
+        // Otherwise, there's no way of closing without having text.
+        if (cm.empty())
+        {
+            mCommandLine->setCaption("");
+            SetEditState(0);
+            return;
+        }
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Player: %s", cm.c_str());
+
+        // Add the command to the history, and set the current pointer to
+        // the end of the list
+        if (mCommandHistory.empty() || mCommandHistory.back() != cm)
+            mCommandHistory.push_back(cm);
+        mCurrent = mCommandHistory.end();
+        mEditString.clear();
+
+        // Reset the command line before the command execution.
+        // It prevents the re-triggering of the acceptCommand() event for the same command
+        // during the actual command execution
+        mCommandLine->setCaption("");
+        SetEditState(0);
+        send (cm);
+    }
+
+    void GUIChat::onResChange(int width, int height)
+    {
+        setCoord(10,10, width-10, height/2);
+    }
+
+    void GUIChat::setFont(const std::string &fntName)
+    {
+        mHistory->setFontName(fntName);
+        mCommandLine->setFontName(fntName);
+    }
+
+    void GUIChat::print(const std::string &msg, const std::string &color)
+    {
+        if (windowState == 2 && !isVisible())
+        {
+            setVisible(true);
+        }
+        mHistory->addText(color + MyGUI::TextIterator::toTagsString(msg));
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, msg.c_str());
+    }
+
+    void GUIChat::printOK(const std::string &msg)
+    {
+        print(msg + "\n", "#FF00FF");
+    }
+
+    void GUIChat::printError(const std::string &msg)
+    {
+        print(msg + "\n", "#FF2222");
+    }
+
+    void GUIChat::send(const std::string &str)
+    {
+        LocalPlayer *localPlayer = Main::get().getLocalPlayer();
+
+        Networking *networking = Main::get().getNetworking();
+
+        localPlayer->chatMessage = str;
+
+        RakNet::BitStream bs;
+        networking->getPlayerPacket(ID_CHAT_MESSAGE)->Packet(&bs, localPlayer, true);
+        networking->sendData(&bs);
+    }
+
+    void GUIChat::clean()
+    {
+        mHistory->clearUserStrings();
+    }
+
+    void GUIChat::pressedChatMode()
+    {
+        windowState++;
+        if (windowState == 3) windowState = 0;
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Switch chat mode to %s", windowState == CHAT_DISABLED ? "CHAT_DISABLED" :
+                                                                       windowState == CHAT_ENABLED ? "CHAT_ENABLED" :
+                                                                       "CHAT_HIDDENMODE");
+        switch (windowState)
+        {
+            case CHAT_DISABLED:
+                this->mMainWidget->setVisible(false);
+                SetEditState(0);
+                break;
+            case CHAT_ENABLED:
+                this->mMainWidget->setVisible(true);
+                break;
+            default: //CHAT_HIDDENMODE
+                this->mMainWidget->setVisible(true);
+                curTime = 0;
+        }
+    }
+
+    void GUIChat::SetEditState(bool state)
+    {
+        editState = state;
+        mCommandLine->setVisible(editState);
+        MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(editState ? mCommandLine : nullptr);
+    }
+
+    void GUIChat::pressedSay()
+    {
+        if (windowState == CHAT_DISABLED)
+            return;
+        else if (windowState == CHAT_HIDDENMODE)
+        {
+            setVisible(true);
+            curTime = 0;
+            editState = true;
+        }
+        else // CHAT_ENABLED
+            editState = true;
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Opening chat.");
+        SetEditState(editState);
+    }
+
+    void GUIChat::keyPress(MyGUI::Widget *_sender, MyGUI::KeyCode key, MyGUI::Char _char)
+    {
+        if (mCommandHistory.empty()) return;
+
+        // Traverse history with up and down arrows
+        if (key == MyGUI::KeyCode::ArrowUp)
+        {
+            // If the user was editing a string, store it for later
+            if (mCurrent == mCommandHistory.end())
+                mEditString = mCommandLine->getOnlyText();
+
+            if (mCurrent != mCommandHistory.begin())
+            {
+                --mCurrent;
+                mCommandLine->setCaption(*mCurrent);
+            }
+        }
+        else if (key == MyGUI::KeyCode::ArrowDown)
+        {
+            if (mCurrent != mCommandHistory.end())
+            {
+                ++mCurrent;
+
+                if (mCurrent != mCommandHistory.end())
+                    mCommandLine->setCaption(*mCurrent);
+                else
+                    // Restore the edit string
+                    mCommandLine->setCaption(mEditString);
+            }
+        }
+
+    }
+
+    void GUIChat::Update(float dt)
+    {
+        if (windowState == CHAT_HIDDENMODE && !editState && isVisible())
+        {
+            curTime += dt;
+            if (curTime >= delay)
+            {
+                SetEditState(false);
+                this->mMainWidget->setVisible(false);
+            }
+        }
+    }
+
+    void GUIChat::setDelay(float delay)
+    {
+        this->delay = delay;
+    }
+}
diff --git a/apps/openmw/mwmp/GUIChat.hpp b/apps/openmw/mwmp/GUIChat.hpp
new file mode 100644
index 000000000..d9a58a9ee
--- /dev/null
+++ b/apps/openmw/mwmp/GUIChat.hpp
@@ -0,0 +1,90 @@
+//
+// Created by koncord on 04.03.16.
+//
+
+#ifndef OPENMW_GUICHAT_HPP
+#define OPENMW_GUICHAT_HPP
+
+#include <list>
+#include <string>
+#include <vector>
+
+#include "../mwgui/windowbase.hpp"
+
+namespace mwmp
+{
+    class GUIController;
+    class GUIChat : public MWGui::WindowBase
+    {
+        friend class GUIController;
+    public:
+        enum
+        {
+            CHAT_DISABLED = 0,
+            CHAT_ENABLED,
+            CHAT_HIDDENMODE
+        } CHAT_WIN_STATE;
+
+        MyGUI::EditBox* mCommandLine;
+        MyGUI::EditBox* mHistory;
+
+        typedef std::list<std::string> StringList;
+
+        // History of previous entered commands
+        StringList mCommandHistory;
+        StringList::iterator mCurrent;
+        std::string mEditString;
+
+        GUIChat(int x, int y, int w, int h);
+
+        void pressedChatMode(); //switch chat mode
+        void pressedSay(); // switch chat focus (if chat mode != CHAT_DISABLED)
+        void setDelay(float delay);
+
+        void Update(float dt);
+
+
+        virtual void open();
+        virtual void close();
+
+        virtual void exit();
+
+        void setFont(const std::string &fntName);
+
+        void onResChange(int width, int height);
+
+        // Print a message to the console, in specified color.
+        void print(const std::string &msg, const std::string& color = "#FFFFFF");
+
+        // Clean chat
+        void clean();
+
+        // These are pre-colored versions that you should use.
+
+        /// Output from successful console command
+        void printOK(const std::string &msg);
+
+        /// Error message
+        void printError(const std::string &msg);
+
+        void send(const std::string &str);
+
+    protected:
+
+    private:
+
+        void keyPress(MyGUI::Widget* _sender,
+                      MyGUI::KeyCode key,
+                      MyGUI::Char _char);
+
+        void acceptCommand(MyGUI::EditBox* _sender);
+
+        void SetEditState(bool state);
+
+        int windowState;
+        bool editState;
+        float delay;
+        float curTime;
+    };
+}
+#endif //OPENMW_GUICHAT_HPP
diff --git a/apps/openmw/mwmp/GUIController.cpp b/apps/openmw/mwmp/GUIController.cpp
new file mode 100644
index 000000000..fb96e2048
--- /dev/null
+++ b/apps/openmw/mwmp/GUIController.cpp
@@ -0,0 +1,387 @@
+//
+// Created by koncord on 20.07.16.
+//
+
+#include <SDL_system.h>
+#include <MyGUI_InputManager.h>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/inputmanager.hpp"
+#include "../mwworld/worldimp.hpp"
+#include "../mwworld/player.hpp"
+#include "../mwworld/cellstore.hpp"
+
+#include <components/openmw-mp/Base/BasePlayer.hpp>
+#include <MyGUI_ScrollView.h>
+#include <MyGUI_ImageBox.h>
+#include <MyGUI_RenderManager.h>
+#include <MyGUI_Gui.h>
+#include <MyGUI_LanguageManager.h>
+#include <MyGUI_InputManager.h>
+#include <MyGUI_RotatingSkin.h>
+#include <MyGUI_FactoryManager.h>
+#include "../mwgui/mapwindow.hpp"
+#include <MyGUI_TextIterator.h>
+#include <components/openmw-mp/Log.hpp>
+
+
+#include "GUIController.hpp"
+#include "Main.hpp"
+#include "PlayerMarkerCollection.hpp"
+#include "LocalPlayer.hpp"
+#include "Networking.hpp"
+#include "DedicatedPlayer.hpp"
+#include "GUIDialogList.hpp"
+#include "GUIChat.hpp"
+
+
+mwmp::GUIController::GUIController(): mInputBox(0), mListBox(0)
+{
+    mChat = nullptr;
+    keySay = SDL_SCANCODE_Y;
+    keyChatMode = SDL_SCANCODE_F2;
+    calledMessageBox = false;
+}
+
+mwmp::GUIController::~GUIController()
+{
+
+}
+
+void mwmp::GUIController::cleanUp()
+{
+    mPlayerMarkers.clear();
+    if (mChat != nullptr)
+        delete mChat;
+    mChat = nullptr;
+}
+
+void mwmp::GUIController::setupChat(const Settings::Manager &mgr)
+{
+    assert(mChat == nullptr);
+
+    float chatDelay = mgr.getFloat("delay", "Chat");
+    int chatY = mgr.getInt("y", "Chat");
+    int chatX = mgr.getInt("x", "Chat");
+    int chatW = mgr.getInt("w", "Chat");
+    int chatH = mgr.getInt("h", "Chat");
+
+    keySay =      SDL_GetScancodeFromName(mgr.getString("keySay", "Chat").c_str());
+    keyChatMode = SDL_GetScancodeFromName(mgr.getString("keyChatMode", "Chat").c_str());
+
+    mChat = new GUIChat(chatX, chatY, chatW, chatH);
+    mChat->setDelay(chatDelay);
+}
+
+void mwmp::GUIController::printChatMessage(std::string &msg)
+{
+    if (mChat != nullptr)
+        mChat->print(msg);
+}
+
+
+void mwmp::GUIController::setChatVisible(bool chatVisible)
+{
+    mChat->setVisible(chatVisible);
+}
+
+void mwmp::GUIController::showDialogList(const mwmp::BasePlayer::GUIMessageBox &guiMessageBox)
+{
+    MWBase::WindowManager *windowManager = MWBase::Environment::get().getWindowManager();
+    windowManager->removeDialog(mListBox);
+    mListBox = NULL;
+
+    std::vector<std::string> list;
+
+    std::string buf;
+
+    for(size_t i = 0; i < guiMessageBox.data.size(); i++)
+    {
+        if(guiMessageBox.data[i] == '\n')
+        {
+            list.push_back(buf);
+            buf.erase();
+            continue;
+        }
+        buf += guiMessageBox.data[i];
+    }
+
+    list.push_back(buf);
+
+    mListBox = new GUIDialogList(guiMessageBox.label, list);
+    windowManager->pushGuiMode((MWGui::GuiMode)GM_TES3MP_ListBox);
+}
+
+void mwmp::GUIController::showMessageBox(const BasePlayer::GUIMessageBox &guiMessageBox)
+{
+    MWBase::WindowManager *windowManager = MWBase::Environment::get().getWindowManager();
+    std::vector<std::string> buttons;
+    buttons.push_back("Ok");
+    windowManager->interactiveMessageBox(guiMessageBox.label, buttons);
+    calledMessageBox = true;
+}
+
+std::vector<std::string> splitString(const std::string &str, char delim = ';')
+{
+    std::istringstream ss(str);
+    std::vector<std::string> result;
+    std::string token;
+    while (std::getline(ss, token, delim))
+        result.push_back(token);
+    return result;
+}
+
+void mwmp::GUIController::showCustomMessageBox(const BasePlayer::GUIMessageBox &guiMessageBox)
+{
+    MWBase::WindowManager *windowManager = MWBase::Environment::get().getWindowManager();
+    std::vector<std::string> buttons = splitString(guiMessageBox.buttons);
+    windowManager->interactiveMessageBox(guiMessageBox.label, buttons);
+    calledMessageBox = true;
+}
+
+void mwmp::GUIController::showInputBox(const BasePlayer::GUIMessageBox &guiMessageBox)
+{
+    MWBase::WindowManager *windowManager = MWBase::Environment::get().getWindowManager();
+
+    windowManager->removeDialog(mInputBox);
+    windowManager->pushGuiMode((MWGui::GuiMode)GM_TES3MP_InputBox);
+    mInputBox = 0;
+    mInputBox = new MWGui::TextInputDialog();
+    mInputBox->setTextLabel(guiMessageBox.label);
+    mInputBox->eventDone += MyGUI::newDelegate(this, &GUIController::onInputBoxDone);
+
+}
+
+void mwmp::GUIController::onInputBoxDone(MWGui::WindowBase *parWindow)
+{
+    //MWBase::WindowManager *windowManager = MWBase::Environment::get().getWindowManager();
+    LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "GUIController::OnInputBoxDone: %s.",mInputBox->getTextInput().c_str());
+
+    Main::get().getLocalPlayer()->guiMessageBox.data = mInputBox->getTextInput();
+    Main::get().getNetworking()->getPlayerPacket(ID_GUI_MESSAGEBOX)->Send(Main::get().getLocalPlayer());
+
+    MWBase::Environment::get().getWindowManager()->removeDialog(mInputBox);
+    mInputBox = 0;
+    MWBase::Environment::get().getWindowManager()->popGuiMode();
+}
+
+bool mwmp::GUIController::pressedKey(int key)
+{
+    MWBase::WindowManager *windowManager = MWBase::Environment::get().getWindowManager();
+    if (mChat == nullptr || windowManager->getMode() != MWGui::GM_None)
+        return false;
+    if (key == keyChatMode)
+    {
+        mChat->pressedChatMode();
+        return true;
+    }
+    else if (key == keySay)
+    {
+        mChat->pressedSay();
+        return true;
+    }
+    return false;
+}
+
+bool mwmp::GUIController::hasFocusedElement()
+{
+    return false;
+}
+
+
+void mwmp::GUIController::update(float dt)
+{
+    if (mChat != nullptr)
+        mChat->Update(dt);
+
+    int pressedButton = MWBase::Environment::get().getWindowManager()->readPressedButton();
+    if (pressedButton != -1 && calledMessageBox)
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Pressed: %d", pressedButton);
+        calledMessageBox = false;
+        Main::get().getLocalPlayer()->guiMessageBox.data = MyGUI::utility::toString(pressedButton);
+        Main::get().getNetworking()->getPlayerPacket(ID_GUI_MESSAGEBOX)->Send(Main::get().getLocalPlayer());
+    }
+
+    blockConsole();
+
+}
+
+void mwmp::GUIController::WM_UpdateVisible(MWGui::GuiMode mode)
+{
+    switch((int)mode)
+    {
+        case GM_TES3MP_InputBox:
+        {
+            if (mInputBox != 0)
+                mInputBox->setVisible(true);
+            break;
+        }
+        case GM_TES3MP_ListBox:
+        {
+            if(mListBox != 0)
+                mListBox->setVisible(true);
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+class MarkerWidget: public MyGUI::Widget
+{
+MYGUI_RTTI_DERIVED(MarkerWidget)
+
+public:
+    void setNormalColour(const MyGUI::Colour& colour)
+    {
+        mNormalColour = colour;
+        setColour(colour);
+    }
+
+    void setHoverColour(const MyGUI::Colour& colour)
+    {
+        mHoverColour = colour;
+    }
+
+private:
+    MyGUI::Colour mNormalColour;
+    MyGUI::Colour mHoverColour;
+
+    void onMouseLostFocus(MyGUI::Widget* _new)
+    {
+        setColour(mNormalColour);
+    }
+
+    void onMouseSetFocus(MyGUI::Widget* _old)
+    {
+        setColour(mHoverColour);
+    }
+};
+
+ESM::CustomMarker mwmp::GUIController::CreateMarker(const RakNet::RakNetGUID &guid)
+{
+    DedicatedPlayer *player = Players::getPlayer(guid);
+    ESM::CustomMarker mEditingMarker;
+    if (!player)
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Unknown player guid: %lu", guid.g);
+        return mEditingMarker;
+    }
+
+    mEditingMarker.mNote = player->npc.mName;
+
+    const ESM::Cell *playerCell = &player->cell;
+
+    mEditingMarker.mCell = player->cell.mCellId;
+
+    mEditingMarker.mWorldX = player->position.pos[0];
+    mEditingMarker.mWorldY = player->position.pos[1];
+
+    mEditingMarker.mCell.mPaged = playerCell->isExterior();
+    if (!playerCell->isExterior())
+        mEditingMarker.mCell.mWorldspace = playerCell->mName;
+    else
+    {
+        mEditingMarker.mCell.mWorldspace = ESM::CellId::sDefaultWorldspace;
+
+        // Don't remove these, or the markers will stop showing up in exteriors
+        mEditingMarker.mCell.mIndex.mX = playerCell->getGridX();
+        mEditingMarker.mCell.mIndex.mY = playerCell->getGridY();
+    }
+    return mEditingMarker;
+}
+
+
+void mwmp::GUIController::updatePlayersMarkers(MWGui::LocalMapBase *localMapBase)
+{
+    std::vector<MyGUI::Widget*>::iterator it = localMapBase->mPlayerMarkerWidgets.begin();
+    for (; it != localMapBase->mPlayerMarkerWidgets.end(); ++it)
+        MyGUI::Gui::getInstance().destroyWidget(*it);
+    localMapBase->mPlayerMarkerWidgets.clear();
+
+    for (int dX = -localMapBase->mCellDistance; dX <= localMapBase->mCellDistance; ++dX)
+    {
+        for (int dY =-localMapBase->mCellDistance; dY <= localMapBase->mCellDistance; ++dY)
+        {
+            ESM::CellId cellId;
+            cellId.mPaged = !localMapBase->mInterior;
+            cellId.mWorldspace = (localMapBase->mInterior ? localMapBase->mPrefix : ESM::CellId::sDefaultWorldspace);
+            cellId.mIndex.mX = localMapBase->mCurX+dX;
+            cellId.mIndex.mY = localMapBase->mCurY+dY;
+
+            PlayerMarkerCollection::RangeType markers = mPlayerMarkers.getMarkers(cellId);
+            for (PlayerMarkerCollection::ContainerType::const_iterator it = markers.first; it != markers.second; ++it)
+            {
+                const ESM::CustomMarker &marker = it->second;
+
+                MWGui::LocalMapBase::MarkerUserData markerPos (localMapBase->mLocalMapRender);
+                MyGUI::IntPoint widgetPos = localMapBase->getMarkerPosition(marker.mWorldX, marker.mWorldY, markerPos);
+
+                MyGUI::IntCoord widgetCoord(widgetPos.left - 8, widgetPos.top - 8, 16, 16);
+                MarkerWidget* markerWidget = localMapBase->mLocalMap->createWidget<MarkerWidget>("CustomMarkerButton",
+                                                                                   widgetCoord, MyGUI::Align::Default);
+
+                markerWidget->setDepth(0); // Local_MarkerAboveFogLayer
+                markerWidget->setUserString("ToolTipType", "Layout");
+                markerWidget->setUserString("ToolTipLayout", "TextToolTipOneLine");
+                markerWidget->setUserString("Caption_TextOneLine", MyGUI::TextIterator::toTagsString(marker.mNote));
+                markerWidget->setNormalColour(MyGUI::Colour(0.6f, 0.6f, 0.6f));
+                markerWidget->setHoverColour(MyGUI::Colour(1.0f, 1.0f, 1.0f));
+                markerWidget->setUserData(marker);
+                markerWidget->setNeedMouseFocus(true);
+                //localMapBase->customMarkerCreated(markerWidget);
+                localMapBase->mPlayerMarkerWidgets.push_back(markerWidget);
+            }
+        }
+    }
+    localMapBase->redraw();
+}
+
+void mwmp::GUIController::setGlobalMapMarkerTooltip(MWGui::MapWindow *mapWindow, MyGUI::Widget *markerWidget, int x, int y)
+{
+    ESM::CellId cellId;
+    cellId.mIndex.mX = x;
+    cellId.mIndex.mY = y;
+    cellId.mWorldspace = ESM::CellId::sDefaultWorldspace;
+    cellId.mPaged = true;
+    PlayerMarkerCollection::RangeType markers = mPlayerMarkers.getMarkers(cellId);
+    std::vector<std::string> destNotes;
+    for (PlayerMarkerCollection::ContainerType::const_iterator it = markers.first; it != markers.second; ++it)
+        destNotes.push_back(it->second.mNote);
+
+    if (!destNotes.empty())
+    {
+        MWGui::LocalMapBase::MarkerUserData data (NULL);
+        data.notes = destNotes;
+        data.caption = markerWidget->getUserString("Caption_TextOneLine");
+
+        markerWidget->setUserData(data);
+        markerWidget->setUserString("ToolTipType", "MapMarker");
+    }
+    else
+        markerWidget->setUserString("ToolTipType", "Layout");
+}
+
+void mwmp::GUIController::updateGlobalMapMarkerTooltips(MWGui::MapWindow *mapWindow)
+{
+    std::map<std::pair<int, int>, MyGUI::Widget*>::iterator widgetIt = mapWindow->mGlobalMapMarkers.begin();
+    for (; widgetIt != mapWindow->mGlobalMapMarkers.end(); ++widgetIt)
+    {
+        int x = widgetIt->first.first;
+        int y = widgetIt->first.second;
+        MyGUI::Widget* markerWidget = widgetIt->second;
+        setGlobalMapMarkerTooltip(mapWindow, markerWidget, x, y);
+    }
+}
+
+void mwmp::GUIController::blockConsole()
+{
+    if (Main::get().getLocalPlayer()->consoleAllowed)
+        return;
+
+    if (MWBase::Environment::get().getWindowManager()->isGuiMode())
+        if (MWBase::Environment::get().getWindowManager()->getMode() == MWGui::GM_Console)
+            MWBase::Environment::get().getWindowManager()->popGuiMode();
+}
diff --git a/apps/openmw/mwmp/GUIController.hpp b/apps/openmw/mwmp/GUIController.hpp
new file mode 100644
index 000000000..898e63bb7
--- /dev/null
+++ b/apps/openmw/mwmp/GUIController.hpp
@@ -0,0 +1,81 @@
+//
+// Created by koncord on 20.07.16.
+//
+
+#ifndef OPENMW_GUICONTROLLER_HPP
+#define OPENMW_GUICONTROLLER_HPP
+
+#include <components/settings/settings.hpp>
+
+#include "../mwgui/textinput.hpp"
+#include "../mwgui/mode.hpp"
+
+#include <components/openmw-mp/Base/BasePlayer.hpp>
+#include "PlayerMarkerCollection.hpp"
+
+namespace MWGui
+{
+    class LocalMapBase;
+    class MapWindow;
+}
+
+namespace mwmp
+{
+    class GUIDialogList;
+    class GUIChat;
+    class GUIController
+    {
+    public:
+        enum GM
+        {
+            GM_TES3MP_InputBox = MWGui::GM_QuickKeysMenu + 1,
+            GM_TES3MP_ListBox
+
+        };
+        GUIController();
+        ~GUIController();
+        void cleanUp();
+        void setupChat(const Settings::Manager &manager);
+
+        void printChatMessage(std::string &msg);
+        void setChatVisible(bool chatVisible);
+
+        void showMessageBox(const BasePlayer::GUIMessageBox &guiMessageBox);
+        void showCustomMessageBox(const BasePlayer::GUIMessageBox &guiMessageBox);
+        void showInputBox(const BasePlayer::GUIMessageBox &guiMessageBox);
+
+        void showDialogList(const BasePlayer::GUIMessageBox &guiMessageBox);
+
+        /// Return true if any tes3mp gui element in active state
+        bool hasFocusedElement();
+        /// Returns 0 if there was no events
+        bool pressedKey(int key);
+
+        void update(float dt);
+
+        void WM_UpdateVisible(MWGui::GuiMode mode);
+
+        void updatePlayersMarkers(MWGui::LocalMapBase *localMapBase);
+        void updateGlobalMapMarkerTooltips(MWGui::MapWindow *pWindow);
+
+        ESM::CustomMarker CreateMarker(const RakNet::RakNetGUID &guid);
+        PlayerMarkerCollection mPlayerMarkers;
+    private:
+        void setGlobalMapMarkerTooltip(MWGui::MapWindow *mapWindow ,MyGUI::Widget* markerWidget, int x, int y);
+
+    private:
+        GUIChat *mChat;
+        int keySay;
+        int keyChatMode;
+
+        long id;
+        bool calledMessageBox;
+        MWGui::TextInputDialog *mInputBox;
+        GUIDialogList *mListBox;
+        void onInputBoxDone(MWGui::WindowBase* parWindow);
+        //MyGUI::Widget *oldFocusWidget, *currentFocusWidget;
+        void blockConsole();
+    };
+}
+
+#endif //OPENMW_GUICONTROLLER_HPP
diff --git a/apps/openmw/mwmp/GUIDialogList.cpp b/apps/openmw/mwmp/GUIDialogList.cpp
new file mode 100644
index 000000000..ea33c6d47
--- /dev/null
+++ b/apps/openmw/mwmp/GUIDialogList.cpp
@@ -0,0 +1,57 @@
+//
+// Created by koncord on 03.11.16.
+//
+
+#include "GUIDialogList.hpp"
+#include "Main.hpp"
+#include "LocalPlayer.hpp"
+#include "Networking.hpp"
+#include <MyGUI_EditBox.h>
+#include <MyGUI_Button.h>
+#include <MyGUI_ListBox.h>
+
+#include "../mwgui/windowmanagerimp.hpp"
+#include "../mwbase/environment.hpp"
+
+#include <components/openmw-mp/Log.hpp>
+
+using namespace mwmp;
+
+GUIDialogList::GUIDialogList(const std::string &message, const std::vector<std::string> &list) : WindowModal("tes3mp_dialog_list.layout")
+{
+    center(); // center window
+
+    getWidget(mListBox, "ListBox");
+    getWidget(mMessage, "Message");
+    getWidget(mButton, "OkButton");
+
+    mButton->eventMouseButtonClick += MyGUI::newDelegate(this, &GUIDialogList::mousePressed);
+
+    mMessage->setCaptionWithReplacing(message);
+    for(size_t i = 0; i < list.size(); i++)
+        mListBox->addItem(list[i]);
+
+}
+
+void GUIDialogList::mousePressed(MyGUI::Widget * /*widget*/)
+{
+    setVisible(false);
+    MWBase::Environment::get().getWindowManager()->popGuiMode();
+
+    size_t id = mListBox->getIndexSelected();
+
+    Main::get().getLocalPlayer()->guiMessageBox.data = MyGUI::utility::toString(id);
+    Main::get().getNetworking()->getPlayerPacket(ID_GUI_MESSAGEBOX)->Send(Main::get().getLocalPlayer());
+
+    LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Selected id: %d", id);
+    if(id == MyGUI::ITEM_NONE)
+        return;
+
+    std::string itemName = mListBox->getItemNameAt(mListBox->getIndexSelected()).asUTF8();
+    LOG_APPEND(Log::LOG_VERBOSE, "name of item: '%s'", itemName.c_str());
+}
+
+void GUIDialogList::onFrame(float frameDuration)
+{
+
+}
diff --git a/apps/openmw/mwmp/GUIDialogList.hpp b/apps/openmw/mwmp/GUIDialogList.hpp
new file mode 100644
index 000000000..f144bebd8
--- /dev/null
+++ b/apps/openmw/mwmp/GUIDialogList.hpp
@@ -0,0 +1,27 @@
+//
+// Created by koncord on 03.11.16.
+//
+
+#ifndef OPENMW_GUIDIALOGLIST_HPP
+#define OPENMW_GUIDIALOGLIST_HPP
+
+
+#include "../mwgui/windowbase.hpp"
+
+namespace mwmp
+{
+    class GUIDialogList : public MWGui::WindowModal
+    {
+    public:
+        GUIDialogList(const std::string &message, const std::vector<std::string> &list);
+        void mousePressed(MyGUI::Widget *_widget);
+        void onFrame(float frameDuration);
+    private:
+        bool mMarkedToDelete;
+        MyGUI::EditBox *mMessage;
+        MyGUI::ListBox *mListBox;
+        MyGUI::Button *mButton;
+    };
+}
+
+#endif //OPENMW_GUIDIALOGLIST_HPP
diff --git a/apps/openmw/mwmp/GUILogin.cpp b/apps/openmw/mwmp/GUILogin.cpp
new file mode 100644
index 000000000..e1ce2b05c
--- /dev/null
+++ b/apps/openmw/mwmp/GUILogin.cpp
@@ -0,0 +1,22 @@
+//
+// Created by koncord on 19.05.16.
+//
+
+#include "GUILogin.hpp"
+#include <MyGUI_EditBox.h>
+#include <MyGUI_Button.h>
+
+
+GUILogin::GUILogin() : WindowModal("tes3mp_login.layout")
+{
+    center(); // center window
+
+    setVisible(false);
+
+
+    getWidget(mLogin, "EditLogin");
+    getWidget(mServer, "EditServer");
+    getWidget(mPort, "EditPort");
+    getWidget(mConnect, "ButtonConnect");
+
+}
diff --git a/apps/openmw/mwmp/GUILogin.hpp b/apps/openmw/mwmp/GUILogin.hpp
new file mode 100644
index 000000000..cfb129649
--- /dev/null
+++ b/apps/openmw/mwmp/GUILogin.hpp
@@ -0,0 +1,23 @@
+//
+// Created by koncord on 19.05.16.
+//
+
+#ifndef OPENMW_GUILOGIN_HPP
+#define OPENMW_GUILOGIN_HPP
+
+#include "../mwgui/windowbase.hpp"
+
+class GUILogin : public MWGui::WindowModal
+{
+public:
+    GUILogin();
+
+    MyGUI::EditBox* mLogin;
+    MyGUI::EditBox* mServer;
+    MyGUI::EditBox* mPort;
+protected:
+    MyGUI::Button* mConnect;
+};
+
+
+#endif //OPENMW_GUILOGIN_HPP
diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp
new file mode 100644
index 000000000..d0c1d8bc8
--- /dev/null
+++ b/apps/openmw/mwmp/LocalPlayer.cpp
@@ -0,0 +1,1176 @@
+//
+// Created by koncord on 14.01.16.
+//
+
+#include "../mwworld/manualref.hpp"
+#include "../mwmechanics/aitravel.hpp"
+#include <components/esm/esmwriter.hpp>
+#include "../mwbase/environment.hpp"
+#include "../mwbase/journal.hpp"
+#include "../mwstate/statemanagerimp.hpp"
+#include "../mwinput/inputmanagerimp.hpp"
+#include "../mwscript/scriptmanagerimp.hpp"
+#include "../mwgui/windowmanagerimp.hpp"
+#include "../mwworld/worldimp.hpp"
+#include "../mwworld/player.hpp"
+#include "../mwworld/customdata.hpp"
+#include "../mwmechanics/creaturestats.hpp"
+#include "../mwclass/npc.hpp"
+#include "../mwclass/creature.hpp"
+#include "../mwmechanics/mechanicsmanagerimp.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwdialogue/dialoguemanagerimp.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwmechanics/spellcasting.hpp"
+#include "../mwgui/inventorywindow.hpp"
+#include <components/openmw-mp/Log.hpp>
+#include <components/misc/rng.hpp>
+
+#include "LocalPlayer.hpp"
+#include "Networking.hpp"
+#include "WorldController.hpp"
+#include "Main.hpp"
+
+using namespace mwmp;
+using namespace std;
+
+LocalPlayer::LocalPlayer()
+{
+    charGenStage.current = 0;
+    charGenStage.end = 1;
+    consoleAllowed = true;
+    ignorePosPacket = false;
+}
+
+LocalPlayer::~LocalPlayer()
+{
+
+}
+
+Networking *LocalPlayer::getNetworking()
+{
+    return mwmp::Main::get().getNetworking();
+}
+
+MWWorld::Ptr LocalPlayer::getPlayerPtr()
+{
+    return MWBase::Environment::get().getWorld()->getPlayerPtr();
+}
+
+void LocalPlayer::update()
+{
+    updateCell();
+    updatePosition();
+    updateDrawStateAndFlags();
+    updateAttackState();
+    updateDeadState();
+    updateEquipment();
+    updateDynamicStats();
+    updateAttributes();
+    updateSkills();
+    updateLevel();
+}
+
+void LocalPlayer::charGen(int stageFirst, int stageEnd)
+{
+    charGenStage.current = stageFirst;
+    charGenStage.end = stageEnd;
+}
+
+bool LocalPlayer::charGenThread()
+{
+    MWBase::WindowManager *windowManager = MWBase::Environment::get().getWindowManager();
+
+    // If we haven't finished CharGen and we're in a menu, it must be
+    // one of the CharGen menus, so go no further until it's closed
+    if (windowManager->isGuiMode() && charGenStage.end != 0)
+        return false;
+
+    // If the current stage of CharGen is not the last one,
+    // move to the next one
+    else if (charGenStage.current < charGenStage.end)
+    {
+        switch (charGenStage.current)
+        {
+        case 0:
+            windowManager->pushGuiMode(MWGui::GM_Name);
+            break;
+        case 1:
+            windowManager->pushGuiMode(MWGui::GM_Race);
+            break;
+        case 2:
+            windowManager->pushGuiMode(MWGui::GM_Class);
+            break;
+        case 3:
+            windowManager->pushGuiMode(MWGui::GM_Birth);
+            break;
+        default:
+            windowManager->pushGuiMode(MWGui::GM_Review);
+            break;
+        }
+        getNetworking()->getPlayerPacket(ID_PLAYER_CHARGEN)->Send(this);
+        charGenStage.current++;
+
+        return false;
+    }
+
+    // If we've reached the last stage of CharGen, send the
+    // corresponding packets and mark CharGen as finished
+    else if (charGenStage.end != 0)
+    {
+        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWWorld::Ptr player = world->getPlayerPtr();
+        npc = *player.get<ESM::NPC>()->mBase;
+        birthsign = world->getPlayer().getBirthSign();
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_PLAYER_BASEINFO to server with my CharGen info");
+        getNetworking()->getPlayerPacket(ID_PLAYER_BASEINFO)->Send(this);
+
+        // Send stats packets if this is the 2nd round of CharGen that
+        // only happens for new characters
+        if (charGenStage.end != 1)
+        {
+            updateDynamicStats(true);
+            updateAttributes(true);
+            updateSkills(true);
+            updateLevel(true);
+            sendClass();
+            sendSpellbook();
+            getNetworking()->getPlayerPacket(ID_PLAYER_CHARGEN)->Send(this);
+        }
+
+        sendCellStates();
+
+        // Set the last stage variable to 0 to indicate that CharGen is finished
+        charGenStage.end = 0;
+    }
+
+    return true;
+}
+
+bool LocalPlayer::hasFinishedCharGen()
+{
+    return charGenStage.end == 0;
+}
+
+void LocalPlayer::updateDynamicStats(bool forceUpdate)
+{
+    MWWorld::Ptr player = getPlayerPtr();
+
+    MWMechanics::CreatureStats *ptrCreatureStats = &player.getClass().getCreatureStats(player);
+    MWMechanics::DynamicStat<float> health(ptrCreatureStats->getHealth());
+    MWMechanics::DynamicStat<float> magicka(ptrCreatureStats->getMagicka());
+    MWMechanics::DynamicStat<float> fatigue(ptrCreatureStats->getFatigue());
+
+    static MWMechanics::DynamicStat<float> oldHealth(ptrCreatureStats->getHealth());
+    static MWMechanics::DynamicStat<float> oldMagicka(ptrCreatureStats->getMagicka());
+    static MWMechanics::DynamicStat<float> oldFatigue(ptrCreatureStats->getFatigue());
+
+    static float timer = 0;
+    const float timeoutSec = 0.5;
+
+    if ((timer += MWBase::Environment::get().getFrameDuration()) >= timeoutSec || forceUpdate)
+    {
+        if (oldHealth != health || oldMagicka != magicka || oldFatigue != fatigue || forceUpdate)
+        {
+            oldHealth = health;
+            oldMagicka = magicka;
+            oldFatigue = fatigue;
+
+            health.writeState(creatureStats.mDynamic[0]);
+            magicka.writeState(creatureStats.mDynamic[1]);
+            fatigue.writeState(creatureStats.mDynamic[2]);
+
+            timer = 0;
+
+            getNetworking()->getPlayerPacket(ID_PLAYER_DYNAMICSTATS)->Send(this);
+        }
+    }
+}
+
+void LocalPlayer::updateAttributes(bool forceUpdate)
+{
+    MWWorld::Ptr player = getPlayerPtr();
+    const MWMechanics::NpcStats &ptrNpcStats = player.getClass().getNpcStats(player);
+    bool attributesChanged = false;
+
+    for (int i = 0; i < 8; ++i)
+    {
+        if (ptrNpcStats.getAttribute(i).getBase() != creatureStats.mAttributes[i].mBase)
+        {
+            ptrNpcStats.getAttribute(i).writeState(creatureStats.mAttributes[i]);
+            attributesChanged = true;
+        }
+    }
+
+    if (attributesChanged || forceUpdate)
+    {
+        getNetworking()->getPlayerPacket(ID_PLAYER_ATTRIBUTE)->Send(this);
+    }
+}
+
+void LocalPlayer::updateSkills(bool forceUpdate)
+{
+    MWWorld::Ptr player = getPlayerPtr();
+    const MWMechanics::NpcStats &ptrNpcStats = player.getClass().getNpcStats(player);
+
+    // Track whether skills have changed their values, but not whether
+    // progress towards skill increases has changed (to not spam server
+    // with packets every time tiny progress is made)
+    bool skillsChanged = false;
+
+    for (int i = 0; i < 27; ++i)
+    {
+        if (ptrNpcStats.getSkill(i).getBase() != npcStats.mSkills[i].mBase)
+        {
+            ptrNpcStats.getSkill(i).writeState(npcStats.mSkills[i]);
+            skillsChanged = true;
+        }
+        // If we only have skill progress, remember it for future packets,
+        // but don't send a packet just because of this
+        else if (ptrNpcStats.getSkill(i).getProgress() != npcStats.mSkills[i].mProgress)
+        {
+            ptrNpcStats.getSkill(i).writeState(npcStats.mSkills[i]);
+        }
+    }
+
+    for (int i = 0; i < 8; i++)
+    {
+        if (ptrNpcStats.getSkillIncrease(i) != npcStats.mSkillIncrease[i]) {
+            npcStats.mSkillIncrease[i] = ptrNpcStats.getSkillIncrease(i);
+        }
+    }
+
+    if (skillsChanged || forceUpdate)
+    {
+        npcStats.mLevelProgress = ptrNpcStats.getLevelProgress();
+        getNetworking()->getPlayerPacket(ID_PLAYER_SKILL)->Send(this);
+    }
+}
+
+void LocalPlayer::updateLevel(bool forceUpdate)
+{
+    MWWorld::Ptr player = getPlayerPtr();
+    const MWMechanics::NpcStats &ptrNpcStats = player.getClass().getNpcStats(player);
+
+    if (ptrNpcStats.getLevel() != creatureStats.mLevel || forceUpdate)
+    {
+        creatureStats.mLevel = ptrNpcStats.getLevel();
+        getNetworking()->getPlayerPacket(ID_PLAYER_LEVEL)->Send(this);
+
+        // Also update skills to refresh level progress and attribute bonuses
+        // for next level up
+        updateSkills(true);
+    }
+}
+
+void LocalPlayer::updatePosition(bool forceUpdate)
+{
+    MWBase::World *world = MWBase::Environment::get().getWorld();
+    MWWorld::Ptr player = world->getPlayerPtr();
+
+    const MWMechanics::Movement &move = player.getClass().getMovementSettings(player);
+
+    static bool posChanged = false;
+
+    static bool isJumping = false;
+    static bool sentJumpEnd = true;
+
+    ESM::Position ptrPos = player.getRefData().getPosition();
+
+    const bool isChangedPos = (move.mPosition[0] != 0 || move.mPosition[1] != 0 || move.mPosition[2] != 0
+                               || move.mRotation[0] != 0 || move.mRotation[1] != 0 || move.mRotation[2] != 0);
+
+    if (isChangedPos || posChanged || forceUpdate)
+    {
+        posChanged = isChangedPos;
+
+        if (!isJumping && !world->isOnGround(player) && !world->isFlying(player))
+        {
+            isJumping = true;
+        }
+
+        position = ptrPos;
+
+        direction.pos[0] = move.mPosition[0];
+        direction.pos[1] = move.mPosition[1];
+        direction.pos[2] = move.mPosition[2];
+
+        getNetworking()->getPlayerPacket(ID_PLAYER_POS)->Send(this);
+    }
+    else if (isJumping && world->isOnGround(player))
+    {
+        isJumping = false;
+        sentJumpEnd = false;
+    }
+    // Packet with jump end position has to be sent one tick after above check
+    else if (!sentJumpEnd)
+    {
+        sentJumpEnd = true;
+        position = ptrPos;
+        getNetworking()->getPlayerPacket(ID_PLAYER_POS)->Send(this);
+    }
+}
+
+void LocalPlayer::updateCell(bool forceUpdate)
+{
+    const ESM::Cell *ptrCell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell()->getCell();
+    bool cellChanged = false;
+
+    // Send a packet to server to update this LocalPlayer's cell if:
+    // 1) forceUpdate is true
+    // 2) The LocalPlayer's cell name does not equal the World Player's cell name
+    // 3) The LocalPlayer's exterior cell coordinates do not equal the World Player's
+    //    exterior cell coordinates
+    if (forceUpdate)
+    {
+        cellChanged = true;
+    }
+    else if (!Misc::StringUtils::ciEqual(ptrCell->mName, cell.mName))
+    {
+        cellChanged = true;
+    }
+    else if (ptrCell->isExterior())
+    {
+        if (ptrCell->mData.mX != cell.mData.mX)
+        {
+            cellChanged = true;
+        }
+        else if (ptrCell->mData.mY != cell.mData.mY)
+        {
+            cellChanged = true;
+        }
+    }
+
+    if (cellChanged)
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_PLAYER_CELL_CHANGE to server");
+
+        LOG_APPEND(Log::LOG_INFO, "- Moved from %s to %s",
+            cell.getDescription().c_str(),
+            ptrCell->getDescription().c_str());
+
+        cell = *ptrCell;
+
+        // Make sure the position is updated before a cell packet is sent, or else
+        // cell change events in server scripts will have the wrong player position
+        updatePosition(true);
+
+        RakNet::BitStream bs;
+        getNetworking()->getPlayerPacket((RakNet::MessageID) ID_PLAYER_CELL_CHANGE)->Packet(&bs, this, true);
+        getNetworking()->sendData(&bs);
+
+        // Also force an update to skills (to send all progress to skill increases)
+        updateSkills(true);
+
+        // Also check if the inventory needs to be updated
+        updateInventory();
+    }
+}
+
+void LocalPlayer::updateChar()
+{
+    MWBase::Environment::get().getMechanicsManager()->setPlayerRace(
+        npc.mRace,
+        npc.isMale(),
+        npc.mHead,
+        npc.mHair
+    );
+
+    MWBase::Environment::get().getMechanicsManager()->setPlayerBirthsign(birthsign);
+
+    MWBase::Environment::get().getWindowManager()->getInventoryWindow()->rebuildAvatar();
+}
+
+void LocalPlayer::updateEquipment(bool forceUpdate)
+{
+    MWWorld::Ptr player = getPlayerPtr();
+
+    static bool equipChanged = false;
+
+    if (forceUpdate)
+        equipChanged = true;
+
+    MWWorld::InventoryStore &invStore = player.getClass().getInventoryStore(player);
+    for (int slot = 0; slot < MWWorld::InventoryStore::Slots; slot++)
+    {
+        MWWorld::ContainerStoreIterator it = invStore.getSlot(slot);
+        if (it != invStore.end() && !::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), equipedItems[slot].refId))
+        {
+            equipChanged = true;
+
+            equipedItems[slot].refId = it->getCellRef().getRefId();
+            equipedItems[slot].charge = it->getCellRef().getCharge();
+            if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
+            {
+                MWMechanics::WeaponType weaptype;
+                MWMechanics::getActiveWeapon(player.getClass().getCreatureStats(player), player.getClass().getInventoryStore(player), &weaptype);
+                if (weaptype != MWMechanics::WeapType_Thrown)
+                    equipedItems[slot].count = 1;
+            }
+            else
+                equipedItems[slot].count = invStore.count(it->getCellRef().getRefId());
+        }
+        else if (it == invStore.end() && !equipedItems[slot].refId.empty())
+        {
+            equipChanged = true;
+            equipedItems[slot].refId = "";
+            equipedItems[slot].count = 0;
+            equipedItems[slot].charge = 0;
+        }
+    }
+
+    if (equipChanged)
+    {
+        RakNet::BitStream bs;
+        bs.ResetWritePointer();
+        getNetworking()->getPlayerPacket((RakNet::MessageID) ID_PLAYER_EQUIPMENT)->Packet(&bs, this, true);
+        getNetworking()->sendData(&bs);
+        equipChanged = false;
+    }
+}
+
+void LocalPlayer::updateInventory(bool forceUpdate)
+{
+    static bool invChanged = false;
+
+    if (forceUpdate)
+        invChanged = true;
+
+    MWWorld::Ptr ptrPlayer = getPlayerPtr();
+    MWWorld::InventoryStore &ptrInventory = ptrPlayer.getClass().getInventoryStore(ptrPlayer);
+    mwmp::Item item;
+
+    if (!invChanged)
+    {
+        for (vector<Item>::iterator iter = inventoryChanges.items.begin(); iter != inventoryChanges.items.end(); ++iter)
+        {
+            MWWorld::ContainerStoreIterator result(ptrInventory.begin());
+            for (; result != ptrInventory.end(); ++result)
+            {
+                item.refId = result->getCellRef().getRefId();
+                if (item.refId.find("$dynamic") != string::npos) // skip generated items (self enchanted for e.g.)
+                    continue;
+
+                item.count = result->getRefData().getCount();
+                item.charge = result->getCellRef().getCharge();
+
+                if (item == (*iter))
+                    break;
+            }
+            if (result == ptrInventory.end())
+            {
+                invChanged = true;
+                break;
+            }
+        }
+    }
+
+    if (!invChanged)
+    {
+        for (MWWorld::ContainerStoreIterator iter(ptrInventory.begin()); iter != ptrInventory.end(); ++iter)
+        {
+            item.refId = iter->getCellRef().getRefId();
+            if (item.refId.find("$dynamic") != string::npos) // skip generated items (self enchanted for e.g.)
+                continue;
+
+            item.count = iter->getRefData().getCount();
+            item.charge = iter->getCellRef().getCharge();
+
+            vector<Item>::iterator result = inventoryChanges.items.begin();
+
+            for (; result != inventoryChanges.items.end(); result++)
+            {
+                if ((*result) == item)
+                    break;
+            }
+
+            if (result == inventoryChanges.items.end())
+            {
+                invChanged = true;
+                break;
+            }
+        }
+    }
+
+    if (!invChanged)
+        return;
+
+    invChanged = false;
+
+    sendInventory();
+}
+
+void LocalPlayer::updateAttackState(bool forceUpdate)
+{
+    MWBase::World *world = MWBase::Environment::get().getWorld();
+    MWWorld::Ptr player = getPlayerPtr();
+
+    using namespace MWMechanics;
+
+    static bool attackPressed = false; // prevent flood
+    MWMechanics::DrawState_ state = player.getClass().getNpcStats(player).getDrawState();
+    //player.getClass().hit(player, 1, ESM::Weapon::AT_Chop);
+    if (world->getPlayer().getAttackingOrSpell() && !attackPressed)
+    {
+        MWWorld::Ptr weapon = MWWorld::Ptr(); // hand-to-hand
+                                              //player.getClass().onHit(player, 0.5, true, weapon, 0, 1);
+        if (state == MWMechanics::DrawState_Spell)
+        {
+            const string &spell = MWBase::Environment::get().getWindowManager()->getSelectedSpell();
+
+            attack.attacker = guid;
+            attack.type = Attack::MAGIC;
+            attack.pressed = true;
+            attack.refid = spell;
+
+            /*RakNet::BitStream bs;
+            getNetworking()->getPlayerPacket((RakNet::MessageID) ID_PLAYER_ATTACK)->Packet(&bs, this, true);
+            getNetworking()->SendData(&bs);*/
+        }
+        else if (state == MWMechanics::DrawState_Weapon)
+        {
+            //PrepareAttack(2);
+        }
+        attackPressed = true;
+    }
+    else if (!world->getPlayer().getAttackingOrSpell() && attackPressed)
+    {
+        if (/*state == MWMechanics::DrawState_Spell ||*/ state == MWMechanics::DrawState_Weapon)
+        {
+            //localNetPlayer->getAttack()->success = false;
+            //SendAttack(0);
+        }
+        attackPressed = false;
+    }
+}
+
+void LocalPlayer::updateDeadState(bool forceUpdate)
+{
+    MWWorld::Ptr player = getPlayerPtr();
+
+    MWMechanics::NpcStats *ptrNpcStats = &player.getClass().getNpcStats(player);
+    static bool isDead = false;
+
+    if (ptrNpcStats->isDead() && !isDead)
+    {
+        creatureStats.mDead = true;
+        RakNet::BitStream bs;
+        getNetworking()->getPlayerPacket((RakNet::MessageID)ID_GAME_DIE)->Packet(&bs, this, true);
+        getNetworking()->sendData(&bs);
+        isDead = true;
+    }
+    else if (ptrNpcStats->getHealth().getCurrent() > 0 && isDead)
+        isDead = false;
+}
+
+void LocalPlayer::updateDrawStateAndFlags(bool forceUpdate)
+{
+    MWBase::World *world = MWBase::Environment::get().getWorld();
+    MWWorld::Ptr player = world->getPlayerPtr();
+
+
+    MWMechanics::NpcStats ptrNpcStats = player.getClass().getNpcStats(player);
+    using namespace MWMechanics;
+
+    static bool oldRun = ptrNpcStats.getMovementFlag(CreatureStats::Flag_Run);
+    static bool oldSneak = ptrNpcStats.getMovementFlag(CreatureStats::Flag_Sneak);
+    static bool oldForceJump = ptrNpcStats.getMovementFlag(CreatureStats::Flag_ForceJump);
+    static bool oldForceMoveJump = ptrNpcStats.getMovementFlag(CreatureStats::Flag_ForceMoveJump);
+
+    bool run = ptrNpcStats.getMovementFlag(CreatureStats::Flag_Run);
+    bool sneak = ptrNpcStats.getMovementFlag(CreatureStats::Flag_Sneak);
+    bool forceJump = ptrNpcStats.getMovementFlag(CreatureStats::Flag_ForceJump);
+    bool forceMoveJump = ptrNpcStats.getMovementFlag(CreatureStats::Flag_ForceMoveJump);
+    bool jump = !world->isOnGround(player) && !world->isFlying(player);
+    static bool onJump = false;
+
+    MWMechanics::DrawState_ state = player.getClass().getNpcStats(player).getDrawState();
+    static MWMechanics::DrawState_ oldState = player.getClass().getNpcStats(player).getDrawState();
+    //static float timer = 0;
+    if (oldRun != run
+        || oldSneak != sneak || oldForceJump != forceJump
+        || oldForceMoveJump != forceMoveJump || oldState != state ||
+        ((jump || onJump)/* && (timer += MWBase::Environment::get().getFrameDuration() )> 0.5*/)
+        || forceUpdate)
+    {
+        oldSneak = sneak;
+        oldRun = run;
+        oldForceJump = forceJump;
+        oldForceMoveJump = forceMoveJump;
+        oldState = state;
+        onJump = jump;
+
+        movementFlags = 0;
+#define __SETFLAG(flag, value) (value) ? (movementFlags | flag) : (movementFlags & ~flag)
+
+        movementFlags = __SETFLAG(CreatureStats::Flag_Sneak, sneak);
+        movementFlags = __SETFLAG(CreatureStats::Flag_Run, run);
+        movementFlags = __SETFLAG(CreatureStats::Flag_ForceJump, forceJump);
+        movementFlags = __SETFLAG(CreatureStats::Flag_ForceJump, jump);
+        movementFlags = __SETFLAG(CreatureStats::Flag_ForceMoveJump, forceMoveJump);
+
+#undef __SETFLAG
+
+        if (state == MWMechanics::DrawState_Nothing)
+            drawState = 0;
+        else if (state == MWMechanics::DrawState_Weapon)
+            drawState = 1;
+        else if (state == MWMechanics::DrawState_Spell)
+            drawState = 2;
+
+        if (jump)
+            mwmp::Main::get().getLocalPlayer()->updatePosition(true); // fix position after jump;
+
+        RakNet::BitStream bs;
+        getNetworking()->getPlayerPacket((RakNet::MessageID) ID_PLAYER_DRAWSTATE)->Packet(&bs, this, true);
+        getNetworking()->sendData(&bs);
+        //timer = 0;
+    }
+}
+
+void LocalPlayer::addItems()
+{
+    MWWorld::Ptr ptrPlayer = getPlayerPtr();
+    MWWorld::ContainerStore &ptrStore = ptrPlayer.getClass().getContainerStore(ptrPlayer);
+
+    for (unsigned int i = 0; i < inventoryChanges.count; i++)
+    {
+        mwmp::Item item = inventoryChanges.items.at(i);
+        MWWorld::Ptr itemPtr = *ptrStore.add(item.refId, item.count, ptrPlayer);
+        if (item.charge != -1)
+            itemPtr.getCellRef().setCharge(item.charge);
+    }
+}
+
+void LocalPlayer::addSpells()
+{
+    MWWorld::Ptr ptrPlayer = getPlayerPtr();
+    MWMechanics::Spells &ptrSpells = ptrPlayer.getClass().getCreatureStats(ptrPlayer).getSpells();
+
+    for (vector<ESM::Spell>::const_iterator spell = spellbookChanges.spells.begin(); spell != spellbookChanges.spells.end(); spell++)
+        ptrSpells.add(spell->mId);
+        
+}
+
+void LocalPlayer::addJournalItems()
+{
+    for (unsigned int i = 0; i < journalChanges.count; i++)
+    {
+        mwmp::JournalItem journalItem = journalChanges.journalItems.at(i);
+        
+        if (journalItem.type == JournalItem::ENTRY)
+        {
+            MWWorld::CellStore *ptrCellStore = Main::get().getWorldController()->getCell(journalItem.actorCell);
+
+            if (!ptrCellStore) continue;
+
+            MWWorld::Ptr ptrFound = ptrCellStore->searchExact(journalItem.actorCellRef.mRefID, journalItem.actorCellRef.mRefNum.mIndex);
+
+            if (!ptrFound)
+            {
+                ptrFound = getPlayerPtr();
+            }
+
+            MWBase::Environment::get().getJournal()->addEntry(journalItem.quest, journalItem.index, ptrFound);
+        }
+        else
+        {
+            MWBase::Environment::get().getJournal()->setJournalIndex(journalItem.quest, journalItem.index);
+        }
+    }
+}
+
+void LocalPlayer::removeItems()
+{
+    MWWorld::Ptr ptrPlayer = getPlayerPtr();
+    MWWorld::ContainerStore &ptrStore = ptrPlayer.getClass().getContainerStore(ptrPlayer);
+
+    for (unsigned int i = 0; i < inventoryChanges.count; i++)
+    {
+        mwmp::Item item = inventoryChanges.items.at(i);
+        ptrStore.remove(item.refId, item.count, ptrPlayer);
+    }
+}
+
+void LocalPlayer::removeSpells()
+{
+    MWWorld::Ptr ptrPlayer = getPlayerPtr();
+    MWMechanics::Spells &ptrSpells = ptrPlayer.getClass().getCreatureStats(ptrPlayer).getSpells();
+
+    for (vector<ESM::Spell>::const_iterator spell = spellbookChanges.spells.begin(); spell != spellbookChanges.spells.end(); spell++)
+    {
+        ptrSpells.remove(spell->mId);
+
+        MWBase::WindowManager *wm = MWBase::Environment::get().getWindowManager();
+        if (spell->mId == wm->getSelectedSpell())
+            wm->unsetSelectedSpell();
+    }
+}
+
+void LocalPlayer::setDynamicStats()
+{
+    MWBase::World *world = MWBase::Environment::get().getWorld();
+    MWWorld::Ptr player = world->getPlayerPtr();
+
+    MWMechanics::CreatureStats *ptrCreatureStats = &player.getClass().getCreatureStats(player);
+    MWMechanics::DynamicStat<float> dynamicStat;
+
+    for (int i = 0; i < 3; ++i)
+    {
+        dynamicStat = ptrCreatureStats->getDynamic(i);
+        dynamicStat.setBase(creatureStats.mDynamic[i].mBase);
+        dynamicStat.setCurrent(creatureStats.mDynamic[i].mCurrent);
+        ptrCreatureStats->setDynamic(i, dynamicStat);
+    }
+}
+
+void LocalPlayer::setAttributes()
+{
+    MWBase::World *world = MWBase::Environment::get().getWorld();
+    MWWorld::Ptr player = world->getPlayerPtr();
+
+    MWMechanics::CreatureStats *ptrCreatureStats = &player.getClass().getCreatureStats(player);
+    MWMechanics::AttributeValue attributeValue;
+
+    for (int i = 0; i < 8; ++i)
+    {
+        attributeValue.readState(creatureStats.mAttributes[i]);
+        ptrCreatureStats->setAttribute(i, attributeValue);
+    }
+}
+
+void LocalPlayer::setSkills()
+{
+    MWBase::World *world = MWBase::Environment::get().getWorld();
+    MWWorld::Ptr player = world->getPlayerPtr();
+
+    MWMechanics::NpcStats *ptrNpcStats = &player.getClass().getNpcStats(player);
+    MWMechanics::SkillValue skillValue;
+
+    for (int i = 0; i < 27; ++i)
+    {
+        skillValue.readState(npcStats.mSkills[i]);
+        ptrNpcStats->setSkill(i, skillValue);
+    }
+
+    for (int i = 0; i < 8; ++i)
+    {
+        ptrNpcStats->setSkillIncrease(i, npcStats.mSkillIncrease[i]);
+    }
+
+    ptrNpcStats->setLevelProgress(npcStats.mLevelProgress);
+}
+
+void LocalPlayer::setLevel()
+{
+    MWBase::World *world = MWBase::Environment::get().getWorld();
+    MWWorld::Ptr player = world->getPlayerPtr();
+
+    MWMechanics::CreatureStats *ptrCreatureStats = &player.getClass().getCreatureStats(player);
+    ptrCreatureStats->setLevel(creatureStats.mLevel);
+}
+
+void LocalPlayer::setPosition()
+{
+    MWBase::World *world = MWBase::Environment::get().getWorld();
+    MWWorld::Ptr player = world->getPlayerPtr();
+
+    // If we're ignoring this position packet because of an invalid cell change,
+    // don't make the next one get ignored as well
+    if (ignorePosPacket)
+    {
+        ignorePosPacket = false;
+    }
+    else
+    {
+        world->getPlayer().setTeleported(true);
+        world->moveObject(player, position.pos[0], position.pos[1], position.pos[2]);
+        world->rotateObject(player, position.rot[0], position.rot[1], position.rot[2]);
+    }
+
+    updatePosition(true);
+
+    // Make sure we update our draw state, or we'll end up with the wrong one
+    updateDrawStateAndFlags(true);
+}
+
+void LocalPlayer::setCell()
+{
+    MWBase::World *world = MWBase::Environment::get().getWorld();
+    MWWorld::Ptr player = world->getPlayerPtr();
+    ESM::Position pos;
+
+    // To avoid crashes, close any container menus this player may be in
+    if (MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Container))
+    {
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container);
+        MWBase::Environment::get().getWindowManager()->setDragDrop(false);
+    }
+
+    world->getPlayer().setTeleported(true);
+
+    int x = cell.mData.mX;
+    int y = cell.mData.mY;
+
+    if (cell.isExterior())
+    {
+        world->indexToPosition(x, y, pos.pos[0], pos.pos[1], true);
+        pos.pos[2] = 0;
+
+        pos.rot[0] = pos.rot[1] = pos.rot[2] = 0;
+
+        world->changeToExteriorCell(pos, true);
+        world->fixPosition(player);
+    }
+    else if (world->findExteriorPosition(cell.mName, pos))
+    {
+        world->changeToExteriorCell(pos, true);
+        world->fixPosition(player);
+    }
+    else
+    {
+        try
+        {
+            world->findInteriorPosition(cell.mName, pos);
+            world->changeToInteriorCell(cell.mName, pos, true);
+        }
+        // If we've been sent to an invalid interior, ignore the incoming
+        // packet about our position in that cell
+        catch (std::exception&)
+        {
+            LOG_APPEND(Log::LOG_INFO, "%s", "- Cell doesn't exist on this client");
+            ignorePosPacket = true;
+        }
+    }
+
+    updateCell(true);
+}
+
+void LocalPlayer::setClass()
+{
+    if (charClass.mId.empty()) // custom class
+    {
+        charClass.mData.mIsPlayable = 0x1;
+        MWBase::Environment::get().getMechanicsManager()->setPlayerClass(charClass);
+        MWBase::Environment::get().getWindowManager()->setPlayerClass(charClass);
+    }
+    else
+    {
+        MWBase::Environment::get().getMechanicsManager()->setPlayerClass(charClass.mId);
+
+        const ESM::Class *existingCharClass = MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(charClass.mId);
+
+        if (existingCharClass)
+            MWBase::Environment::get().getWindowManager()->setPlayerClass(charClass);
+    }
+}
+
+void LocalPlayer::setEquipment()
+{
+    MWWorld::Ptr ptrPlayer = getPlayerPtr();
+
+    MWWorld::InventoryStore &ptrInventory = ptrPlayer.getClass().getInventoryStore(ptrPlayer);
+
+    for (int slot = 0; slot < MWWorld::InventoryStore::Slots; slot++)
+    {
+        mwmp::Item *currentItem = &equipedItems[slot];
+
+        if (!currentItem->refId.empty())
+        {
+            MWWorld::ContainerStoreIterator it = ptrInventory.begin();
+            for (; it != ptrInventory.end(); ++it) // find item in inventory
+            {
+                if (::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), currentItem->refId))
+                    break;
+            }
+            if (it == ptrInventory.end()) // if not exists add item
+                ptrInventory.equip(
+                    slot,
+                    ptrInventory.ContainerStore::add(
+                        equipedItems[slot].refId.c_str(),
+                        equipedItems[slot].count,
+                        ptrPlayer),
+                    ptrPlayer);
+            else
+                ptrInventory.equip(slot, it, ptrPlayer);
+        }
+        else
+        {
+            ptrInventory.unequipSlot(slot, ptrPlayer);
+        }
+    }
+}
+
+void LocalPlayer::setInventory()
+{
+    MWWorld::Ptr ptrPlayer = getPlayerPtr();
+    MWWorld::ContainerStore &ptrStore = ptrPlayer.getClass().getContainerStore(ptrPlayer);
+
+    // Clear items in inventory
+    ptrStore.clear();
+
+    // Proceed by adding items
+    addItems();
+
+    // Don't automatically setEquipment() here, or the player could end
+    // up getting a new set of their starting clothes, or other items
+    // supposed to no longer exist
+    //
+    // Instead, expect server scripts to do that manually
+}
+
+void LocalPlayer::setSpellbook()
+{
+    MWWorld::Ptr ptrPlayer = getPlayerPtr();
+    MWMechanics::Spells &ptrSpells = ptrPlayer.getClass().getCreatureStats(ptrPlayer).getSpells();
+
+    // Clear spells in spellbook, while ignoring abilities, powers, etc.
+    while (true)
+    {
+        MWMechanics::Spells::TIterator iter = ptrSpells.begin();
+        for (; iter != ptrSpells.end(); iter++)
+        {
+            const ESM::Spell *spell = iter->first;
+            if (spell->mData.mType == ESM::Spell::ST_Spell)
+            {
+                ptrSpells.remove(spell->mId);
+                break;
+            }
+        }
+        if (iter == ptrSpells.end())
+            break;
+    }
+
+    // Proceed by adding spells
+    addSpells();
+}
+
+void LocalPlayer::sendClass()
+{
+    MWBase::World *world = MWBase::Environment::get().getWorld();
+    const ESM::NPC *cpl = world->getPlayerPtr().get<ESM::NPC>()->mBase;
+    const ESM::Class *cls = world->getStore().get<ESM::Class>().find(cpl->mClass);
+
+    if (cpl->mClass.find("$dynamic") != string::npos) // custom class
+    {
+        charClass.mId = "";
+        charClass.mName = cls->mName;
+        charClass.mDescription = cls->mDescription;
+        charClass.mData = cls->mData;
+    }
+    else
+        charClass.mId = cls->mId;
+
+    getNetworking()->getPlayerPacket(ID_PLAYER_CHARCLASS)->Send(this);
+}
+
+void LocalPlayer::sendInventory()
+{
+    MWWorld::Ptr ptrPlayer = getPlayerPtr();
+    MWWorld::InventoryStore &ptrInventory = ptrPlayer.getClass().getInventoryStore(ptrPlayer);
+    mwmp::Item item;
+
+    inventoryChanges.items.clear();
+
+    for (MWWorld::ContainerStoreIterator iter(ptrInventory.begin()); iter != ptrInventory.end(); ++iter)
+    {
+        item.refId = iter->getCellRef().getRefId();
+        if (item.refId.find("$dynamic") != string::npos) // skip generated items (self enchanted for e.g.)
+            continue;
+
+        item.count = iter->getRefData().getCount();
+        item.charge = iter->getCellRef().getCharge();
+
+        inventoryChanges.items.push_back(item);
+    }
+
+    inventoryChanges.count = (unsigned int) inventoryChanges.items.size();
+    inventoryChanges.action = InventoryChanges::SET;
+    Main::get().getNetworking()->getPlayerPacket(ID_PLAYER_INVENTORY)->Send(this);
+}
+
+void LocalPlayer::sendSpellbook()
+{
+    MWWorld::Ptr ptrPlayer = getPlayerPtr();
+    MWMechanics::Spells &ptrSpells = ptrPlayer.getClass().getCreatureStats(ptrPlayer).getSpells();
+
+    spellbookChanges.spells.clear();
+
+    // Send spells in spellbook, while ignoring abilities, powers, etc.
+    for (MWMechanics::Spells::TIterator iter = ptrSpells.begin(); iter != ptrSpells.end(); ++iter)
+    {
+        const ESM::Spell *spell = iter->first;
+
+        if (spell->mData.mType == ESM::Spell::ST_Spell)
+        {
+            spellbookChanges.spells.push_back(*spell);
+        }
+    }
+
+    spellbookChanges.action = SpellbookChanges::SET;
+    Main::get().getNetworking()->getPlayerPacket(ID_PLAYER_SPELLBOOK)->Send(this);
+}
+
+void LocalPlayer::sendCellStates()
+{
+    Main::get().getNetworking()->getPlayerPacket(ID_PLAYER_CELL_STATE)->Send(this);
+
+}
+
+void LocalPlayer::sendSpellAddition(std::string id)
+{
+    if (id.find("$dynamic") != string::npos) // skip custom spells
+        return;
+
+    spellbookChanges.spells.clear();
+
+    ESM::Spell spell;
+    spell.mId = id;
+    spellbookChanges.spells.push_back(spell);
+
+    spellbookChanges.action = SpellbookChanges::ADD;
+    Main::get().getNetworking()->getPlayerPacket(ID_PLAYER_SPELLBOOK)->Send(this);
+}
+
+void LocalPlayer::sendSpellRemoval(std::string id)
+{
+    if (id.find("$dynamic") != string::npos) // skip custom spells
+        return;
+
+    spellbookChanges.spells.clear();
+
+    ESM::Spell spell;
+    spell.mId = id;
+    spellbookChanges.spells.push_back(spell);
+
+    spellbookChanges.action = SpellbookChanges::REMOVE;
+    Main::get().getNetworking()->getPlayerPacket(ID_PLAYER_SPELLBOOK)->Send(this);
+}
+
+void LocalPlayer::sendSpellAddition(const ESM::Spell &spell)
+{
+    LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Not implemented.");
+}
+
+void LocalPlayer::sendSpellRemoval(const ESM::Spell &spell)
+{
+    LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Not implemented.");
+}
+
+void LocalPlayer::sendJournalEntry(const std::string& quest, int index, const MWWorld::Ptr& actor)
+{
+    journalChanges.journalItems.clear();
+
+    mwmp::JournalItem journalItem;
+    journalItem.type = JournalItem::ENTRY;
+    journalItem.quest = quest;
+    journalItem.index = index;
+
+    if (actor.mCell != nullptr)
+        journalItem.actorCell = *actor.mCell->getCell();
+
+    journalItem.actorCellRef.mRefID = actor.getCellRef().getRefId();
+    journalItem.actorCellRef.mRefNum = actor.getCellRef().getRefNum();
+
+    journalChanges.journalItems.push_back(journalItem);
+
+    Main::get().getNetworking()->getPlayerPacket(ID_PLAYER_JOURNAL)->Send(this);
+}
+
+void LocalPlayer::sendJournalIndex(const std::string& quest, int index)
+{
+    journalChanges.journalItems.clear();
+
+    mwmp::JournalItem journalItem;
+    journalItem.type = JournalItem::INDEX;
+    journalItem.quest = quest;
+    journalItem.index = index;
+
+    journalChanges.journalItems.push_back(journalItem);
+
+    Main::get().getNetworking()->getPlayerPacket(ID_PLAYER_JOURNAL)->Send(this);
+}
+
+void LocalPlayer::sendAttack(Attack::TYPE type)
+{
+    MWMechanics::DrawState_ state = getPlayerPtr().getClass().getNpcStats(getPlayerPtr()).getDrawState();
+
+    attack.type = type;
+    attack.pressed = false;
+    RakNet::BitStream bs;
+    getNetworking()->getPlayerPacket((RakNet::MessageID) ID_PLAYER_ATTACK)->Packet(&bs, this, true);
+    getNetworking()->sendData(&bs);
+}
+
+void LocalPlayer::clearCellStates()
+{
+    cellStateChanges.cellStates.clear();
+}
+
+void LocalPlayer::clearCurrentContainer()
+{
+    currentContainer.refId = "";
+    currentContainer.refNumIndex = 0;
+}
+
+void LocalPlayer::storeCellState(ESM::Cell cell, int stateType)
+{
+    std::vector<CellState>::iterator iter;
+
+    for (iter = cellStateChanges.cellStates.begin(); iter != cellStateChanges.cellStates.end(); )
+    {
+        // If there's already a cell state recorded for this particular cell,
+        // remove it
+        if (cell.getDescription() == (*iter).cell.getDescription())
+        {
+            iter = cellStateChanges.cellStates.erase(iter);
+        }
+        else
+            ++iter;
+    }
+
+    CellState cellState;
+    cellState.cell = cell;
+    cellState.type = stateType;
+
+    cellStateChanges.cellStates.push_back(cellState);
+}
+
+void LocalPlayer::storeCurrentContainer(const MWWorld::Ptr &container, bool loot)
+{
+    currentContainer.refId = container.getCellRef().getRefId();
+    currentContainer.refNumIndex = container.getCellRef().getRefNum().mIndex;
+    currentContainer.loot = loot;
+}
+
+void LocalPlayer::prepareAttack(Attack::TYPE type, bool state)
+{
+    if (attack.pressed == state && type != Attack::MAGIC)
+        return;
+
+    MWMechanics::DrawState_ dstate = getPlayerPtr().getClass().getNpcStats(getPlayerPtr()).getDrawState();
+
+    if (dstate == MWMechanics::DrawState_Spell)
+    {
+        const string &spell = MWBase::Environment::get().getWindowManager()->getSelectedSpell();
+        attack.success = Misc::Rng::roll0to99() < MWMechanics::getSpellSuccessChance(spell, getPlayerPtr());
+        state = true;
+        attack.refid = spell;
+    }
+    else
+    {
+        attack.success = false;
+    }
+
+    attack.pressed = state;
+    attack.type = type;
+    attack.knockdown = false;
+    attack.block = false;
+    attack.target = RakNet::RakNetGUID();
+    attack.attacker = guid;
+
+    RakNet::BitStream bs;
+    getNetworking()->getPlayerPacket((RakNet::MessageID) ID_PLAYER_ATTACK)->Packet(&bs, this, true);
+    getNetworking()->sendData(&bs);
+}
diff --git a/apps/openmw/mwmp/LocalPlayer.hpp b/apps/openmw/mwmp/LocalPlayer.hpp
new file mode 100644
index 000000000..54830df43
--- /dev/null
+++ b/apps/openmw/mwmp/LocalPlayer.hpp
@@ -0,0 +1,85 @@
+//
+// Created by koncord on 14.01.16.
+//
+
+#ifndef OPENMW_LOCALPLAYER_HPP
+#define OPENMW_LOCALPLAYER_HPP
+
+#include <components/openmw-mp/Base/BasePlayer.hpp>
+#include <RakNetTypes.h>
+
+namespace mwmp
+{
+    class Networking;
+    class LocalPlayer : public BasePlayer
+    {
+    public:
+
+        LocalPlayer();
+        virtual ~LocalPlayer();
+
+        void update();
+
+        void charGen(int stageFirst, int stageEnd);
+        bool charGenThread(); // return true if CGStage::current == CGStage::end
+        bool hasFinishedCharGen();
+
+        void updateDynamicStats(bool forceUpdate = false);
+        void updateAttributes(bool forceUpdate = false);
+        void updateSkills(bool forceUpdate = false);
+        void updateLevel(bool forceUpdate = false);
+        void updatePosition(bool forceUpdate = false);
+        void updateCell(bool forceUpdate = false);
+        void updateChar();
+        void updateEquipment(bool forceUpdate = false);
+        void updateInventory(bool forceUpdate = false);
+        void updateAttackState(bool forceUpdate = false);
+        void updateDeadState(bool forceUpdate = false);
+        void updateDrawStateAndFlags(bool forceUpdate = false);
+
+        void addItems();
+        void addSpells();
+        void addJournalItems();
+
+        void removeItems();
+        void removeSpells();
+
+        void setDynamicStats();
+        void setAttributes();
+        void setSkills();
+        void setLevel();
+        void setPosition();
+        void setCell();
+        void setClass();
+        void setEquipment();
+        void setInventory();
+        void setSpellbook();
+
+        void sendClass();
+        void sendInventory();
+        void sendSpellbook();
+        void sendCellStates();
+        void sendSpellAddition(std::string id);
+        void sendSpellAddition(const ESM::Spell &spell);
+        void sendSpellRemoval(std::string id);
+        void sendSpellRemoval(const ESM::Spell &spell);
+        void sendJournalEntry(const std::string& id, int index, const MWWorld::Ptr& actor);
+        void sendJournalIndex(const std::string& id, int index);
+        void sendAttack(Attack::TYPE type);
+
+        void clearCellStates();
+        void clearCurrentContainer();
+
+        void storeCellState(ESM::Cell cell, int stateType);
+        void storeCurrentContainer(const MWWorld::Ptr& container, bool loot);
+
+        void prepareAttack(Attack::TYPE type, bool state);
+
+    private:
+        Networking *getNetworking();
+        MWWorld::Ptr getPlayerPtr();
+
+    };
+}
+
+#endif //OPENMW_LOCALPLAYER_HPP
diff --git a/apps/openmw/mwmp/Main.cpp b/apps/openmw/mwmp/Main.cpp
new file mode 100644
index 000000000..9d0de523c
--- /dev/null
+++ b/apps/openmw/mwmp/Main.cpp
@@ -0,0 +1,320 @@
+//
+// Created by koncord on 01.01.16.
+//
+
+#include "Main.hpp"
+#include "../mwworld/manualref.hpp"
+#include "../mwmechanics/aitravel.hpp"
+#include <components/esm/esmwriter.hpp>
+#include "../mwbase/environment.hpp"
+#include "../mwstate/statemanagerimp.hpp"
+#include "../mwinput/inputmanagerimp.hpp"
+#include "../mwscript/scriptmanagerimp.hpp"
+#include "../mwgui/windowmanagerimp.hpp"
+#include "../mwworld/worldimp.hpp"
+#include "../mwworld/ptr.hpp"
+#include "../mwworld/player.hpp"
+#include "../mwworld/customdata.hpp"
+#include "../mwmechanics/creaturestats.hpp"
+#include "../mwclass/npc.hpp"
+#include "../mwclass/creature.hpp"
+#include "../mwmechanics/mechanicsmanagerimp.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwdialogue/dialoguemanagerimp.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwmechanics/spellcasting.hpp"
+#include <components/openmw-mp/Log.hpp>
+#include <cstdlib>
+#include <components/openmw-mp/Version.hpp>
+
+#include "Networking.hpp"
+#include "LocalPlayer.hpp"
+#include "DedicatedPlayer.hpp"
+#include "GUIController.hpp"
+#include "WorldController.hpp"
+
+using namespace mwmp;
+using namespace std;
+
+Main *Main::pMain = 0;
+std::string Main::addr = "";
+std::string Main::passw = TES3MP_DEFAULT_PASSW;
+
+std::string loadSettings (Settings::Manager & settings)
+{
+    Files::ConfigurationManager mCfgMgr;
+    // Create the settings manager and load default settings file
+    const std::string localdefault = (mCfgMgr.getLocalPath() / "tes3mp-client-default.cfg").string();
+    const std::string globaldefault = (mCfgMgr.getGlobalPath() / "tes3mp-client-default.cfg").string();
+
+    // prefer local
+    if (boost::filesystem::exists(localdefault))
+        settings.loadDefault(localdefault);
+    else if (boost::filesystem::exists(globaldefault))
+        settings.loadDefault(globaldefault);
+    else
+        throw std::runtime_error ("No default settings file found! Make sure the file \"tes3mp-client-default.cfg\" was properly installed.");
+
+    // load user settings if they exist
+    const std::string settingspath = (mCfgMgr.getUserConfigPath() / "tes3mp-client.cfg").string();
+    if (boost::filesystem::exists(settingspath))
+        settings.loadUser(settingspath);
+
+    return settingspath;
+}
+
+Main::Main()
+{
+    LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "tes3mp started");
+    mNetworking = new Networking();
+    mLocalPlayer = new LocalPlayer();
+    mGUIController = new GUIController();
+    mWorldController = new WorldController();
+    //mLocalPlayer->CharGen(0, 4);
+
+    server = "mp.tes3mp.com";
+    port = 25565;
+}
+
+Main::~Main()
+{
+    LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "tes3mp stopped");
+    delete mNetworking;
+    delete mLocalPlayer;
+    Players::cleanUp();
+}
+
+void Main::optionsDesc(boost::program_options::options_description *desc)
+{
+    namespace bpo = boost::program_options;
+    desc->add_options()
+            ("connect", bpo::value<std::string>()->default_value(""),
+                        "connect to server (e.g. --connect=127.0.0.1:25565)")
+            ("password", bpo::value<std::string>()->default_value(TES3MP_DEFAULT_PASSW),
+                        "сonnect to a secured server. (e.g. --password=AnyPassword");
+}
+
+void Main::configure(const boost::program_options::variables_map &variables)
+{
+    Main::addr = variables["connect"].as<string>();
+    Main::passw = variables["password"].as<string>();
+}
+
+static Settings::CategorySettingValueMap saveUserSettings;
+static Settings::CategorySettingValueMap saveDefaultSettings;
+static Settings::CategorySettingVector saveChangedSettings;
+
+void InitMgr(Settings::Manager &mgr)
+{
+    saveUserSettings = mgr.mUserSettings;
+    saveDefaultSettings = mgr.mDefaultSettings;
+    saveChangedSettings = mgr.mChangedSettings;
+    mgr.mUserSettings.clear();
+    mgr.mDefaultSettings.clear();
+    mgr.mChangedSettings.clear();
+    loadSettings(mgr);
+}
+
+void RestoreMgr(Settings::Manager &mgr)
+{
+    mgr.mUserSettings = saveUserSettings;
+    mgr.mDefaultSettings = saveDefaultSettings;
+    mgr.mChangedSettings = saveChangedSettings;
+}
+
+bool Main::init(std::vector<std::string> &content)
+{
+    assert(!pMain);
+    pMain = new Main();
+
+    Settings::Manager mgr;
+    InitMgr(mgr);
+
+    int logLevel = mgr.getInt("loglevel", "General");
+    Log::SetLevel(logLevel);
+    if (addr.empty())
+    {
+        pMain->server = mgr.getString("server", "General");
+        pMain->port = (unsigned short) mgr.getInt("port", "General");
+
+        passw = mgr.getString("password", "General");
+        if (passw.empty())
+            passw = TES3MP_DEFAULT_PASSW;
+    }
+    else
+    {
+        size_t delim_pos = addr.find(':');
+        pMain->server = addr.substr(0, delim_pos);
+        pMain->port = atoi(addr.substr(delim_pos + 1).c_str());
+    }
+    get().mLocalPlayer->passw = passw;
+    
+    pMain->mNetworking->connect(pMain->server, pMain->port);
+    RestoreMgr(mgr);
+    return pMain->mNetworking->isConnected();
+}
+
+void Main::postInit()
+{
+    Settings::Manager mgr;
+    InitMgr(mgr);
+
+    pMain->mGUIController->setupChat(mgr);
+    RestoreMgr(mgr);
+
+    const MWBase::Environment &environment = MWBase::Environment::get();
+    environment.getStateManager()->newGame(true);
+    MWBase::Environment::get().getMechanicsManager()->toggleAI();
+}
+
+void Main::destroy()
+{
+    assert(pMain);
+
+    delete pMain;
+    pMain = 0;
+}
+
+void Main::frame(float dt)
+{
+    const MWBase::Environment &environment = MWBase::Environment::get();
+
+    get().getNetworking()->update();
+
+    Players::update(dt);
+    get().updateWorld(dt);
+
+    get().getGUIController()->update(dt);
+
+}
+
+void Main::updateWorld(float dt) const
+{
+
+    if (!mLocalPlayer->charGenThread())
+        return;
+
+    static bool init = true;
+    if (init)
+    {
+        init = false;
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_PLAYER_BASEINFO to server");
+
+        mNetworking->getPlayerPacket(ID_PLAYER_BASEINFO)->Send(getLocalPlayer());
+        mNetworking->getPlayerPacket(ID_LOADED)->Send(getLocalPlayer());
+        mLocalPlayer->updateDynamicStats(true);
+        get().getGUIController()->setChatVisible(true);
+    }
+    else
+        mLocalPlayer->update();
+}
+
+const Main &Main::get()
+{
+    return *pMain;
+}
+
+Networking *Main::getNetworking() const
+{
+    return mNetworking;
+}
+
+LocalPlayer *Main::getLocalPlayer() const
+{
+    return mLocalPlayer;
+}
+
+
+GUIController *Main::getGUIController() const
+{
+    return mGUIController;
+}
+
+WorldController *Main::getWorldController() const
+{
+    return mWorldController;
+}
+
+void Main::pressedKey(int key)
+{
+    if (pMain == nullptr) return;
+    if (get().getGUIController()->pressedKey(key))
+        return; // if any gui bind pressed
+}
+
+// When sending packets with ingame script values, certain packets
+// should be ignored because of their potential for spam
+bool Main::isValidPacketScript(std::string script)
+{
+    static const int validPacketScriptsCount = 21;
+    static const std::string validPacketScripts[validPacketScriptsCount] = {
+        // Ghostgate buttons
+        "GG_OpenGate1", // coc Ghostgate
+        "GG_OpenGate2",
+        // Dwemer ruin cranks
+        "Arkn_doors", // coe 0, -2
+        "nchuleftingthWrong1", // coc "Nchuleftingth, Test of Pattern"
+        "nchuleftingthWrong2",
+        "nchulfetingthRight",
+        "Akula_innerdoors", // coc "Akulakhan's Chamber"
+        "Dagoth_doors", // coe 2, 8
+        // Sotha Sil levers
+        "SothaLever1", // coc "Sotha Sil, Outer Flooded Halls"
+        "SothaLever2",
+        "SothaLever3",
+        "SothaLever4",
+        "SothaLever5",
+        "SothaLever6",
+        "SothaLever7",
+        "SothaLever8",
+        "SothaLever9",
+        "SothaLever10",
+        "SothaLever11",
+        "SothaOilLever", // coc "Sotha Sil, Dome of Udok"
+        // Generic state script
+        "LocalState"
+    };
+
+    static const int invalidPacketScriptsCount = 17;
+    static const std::string invalidPacketScripts[invalidPacketScriptsCount] = {
+        // Spammy shorts
+        "OutsideBanner",
+        "sleeperScript",
+        "dreamer_talkerEnable",
+        "drenSlaveOwners",
+        "ahnassiScript",
+        "hlormarScript",
+        // Spammy floats
+        "Float",
+        "SignRotate",
+        "FaluraScript",
+        "jsaddhaScript",
+        // Spammy globals
+        "wraithguardScript",
+        // Spammy globals leading to crashes
+        "LegionUniform",
+        "OrdinatorUniform",
+        "LorkhanHeart",
+        "ouch_keening",
+        "ouch_sunder",
+        "ouch_wraithguard"
+    };
+
+    for (int i = 0; i < validPacketScriptsCount; i++)
+    {
+        if (Misc::StringUtils::ciEqual(script, validPacketScripts[i]))
+            return true;
+    }
+
+    return false;
+
+    /* Switch over to this when using a blacklist system
+    for (int i = 0; i < invalidPacketScriptsCount; i++)
+    {
+        if (Misc::StringUtils::ciEqual(script, invalidPacketScripts[i]))
+            return false;
+    }
+
+    return true;
+    */
+}
diff --git a/apps/openmw/mwmp/Main.hpp b/apps/openmw/mwmp/Main.hpp
new file mode 100644
index 000000000..673de61e8
--- /dev/null
+++ b/apps/openmw/mwmp/Main.hpp
@@ -0,0 +1,51 @@
+#include "../mwworld/ptr.hpp"
+#include <boost/program_options.hpp>
+
+namespace mwmp
+{
+    class WorldController;
+    class GUIController;
+    class LocalPlayer;
+    class Networking;
+
+    class Main
+    {
+    public:
+        Main();
+        ~Main();
+
+        static void optionsDesc(boost::program_options::options_description *desc);
+        static void configure(const boost::program_options::variables_map &variables);
+        static bool init(std::vector<std::string> &content);
+        static void postInit();
+        static void destroy();
+        static const Main &get();
+        static void frame(float dt);
+        static void pressedKey(int key);
+
+        static bool isValidPacketScript(std::string script);
+
+        Networking *getNetworking() const;
+        LocalPlayer *getLocalPlayer() const;
+        GUIController *getGUIController() const;
+        WorldController *getWorldController() const;
+
+        void updateWorld(float dt) const;
+
+    private:
+        static std::string addr;
+        static std::string passw;
+        Main (const Main&);
+        ///< not implemented
+        Main& operator= (const Main&);
+        ///< not implemented
+        static Main *pMain;
+        Networking *mNetworking;
+        LocalPlayer *mLocalPlayer;
+
+        GUIController *mGUIController;
+        WorldController *mWorldController;
+        std::string server;
+        unsigned short port;
+    };
+}
diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp
new file mode 100644
index 000000000..fce91e000
--- /dev/null
+++ b/apps/openmw/mwmp/Networking.cpp
@@ -0,0 +1,991 @@
+//
+// Created by koncord on 04.01.16.
+//
+
+#include <stdexcept>
+#include <iostream>
+#include <string>
+#include <components/esm/cellid.hpp>
+
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
+
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
+
+#include "../mwclass/npc.hpp"
+#include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/combat.hpp"
+
+#include <SDL_messagebox.h>
+#include "Networking.hpp"
+#include "../mwstate/statemanagerimp.hpp"
+#include <components/openmw-mp/Log.hpp>
+#include <components/openmw-mp/Version.hpp>
+#include "DedicatedPlayer.hpp"
+#include "LocalPlayer.hpp"
+#include "GUIController.hpp"
+#include "WorldController.hpp"
+#include "Main.hpp"
+
+using namespace std;
+using namespace mwmp;
+
+Networking::Networking(): peer(RakNet::RakPeerInterface::GetInstance()), playerController(peer), worldController(peer)
+{
+
+    RakNet::SocketDescriptor sd;
+    sd.port=0;
+    RakNet::StartupResult b = peer->Startup(1,&sd, 1);
+    RakAssert(b==RAKNET_STARTED);
+
+    playerController.SetStream(0, &bsOut);
+    worldController.SetStream(0, &bsOut);
+
+    connected = 0;
+}
+
+Networking::~Networking()
+{
+    peer->Shutdown(100);
+    peer->CloseConnection(peer->GetSystemAddressFromIndex(0), true, 0);
+    RakNet::RakPeerInterface::DestroyInstance(peer);
+}
+
+void Networking::update()
+{
+    RakNet::Packet *packet;
+    std::string errmsg = "";
+
+    for (packet=peer->Receive(); packet; peer->DeallocatePacket(packet), packet=peer->Receive())
+    {
+        switch (packet->data[0])
+        {
+            case ID_REMOTE_DISCONNECTION_NOTIFICATION:
+                LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Another client has disconnected.");
+                break;
+            case ID_REMOTE_CONNECTION_LOST:
+                LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Another client has lost connection.");
+                break;
+            case ID_REMOTE_NEW_INCOMING_CONNECTION:
+                LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Another client has connected.");
+                break;
+            case ID_CONNECTION_REQUEST_ACCEPTED:
+                LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Our connection request has been accepted.");
+                break;
+            case ID_NEW_INCOMING_CONNECTION:
+                LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "A connection is incoming.");
+                break;
+            case ID_NO_FREE_INCOMING_CONNECTIONS:
+                errmsg = "The server is full.";
+                break;
+            case ID_DISCONNECTION_NOTIFICATION:
+                errmsg = "We have been disconnected.";
+                break;
+            case ID_CONNECTION_LOST:
+                errmsg = "Connection lost.";
+                break;
+            default:
+                receiveMessage(packet);
+                //LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Message with identifier %i has arrived.", packet->data[0]);
+                break;
+        }
+    }
+
+    if (!errmsg.empty())
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, errmsg.c_str());
+        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "tes3mp", errmsg.c_str(), 0);
+        MWBase::Environment::get().getStateManager()->requestQuit();
+    }
+}
+
+void Networking::sendData(RakNet::BitStream *bs)
+{
+    peer->Send(bs, HIGH_PRIORITY, RELIABLE_ORDERED, 0, serverAddr, false);
+}
+
+void Networking::connect(const std::string &ip, unsigned short port)
+{
+    RakNet::SystemAddress master;
+    master.SetBinaryAddress(ip.c_str());
+    master.SetPortHostOrder(port);
+    std::string errmsg = "";
+
+    stringstream sstr(TES3MP_VERSION);
+    sstr << TES3MP_PROTO_VERSION;
+
+    if (peer->Connect(master.ToString(false), master.GetPort(), sstr.str().c_str(), (int) sstr.str().size(), 0, 0, 3, 500, 0) != RakNet::CONNECTION_ATTEMPT_STARTED)
+        errmsg = "Connection attempt failed.\n";
+
+    bool queue = true;
+    while (queue)
+    {
+        for (RakNet::Packet *packet = peer->Receive(); packet; peer->DeallocatePacket(
+                packet), packet = peer->Receive())
+        {
+            switch (packet->data[0])
+            {
+                case ID_CONNECTION_ATTEMPT_FAILED:
+                {
+                    errmsg = "Connection failed.\n"
+                            "Either the IP address is wrong or a firewall on either system is blocking\n"
+                            "UDP packets on the port you have chosen.";
+                    queue = false;
+                    break;
+                }
+                case ID_INVALID_PASSWORD:
+                {
+                    errmsg = "Connection failed.\n"
+                            "The client or server is outdated.";
+                    queue = false;
+                    break;
+                }
+                case ID_CONNECTION_REQUEST_ACCEPTED:
+                {
+                    serverAddr = packet->systemAddress;
+                    connected = true;
+                    queue = false;
+
+                    LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_CONNECTION_REQUESTED_ACCEPTED from %s",
+                        serverAddr.ToString());
+
+                    break;
+                }
+                case ID_DISCONNECTION_NOTIFICATION:
+                    throw runtime_error("ID_DISCONNECTION_NOTIFICATION.\n");
+                case ID_CONNECTION_BANNED:
+                    throw runtime_error("ID_CONNECTION_BANNED.\n");
+                case ID_CONNECTION_LOST:
+                    throw runtime_error("ID_CONNECTION_LOST.\n");
+                default:
+                    LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Connection message with identifier %i has arrived in initialization.", packet->data[0]);
+            }
+        }
+    }
+
+    if (!errmsg.empty())
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, errmsg.c_str());
+        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "tes3mp", errmsg.c_str(), 0);
+    }
+}
+
+void Networking::processPlayerPacket(RakNet::Packet *packet)
+{
+    RakNet::RakNetGUID guid;
+    RakNet::BitStream bsIn(&packet->data[1], packet->length, false);
+    bsIn.Read(guid);
+
+    DedicatedPlayer *pl = 0;
+    static RakNet::RakNetGUID myGuid = getLocalPlayer()->guid;
+    if (guid != myGuid)
+        pl = Players::getPlayer(guid);
+
+    PlayerPacket *myPacket = playerController.GetPacket(packet->data[0]);
+
+    switch (packet->data[0])
+    {
+    case ID_HANDSHAKE:
+    {
+        myPacket->Send(getLocalPlayer(), serverAddr);
+        break;
+    }
+    case ID_PLAYER_BASEINFO:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_PLAYER_BASEINFO from server");
+
+        if (guid == myGuid)
+        {
+            LOG_APPEND(Log::LOG_INFO, "- Packet was about my id");
+
+            if (packet->length == myPacket->headerSize())
+            {
+                LOG_APPEND(Log::LOG_INFO, "- Requesting info");
+                myPacket->Send(getLocalPlayer(), serverAddr);
+            }
+            else
+            {
+                myPacket->Packet(&bsIn, getLocalPlayer(), false);
+                LOG_APPEND(Log::LOG_INFO, "- Updating LocalPlayer");
+                getLocalPlayer()->updateChar();
+            }
+        }
+        else
+        {
+            LOG_APPEND(Log::LOG_INFO, "- Packet was about %s", pl == 0 ? "new player" : pl->npc.mName.c_str());
+
+            if (pl == 0)
+            {
+                LOG_APPEND(Log::LOG_INFO, "- Exchanging data with new player");
+                pl = Players::newPlayer(guid);
+            }
+
+            myPacket->Packet(&bsIn, pl, false);
+            Players::createPlayer(guid);
+        }
+        break;
+    }
+    case ID_PLAYER_POS:
+    {
+        if (guid == myGuid)
+        {
+            if (packet->length != myPacket->headerSize())
+            {
+                LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "ID_PLAYER_POS changed by server");
+                myPacket->Packet(&bsIn, getLocalPlayer(), false);
+                getLocalPlayer()->setPosition();
+            }
+            else
+                getLocalPlayer()->updatePosition(true);
+        }
+        else if (pl != 0)
+        {
+            myPacket->Packet(&bsIn, pl, false);
+            pl->updateMarker();
+        }
+        break;
+    }
+    case ID_USER_MYID:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_USER_MYID from server");
+        myGuid = guid;
+        getLocalPlayer()->guid = guid;
+        break;
+    }
+    case ID_USER_DISCONNECTED:
+    {
+        if (guid == myGuid)
+            MWBase::Environment::get().getStateManager()->requestQuit();
+        else if (pl != 0)
+            Players::disconnectPlayer(guid);
+
+    }
+    case ID_PLAYER_EQUIPMENT:
+    {
+        if (guid == myGuid)
+        {
+            if (packet->length == myPacket->headerSize())
+            {
+                getLocalPlayer()->updateEquipment(true);
+            }
+            else
+            {
+                myPacket->Packet(&bsIn, getLocalPlayer(), false);
+                getLocalPlayer()->setEquipment();
+            }
+        }
+        else if (pl != 0)
+        {
+            myPacket->Packet(&bsIn, pl, false);
+            pl->updateEquipment();
+        }
+        break;
+    }
+    case ID_PLAYER_INVENTORY:
+    {
+        if (guid == myGuid)
+        {
+            if (packet->length == myPacket->headerSize())
+            {
+                getLocalPlayer()->updateInventory(true);
+            }
+            else
+            {
+                myPacket->Packet(&bsIn, getLocalPlayer(), false);
+                int inventoryAction = getLocalPlayer()->inventoryChanges.action;
+
+                if (inventoryAction == InventoryChanges::ADD)
+                {
+                    getLocalPlayer()->addItems();
+                }
+                else if (inventoryAction == InventoryChanges::REMOVE)
+                {
+                    getLocalPlayer()->removeItems();
+                }
+                else // InventoryChanges::SET
+                {
+                    getLocalPlayer()->setInventory();
+                }
+            }
+        }
+        break;
+    }
+    case ID_PLAYER_SPELLBOOK:
+    {
+        if (guid == myGuid)
+        {
+            if (packet->length == myPacket->headerSize())
+            {
+                getLocalPlayer()->sendSpellbook();
+            }
+            else
+            {
+                myPacket->Packet(&bsIn, getLocalPlayer(), false);
+                int spellbookAction = getLocalPlayer()->spellbookChanges.action;
+
+                if (spellbookAction == SpellbookChanges::ADD)
+                {
+                    getLocalPlayer()->addSpells();
+                }
+                else if (spellbookAction == SpellbookChanges::REMOVE)
+                {
+                    getLocalPlayer()->removeSpells();
+                }
+                else // SpellbookChanges::SET
+                {
+                    getLocalPlayer()->setSpellbook();
+                }
+            }
+        }
+        break;
+    }
+    case ID_PLAYER_JOURNAL:
+    {
+        if (guid == myGuid)
+        {
+            if (packet->length == myPacket->headerSize())
+            {
+                // Entire journal cannot currently be requested from players
+            }
+            else
+            {
+                myPacket->Packet(&bsIn, getLocalPlayer(), false);
+                getLocalPlayer()->addJournalItems();
+            }
+        }
+        break;
+    }
+    case ID_PLAYER_ATTACK:
+    {
+        if (pl != 0)
+        {
+            myPacket->Packet(&bsIn, pl, false);
+
+            //cout << "Player: " << pl->Npc()->mName << " pressed: " << (pl->getAttack()->pressed == 1) << endl;
+            if (pl->attack.pressed == 0)
+            {
+                LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Attack success: %s",
+                    pl->attack.success ? "true" : "false");
+
+                if (pl->attack.success == 1)
+                {
+                    LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Damage: %f",
+                        pl->attack.damage);
+                }
+            }
+
+            MWMechanics::CreatureStats &stats = pl->getPtr().getClass().getNpcStats(pl->getPtr());
+            stats.getSpells().setSelectedSpell(pl->attack.refid);
+
+            MWWorld::Ptr victim;
+            if (pl->attack.target == getLocalPlayer()->guid)
+                victim = MWBase::Environment::get().getWorld()->getPlayerPtr();
+            else if (Players::getPlayer(pl->attack.target) != 0)
+                victim = Players::getPlayer(pl->attack.target)->getPtr();
+
+            MWWorld::Ptr attacker;
+            attacker = pl->getPtr();
+
+            // Get the weapon used (if hand-to-hand, weapon = inv.end())
+            if (pl->drawState == 1)
+            {
+                MWWorld::InventoryStore &inv = attacker.getClass().getInventoryStore(attacker);
+                MWWorld::ContainerStoreIterator weaponslot = inv.getSlot(
+                    MWWorld::InventoryStore::Slot_CarriedRight);
+                MWWorld::Ptr weapon = ((weaponslot != inv.end()) ? *weaponslot : MWWorld::Ptr());
+                if (!weapon.isEmpty() && weapon.getTypeName() != typeid(ESM::Weapon).name())
+                    weapon = MWWorld::Ptr();
+
+                if (victim.mRef != 0)
+                {
+                    bool healthdmg;
+                    if (!weapon.isEmpty())
+                        healthdmg = true;
+                    else
+                    {
+                        MWMechanics::CreatureStats &otherstats = victim.getClass().getCreatureStats(victim);
+                        healthdmg = otherstats.isParalyzed() || otherstats.getKnockedDown();
+                    }
+
+                    if (!weapon.isEmpty())
+                        MWMechanics::blockMeleeAttack(attacker, victim, weapon, pl->attack.damage, 1);
+                    pl->getPtr().getClass().onHit(victim, pl->attack.damage, healthdmg, weapon, attacker, osg::Vec3f(),
+                        pl->attack.success);
+                }
+            }
+            else
+            {
+                LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "SpellId: %s",
+                    pl->attack.refid.c_str());
+                LOG_APPEND(Log::LOG_VERBOSE, " - success: %d", pl->attack.success);
+            }
+        }
+        break;
+    }
+    case ID_PLAYER_DYNAMICSTATS:
+    {
+        if (guid == myGuid)
+        {
+            if (packet->length == myPacket->headerSize())
+            {
+                getLocalPlayer()->updateDynamicStats(true);
+            }
+            else
+            {
+                myPacket->Packet(&bsIn, getLocalPlayer(), false);
+                getLocalPlayer()->setDynamicStats();
+            }
+        }
+        else if (pl != 0)
+        {
+            myPacket->Packet(&bsIn, pl, false);
+
+            MWWorld::Ptr ptrPlayer = pl->getPtr();
+            MWMechanics::CreatureStats *ptrCreatureStats = &ptrPlayer.getClass().getCreatureStats(ptrPlayer);
+            MWMechanics::DynamicStat<float> value;
+
+            for (int i = 0; i < 3; ++i)
+            {
+                value.readState(pl->creatureStats.mDynamic[i]);
+                ptrCreatureStats->setDynamic(i, value);
+            }
+        }
+        break;
+    }
+    case ID_GAME_DIE:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_GAME_DIE from server");
+        if (guid == myGuid)
+        {
+            MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+            MWMechanics::DynamicStat<float> health = player.getClass().getCreatureStats(player).getHealth();
+            health.setCurrent(0);
+            player.getClass().getCreatureStats(player).setHealth(health);
+            myPacket->Send(getLocalPlayer(), serverAddr);
+        }
+        else if (pl != 0)
+        {
+            LOG_APPEND(Log::LOG_INFO, "- Packet was about %s", pl->npc.mName.c_str());
+            MWMechanics::DynamicStat<float> health;
+            pl->creatureStats.mDead = true;
+            health.readState(pl->creatureStats.mDynamic[0]);
+            health.setCurrent(0);
+            health.writeState(pl->creatureStats.mDynamic[0]);
+            pl->getPtr().getClass().getCreatureStats(pl->getPtr()).setHealth(health);
+        }
+        break;
+    }
+    case ID_GAME_RESURRECT:
+    {
+        if (guid == myGuid)
+        {
+            MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+            player.getClass().getCreatureStats(player).resurrect();
+            ESM::Position resurrectPos;
+            MWBase::Environment::get().getWorld()->findInteriorPosition("Pelagiad, Fort Pelagiad", resurrectPos);
+            MWBase::Environment::get().getWorld()->changeToInteriorCell("Pelagiad, Fort Pelagiad", resurrectPos, true);
+
+            // If this player had a weapon or spell readied when dying, they will
+            // still have it readied but be unable to use it unless we clear it here
+            player.getClass().getNpcStats(player).setDrawState(MWMechanics::DrawState_Nothing);
+
+            getLocalPlayer()->position = resurrectPos;
+            getLocalPlayer()->cell = *player.getCell()->getCell();
+            myPacket->Send(getLocalPlayer(), serverAddr);
+
+            getLocalPlayer()->updateDynamicStats(true);
+            playerController.GetPacket(ID_PLAYER_DYNAMICSTATS)->Send(getLocalPlayer(), serverAddr);
+        }
+        else if (pl != 0)
+        {
+            pl->creatureStats.mDead = false;
+            if (pl->creatureStats.mDynamic[0].mMod < 1)
+                pl->creatureStats.mDynamic[0].mMod = 1;
+            pl->creatureStats.mDynamic[0].mCurrent = pl->creatureStats.mDynamic[0].mMod;
+
+            pl->getPtr().getClass().getCreatureStats(pl->getPtr()).resurrect();
+
+            MWMechanics::DynamicStat<float> health;
+            health.readState(pl->creatureStats.mDynamic[0]);
+            pl->getPtr().getClass().getCreatureStats(pl->getPtr()).setHealth(health);
+        }
+        break;
+    }
+    case ID_PLAYER_CELL_CHANGE:
+    {
+        if (guid == myGuid)
+        {
+            if (packet->length == myPacket->headerSize())
+                getLocalPlayer()->updateCell(true);
+            else
+            {
+                myPacket->Packet(&bsIn, getLocalPlayer(), false);
+                getLocalPlayer()->setCell();
+            }
+        }
+        else if (pl != 0)
+        {
+            myPacket->Packet(&bsIn, pl, false);
+            pl->updateCell();
+        }
+        break;
+    }
+    case ID_PLAYER_CELL_STATE:
+    {
+        if (guid == myGuid)
+        {
+            if (packet->length == myPacket->headerSize())
+                getLocalPlayer()->sendCellStates();
+        }
+
+        break;
+    }
+    case ID_PLAYER_DRAWSTATE:
+    {
+        if (guid == myGuid)
+            getLocalPlayer()->updateDrawStateAndFlags(true);
+        else if (pl != 0)
+        {
+            myPacket->Packet(&bsIn, pl, false);
+            pl->updateDrawState();
+        }
+        break;
+    }
+    case ID_CHAT_MESSAGE:
+    {
+        std::string message;
+        if (guid == myGuid)
+        {
+            myPacket->Packet(&bsIn, getLocalPlayer(), false);
+            message = getLocalPlayer()->chatMessage;
+        }
+        else if (pl != 0)
+        {
+            myPacket->Packet(&bsIn, pl, false);
+            message = pl->chatMessage;
+        }
+        Main::get().getGUIController()->printChatMessage(message);
+
+        break;
+    }
+    case ID_PLAYER_CHARGEN:
+    {
+        if (guid == myGuid)
+        {
+            myPacket->Packet(&bsIn, getLocalPlayer(), false);
+        }
+        break;
+    }
+    case ID_PLAYER_ATTRIBUTE:
+    {
+        if (guid == myGuid)
+        {
+            if (packet->length == myPacket->headerSize())
+            {
+                getLocalPlayer()->updateAttributes(true);
+            }
+            else
+            {
+                myPacket->Packet(&bsIn, getLocalPlayer(), false);
+                getLocalPlayer()->setAttributes();
+            }
+        }
+        else if (pl != 0)
+        {
+            myPacket->Packet(&bsIn, pl, false);
+
+            MWWorld::Ptr ptrPlayer = pl->getPtr();
+            MWMechanics::CreatureStats *ptrCreatureStats = &ptrPlayer.getClass().getCreatureStats(ptrPlayer);
+            MWMechanics::AttributeValue attributeValue;
+
+            for (int i = 0; i < 8; ++i)
+            {
+                attributeValue.readState(pl->creatureStats.mAttributes[i]);
+                ptrCreatureStats->setAttribute(i, attributeValue);
+            }
+        }
+        break;
+    }
+    case ID_PLAYER_SKILL:
+    {
+        if (guid == myGuid)
+        {
+            if (packet->length == myPacket->headerSize())
+            {
+                getLocalPlayer()->updateSkills(true);
+            }
+            else
+            {
+                myPacket->Packet(&bsIn, getLocalPlayer(), false);
+                getLocalPlayer()->setSkills();
+            }
+        }
+        else if (pl != 0)
+        {
+            myPacket->Packet(&bsIn, pl, false);
+
+            MWWorld::Ptr ptrPlayer = pl->getPtr();
+            MWMechanics::NpcStats *ptrNpcStats = &ptrPlayer.getClass().getNpcStats(ptrPlayer);
+            MWMechanics::SkillValue skillValue;
+
+            for (int i = 0; i < 27; ++i)
+            {
+                skillValue.readState(pl->npcStats.mSkills[i]);
+                ptrNpcStats->setSkill(i, skillValue);
+            }
+        }
+        break;
+    }
+    case ID_PLAYER_LEVEL:
+    {
+        if (guid == myGuid)
+        {
+            if (packet->length == myPacket->headerSize())
+            {
+                getLocalPlayer()->updateLevel(true);
+            }
+            else
+            {
+                myPacket->Packet(&bsIn, getLocalPlayer(), false);
+                getLocalPlayer()->setLevel();
+            }
+        }
+        else if (pl != 0)
+        {
+            myPacket->Packet(&bsIn, pl, false);
+
+            MWWorld::Ptr ptrPlayer = pl->getPtr();
+            MWMechanics::CreatureStats *ptrCreatureStats = &ptrPlayer.getClass().getCreatureStats(ptrPlayer);
+
+            ptrCreatureStats->setLevel(pl->creatureStats.mLevel);
+        }
+        break;
+    }
+    case ID_GUI_MESSAGEBOX:
+    {
+        if (guid == myGuid)
+        {
+            myPacket->Packet(&bsIn, getLocalPlayer(), false);
+
+            LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "ID_GUI_MESSAGEBOX, Type %d, MSG %s",
+                getLocalPlayer()->guiMessageBox.type,
+                getLocalPlayer()->guiMessageBox.label.c_str());
+
+            int messageBoxType = getLocalPlayer()->guiMessageBox.type;
+
+            if (messageBoxType == BasePlayer::GUIMessageBox::MessageBox)
+                Main::get().getGUIController()->showMessageBox(getLocalPlayer()->guiMessageBox);
+            else if (messageBoxType == BasePlayer::GUIMessageBox::CustomMessageBox)
+                Main::get().getGUIController()->showCustomMessageBox(getLocalPlayer()->guiMessageBox);
+            else if (messageBoxType == BasePlayer::GUIMessageBox::InputDialog)
+                Main::get().getGUIController()->showInputBox(getLocalPlayer()->guiMessageBox);
+            else if (messageBoxType == BasePlayer::GUIMessageBox::ListBox)
+                Main::get().getGUIController()->showDialogList(getLocalPlayer()->guiMessageBox);
+        }
+        break;
+    }
+    case ID_PLAYER_CHARCLASS:
+    {
+        if (guid == myGuid)
+        {
+            if (packet->length == myPacket->headerSize())
+                getLocalPlayer()->sendClass();
+            else
+            {
+                myPacket->Packet(&bsIn, getLocalPlayer(), false);
+                getLocalPlayer()->setClass();
+            }
+        }
+        break;
+    }
+    case ID_GAME_TIME:
+    {
+        if (guid == myGuid)
+        {
+            myPacket->Packet(&bsIn, getLocalPlayer(), false);
+            MWBase::World *world = MWBase::Environment::get().getWorld();
+            if (getLocalPlayer()->hour != -1)
+                world->setHour(getLocalPlayer()->hour);
+            else if (getLocalPlayer()->day != -1)
+                world->setDay(getLocalPlayer()->day);
+            else if (getLocalPlayer()->month != -1)
+                world->setMonth(getLocalPlayer()->month);
+        }
+        break;
+    }
+    case ID_GAME_CONSOLE:
+    {
+        myPacket->Packet(&bsIn, getLocalPlayer(), false);
+        break;
+    }
+    default:
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Unhandled PlayerPacket with identifier %i has arrived",
+            packet->data[0]);
+    }
+}
+
+void Networking::processWorldPacket(RakNet::Packet *packet)
+{
+    RakNet::RakNetGUID guid;
+    RakNet::BitStream bsIn(&packet->data[1], packet->length, false);
+    bsIn.Read(guid);
+
+    DedicatedPlayer *pl = 0;
+    static RakNet::RakNetGUID myGuid = getLocalPlayer()->guid;
+    if (guid != myGuid)
+        pl = Players::getPlayer(guid);
+
+    WorldPacket *myPacket = worldController.GetPacket(packet->data[0]);
+
+    myPacket->Packet(&bsIn, &worldEvent, false);
+
+    switch (packet->data[0])
+    {
+    case ID_CONTAINER:
+    {
+        MWWorld::CellStore *ptrCellStore = Main::get().getWorldController()->getCell(worldEvent.cell);
+
+        if (!ptrCellStore) return;
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Received ID_CONTAINER about %s",
+            worldEvent.cell.getDescription().c_str());
+        LOG_APPEND(Log::LOG_VERBOSE, "- action: %i", worldEvent.action);
+
+        // If we've received a request for information, comply with it
+        if (worldEvent.action == mwmp::BaseEvent::REQUEST)
+            worldEvent.sendContainers(ptrCellStore);
+        // Otherwise, edit containers based on the information received
+        else
+            worldEvent.editContainers(ptrCellStore);
+
+        break;
+    }
+    case ID_OBJECT_PLACE:
+    {
+        MWWorld::CellStore *ptrCellStore = Main::get().getWorldController()->getCell(worldEvent.cell);
+
+        if (!ptrCellStore) return;
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_PLACE about %s",
+            worldEvent.cell.getDescription().c_str());
+        worldEvent.placeObjects(ptrCellStore);
+
+        break;
+    }
+    case ID_OBJECT_DELETE:
+    {
+        MWWorld::CellStore *ptrCellStore = Main::get().getWorldController()->getCell(worldEvent.cell);
+
+        if (!ptrCellStore) return;
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_DELETE about %s",
+            worldEvent.cell.getDescription().c_str());
+        worldEvent.deleteObjects(ptrCellStore);
+
+        break;
+    }
+    case ID_OBJECT_LOCK:
+    {
+        MWWorld::CellStore *ptrCellStore = Main::get().getWorldController()->getCell(worldEvent.cell);
+
+        if (!ptrCellStore) return;
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_LOCK about %s",
+            worldEvent.cell.getDescription().c_str());
+        worldEvent.lockObjects(ptrCellStore);
+
+        break;
+    }
+    case ID_OBJECT_UNLOCK:
+    {
+        MWWorld::CellStore *ptrCellStore = Main::get().getWorldController()->getCell(worldEvent.cell);
+
+        if (!ptrCellStore) return;
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_UNLOCK about %s",
+            worldEvent.cell.getDescription().c_str());
+        worldEvent.unlockObjects(ptrCellStore);
+
+        break;
+    }
+    case ID_OBJECT_SCALE:
+    {
+        MWWorld::CellStore *ptrCellStore = Main::get().getWorldController()->getCell(worldEvent.cell);
+
+        if (!ptrCellStore) return;
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_SCALE about %s",
+            worldEvent.cell.getDescription().c_str());
+        worldEvent.scaleObjects(ptrCellStore);
+
+        break;
+    }
+    case ID_OBJECT_MOVE:
+    {
+        MWWorld::CellStore *ptrCellStore = Main::get().getWorldController()->getCell(worldEvent.cell);
+
+        if (!ptrCellStore) return;
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_MOVE about %s",
+            worldEvent.cell.getDescription().c_str());
+        worldEvent.moveObjects(ptrCellStore);
+
+        break;
+    }
+    case ID_OBJECT_ROTATE:
+    {
+        MWWorld::CellStore *ptrCellStore = Main::get().getWorldController()->getCell(worldEvent.cell);
+
+        if (!ptrCellStore) return;
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_ROTATE about %s",
+            worldEvent.cell.getDescription().c_str());
+        worldEvent.rotateObjects(ptrCellStore);
+
+        break;
+    }
+    case ID_OBJECT_ANIM_PLAY:
+    {
+        MWWorld::CellStore *ptrCellStore = Main::get().getWorldController()->getCell(worldEvent.cell);
+
+        if (!ptrCellStore) return;
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_ANIM_PLAY about %s",
+            worldEvent.cell.getDescription().c_str());
+        worldEvent.animateObjects(ptrCellStore);
+
+        break;
+    }
+    case ID_DOOR_STATE:
+    {
+        MWWorld::CellStore *ptrCellStore = Main::get().getWorldController()->getCell(worldEvent.cell);
+
+        if (!ptrCellStore) return;
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_DOOR_STATE about %s",
+            worldEvent.cell.getDescription().c_str());
+        worldEvent.activateDoors(ptrCellStore);
+
+        break;
+    }
+    case ID_SCRIPT_LOCAL_SHORT:
+    {
+        MWWorld::CellStore *ptrCellStore = Main::get().getWorldController()->getCell(worldEvent.cell);
+
+        if (!ptrCellStore) return;
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_SCRIPT_LOCAL_SHORT about %s",
+            worldEvent.cell.getDescription().c_str());
+        worldEvent.setLocalShorts(ptrCellStore);
+
+        break;
+    }
+    case ID_SCRIPT_LOCAL_FLOAT:
+    {
+        MWWorld::CellStore *ptrCellStore = Main::get().getWorldController()->getCell(worldEvent.cell);
+
+        if (!ptrCellStore) return;
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_SCRIPT_LOCAL_FLOAT about %s",
+            worldEvent.cell.getDescription().c_str());
+        worldEvent.setLocalFloats(ptrCellStore);
+
+        break;
+    }
+    case ID_SCRIPT_MEMBER_SHORT:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_SCRIPT_MEMBER_SHORT");
+        worldEvent.setMemberShorts();
+
+        break;
+    }
+    case ID_SCRIPT_GLOBAL_SHORT:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_SCRIPT_GLOBAL_SHORT");
+        worldEvent.setGlobalShorts();
+
+        break;
+    }
+    case ID_MUSIC_PLAY:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_MUSIC_PLAY");
+        worldEvent.playMusic();
+
+        break;
+    }
+    case ID_VIDEO_PLAY:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_VIDEO_PLAY");
+        worldEvent.playVideo();
+
+        break;
+    }
+    default:
+        LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Unhandled WorldPacket with identifier %i has arrived",
+            packet->data[0]);
+    }
+}
+
+void Networking::receiveMessage(RakNet::Packet *packet)
+{
+    if (packet->length < 2)
+        return;
+
+    if (playerController.ContainsPacket(packet->data[0]))
+    {
+        processPlayerPacket(packet);
+    }
+    else if (worldController.ContainsPacket(packet->data[0]))
+    {
+        processWorldPacket(packet);
+    }
+}
+
+PlayerPacket *Networking::getPlayerPacket(RakNet::MessageID id)
+{
+    return playerController.GetPacket(id);
+}
+
+WorldPacket *Networking::getWorldPacket(RakNet::MessageID id)
+{
+    return worldController.GetPacket(id);
+}
+
+LocalPlayer *Networking::getLocalPlayer()
+{
+    return mwmp::Main::get().getLocalPlayer();
+}
+
+WorldEvent *Networking::resetWorldEvent()
+{
+    worldEvent.cell.blank();
+    worldEvent.objectChanges.objects.clear();
+    worldEvent.guid = getLocalPlayer()->guid;
+    return &worldEvent;
+}
+
+bool Networking::isDedicatedPlayer(const MWWorld::Ptr &ptr)
+{
+    if (ptr.mRef == 0)
+        return 0;
+    DedicatedPlayer *pl = Players::getPlayer(ptr);
+
+    return pl != 0;
+}
+
+bool Networking::attack(const MWWorld::Ptr &ptr)
+{
+    DedicatedPlayer *pl = Players::getPlayer(ptr);
+
+    if (pl == 0)
+        return false;
+
+    return pl->attack.pressed;
+}
+
+bool Networking::isConnected()
+{
+    return connected;
+}
diff --git a/apps/openmw/mwmp/Networking.hpp b/apps/openmw/mwmp/Networking.hpp
new file mode 100644
index 000000000..4d6079333
--- /dev/null
+++ b/apps/openmw/mwmp/Networking.hpp
@@ -0,0 +1,63 @@
+//
+// Created by koncord on 04.01.16.
+//
+
+#ifndef OPENMW_NETWORKING_HPP
+#define OPENMW_NETWORKING_HPP
+
+#include <RakPeerInterface.h>
+#include <BitStream.h>
+#include <string>
+
+#include "WorldEvent.hpp"
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <components/openmw-mp/Controllers/PlayerPacketController.hpp>
+#include <components/openmw-mp/Controllers/WorldPacketController.hpp>
+
+namespace mwmp
+{
+    class LocalPlayer;
+
+    class Networking
+    {
+    public:
+        Networking();
+        ~Networking();
+        void connect(const std::string& ip, unsigned short port);
+        void update();
+        void sendData(RakNet::BitStream *bitStream);
+
+        PlayerPacket *getPlayerPacket(RakNet::MessageID id);
+        WorldPacket *getWorldPacket(RakNet::MessageID id);
+
+        bool isDedicatedPlayer(const MWWorld::Ptr &ptr);
+        bool attack(const MWWorld::Ptr &ptr);
+
+        RakNet::SystemAddress serverAddress()
+        {
+            return serverAddr;
+        }
+
+        bool isConnected();
+
+        WorldEvent *resetWorldEvent();
+
+    private:
+        bool connected;
+        RakNet::RakPeerInterface *peer;
+        RakNet::SystemAddress serverAddr;
+        RakNet::BitStream bsOut;
+
+        PlayerPacketController playerController;
+        WorldPacketController worldController;
+        WorldEvent worldEvent;
+
+        void processPlayerPacket(RakNet::Packet *packet);
+        void processWorldPacket(RakNet::Packet *packet);
+        void receiveMessage(RakNet::Packet *packet);
+        LocalPlayer *getLocalPlayer();
+    };
+}
+
+
+#endif //OPENMW_NETWORKING_HPP
diff --git a/apps/openmw/mwmp/PlayerMarkerCollection.cpp b/apps/openmw/mwmp/PlayerMarkerCollection.cpp
new file mode 100644
index 000000000..f0aa602b1
--- /dev/null
+++ b/apps/openmw/mwmp/PlayerMarkerCollection.cpp
@@ -0,0 +1,87 @@
+//
+// Created by koncord on 30.09.16.
+//
+
+#include <stdexcept>
+#include "PlayerMarkerCollection.hpp"
+
+
+using namespace mwmp;
+
+void PlayerMarkerCollection::addMarker(const ESM::CustomMarker &marker, bool triggerEvent)
+{
+    mMarkers.insert(std::make_pair(marker.mCell, marker));
+    if (triggerEvent)
+        eventMarkersChanged();
+}
+
+void PlayerMarkerCollection::deleteMarker(const ESM::CustomMarker &marker)
+{
+    std::pair<ContainerType::iterator, ContainerType::iterator> range = mMarkers.equal_range(marker.mCell);
+
+    for (ContainerType::iterator it = range.first; it != range.second; ++it)
+    {
+        if (it->second == marker)
+        {
+            mMarkers.erase(it);
+            eventMarkersChanged();
+            return;
+        }
+    }
+    throw std::runtime_error("can't find marker to delete");
+}
+
+void PlayerMarkerCollection::updateMarker(const ESM::CustomMarker &marker, const std::string &newNote)
+{
+    std::pair<ContainerType::iterator, ContainerType::iterator> range = mMarkers.equal_range(marker.mCell);
+
+    for (ContainerType::iterator it = range.first; it != range.second; ++it)
+    {
+        if (it->second == marker)
+        {
+            it->second.mNote = newNote;
+            eventMarkersChanged();
+            return;
+        }
+    }
+    throw std::runtime_error("can't find marker to update");
+}
+
+void PlayerMarkerCollection::clear()
+{
+    mMarkers.clear();
+    eventMarkersChanged();
+}
+
+PlayerMarkerCollection::ContainerType::const_iterator PlayerMarkerCollection::begin() const
+{
+    return mMarkers.begin();
+}
+
+PlayerMarkerCollection::ContainerType::const_iterator PlayerMarkerCollection::end() const
+{
+    return mMarkers.end();
+}
+
+PlayerMarkerCollection::RangeType PlayerMarkerCollection::getMarkers(const ESM::CellId &cellId) const
+{
+    return mMarkers.equal_range(cellId);
+}
+
+size_t PlayerMarkerCollection::size() const
+{
+    return mMarkers.size();
+}
+
+bool PlayerMarkerCollection::contains(const ESM::CustomMarker &marker)
+{
+    std::pair<ContainerType::iterator, ContainerType::iterator> range = mMarkers.equal_range(marker.mCell);
+
+    for (ContainerType::iterator it = range.first; it != range.second; ++it)
+    {
+        if (it->second == marker)
+            return true;
+    }
+
+    return false;
+}
diff --git a/apps/openmw/mwmp/PlayerMarkerCollection.hpp b/apps/openmw/mwmp/PlayerMarkerCollection.hpp
new file mode 100644
index 000000000..de17062d5
--- /dev/null
+++ b/apps/openmw/mwmp/PlayerMarkerCollection.hpp
@@ -0,0 +1,48 @@
+//
+// Created by koncord on 30.09.16.
+//
+
+// Copied from MWGui::CustomMarkerCollection
+
+#ifndef OPENMW_PLAYERMARKERCOLLECTION_HPP
+#define OPENMW_PLAYERMARKERCOLLECTION_HPP
+
+#include <components/esm/cellid.hpp>
+#include <components/esm/custommarkerstate.hpp>
+#include <map>
+#include <MyGUI_Common.h>
+#include <MyGUI_Colour.h>
+
+namespace mwmp
+{
+    class PlayerMarkerCollection
+    {
+    public:
+
+        void addMarker(const ESM::CustomMarker &marker, bool triggerEvent = true);
+        void deleteMarker(const ESM::CustomMarker &marker);
+        void updateMarker(const ESM::CustomMarker &marker, const std::string &newNote);
+
+        void clear();
+
+        size_t size() const;
+
+        typedef std::multimap <ESM::CellId, ESM::CustomMarker> ContainerType;
+
+        typedef std::pair <ContainerType::const_iterator, ContainerType::const_iterator> RangeType;
+
+        ContainerType::const_iterator begin() const;
+        ContainerType::const_iterator end() const;
+
+        RangeType getMarkers(const ESM::CellId &cellId) const;
+
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
+        EventHandle_Void eventMarkersChanged;
+
+        bool contains(const ESM::CustomMarker &marker);
+    private:
+        ContainerType mMarkers;
+    };
+}
+
+#endif //OPENMW_PLAYERMARKERCOLLECTION_HPP
diff --git a/apps/openmw/mwmp/WorldController.cpp b/apps/openmw/mwmp/WorldController.cpp
new file mode 100644
index 000000000..ffbb258ca
--- /dev/null
+++ b/apps/openmw/mwmp/WorldController.cpp
@@ -0,0 +1,89 @@
+#include "../mwbase/environment.hpp"
+#include "../mwworld/worldimp.hpp"
+#include <components/esm/cellid.hpp>
+#include <components/openmw-mp/Log.hpp>
+#include "../mwworld/containerstore.hpp"
+#include "../mwworld/class.hpp"
+
+#include "WorldController.hpp"
+#include "Main.hpp"
+#include "LocalPlayer.hpp"
+
+
+mwmp::WorldController::WorldController()
+{
+
+}
+
+mwmp::WorldController::~WorldController()
+{
+
+}
+
+MWWorld::CellStore *mwmp::WorldController::getCell(const ESM::Cell& cell)
+{
+    MWWorld::CellStore *cellStore;
+
+    if (cell.isExterior())
+        cellStore = MWBase::Environment::get().getWorld()->getExterior(cell.mData.mX, cell.mData.mY);
+    else
+    {
+        try
+        {
+            cellStore = MWBase::Environment::get().getWorld()->getInterior(cell.mName);
+        }
+        catch (std::exception&)
+        {
+            cellStore = NULL;
+        }
+    }
+
+    return cellStore;
+}
+
+
+void mwmp::WorldController::openContainer(const MWWorld::Ptr &container, bool loot)
+{
+    // Record this as the player's current open container
+    mwmp::Main::get().getLocalPlayer()->storeCurrentContainer(container, loot);
+
+    LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Container \"%s\" (%d) is opened. Loot: %s",
+                       container.getCellRef().getRefId().c_str(),
+                       container.getCellRef().getRefNum().mIndex,
+                       loot ? "true" : "false");
+
+    MWWorld::ContainerStore &cont = container.getClass().getContainerStore(container);
+    for (MWWorld::ContainerStoreIterator iter = cont.begin(); iter != cont.end(); iter++)
+    {
+        int count = iter->getRefData().getCount();
+        const std::string &name = iter->getCellRef().getRefId();
+
+        LOG_APPEND(Log::LOG_VERBOSE, " - Item. Refid: \"%s\" Count: %d", name.c_str(), count);
+
+        /*if(::Misc::StringUtils::ciEqual(name, "gold_001"))
+            cont.remove("gold_001", count, container);*/
+    }
+
+}
+
+void mwmp::WorldController::closeContainer(const MWWorld::Ptr &container)
+{
+    mwmp::Main::get().getLocalPlayer()->clearCurrentContainer();
+
+    // If the player died while in a container, the container's Ptr could be invalid now
+    if (!container.isEmpty())
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Container \"%s\" (%d) is closed.",
+            container.getCellRef().getRefId().c_str(),
+            container.getCellRef().getRefNum().mIndex);
+
+        MWWorld::ContainerStore &cont = container.getClass().getContainerStore(container);
+        for (MWWorld::ContainerStoreIterator iter = cont.begin(); iter != cont.end(); iter++)
+        {
+            LOG_APPEND(Log::LOG_VERBOSE, " - Item. Refid: \"%s\" Count: %d",
+                iter->getCellRef().getRefId().c_str(), iter->getRefData().getCount());
+        }
+    }
+
+    mwmp::Main::get().getLocalPlayer()->updateInventory();
+}
diff --git a/apps/openmw/mwmp/WorldController.hpp b/apps/openmw/mwmp/WorldController.hpp
new file mode 100644
index 000000000..3b05b55e9
--- /dev/null
+++ b/apps/openmw/mwmp/WorldController.hpp
@@ -0,0 +1,22 @@
+#ifndef OPENMW_WORLDCONTROLLER_HPP
+#define OPENMW_WORLDCONTROLLER_HPP
+
+#include "../mwworld/cellstore.hpp"
+
+namespace mwmp
+{
+    class WorldController
+    {
+    public:
+
+        WorldController();
+        ~WorldController();
+
+        void openContainer(const MWWorld::Ptr& container,  bool loot);
+        void closeContainer(const MWWorld::Ptr& container);
+
+        virtual MWWorld::CellStore *getCell(const ESM::Cell& cell);
+    };
+}
+
+#endif //OPENMW_WORLDCONTROLLER_HPP
diff --git a/apps/openmw/mwmp/WorldEvent.cpp b/apps/openmw/mwmp/WorldEvent.cpp
new file mode 100644
index 000000000..811a163ac
--- /dev/null
+++ b/apps/openmw/mwmp/WorldEvent.cpp
@@ -0,0 +1,530 @@
+#include "WorldEvent.hpp"
+#include "Main.hpp"
+#include "Networking.hpp"
+#include "LocalPlayer.hpp"
+#include "DedicatedPlayer.hpp"
+
+#include <components/openmw-mp/Log.hpp>
+
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+
+#include "../mwworld/class.hpp"
+#include "../mwworld/containerstore.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/manualref.hpp"
+
+using namespace mwmp;
+using namespace std;
+
+WorldEvent::WorldEvent()
+{
+
+}
+
+WorldEvent::~WorldEvent()
+{
+
+}
+
+Networking *WorldEvent::getNetworking()
+{
+    return mwmp::Main::get().getNetworking();
+}
+
+void WorldEvent::addObject(WorldObject worldObject)
+{
+    objectChanges.objects.push_back(worldObject);
+}
+
+void WorldEvent::sendContainers(MWWorld::CellStore* cellStore)
+{
+    mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+    worldEvent->cell = *cellStore->getCell();
+    worldEvent->action = BaseEvent::SET;
+
+    MWWorld::CellRefList<ESM::Container> *containerList = cellStore->getContainers();
+
+    for (typename MWWorld::CellRefList<ESM::Container>::List::iterator listIter(containerList->mList.begin());
+        listIter != containerList->mList.end(); ++listIter)
+    {
+        MWWorld::Ptr container(&*listIter, 0);
+
+        mwmp::WorldObject worldObject;
+        worldObject.refId = container.getCellRef().getRefId();
+        worldObject.refNumIndex = container.getCellRef().getRefNum().mIndex;
+
+        MWWorld::ContainerStore& containerStore = container.getClass().getContainerStore(container);
+
+        for (MWWorld::ContainerStoreIterator storeIter = containerStore.begin(); storeIter != containerStore.end(); ++storeIter)
+        {
+            MWWorld::Ptr itemPtr = *storeIter;
+
+            mwmp::ContainerItem containerItem;
+            containerItem.refId = itemPtr.getCellRef().getRefId();
+            containerItem.count = itemPtr.getRefData().getCount();
+            containerItem.charge = itemPtr.getCellRef().getCharge();
+
+            worldObject.containerChanges.items.push_back(containerItem);
+        }
+
+        worldEvent->addObject(worldObject);
+    }
+
+    mwmp::Main::get().getNetworking()->getWorldPacket(ID_CONTAINER)->Send(worldEvent);
+}
+
+void WorldEvent::editContainers(MWWorld::CellStore* cellStore)
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex);
+
+        MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex);
+
+        if (ptrFound)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Found %s, %i",
+                ptrFound.getCellRef().getRefId().c_str(),
+                ptrFound.getCellRef().getRefNum());
+
+            MWWorld::ContainerStore& containerStore = ptrFound.getClass().getContainerStore(ptrFound);
+
+            // If we are setting the entire contents, clear the current ones
+            if (action == BaseEvent::SET)
+                containerStore.clear();
+
+            for (unsigned int i = 0; i < worldObject.containerChanges.count; i++)
+            {
+                ContainerItem containerItem = worldObject.containerChanges.items.at(i);
+                MWWorld::Ptr ownerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr();
+
+                if (action == BaseEvent::ADD || action == BaseEvent::SET)
+                {
+                    // Create a ManualRef to be able to set item charge
+                    MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), containerItem.refId, 1);
+                    MWWorld::Ptr newPtr = ref.getPtr();
+
+                    if (containerItem.count > 1)
+                        newPtr.getRefData().setCount(containerItem.count);
+
+                    if (containerItem.charge > -1)
+                        newPtr.getCellRef().setCharge(containerItem.charge);
+
+                    containerStore.add(newPtr, containerItem.count, ownerPtr, true);
+                }
+                else if (action == BaseEvent::REMOVE)
+                {
+                    // We have to find the right item ourselves because ContainerStore has no method
+                    // accounting for charge
+                    for (MWWorld::ContainerStoreIterator iter(containerStore.begin()); iter != containerStore.end(); ++iter)
+                    {
+                        if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), containerItem.refId))
+                        {
+                            if (iter->getCellRef().getCharge() == containerItem.charge &&
+                                iter->getRefData().getCount() == containerItem.count)
+                            {
+                                containerStore.remove(*iter, containerItem.actionCount, ownerPtr);
+                            }
+                        }
+                    }
+                }
+            }
+
+            // If we are in a container, and it happens to be this container, update its view
+            if (MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Container))
+            {
+                CurrentContainer *currentContainer = &mwmp::Main::get().getLocalPlayer()->currentContainer;
+
+                if (currentContainer->refNumIndex == ptrFound.getCellRef().getRefNum().mIndex &&
+                    Misc::StringUtils::ciEqual(currentContainer->refId, ptrFound.getCellRef().getRefId()))
+                {
+                    MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container);
+                    MWBase::Environment::get().getWindowManager()->openContainer(ptrFound, currentContainer->loot);
+                }
+            }
+        }
+    }
+}
+
+void WorldEvent::placeObjects(MWWorld::CellStore* cellStore)
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- charge: %i\n- count: %i",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex,
+            worldObject.charge,
+            worldObject.count);
+
+        MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), worldObject.refId, 1);
+        MWWorld::Ptr newPtr = ref.getPtr();
+
+        if (worldObject.charge > -1)
+            newPtr.getCellRef().setCharge(worldObject.charge);
+
+        if (worldObject.count > 1)
+            newPtr.getRefData().setCount(worldObject.count);
+
+        newPtr.getCellRef().setGoldValue(worldObject.goldValue);
+        newPtr = MWBase::Environment::get().getWorld()->placeObject(newPtr, cellStore, worldObject.pos);
+
+        // Change RefNum here because the line above unsets it
+        newPtr.getCellRef().setRefNumIndex(worldObject.refNumIndex);
+
+        // If this RefNum is higher than the last we've recorded for this CellStore,
+        // start using it as our new last one
+        if (cellStore->getLastRefNumIndex() < worldObject.refNumIndex)
+            cellStore->setLastRefNumIndex(worldObject.refNumIndex);
+    }
+}
+
+void WorldEvent::deleteObjects(MWWorld::CellStore* cellStore)
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex);
+
+        MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex);
+
+        if (ptrFound)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Found %s, %i",
+                ptrFound.getCellRef().getRefId().c_str(),
+                ptrFound.getCellRef().getRefNum());
+
+            MWBase::Environment::get().getWorld()->deleteObject(ptrFound);
+        }
+    }
+}
+
+void WorldEvent::lockObjects(MWWorld::CellStore* cellStore)
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex);
+
+        MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex);
+
+        if (ptrFound)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Found %s, %i",
+                ptrFound.getCellRef().getRefId().c_str(),
+                ptrFound.getCellRef().getRefNum());
+
+            ptrFound.getClass().lock(ptrFound, worldObject.lockLevel);
+        }
+    }
+}
+
+void WorldEvent::unlockObjects(MWWorld::CellStore* cellStore)
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex);
+
+        MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex);
+
+        if (ptrFound)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Found %s, %i",
+                ptrFound.getCellRef().getRefId().c_str(),
+                ptrFound.getCellRef().getRefNum());
+
+            ptrFound.getClass().unlock(ptrFound);
+        }
+    }
+}
+
+void WorldEvent::scaleObjects(MWWorld::CellStore* cellStore)
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex);
+
+        MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex);
+
+        if (ptrFound)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Found %s, %i",
+                ptrFound.getCellRef().getRefId().c_str(),
+                ptrFound.getCellRef().getRefNum());
+
+            MWBase::Environment::get().getWorld()->scaleObject(ptrFound, worldObject.scale);
+        }
+    }
+}
+
+void WorldEvent::moveObjects(MWWorld::CellStore* cellStore)
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex);
+
+        MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex);
+
+        if (ptrFound)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Found %s, %i",
+                ptrFound.getCellRef().getRefId().c_str(),
+                ptrFound.getCellRef().getRefNum());
+
+            MWBase::Environment::get().getWorld()->moveObject(ptrFound,
+                worldObject.pos.pos[0], worldObject.pos.pos[1], worldObject.pos.pos[2]);
+        }
+    }
+}
+
+void WorldEvent::rotateObjects(MWWorld::CellStore* cellStore)
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex);
+
+        MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex);
+
+        if (ptrFound)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Found %s, %i",
+                ptrFound.getCellRef().getRefId().c_str(),
+                ptrFound.getCellRef().getRefNum());
+
+            MWBase::Environment::get().getWorld()->rotateObject(ptrFound,
+                worldObject.pos.rot[0], worldObject.pos.rot[1], worldObject.pos.rot[2]);
+        }
+    }
+}
+
+void WorldEvent::animateObjects(MWWorld::CellStore* cellStore)
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex);
+
+        MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex);
+
+        if (ptrFound)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Found %s, %i",
+                ptrFound.getCellRef().getRefId().c_str(),
+                ptrFound.getCellRef().getRefNum());
+
+            MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(ptrFound,
+                worldObject.animGroup, worldObject.animMode, std::numeric_limits<int>::max(), true);
+        }
+    }
+}
+
+void WorldEvent::activateDoors(MWWorld::CellStore* cellStore)
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex);
+
+        MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex);
+
+        if (ptrFound)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Found %s, %i",
+                ptrFound.getCellRef().getRefId().c_str(),
+                ptrFound.getCellRef().getRefNum());
+
+            ptrFound.getClass().setDoorState(ptrFound, worldObject.doorState);
+            MWBase::Environment::get().getWorld()->saveDoorState(ptrFound, worldObject.doorState);
+        }
+    }
+}
+
+void WorldEvent::playMusic()
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- filename: %s",
+            worldObject.filename.c_str());
+
+        MWBase::Environment::get().getSoundManager()->streamMusic(worldObject.filename);
+    }
+}
+
+void WorldEvent::playVideo()
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- filename: %s\n- allowSkipping: %s",
+            worldObject.filename.c_str(),
+            worldObject.allowSkipping ? "true" : "false");
+
+        MWBase::Environment::get().getWindowManager()->playVideo(worldObject.filename, worldObject.allowSkipping);
+    }
+}
+
+void WorldEvent::setLocalShorts(MWWorld::CellStore* cellStore)
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- index: %i\n- shortVal: %i",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex,
+            worldObject.index,
+            worldObject.shortVal);
+
+        MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex);
+
+        if (ptrFound)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Found %s, %i",
+                ptrFound.getCellRef().getRefId().c_str(),
+                ptrFound.getCellRef().getRefNum());
+
+            ptrFound.getRefData().getLocals().mShorts.at(worldObject.index) = worldObject.shortVal;
+        }
+    }
+}
+
+void WorldEvent::setLocalFloats(MWWorld::CellStore* cellStore)
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- index: %i\n- floatVal: %f",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex,
+            worldObject.index,
+            worldObject.floatVal);
+
+        MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex);
+
+        if (ptrFound)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Found %s, %i",
+                ptrFound.getCellRef().getRefId().c_str(),
+                ptrFound.getCellRef().getRefNum());
+
+            ptrFound.getRefData().getLocals().mFloats.at(worldObject.index) = worldObject.floatVal;
+        }
+    }
+}
+
+void WorldEvent::setMemberShorts()
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s\n- index: %i\n- shortVal: %i\n",
+            worldObject.refId.c_str(),
+            worldObject.index,
+            worldObject.shortVal);
+
+        // Mimic the way a Ptr is fetched in InterpreterContext for similar situations
+        MWWorld::Ptr ptrFound = MWBase::Environment::get().getWorld()->searchPtr(worldObject.refId, false);
+
+        if (!ptrFound.isEmpty())
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Found %s, %i",
+                ptrFound.getCellRef().getRefId().c_str(),
+                ptrFound.getCellRef().getRefNum());
+
+            std::string scriptId = ptrFound.getClass().getScript(ptrFound);
+
+            ptrFound.getRefData().setLocals(
+                *MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().find(scriptId));
+
+            ptrFound.getRefData().getLocals().mShorts.at(worldObject.index) = worldObject.shortVal;;
+        }
+    }
+}
+
+void WorldEvent::setGlobalShorts()
+{
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < objectChanges.count; i++)
+    {
+        worldObject = objectChanges.objects.at(i);
+
+        LOG_APPEND(Log::LOG_VERBOSE, "- varName: %s\n- shortVal: %i",
+            worldObject.varName.c_str(),
+            worldObject.shortVal);
+
+        MWBase::Environment::get().getWorld()->setGlobalInt(worldObject.varName, worldObject.shortVal);
+    }
+}
diff --git a/apps/openmw/mwmp/WorldEvent.hpp b/apps/openmw/mwmp/WorldEvent.hpp
new file mode 100644
index 000000000..9db71fb57
--- /dev/null
+++ b/apps/openmw/mwmp/WorldEvent.hpp
@@ -0,0 +1,47 @@
+#ifndef OPENMW_WORLDEVENT_HPP
+#define OPENMW_WORLDEVENT_HPP
+
+#include <components/openmw-mp/Base/BaseEvent.hpp>
+#include "../mwworld/cellstore.hpp"
+#include <RakNetTypes.h>
+
+namespace mwmp
+{
+    class Networking;
+    class WorldEvent : public BaseEvent
+    {
+    public:
+
+        WorldEvent();
+        virtual ~WorldEvent();
+
+        void addObject(WorldObject worldObject);
+
+        void sendContainers(MWWorld::CellStore* cellStore);
+
+        void editContainers(MWWorld::CellStore* cellStore);
+        void placeObjects(MWWorld::CellStore* cellStore);
+        void deleteObjects(MWWorld::CellStore* cellStore);
+        void lockObjects(MWWorld::CellStore* cellStore);
+        void unlockObjects(MWWorld::CellStore* cellStore);
+        void scaleObjects(MWWorld::CellStore* cellStore);
+        void moveObjects(MWWorld::CellStore* cellStore);
+        void rotateObjects(MWWorld::CellStore* cellStore);
+        void animateObjects(MWWorld::CellStore* cellStore);
+        void activateDoors(MWWorld::CellStore* cellStore);
+
+        void setLocalShorts(MWWorld::CellStore* cellStore);
+        void setLocalFloats(MWWorld::CellStore* cellStore);
+        void setMemberShorts();
+        void setGlobalShorts();
+
+        void playMusic();
+        void playVideo();
+
+    private:
+        Networking *getNetworking();
+
+    };
+}
+
+#endif //OPENMW_WORLDEVENT_HPP
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index c99754b5c..2730bf4f0 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -1,6 +1,6 @@
 #include "actor.hpp"
 
-#include <BulletCollision/CollisionShapes/btCylinderShape.h>
+#include <BulletCollision/CollisionShapes/btCapsuleShape.h>
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
@@ -18,7 +18,7 @@ namespace MWPhysics
 
 Actor::Actor(const MWWorld::Ptr& ptr, osg::ref_ptr<const Resource::BulletShape> shape, btCollisionWorld* world)
   : mCanWaterWalk(false), mWalkingOnWater(false)
-  , mCollisionObject(0), mForce(0.f, 0.f, 0.f), mOnGround(false)
+  , mCollisionObject(0), mForce(0.f, 0.f, 0.f), mOnGround(true), mOnSlope(false)
   , mInternalCollisionMode(true)
   , mExternalCollisionMode(true)
   , mCollisionWorld(world)
@@ -31,11 +31,16 @@ Actor::Actor(const MWWorld::Ptr& ptr, osg::ref_ptr<const Resource::BulletShape>
     // Use capsule shape only if base is square (nonuniform scaling apparently doesn't work on it)
     if (std::abs(mHalfExtents.x()-mHalfExtents.y())<mHalfExtents.x()*0.05 && mHalfExtents.z() >= mHalfExtents.x())
     {
-        // Could also be btCapsuleShapeZ, but the movement solver seems to have issues with it (jumping on slopes doesn't work)
-        mShape.reset(new btCylinderShapeZ(toBullet(mHalfExtents)));
+        mShape.reset(new btCapsuleShapeZ(mHalfExtents.x(), 2*mHalfExtents.z() - 2*mHalfExtents.x()));
+        mRotationallyInvariant = true;
     }
     else
+    {
         mShape.reset(new btBoxShape(toBullet(mHalfExtents)));
+        mRotationallyInvariant = false;
+    }
+
+    mConvexShape = static_cast<btConvexShape*>(mShape.get());
 
     mCollisionObject.reset(new btCollisionObject);
     mCollisionObject->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT);
@@ -45,10 +50,9 @@ Actor::Actor(const MWWorld::Ptr& ptr, osg::ref_ptr<const Resource::BulletShape>
 
     updateRotation();
     updateScale();
-    // already called by updateScale()
-    //updatePosition();
+    updatePosition();
 
-    updateCollisionMask();
+    addCollisionMask(getCollisionMask());
 }
 
 Actor::~Actor()
@@ -71,34 +75,70 @@ void Actor::enableCollisionBody(bool collision)
     }
 }
 
+void Actor::addCollisionMask(int collisionMask)
+{
+    mCollisionWorld->addCollisionObject(mCollisionObject.get(), CollisionType_Actor, collisionMask);
+}
+
 void Actor::updateCollisionMask()
 {
     mCollisionWorld->removeCollisionObject(mCollisionObject.get());
+    addCollisionMask(getCollisionMask());
+}
+
+int Actor::getCollisionMask()
+{
     int collisionMask = CollisionType_World | CollisionType_HeightMap;
     if (mExternalCollisionMode)
         collisionMask |= CollisionType_Actor | CollisionType_Projectile | CollisionType_Door;
     if (mCanWaterWalk)
         collisionMask |= CollisionType_Water;
-    mCollisionWorld->addCollisionObject(mCollisionObject.get(), CollisionType_Actor, collisionMask);
+    return collisionMask;
+    
 }
 
 void Actor::updatePosition()
 {
     osg::Vec3f position = mPtr.getRefData().getPosition().asVec3();
 
+    mPosition = position;
+    mPreviousPosition = position;
+
+    updateCollisionObjectPosition();
+}
+
+void Actor::updateCollisionObjectPosition()
+{
     btTransform tr = mCollisionObject->getWorldTransform();
     osg::Vec3f scaledTranslation = mRotation * osg::componentMultiply(mMeshTranslation, mScale);
-    osg::Vec3f newPosition = scaledTranslation + position;
-
+    osg::Vec3f newPosition = scaledTranslation + mPosition;
     tr.setOrigin(toBullet(newPosition));
     mCollisionObject->setWorldTransform(tr);
 }
 
-osg::Vec3f Actor::getPosition() const
+osg::Vec3f Actor::getCollisionObjectPosition() const
 {
     return toOsg(mCollisionObject->getWorldTransform().getOrigin());
 }
 
+void Actor::setPosition(const osg::Vec3f &position)
+{
+    mPreviousPosition = mPosition;
+
+    mPosition = position;
+    updateCollisionObjectPosition();
+}
+
+osg::Vec3f Actor::getPosition() const
+{
+    return mPosition;
+}
+
+osg::Vec3f Actor::getPreviousPosition() const
+{
+    return mPreviousPosition;
+}
+
 void Actor::updateRotation ()
 {
     btTransform tr = mCollisionObject->getWorldTransform();
@@ -106,7 +146,12 @@ void Actor::updateRotation ()
     tr.setRotation(toBullet(mRotation));
     mCollisionObject->setWorldTransform(tr);
 
-    updatePosition();
+    updateCollisionObjectPosition();
+}
+
+bool Actor::isRotationallyInvariant() const
+{
+    return mRotationallyInvariant;
 }
 
 void Actor::updateScale()
@@ -122,7 +167,7 @@ void Actor::updateScale()
     mPtr.getClass().adjustScale(mPtr, scaleVec, true);
     mRenderingScale = scaleVec;
 
-    updatePosition();
+    updateCollisionObjectPosition();
 }
 
 osg::Vec3f Actor::getHalfExtents() const
@@ -145,6 +190,11 @@ void Actor::setOnGround(bool grounded)
     mOnGround = grounded;
 }
 
+void Actor::setOnSlope(bool slope)
+{
+    mOnSlope = slope;
+}
+
 bool Actor::isWalkingOnWater() const
 {
     return mWalkingOnWater;
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 5755def74..88f7f5537 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -12,6 +12,7 @@
 class btCollisionWorld;
 class btCollisionShape;
 class btCollisionObject;
+class btConvexShape;
 
 namespace Resource
 {
@@ -61,6 +62,8 @@ namespace MWPhysics
             return mInternalCollisionMode;
         }
 
+        btConvexShape* getConvexShape() const { return mConvexShape; }
+
         /**
          * Enables or disables the *external* collision body. If disabled, other actors will not collide with this actor.
          */
@@ -68,8 +71,20 @@ namespace MWPhysics
 
         void updateScale();
         void updateRotation();
+
+        /**
+         * Return true if the collision shape looks the same no matter how its Z rotated.
+         */
+        bool isRotationallyInvariant() const;
+
+        /**
+         * Set mPosition and mPreviousPosition to the position in the Ptr's RefData. This should be used
+         * when an object is "instantly" moved/teleported as opposed to being moved by the physics simulation.
+         */
         void updatePosition();
 
+        void updateCollisionObjectPosition();
+
         /**
          * Returns the half extents of the collision body (scaled according to collision scale)
          */
@@ -79,8 +94,17 @@ namespace MWPhysics
          * Returns the position of the collision body
          * @note The collision shape's origin is in its center, so the position returned can be described as center of the actor collision box in world space.
          */
+        osg::Vec3f getCollisionObjectPosition() const;
+
+        /**
+          * Store the current position into mPreviousPosition, then move to this position.
+          */
+        void setPosition(const osg::Vec3f& position);
+
         osg::Vec3f getPosition() const;
 
+        osg::Vec3f getPreviousPosition() const;
+
         /**
          * Returns the half extents of the collision body (scaled according to rendering scale)
          * @note The reason we need this extra method is because of an inconsistency in MW - NPC race scales aren't applied to the collision shape,
@@ -108,6 +132,13 @@ namespace MWPhysics
             return mInternalCollisionMode && mOnGround;
         }
 
+        void setOnSlope(bool slope);
+
+        bool getOnSlope() const
+        {
+            return mInternalCollisionMode && mOnSlope;
+        }
+
         btCollisionObject* getCollisionObject() const
         {
             return mCollisionObject.get();
@@ -123,11 +154,16 @@ namespace MWPhysics
     private:
         /// Removes then re-adds the collision object to the dynamics world
         void updateCollisionMask();
+        void addCollisionMask(int collisionMask);
+        int getCollisionMask();
 
         bool mCanWaterWalk;
         bool mWalkingOnWater;
 
+        bool mRotationallyInvariant;
+
         std::auto_ptr<btCollisionShape> mShape;
+        btConvexShape* mConvexShape;
 
         std::auto_ptr<btCollisionObject> mCollisionObject;
 
@@ -138,9 +174,11 @@ namespace MWPhysics
         osg::Vec3f mScale;
         osg::Vec3f mRenderingScale;
         osg::Vec3f mPosition;
+        osg::Vec3f mPreviousPosition;
 
         osg::Vec3f mForce;
         bool mOnGround;
+        bool mOnSlope;
         bool mInternalCollisionMode;
         bool mExternalCollisionMode;
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 9f1cfc682..40a3070d8 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -14,6 +14,7 @@
 #include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 #include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
+
 #include <LinearMath/btQuickprof.h>
 
 #include <components/nifbullet/bulletnifloader.hpp>
@@ -54,22 +55,47 @@ namespace MWPhysics
     static const float sMaxSlope = 49.0f;
     static const float sStepSizeUp = 34.0f;
     static const float sStepSizeDown = 62.0f;
+    static const float sMinStep = 10.f;
+    static const float sGroundOffset = 1.0f;
 
     // Arbitrary number. To prevent infinite loops. They shouldn't happen but it's good to be prepared.
     static const int sMaxIterations = 8;
 
-    // FIXME: move to a separate file
-    class MovementSolver
+    static bool isActor(const btCollisionObject *obj)
+    {
+        assert(obj);
+        return obj->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Actor;
+    }
+
+    template <class Vec3>
+    static bool isWalkableSlope(const Vec3 &normal)
+    {
+        static const float sMaxSlopeCos = std::cos(osg::DegreesToRadians(sMaxSlope));
+        return (normal.z() > sMaxSlopeCos);
+    }
+
+    static bool canStepDown(const ActorTracer &stepper)
+    {
+        return stepper.mHitObject && isWalkableSlope(stepper.mPlaneNormal) && !isActor(stepper.mHitObject);
+    }
+
+    class Stepper
     {
     private:
-        static float getSlope(osg::Vec3f normal)
-        {
-            normal.normalize();
-            return osg::RadiansToDegrees(std::acos(normal * osg::Vec3f(0.f, 0.f, 1.f)));
-        }
+        const btCollisionWorld *mColWorld;
+        const btCollisionObject *mColObj;
 
-        static bool stepMove(btCollisionObject *colobj, osg::Vec3f &position,
-                             const osg::Vec3f &toMove, float &remainingTime, btCollisionWorld* collisionWorld)
+        ActorTracer mTracer, mUpStepper, mDownStepper;
+        bool mHaveMoved;
+
+    public:
+        Stepper(const btCollisionWorld *colWorld, const btCollisionObject *colObj)
+            : mColWorld(colWorld)
+            , mColObj(colObj)
+            , mHaveMoved(true)
+        {}
+
+        bool step(osg::Vec3f &position, const osg::Vec3f &toMove, float &remainingTime)
         {
             /*
              * Slide up an incline or set of stairs.  Should be called only after a
@@ -115,12 +141,14 @@ namespace MWPhysics
              *          +--+                         +--------
              *    ==============================================
              */
-            ActorTracer tracer, stepper;
-
-            stepper.doTrace(colobj, position, position+osg::Vec3f(0.0f,0.0f,sStepSizeUp), collisionWorld);
-            if(stepper.mFraction < std::numeric_limits<float>::epsilon())
-                return false; // didn't even move the smallest representable amount
-                              // (TODO: shouldn't this be larger? Why bother with such a small amount?)
+            if (mHaveMoved)
+            {
+                mHaveMoved = false;
+                mUpStepper.doTrace(mColObj, position, position+osg::Vec3f(0.0f,0.0f,sStepSizeUp), mColWorld);
+                if(mUpStepper.mFraction < std::numeric_limits<float>::epsilon())
+                    return false; // didn't even move the smallest representable amount
+                                  // (TODO: shouldn't this be larger? Why bother with such a small amount?)
+            }
 
             /*
              * Try moving from the elevated position using tracer.
@@ -135,8 +163,9 @@ namespace MWPhysics
              *          +--+
              *    ==============================================
              */
-            tracer.doTrace(colobj, stepper.mEndPos, stepper.mEndPos + toMove, collisionWorld);
-            if(tracer.mFraction < std::numeric_limits<float>::epsilon())
+            osg::Vec3f tracerPos = mUpStepper.mEndPos;
+            mTracer.doTrace(mColObj, tracerPos, tracerPos + toMove, mColWorld);
+            if(mTracer.mFraction < std::numeric_limits<float>::epsilon())
                 return false; // didn't even move the smallest representable amount
 
             /*
@@ -154,26 +183,40 @@ namespace MWPhysics
              *          +--+            +--+
              *    ==============================================
              */
-            stepper.doTrace(colobj, tracer.mEndPos, tracer.mEndPos-osg::Vec3f(0.0f,0.0f,sStepSizeDown), collisionWorld);
-            if(stepper.mFraction < 1.0f && getSlope(stepper.mPlaneNormal) <= sMaxSlope)
+            mDownStepper.doTrace(mColObj, mTracer.mEndPos, mTracer.mEndPos-osg::Vec3f(0.0f,0.0f,sStepSizeDown), mColWorld);
+            if (!canStepDown(mDownStepper))
             {
-                // don't allow stepping up other actors
-                if (stepper.mHitObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Actor)
+                // Try again with increased step length
+                if (mTracer.mFraction < 1.0f || toMove.length2() > sMinStep*sMinStep)
+                    return false;
+
+                osg::Vec3f direction = toMove;
+                direction.normalize();
+                mTracer.doTrace(mColObj, tracerPos, tracerPos + direction*sMinStep, mColWorld);
+                if (mTracer.mFraction < 0.001f)
                     return false;
+
+                mDownStepper.doTrace(mColObj, mTracer.mEndPos, mTracer.mEndPos-osg::Vec3f(0.0f,0.0f,sStepSizeDown), mColWorld);
+                if (!canStepDown(mDownStepper))
+                    return false;
+            }
+            if (mDownStepper.mFraction < 1.0f)
+            {
                 // only step down onto semi-horizontal surfaces. don't step down onto the side of a house or a wall.
                 // TODO: stepper.mPlaneNormal does not appear to be reliable - needs more testing
                 // NOTE: caller's variables 'position' & 'remainingTime' are modified here
-                position = stepper.mEndPos;
-                remainingTime *= (1.0f-tracer.mFraction); // remaining time is proportional to remaining distance
+                position = mDownStepper.mEndPos;
+                remainingTime *= (1.0f-mTracer.mFraction); // remaining time is proportional to remaining distance
+                mHaveMoved = true;
                 return true;
             }
-
-            // moved between 0 and just under sStepSize distance but slope was too great,
-            // or moved full sStepSize distance (FIXME: is this a bug?)
             return false;
         }
+    };
 
-
+    class MovementSolver
+    {
+    private:
         ///Project a vector u on another vector v
         static inline osg::Vec3f project(const osg::Vec3f& u, const osg::Vec3f &v)
         {
@@ -195,12 +238,12 @@ namespace MWPhysics
 
 
     public:
-        static osg::Vec3f traceDown(const MWWorld::Ptr &ptr, Actor* actor, btCollisionWorld* collisionWorld, float maxHeight)
+        static osg::Vec3f traceDown(const MWWorld::Ptr &ptr, const osg::Vec3f& position, Actor* actor, btCollisionWorld* collisionWorld, float maxHeight)
         {
-            osg::Vec3f position(ptr.getRefData().getPosition().asVec3());
+            osg::Vec3f offset = actor->getCollisionObjectPosition() - ptr.getRefData().getPosition().asVec3();
 
             ActorTracer tracer;
-            tracer.findGround(actor, position, position-osg::Vec3f(0,0,maxHeight), collisionWorld);
+            tracer.findGround(actor, position + offset, position + offset - osg::Vec3f(0,0,maxHeight), collisionWorld);
             if(tracer.mFraction >= 1.0f)
             {
                 actor->setOnGround(false);
@@ -208,6 +251,8 @@ namespace MWPhysics
             }
             else
             {
+                actor->setOnGround(true);
+
                 // Check if we actually found a valid spawn point (use an infinitely thin ray this time).
                 // Required for some broken door destinations in Morrowind.esm, where the spawn point
                 // intersects with other geometry if the actor's base is taken into account
@@ -221,26 +266,26 @@ namespace MWPhysics
                 collisionWorld->rayTest(from, to, resultCallback1);
 
                 if (resultCallback1.hasHit() &&
-                        ( (toOsg(resultCallback1.m_hitPointWorld) - tracer.mEndPos).length() > 30
-                        || getSlope(tracer.mPlaneNormal) > sMaxSlope))
+                        ( (toOsg(resultCallback1.m_hitPointWorld) - (tracer.mEndPos-offset)).length2() > 35*35
+                        || !isWalkableSlope(tracer.mPlaneNormal)))
                 {
-                    actor->setOnGround(getSlope(toOsg(resultCallback1.m_hitNormalWorld)) <= sMaxSlope);
-                    return toOsg(resultCallback1.m_hitPointWorld) + osg::Vec3f(0.f, 0.f, 1.f);
+                    actor->setOnSlope(!isWalkableSlope(resultCallback1.m_hitNormalWorld));
+                    return toOsg(resultCallback1.m_hitPointWorld) + osg::Vec3f(0.f, 0.f, sGroundOffset);
+                }
+                else
+                {
+                    actor->setOnSlope(!isWalkableSlope(tracer.mPlaneNormal));
                 }
 
-                actor->setOnGround(getSlope(tracer.mPlaneNormal) <= sMaxSlope);
-
-                return tracer.mEndPos;
+                return tracer.mEndPos-offset + osg::Vec3f(0.f, 0.f, sGroundOffset);
             }
         }
 
-        static osg::Vec3f move(const MWWorld::Ptr &ptr, Actor* physicActor, const osg::Vec3f &movement, float time,
-                                  bool isFlying, float waterlevel, float slowFall, btCollisionWorld* collisionWorld,
+        static osg::Vec3f move(osg::Vec3f position, const MWWorld::Ptr &ptr, Actor* physicActor, const osg::Vec3f &movement, float time,
+                                  bool isFlying, float waterlevel, float slowFall, const btCollisionWorld* collisionWorld,
                                std::map<MWWorld::Ptr, MWWorld::Ptr>& standingCollisionTracker)
         {
             const ESM::Position& refpos = ptr.getRefData().getPosition();
-            osg::Vec3f position(refpos.asVec3());
-
             // Early-out for totally static creatures
             // (Not sure if gravity should still apply?)
             if (!ptr.getClass().isMobile(ptr))
@@ -256,7 +301,7 @@ namespace MWPhysics
                                     ) * movement * time;
             }
 
-            btCollisionObject *colobj = physicActor->getCollisionObject();
+            const btCollisionObject *colobj = physicActor->getCollisionObject();
             osg::Vec3f halfExtents = physicActor->getHalfExtents();
 
             // NOTE: here we don't account for the collision box translation (i.e. physicActor->getPosition() - refpos.pos).
@@ -282,12 +327,10 @@ namespace MWPhysics
             {
                 velocity = (osg::Quat(refpos.rot[2], osg::Vec3f(0, 0, -1))) * movement;
 
-                if (velocity.z() > 0.f)
+                if (velocity.z() > 0.f && physicActor->getOnGround() && !physicActor->getOnSlope())
                     inertia = velocity;
-                if(!physicActor->getOnGround())
-                {
+                else if(!physicActor->getOnGround() || physicActor->getOnSlope())
                     velocity = velocity + physicActor->getInertialForce();
-                }
             }
 
             // dead actors underwater will float to the surface, if the CharacterController tells us to do so
@@ -306,8 +349,8 @@ namespace MWPhysics
                 velocity *= 1.f-(fStromWalkMult * (angleDegrees/180.f));
             }
 
+            Stepper stepper(collisionWorld, colobj);
             osg::Vec3f origVelocity = velocity;
-
             osg::Vec3f newPosition = position;
             /*
              * A loop to find newPosition using tracer, if successful different from the starting position.
@@ -326,10 +369,7 @@ namespace MWPhysics
                    newPosition.z() <= swimlevel)
                 {
                     const osg::Vec3f down(0,0,-1);
-                    float movelen = velocity.normalize();
-                    osg::Vec3f reflectdir = reflect(velocity, down);
-                    reflectdir.normalize();
-                    velocity = slide(reflectdir, down)*movelen;
+                    velocity = slide(velocity, down);
                     // NOTE: remainingTime is unchanged before the loop continues
                     continue; // velocity updated, calculate nextpos again
                 }
@@ -358,18 +398,25 @@ namespace MWPhysics
                     break;
                 }
 
+                // We are touching something.
+                if (tracer.mFraction < 1E-9f)
+                {
+                    // Try to separate by backing off slighly to unstuck the solver
+                    osg::Vec3f backOff = (newPosition - tracer.mHitPoint) * 1E-2f;
+                    newPosition += backOff;
+                }
 
+                // We hit something. Check if we can step up.
+                float hitHeight = tracer.mHitPoint.z() - tracer.mEndPos.z() + halfExtents.z();
                 osg::Vec3f oldPosition = newPosition;
-                // We hit something. Try to step up onto it. (NOTE: stepMove does not allow stepping over)
-                // NOTE: stepMove modifies newPosition if successful
-                bool result = stepMove(colobj, newPosition, velocity*remainingTime, remainingTime, collisionWorld);
-                if (!result) // to make sure the maximum stepping distance isn't framerate-dependent or movement-speed dependent
+                bool result = false;
+                if (hitHeight < sStepSizeUp && !isActor(tracer.mHitObject))
                 {
-                    osg::Vec3f normalizedVelocity = velocity;
-                    normalizedVelocity.normalize();
-                    result = stepMove(colobj, newPosition, normalizedVelocity*10.f, remainingTime, collisionWorld);
+                    // Try to step up onto it.
+                    // NOTE: stepMove does not allow stepping over, modifies newPosition if successful
+                    result = stepper.step(newPosition, velocity*remainingTime, remainingTime);
                 }
-                if(result)
+                if (result)
                 {
                     // don't let pure water creatures move out of water after stepMove
                     if (ptr.getClass().isPureWaterCreature(ptr)
@@ -379,34 +426,31 @@ namespace MWPhysics
                 else
                 {
                     // Can't move this way, try to find another spot along the plane
-                    osg::Vec3f direction = velocity;
-                    float movelen = direction.normalize();
-                    osg::Vec3f reflectdir = reflect(velocity, tracer.mPlaneNormal);
-                    reflectdir.normalize();
+                    osg::Vec3f newVelocity = slide(velocity, tracer.mPlaneNormal);
+
+                    // Do not allow sliding upward if there is gravity.
+                    // Stepping will have taken care of that.
+                    if(!(newPosition.z() < swimlevel || isFlying))
+                        newVelocity.z() = std::min(newVelocity.z(), 0.0f);
 
-                    osg::Vec3f newVelocity = slide(reflectdir, tracer.mPlaneNormal)*movelen;
                     if ((newVelocity-velocity).length2() < 0.01)
                         break;
-                    if ((velocity * origVelocity) <= 0.f)
+                    if ((newVelocity * origVelocity) <= 0.f)
                         break; // ^ dot product
 
                     velocity = newVelocity;
-
-                    // Do not allow sliding upward if there is gravity. Stepping will have taken
-                    // care of that.
-                    if(!(newPosition.z() < swimlevel || isFlying))
-                        velocity.z() = std::min(velocity.z(), 0.0f);
                 }
             }
 
             bool isOnGround = false;
+            bool isOnSlope = false;
             if (!(inertia.z() > 0.f) && !(newPosition.z() < swimlevel))
             {
                 osg::Vec3f from = newPosition;
                 osg::Vec3f to = newPosition - (physicActor->getOnGround() ?
-                             osg::Vec3f(0,0,sStepSizeDown+2.f) : osg::Vec3f(0,0,2.f));
+                             osg::Vec3f(0,0,sStepSizeDown + 2*sGroundOffset) : osg::Vec3f(0,0,2*sGroundOffset));
                 tracer.doTrace(colobj, from, to, collisionWorld);
-                if(tracer.mFraction < 1.0f && getSlope(tracer.mPlaneNormal) <= sMaxSlope
+                if(tracer.mFraction < 1.0f
                         && tracer.mHitObject->getBroadphaseHandle()->m_collisionFilterGroup != CollisionType_Actor)
                 {
                     const btCollisionObject* standingOn = tracer.mHitObject;
@@ -417,9 +461,11 @@ namespace MWPhysics
                     if (standingOn->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Water)
                         physicActor->setWalkingOnWater(true);
                     if (!isFlying)
-                        newPosition.z() = tracer.mEndPos.z() + 1.0f;
+                        newPosition.z() = tracer.mEndPos.z() + sGroundOffset;
 
                     isOnGround = true;
+
+                    isOnSlope = !isWalkableSlope(tracer.mPlaneNormal);
                 }
                 else
                 {
@@ -443,16 +489,21 @@ namespace MWPhysics
                 }
             }
 
-            if(isOnGround || newPosition.z() < swimlevel || isFlying)
+            if((isOnGround && !isOnSlope) || newPosition.z() < swimlevel || isFlying)
                 physicActor->setInertialForce(osg::Vec3f(0.f, 0.f, 0.f));
             else
             {
                 inertia.z() += time * -627.2f;
                 if (inertia.z() < 0)
                     inertia.z() *= slowFall;
+                if (slowFall < 1.f) {
+                    inertia.x() *= slowFall;
+                    inertia.y() *= slowFall;
+                }
                 physicActor->setInertialForce(inertia);
             }
             physicActor->setOnGround(isOnGround);
+            physicActor->setOnSlope(isOnSlope);
 
             newPosition.z() -= halfExtents.z(); // remove what was added at the beginning
             return newPosition;
@@ -480,7 +531,7 @@ namespace MWPhysics
             mShape = new btHeightfieldTerrainShape(
                 sqrtVerts, sqrtVerts, heights, 1,
                 minh, maxh, 2,
-                PHY_FLOAT, true
+                PHY_FLOAT, false
             );
             mShape->setUseDiamondSubdivision(true);
             mShape->setLocalScaling(btVector3(triSize, triSize, 1));
@@ -559,6 +610,11 @@ namespace MWPhysics
             return mCollisionObject.get();
         }
 
+        const btCollisionObject* getCollisionObject() const
+        {
+            return mCollisionObject.get();
+        }
+
         /// Return solid flag. Not used by the object itself, true by default.
         bool isSolid() const
         {
@@ -582,42 +638,30 @@ namespace MWPhysics
 
             assert (mShapeInstance->getCollisionShape()->isCompound());
 
-            btCompoundShape* compound = dynamic_cast<btCompoundShape*>(mShapeInstance->getCollisionShape());
+            btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->getCollisionShape());
 
-            for (std::map<int, int>::iterator it = mShapeInstance->mAnimatedShapes.begin(); it != mShapeInstance->mAnimatedShapes.end();)
+            for (std::map<int, int>::const_iterator it = mShapeInstance->mAnimatedShapes.begin(); it != mShapeInstance->mAnimatedShapes.end(); ++it)
             {
                 int recIndex = it->first;
                 int shapeIndex = it->second;
 
-                NifOsg::FindGroupByRecIndex visitor(recIndex);
-                mPtr.getRefData().getBaseNode()->accept(visitor);
-                if (!visitor.mFound)
+                std::map<int, osg::NodePath>::iterator nodePathFound = mRecIndexToNodePath.find(recIndex);
+                if (nodePathFound == mRecIndexToNodePath.end())
                 {
-                    std::cerr << "animateCollisionShapes: Can't find node " << recIndex << std::endl;
-                    return;
-                }
-
-                osg::NodePath path = visitor.mFoundPath;
-                path.erase(path.begin());
-
-                // Attempt to remove "animated" shapes that are not actually animated
-                // We may get these because the BulletNifLoader does not know if a .kf file with additional controllers will be attached later on.
-                // On the first animateCollisionShapes call, we'll consider the graph completely loaded (with extra controllers and what not),
-                // so now we can better decide if the shape is really animated.
-                bool animated = false;
-                for (osg::NodePath::iterator nodePathIt = path.begin(); nodePathIt != path.end(); ++nodePathIt)
-                {
-                    osg::Node* node = *nodePathIt;
-                    if (node->getUpdateCallback())
-                        animated = true;
-                }
-                if (!animated)
-                {
-                    mShapeInstance->mAnimatedShapes.erase(it++);
-                    break;
+                    NifOsg::FindGroupByRecIndex visitor(recIndex);
+                    mPtr.getRefData().getBaseNode()->accept(visitor);
+                    if (!visitor.mFound)
+                    {
+                        std::cerr << "animateCollisionShapes: Can't find node " << recIndex << std::endl;
+                        return;
+                    }
+                    osg::NodePath nodePath = visitor.mFoundPath;
+                    nodePath.erase(nodePath.begin());
+                    nodePathFound = mRecIndexToNodePath.insert(std::make_pair(recIndex, nodePath)).first;
                 }
 
-                osg::Matrixf matrix = osg::computeLocalToWorld(path);
+                osg::NodePath& nodePath = nodePathFound->second;
+                osg::Matrixf matrix = osg::computeLocalToWorld(nodePath);
                 osg::Vec3f scale = matrix.getScale();
                 matrix.orthoNormalize(matrix);
 
@@ -627,10 +671,10 @@ namespace MWPhysics
                     for (int j=0; j<3; ++j)
                         transform.getBasis()[i][j] = matrix(j,i); // NB column/row major difference
 
-                compound->getChildShape(shapeIndex)->setLocalScaling(compound->getLocalScaling() * toBullet(scale));
-                compound->updateChildTransform(shapeIndex, transform);
-
-                ++it;
+                if (compound->getLocalScaling() * toBullet(scale) != compound->getChildShape(shapeIndex)->getLocalScaling())
+                    compound->getChildShape(shapeIndex)->setLocalScaling(compound->getLocalScaling() * toBullet(scale));
+                if (!(transform == compound->getChildTransform(shapeIndex)))
+                    compound->updateChildTransform(shapeIndex, transform);
             }
 
             collisionWorld->updateSingleAabb(mCollisionObject.get());
@@ -639,6 +683,7 @@ namespace MWPhysics
     private:
         std::auto_ptr<btCollisionObject> mCollisionObject;
         osg::ref_ptr<Resource::BulletShapeInstance> mShapeInstance;
+        std::map<int, osg::NodePath> mRecIndexToNodePath;
         bool mSolid;
     };
 
@@ -753,6 +798,7 @@ namespace MWPhysics
     class DeepestNotMeContactTestResultCallback : public btCollisionWorld::ContactResultCallback
     {
         const btCollisionObject* mMe;
+        const std::vector<const btCollisionObject*> mTargets;
 
         // Store the real origin, since the shape's origin is its center
         btVector3 mOrigin;
@@ -762,25 +808,28 @@ namespace MWPhysics
         btVector3 mContactPoint;
         btScalar mLeastDistSqr;
 
-        DeepestNotMeContactTestResultCallback(const btCollisionObject* me, const btVector3 &origin)
-          : mMe(me), mOrigin(origin), mObject(NULL), mContactPoint(0,0,0),
+        DeepestNotMeContactTestResultCallback(const btCollisionObject* me, const std::vector<const btCollisionObject*> targets, const btVector3 &origin)
+          : mMe(me), mTargets(targets), mOrigin(origin), mObject(NULL), mContactPoint(0,0,0),
             mLeastDistSqr(std::numeric_limits<float>::max())
         { }
 
-#if BT_BULLET_VERSION >= 281
         virtual btScalar addSingleResult(btManifoldPoint& cp,
                                          const btCollisionObjectWrapper* col0Wrap,int partId0,int index0,
                                          const btCollisionObjectWrapper* col1Wrap,int partId1,int index1)
         {
             const btCollisionObject* collisionObject = col1Wrap->m_collisionObject;
-#else
-        virtual btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObject* col0, int partId0, int index0,
-                                         const btCollisionObject* col1, int partId1, int index1)
-        {
-            const btCollisionObject* collisionObject = col1;
-#endif
             if (collisionObject != mMe)
             {
+                if (!mTargets.empty())
+                {
+                    if ((std::find(mTargets.begin(), mTargets.end(), collisionObject) == mTargets.end()))
+                    {
+                        PtrHolder* holder = static_cast<PtrHolder*>(collisionObject->getUserPointer());
+                        if (holder && !holder->getPtr().isEmpty() && holder->getPtr().getClass().isActor())
+                            return 0.f;
+                    }
+                }
+
                 btScalar distsqr = mOrigin.distance2(cp.getPositionWorldOnA());
                 if(!mObject || distsqr < mLeastDistSqr)
                 {
@@ -797,7 +846,7 @@ namespace MWPhysics
     std::pair<MWWorld::Ptr, osg::Vec3f> PhysicsSystem::getHitContact(const MWWorld::ConstPtr& actor,
                                                                      const osg::Vec3f &origin,
                                                                      const osg::Quat &orient,
-                                                                      float queryDistance)
+                                                                     float queryDistance, std::vector<MWWorld::Ptr> targets)
     {
         const MWWorld::Store<ESM::GameSetting> &store = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
@@ -814,11 +863,23 @@ namespace MWPhysics
         object.setWorldTransform(btTransform(toBullet(orient), toBullet(center)));
 
         const btCollisionObject* me = NULL;
+        std::vector<const btCollisionObject*> targetCollisionObjects;
+
         const Actor* physactor = getActor(actor);
         if (physactor)
             me = physactor->getCollisionObject();
 
-        DeepestNotMeContactTestResultCallback resultCallback(me, toBullet(origin));
+        if (!targets.empty())
+        {
+            for (std::vector<MWWorld::Ptr>::const_iterator it = targets.begin(); it != targets.end(); ++it)
+            {
+                const Actor* physactor2 = getActor(*it);
+                if (physactor2)
+                    targetCollisionObjects.push_back(physactor2->getCollisionObject());
+            }
+        }
+
+        DeepestNotMeContactTestResultCallback resultCallback(me, targetCollisionObjects, toBullet(origin));
         resultCallback.m_collisionFilterGroup = CollisionType_Actor;
         resultCallback.m_collisionFilterMask = CollisionType_World | CollisionType_Door | CollisionType_HeightMap | CollisionType_Actor;
         mCollisionWorld->contactTest(&object, resultCallback);
@@ -865,36 +926,64 @@ namespace MWPhysics
     class ClosestNotMeRayResultCallback : public btCollisionWorld::ClosestRayResultCallback
     {
     public:
-        ClosestNotMeRayResultCallback(const btCollisionObject* me, const btVector3& from, const btVector3& to)
+        ClosestNotMeRayResultCallback(const btCollisionObject* me, const std::vector<const btCollisionObject*> targets, const btVector3& from, const btVector3& to)
             : btCollisionWorld::ClosestRayResultCallback(from, to)
-            , mMe(me)
+            , mMe(me), mTargets(targets)
         {
         }
 
-        virtual btScalar addSingleResult(btCollisionWorld::LocalRayResult& rayResult,bool normalInWorldSpace)
+        virtual btScalar addSingleResult(btCollisionWorld::LocalRayResult& rayResult, bool normalInWorldSpace)
         {
             if (rayResult.m_collisionObject == mMe)
                 return 1.f;
+            if (!mTargets.empty())
+            {
+                if ((std::find(mTargets.begin(), mTargets.end(), rayResult.m_collisionObject) == mTargets.end()))
+                {
+                    PtrHolder* holder = static_cast<PtrHolder*>(rayResult.m_collisionObject->getUserPointer());
+                    if (holder && !holder->getPtr().isEmpty() && holder->getPtr().getClass().isActor())
+                        return 1.f;
+                }
+            }
             return btCollisionWorld::ClosestRayResultCallback::addSingleResult(rayResult, normalInWorldSpace);
         }
     private:
         const btCollisionObject* mMe;
+        const std::vector<const btCollisionObject*> mTargets;
     };
 
-    PhysicsSystem::RayResult PhysicsSystem::castRay(const osg::Vec3f &from, const osg::Vec3f &to, MWWorld::ConstPtr ignore, int mask, int group) const
+    PhysicsSystem::RayResult PhysicsSystem::castRay(const osg::Vec3f &from, const osg::Vec3f &to, MWWorld::ConstPtr ignore, std::vector<MWWorld::Ptr> targets, int mask, int group) const
     {
         btVector3 btFrom = toBullet(from);
         btVector3 btTo = toBullet(to);
 
         const btCollisionObject* me = NULL;
+        std::vector<const btCollisionObject*> targetCollisionObjects;
+
         if (!ignore.isEmpty())
         {
             const Actor* actor = getActor(ignore);
             if (actor)
                 me = actor->getCollisionObject();
+            else
+            {
+                const Object* object = getObject(ignore);
+                if (object)
+                    me = object->getCollisionObject();
+            }
+        }
+
+        if (!targets.empty())
+        {
+            for (std::vector<MWWorld::Ptr>::const_iterator it = targets.begin(); it != targets.end(); ++it)
+            {
+                const Actor* actor = getActor(*it);
+                if (actor)
+                    targetCollisionObjects.push_back(actor->getCollisionObject());
+            }
         }
 
-        ClosestNotMeRayResultCallback resultCallback(me, btFrom, btTo);
+        ClosestNotMeRayResultCallback resultCallback(me, targetCollisionObjects, btFrom, btTo);
         resultCallback.m_collisionFilterGroup = group;
         resultCallback.m_collisionFilterMask = mask;
 
@@ -944,49 +1033,32 @@ namespace MWPhysics
         if (!physactor1 || !physactor2)
             return false;
 
-        osg::Vec3f pos1 (physactor1->getPosition() + osg::Vec3f(0,0,physactor1->getHalfExtents().z() * 0.8)); // eye level
-        osg::Vec3f pos2 (physactor2->getPosition() + osg::Vec3f(0,0,physactor2->getHalfExtents().z() * 0.8));
+        osg::Vec3f pos1 (physactor1->getCollisionObjectPosition() + osg::Vec3f(0,0,physactor1->getHalfExtents().z() * 0.9)); // eye level
+        osg::Vec3f pos2 (physactor2->getCollisionObjectPosition() + osg::Vec3f(0,0,physactor2->getHalfExtents().z() * 0.9));
 
-        RayResult result = castRay(pos1, pos2, MWWorld::Ptr(), CollisionType_World|CollisionType_HeightMap|CollisionType_Door);
+        RayResult result = castRay(pos1, pos2, MWWorld::ConstPtr(), std::vector<MWWorld::Ptr>(), CollisionType_World|CollisionType_HeightMap|CollisionType_Door);
 
         return !result.mHit;
     }
 
-    // physactor->getOnGround() is not a reliable indicator of whether the actor
-    // is on the ground (defaults to false, which means code blocks such as
-    // CharacterController::update() may falsely detect "falling").
-    //
-    // Also, collisions can move z position slightly off zero, giving a false
-    // indication. In order to reduce false detection of jumping, small distance
-    // below the actor is detected and ignored. A value of 1.5 is used here, but
-    // something larger may be more suitable.  This change should resolve Bug#1271.
-    //
-    // TODO: There might be better places to update PhysicActor::mOnGround.
     bool PhysicsSystem::isOnGround(const MWWorld::Ptr &actor)
     {
         Actor* physactor = getActor(actor);
-        if(!physactor)
-            return false;
-        if(physactor->getOnGround())
-            return true;
-        else
-        {
-            osg::Vec3f pos(actor.getRefData().getPosition().asVec3());
+        return physactor->getOnGround();
+    }
 
-            ActorTracer tracer;
-            // a small distance above collision object is considered "on ground"
-            tracer.findGround(physactor,
-                              pos,
-                              pos - osg::Vec3f(0, 0, 1.5f), // trace a small amount down
-                              mCollisionWorld);
-            if(tracer.mFraction < 1.0f) // collision, must be close to something below
-            {
-                physactor->setOnGround(true);
-                return true;
-            }
-            else
-                return false;
-        }
+    bool PhysicsSystem::canMoveToWaterSurface(const MWWorld::ConstPtr &actor, const float waterlevel)
+    {
+        const Actor* physicActor = getActor(actor);
+        if (!physicActor)
+            return false;
+        const float halfZ = physicActor->getHalfExtents().z();
+        const osg::Vec3f actorPosition = physicActor->getPosition();
+        const osg::Vec3f startingPosition(actorPosition.x(), actorPosition.y(), actorPosition.z() + halfZ);
+        const osg::Vec3f destinationPosition(actorPosition.x(), actorPosition.y(), waterlevel + halfZ);
+        ActorTracer tracer;
+        tracer.doTrace(physicActor->getCollisionObject(), startingPosition, destinationPosition, mCollisionWorld);
+        return (tracer.mFraction >= 1.0f);
     }
 
     osg::Vec3f PhysicsSystem::getHalfExtents(const MWWorld::ConstPtr &actor) const
@@ -1007,11 +1079,11 @@ namespace MWPhysics
             return osg::Vec3f();
     }
 
-    osg::Vec3f PhysicsSystem::getPosition(const MWWorld::ConstPtr &actor) const
+    osg::Vec3f PhysicsSystem::getCollisionObjectPosition(const MWWorld::ConstPtr &actor) const
     {
         const Actor* physactor = getActor(actor);
         if (physactor)
-            return physactor->getPosition();
+            return physactor->getCollisionObjectPosition();
         else
             return osg::Vec3f();
     }
@@ -1028,7 +1100,6 @@ namespace MWPhysics
 
         std::vector<MWWorld::Ptr> mResult;
 
-#if BT_BULLET_VERSION >= 281
         virtual btScalar addSingleResult(btManifoldPoint& cp,
                                          const btCollisionObjectWrapper* col0Wrap,int partId0,int index0,
                                          const btCollisionObjectWrapper* col1Wrap,int partId1,int index1)
@@ -1036,14 +1107,6 @@ namespace MWPhysics
             const btCollisionObject* collisionObject = col0Wrap->m_collisionObject;
             if (collisionObject == mTestedAgainst)
                 collisionObject = col1Wrap->m_collisionObject;
-#else
-        virtual btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObject* col0, int partId0, int index0,
-                                         const btCollisionObject* col1, int partId1, int index1)
-        {
-            const btCollisionObject* collisionObject = col0;
-            if (collisionObject == mTestedAgainst)
-                collisionObject = col1;
-#endif
             PtrHolder* holder = static_cast<PtrHolder*>(collisionObject->getUserPointer());
             if (holder)
                 mResult.push_back(holder->getPtr());
@@ -1068,13 +1131,13 @@ namespace MWPhysics
         return resultCallback.mResult;
     }
 
-    osg::Vec3f PhysicsSystem::traceDown(const MWWorld::Ptr &ptr, float maxHeight)
+    osg::Vec3f PhysicsSystem::traceDown(const MWWorld::Ptr &ptr, const osg::Vec3f& position, float maxHeight)
     {
         ActorMap::iterator found = mActors.find(ptr);
         if (found ==  mActors.end())
             return ptr.getRefData().getPosition().asVec3();
         else
-            return MovementSolver::traceDown(ptr, found->second, mCollisionWorld, maxHeight);
+            return MovementSolver::traceDown(ptr, position, found->second, mCollisionWorld, maxHeight);
     }
 
     void PhysicsSystem::addHeightField (const float* heights, int x, int y, float triSize, float sqrtVerts)
@@ -1192,6 +1255,14 @@ namespace MWPhysics
         return NULL;
     }
 
+    const Object* PhysicsSystem::getObject(const MWWorld::ConstPtr &ptr) const
+    {
+        ObjectMap::const_iterator found = mObjects.find(ptr);
+        if (found != mObjects.end())
+            return found->second;
+        return NULL;
+    }
+
     void PhysicsSystem::updateScale(const MWWorld::Ptr &ptr)
     {
         ObjectMap::iterator found = mObjects.find(ptr);
@@ -1223,8 +1294,11 @@ namespace MWPhysics
         ActorMap::iterator foundActor = mActors.find(ptr);
         if (foundActor != mActors.end())
         {
-            foundActor->second->updateRotation();
-            mCollisionWorld->updateSingleAabb(foundActor->second->getCollisionObject());
+            if (!foundActor->second->isRotationallyInvariant())
+            {
+                foundActor->second->updateRotation();
+                mCollisionWorld->updateSingleAabb(foundActor->second->getCollisionObject());
+            }
             return;
         }
     }
@@ -1296,54 +1370,79 @@ namespace MWPhysics
         mMovementResults.clear();
 
         mTimeAccum += dt;
-        if(mTimeAccum >= 1.0f/60.0f)
+        const float physicsDt = 1.f/60.0f;
+
+        const int maxAllowedSteps = 20;
+        int numSteps = mTimeAccum / (physicsDt);
+        numSteps = std::min(numSteps, maxAllowedSteps);
+
+        mTimeAccum -= numSteps * physicsDt;
+
+        if (numSteps)
         {
             // Collision events should be available on every frame
             mStandingCollisions.clear();
+        }
 
-            const MWBase::World *world = MWBase::Environment::get().getWorld();
-            PtrVelocityList::iterator iter = mMovementQueue.begin();
-            for(;iter != mMovementQueue.end();++iter)
-            {
-                float waterlevel = -std::numeric_limits<float>::max();
-                const MWWorld::CellStore *cell = iter->first.getCell();
-                if(cell->getCell()->hasWater())
-                    waterlevel = cell->getWaterLevel();
+        const MWBase::World *world = MWBase::Environment::get().getWorld();
+        PtrVelocityList::iterator iter = mMovementQueue.begin();
+        for(;iter != mMovementQueue.end();++iter)
+        {
+            ActorMap::iterator foundActor = mActors.find(iter->first);
+            if (foundActor == mActors.end()) // actor was already removed from the scene
+                continue;
+            Actor* physicActor = foundActor->second;
 
-                float oldHeight = iter->first.getRefData().getPosition().pos[2];
+            float waterlevel = -std::numeric_limits<float>::max();
+            const MWWorld::CellStore *cell = iter->first.getCell();
+            if(cell->getCell()->hasWater())
+                waterlevel = cell->getWaterLevel();
 
-                const MWMechanics::MagicEffects& effects = iter->first.getClass().getCreatureStats(iter->first).getMagicEffects();
+            const MWMechanics::MagicEffects& effects = iter->first.getClass().getCreatureStats(iter->first).getMagicEffects();
 
-                bool waterCollision = false;
-                if (effects.get(ESM::MagicEffect::WaterWalking).getMagnitude()
-                        && cell->getCell()->hasWater()
-                        && !world->isUnderwater(iter->first.getCell(),
-                                               osg::Vec3f(iter->first.getRefData().getPosition().asVec3())))
+            bool waterCollision = false;
+            if (cell->getCell()->hasWater() && effects.get(ESM::MagicEffect::WaterWalking).getMagnitude())
+            {
+                if (!world->isUnderwater(iter->first.getCell(), osg::Vec3f(iter->first.getRefData().getPosition().asVec3())))
                     waterCollision = true;
+                else if (physicActor->getCollisionMode() && canMoveToWaterSurface(iter->first, waterlevel))
+                {
+                    const osg::Vec3f actorPosition = physicActor->getPosition();
+                    physicActor->setPosition(osg::Vec3f(actorPosition.x(), actorPosition.y(), waterlevel));
+                    waterCollision = true;
+                }
+            }
+            physicActor->setCanWaterWalk(waterCollision);
 
-                ActorMap::iterator foundActor = mActors.find(iter->first);
-                if (foundActor == mActors.end()) // actor was already removed from the scene
-                    continue;
-                Actor* physicActor = foundActor->second;
-                physicActor->setCanWaterWalk(waterCollision);
-
-                // Slow fall reduces fall speed by a factor of (effect magnitude / 200)
-                float slowFall = 1.f - std::max(0.f, std::min(1.f, effects.get(ESM::MagicEffect::SlowFall).getMagnitude() * 0.005f));
+            // Slow fall reduces fall speed by a factor of (effect magnitude / 200)
+            float slowFall = 1.f - std::max(0.f, std::min(1.f, effects.get(ESM::MagicEffect::SlowFall).getMagnitude() * 0.005f));
 
-                osg::Vec3f newpos = MovementSolver::move(physicActor->getPtr(), physicActor, iter->second, mTimeAccum,
-                                                            world->isFlying(iter->first),
-                                                            waterlevel, slowFall, mCollisionWorld, mStandingCollisions);
+            osg::Vec3f position = physicActor->getPosition();
+            float oldHeight = position.z();
+            bool positionChanged = false;
+            for (int i=0; i<numSteps; ++i)
+            {
+                position = MovementSolver::move(position, physicActor->getPtr(), physicActor, iter->second, physicsDt,
+                                                world->isFlying(iter->first),
+                                                waterlevel, slowFall, mCollisionWorld, mStandingCollisions);
+                if (position != physicActor->getPosition())
+                    positionChanged = true;
+                physicActor->setPosition(position); // always set even if unchanged to make sure interpolation is correct
+            }
+            if (positionChanged)
+                mCollisionWorld->updateSingleAabb(physicActor->getCollisionObject());
 
-                float heightDiff = newpos.z() - oldHeight;
+            float interpolationFactor = mTimeAccum / physicsDt;
+            osg::Vec3f interpolated = position * interpolationFactor + physicActor->getPreviousPosition() * (1.f - interpolationFactor);
 
-                if (heightDiff < 0)
-                    iter->first.getClass().getCreatureStats(iter->first).addToFallHeight(-heightDiff);
+            float heightDiff = position.z() - oldHeight;
 
-                mMovementResults.push_back(std::make_pair(iter->first, newpos));
-            }
+            if (heightDiff < 0)
+                iter->first.getClass().getCreatureStats(iter->first).addToFallHeight(-heightDiff);
 
-            mTimeAccum = 0.0f;
+            mMovementResults.push_back(std::make_pair(iter->first, interpolated));
         }
+
         mMovementQueue.clear();
 
         return mMovementResults;
@@ -1354,8 +1453,10 @@ namespace MWPhysics
         for (std::set<Object*>::iterator it = mAnimatedObjects.begin(); it != mAnimatedObjects.end(); ++it)
             (*it)->animateCollisionShapes(mCollisionWorld);
 
+#ifndef BT_NO_PROFILE
         CProfileManager::Reset();
         CProfileManager::Increment_Frame_Counter();
+#endif
     }
 
     void PhysicsSystem::debugDraw()
@@ -1431,7 +1532,10 @@ namespace MWPhysics
         }
 
         if (!mWaterEnabled)
+        {
+            mWaterCollisionObject.reset();
             return;
+        }
 
         mWaterCollisionObject.reset(new btCollisionObject());
         mWaterCollisionShape.reset(new btStaticPlaneShape(btVector3(0,0,1), mWaterHeight));
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 110b59268..9730cda74 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -70,6 +70,8 @@ namespace MWPhysics
             Actor* getActor(const MWWorld::Ptr& ptr);
             const Actor* getActor(const MWWorld::ConstPtr& ptr) const;
 
+            const Object* getObject(const MWWorld::ConstPtr& ptr) const;
+
             // Object or Actor
             void remove (const MWWorld::Ptr& ptr);
 
@@ -88,12 +90,12 @@ namespace MWPhysics
             void debugDraw();
 
             std::vector<MWWorld::Ptr> getCollisions(const MWWorld::ConstPtr &ptr, int collisionGroup, int collisionMask) const; ///< get handles this object collides with
-            osg::Vec3f traceDown(const MWWorld::Ptr &ptr, float maxHeight);
+            osg::Vec3f traceDown(const MWWorld::Ptr &ptr, const osg::Vec3f& position, float maxHeight);
 
             std::pair<MWWorld::Ptr, osg::Vec3f> getHitContact(const MWWorld::ConstPtr& actor,
                                                                const osg::Vec3f &origin,
                                                                const osg::Quat &orientation,
-                                                               float queryDistance);
+                                                               float queryDistance, std::vector<MWWorld::Ptr> targets = std::vector<MWWorld::Ptr>());
 
 
             /// Get distance from \a point to the collision shape of \a target. Uses a raycast to find where the
@@ -110,9 +112,10 @@ namespace MWPhysics
                 MWWorld::Ptr mHitObject;
             };
 
-            /// @param me Optional, a Ptr to ignore in the list of results
-            RayResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, MWWorld::ConstPtr ignore = MWWorld::ConstPtr(), int mask =
-                    CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff) const;
+            /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all other actors.
+            RayResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, MWWorld::ConstPtr ignore = MWWorld::ConstPtr(),
+                    std::vector<MWWorld::Ptr> targets = std::vector<MWWorld::Ptr>(),
+                    int mask = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff) const;
 
             RayResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius);
 
@@ -121,6 +124,8 @@ namespace MWPhysics
 
             bool isOnGround (const MWWorld::Ptr& actor);
 
+            bool canMoveToWaterSurface (const MWWorld::ConstPtr &actor, const float waterlevel);
+
             /// Get physical half extents (scaled) of the given actor.
             osg::Vec3f getHalfExtents(const MWWorld::ConstPtr& actor) const;
 
@@ -129,7 +134,7 @@ namespace MWPhysics
 
             /// Get the position of the collision shape for the actor. Use together with getHalfExtents() to get the collision bounds in world space.
             /// @note The collision shape's origin is in its center, so the position returned can be described as center of the actor collision box in world space.
-            osg::Vec3f getPosition(const MWWorld::ConstPtr& actor) const;
+            osg::Vec3f getCollisionObjectPosition(const MWWorld::ConstPtr& actor) const;
 
             /// Queues velocity movement for a Ptr. If a Ptr is already queued, its velocity will
             /// be overwritten. Valid until the next call to applyQueuedMovement.
@@ -196,7 +201,7 @@ namespace MWPhysics
             typedef std::map<MWWorld::Ptr, MWWorld::Ptr> CollisionMap;
             CollisionMap mStandingCollisions;
 
-            // replaces all occurences of 'old' in the map by 'updated', no matter if its a key or value
+            // replaces all occurrences of 'old' in the map by 'updated', no matter if it's a key or value
             void updateCollisionMapPtr(CollisionMap& map, const MWWorld::Ptr &old, const MWWorld::Ptr &updated);
 
             PtrVelocityList mMovementQueue;
diff --git a/apps/openmw/mwphysics/trace.cpp b/apps/openmw/mwphysics/trace.cpp
index 94434b856..14a5dac48 100644
--- a/apps/openmw/mwphysics/trace.cpp
+++ b/apps/openmw/mwphysics/trace.cpp
@@ -4,7 +4,6 @@
 
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 #include <BulletCollision/CollisionShapes/btConvexShape.h>
-#include <BulletCollision/CollisionShapes/btCylinderShape.h>
 
 #include "collisiontype.hpp"
 #include "actor.hpp"
@@ -16,7 +15,7 @@ namespace MWPhysics
 class ClosestNotMeConvexResultCallback : public btCollisionWorld::ClosestConvexResultCallback
 {
 public:
-    ClosestNotMeConvexResultCallback(btCollisionObject *me, const btVector3 &up, btScalar minSlopeDot)
+    ClosestNotMeConvexResultCallback(const btCollisionObject *me, const btVector3 &up, btScalar minSlopeDot)
       : btCollisionWorld::ClosestConvexResultCallback(btVector3(0.0, 0.0, 0.0), btVector3(0.0, 0.0, 0.0)),
         mMe(me), mUp(up), mMinSlopeDot(minSlopeDot)
     {
@@ -44,13 +43,13 @@ public:
     }
 
 protected:
-    btCollisionObject *mMe;
+    const btCollisionObject *mMe;
     const btVector3 mUp;
     const btScalar mMinSlopeDot;
 };
 
 
-void ActorTracer::doTrace(btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, btCollisionWorld* world)
+void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world)
 {
     const btVector3 btstart = toBullet(start);
     const btVector3 btend = toBullet(end);
@@ -66,9 +65,9 @@ void ActorTracer::doTrace(btCollisionObject *actor, const osg::Vec3f& start, con
     newTraceCallback.m_collisionFilterGroup = actor->getBroadphaseHandle()->m_collisionFilterGroup;
     newTraceCallback.m_collisionFilterMask = actor->getBroadphaseHandle()->m_collisionFilterMask;
 
-    btCollisionShape *shape = actor->getCollisionShape();
+    const btCollisionShape *shape = actor->getCollisionShape();
     assert(shape->isConvex());
-    world->convexSweepTest(static_cast<btConvexShape*>(shape),
+    world->convexSweepTest(static_cast<const btConvexShape*>(shape),
                                                from, to, newTraceCallback);
 
     // Copy the hit data over to our trace results struct:
@@ -78,6 +77,7 @@ void ActorTracer::doTrace(btCollisionObject *actor, const osg::Vec3f& start, con
         mFraction = newTraceCallback.m_closestHitFraction;
         mPlaneNormal = osg::Vec3f(tracehitnormal.x(), tracehitnormal.y(), tracehitnormal.z());
         mEndPos = (end-start)*mFraction + start;
+        mHitPoint = toOsg(newTraceCallback.m_hitPointWorld);
         mHitObject = newTraceCallback.m_hitCollisionObject;
     }
     else
@@ -85,14 +85,15 @@ void ActorTracer::doTrace(btCollisionObject *actor, const osg::Vec3f& start, con
         mEndPos = end;
         mPlaneNormal = osg::Vec3f(0.0f, 0.0f, 1.0f);
         mFraction = 1.0f;
+        mHitPoint = end;
         mHitObject = NULL;
     }
 }
 
-void ActorTracer::findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, btCollisionWorld* world)
+void ActorTracer::findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world)
 {
-    const btVector3 btstart(start.x(), start.y(), start.z()+1.0f);
-    const btVector3 btend(end.x(), end.y(), end.z()+1.0f);
+    const btVector3 btstart(start.x(), start.y(), start.z());
+    const btVector3 btend(end.x(), end.y(), end.z());
 
     const btTransform &trans = actor->getCollisionObject()->getWorldTransform();
     btTransform from(trans.getBasis(), btstart);
@@ -104,19 +105,13 @@ void ActorTracer::findGround(const Actor* actor, const osg::Vec3f& start, const
     newTraceCallback.m_collisionFilterMask = actor->getCollisionObject()->getBroadphaseHandle()->m_collisionFilterMask;
     newTraceCallback.m_collisionFilterMask &= ~CollisionType_Actor;
 
-    btVector3 halfExtents = toBullet(actor->getHalfExtents());
-
-    halfExtents[2] = 1.0f;
-    btCylinderShapeZ base(halfExtents);
-
-    world->convexSweepTest(&base, from, to, newTraceCallback);
+    world->convexSweepTest(actor->getConvexShape(), from, to, newTraceCallback);
     if(newTraceCallback.hasHit())
     {
         const btVector3& tracehitnormal = newTraceCallback.m_hitNormalWorld;
         mFraction = newTraceCallback.m_closestHitFraction;
         mPlaneNormal = osg::Vec3f(tracehitnormal.x(), tracehitnormal.y(), tracehitnormal.z());
         mEndPos = (end-start)*mFraction + start;
-        mEndPos[2] += 1.0f;
     }
     else
     {
diff --git a/apps/openmw/mwphysics/trace.h b/apps/openmw/mwphysics/trace.h
index ef1a24d44..0297c9e07 100644
--- a/apps/openmw/mwphysics/trace.h
+++ b/apps/openmw/mwphysics/trace.h
@@ -15,12 +15,13 @@ namespace MWPhysics
     {
         osg::Vec3f mEndPos;
         osg::Vec3f mPlaneNormal;
+        osg::Vec3f mHitPoint;
         const btCollisionObject* mHitObject;
 
         float mFraction;
 
-        void doTrace(btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, btCollisionWorld* world);
-        void findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, btCollisionWorld* world);
+        void doTrace(const btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world);
+        void findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world);
     };
 }
 
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
new file mode 100644
index 000000000..75e56e9e7
--- /dev/null
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -0,0 +1,123 @@
+#include "actoranimation.hpp"
+
+#include <utility>
+
+#include <osg/Node>
+#include <osg/Group>
+#include <osg/Vec4f>
+
+#include <components/esm/loadligh.hpp>
+#include <components/esm/loadcell.hpp>
+
+#include <components/sceneutil/lightmanager.hpp>
+#include <components/sceneutil/lightutil.hpp>
+
+#include <components/fallback/fallback.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwworld/ptr.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwmechanics/actorutil.hpp"
+
+#include "vismask.hpp"
+
+namespace MWRender
+{
+
+ActorAnimation::ActorAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem)
+    : Animation(ptr, parentNode, resourceSystem)
+{
+    MWWorld::ContainerStore& store = mPtr.getClass().getContainerStore(mPtr);
+
+    for (MWWorld::ContainerStoreIterator iter = store.begin(MWWorld::ContainerStore::Type_Light); iter != store.end(); ++iter)
+    {
+        const ESM::Light* light = iter->get<ESM::Light>()->mBase;
+        if (!(light->mData.mFlags & ESM::Light::Carry))
+        {
+            addHiddenItemLight(*iter, light);
+        }
+    }
+}
+
+ActorAnimation::~ActorAnimation()
+{
+    for (ItemLightMap::iterator iter = mItemLights.begin(); iter != mItemLights.end(); ++iter)
+    {
+        mInsert->removeChild(iter->second);
+    }
+}
+
+void ActorAnimation::itemAdded(const MWWorld::ConstPtr& item, int /*count*/)
+{
+    if (item.getTypeName() == typeid(ESM::Light).name())
+    {
+        const ESM::Light* light = item.get<ESM::Light>()->mBase;
+        if (!(light->mData.mFlags & ESM::Light::Carry))
+        {
+            addHiddenItemLight(item, light);
+        }
+    }
+}
+
+void ActorAnimation::itemRemoved(const MWWorld::ConstPtr& item, int /*count*/)
+{
+    if (item.getTypeName() == typeid(ESM::Light).name())
+    {
+        ItemLightMap::iterator iter = mItemLights.find(item);
+        if (iter != mItemLights.end())
+        {
+            if (!item.getRefData().getCount())
+            {
+                removeHiddenItemLight(item);
+            }
+        }
+    }
+}
+
+void ActorAnimation::addHiddenItemLight(const MWWorld::ConstPtr& item, const ESM::Light* esmLight)
+{
+    if (mItemLights.find(item) != mItemLights.end())
+        return;
+
+    const Fallback::Map* fallback = MWBase::Environment::get().getWorld()->getFallback();
+    static bool outQuadInLin = fallback->getFallbackBool("LightAttenuation_OutQuadInLin");
+    static bool useQuadratic = fallback->getFallbackBool("LightAttenuation_UseQuadratic");
+    static float quadraticValue = fallback->getFallbackFloat("LightAttenuation_QuadraticValue");
+    static float quadraticRadiusMult = fallback->getFallbackFloat("LightAttenuation_QuadraticRadiusMult");
+    static bool useLinear = fallback->getFallbackBool("LightAttenuation_UseLinear");
+    static float linearRadiusMult = fallback->getFallbackFloat("LightAttenuation_LinearRadiusMult");
+    static float linearValue = fallback->getFallbackFloat("LightAttenuation_LinearValue");
+    bool exterior = mPtr.isInCell() && mPtr.getCell()->getCell()->isExterior();
+
+    osg::Vec4f ambient(1,1,1,1);
+    osg::ref_ptr<SceneUtil::LightSource> lightSource = SceneUtil::createLightSource(esmLight, Mask_Lighting, exterior, outQuadInLin,
+                                 useQuadratic, quadraticValue, quadraticRadiusMult, useLinear, linearRadiusMult, linearValue, ambient);
+
+    mInsert->addChild(lightSource);
+
+    if (mLightListCallback && mPtr == MWMechanics::getPlayer())
+        mLightListCallback->getIgnoredLightSources().insert(lightSource.get());
+
+    mItemLights.insert(std::make_pair(item, lightSource));
+}
+
+void ActorAnimation::removeHiddenItemLight(const MWWorld::ConstPtr& item)
+{
+    ItemLightMap::iterator iter = mItemLights.find(item);
+    if (iter == mItemLights.end())
+        return;
+
+    if (mLightListCallback && mPtr == MWMechanics::getPlayer())
+    {
+        std::set<SceneUtil::LightSource*>::iterator ignoredIter = mLightListCallback->getIgnoredLightSources().find(iter->second.get());
+        if (ignoredIter != mLightListCallback->getIgnoredLightSources().end())
+            mLightListCallback->getIgnoredLightSources().erase(ignoredIter);
+    }
+
+    mInsert->removeChild(iter->second);
+    mItemLights.erase(iter);
+}
+
+}
diff --git a/apps/openmw/mwrender/actoranimation.hpp b/apps/openmw/mwrender/actoranimation.hpp
new file mode 100644
index 000000000..c00f05718
--- /dev/null
+++ b/apps/openmw/mwrender/actoranimation.hpp
@@ -0,0 +1,50 @@
+#ifndef GAME_RENDER_ACTORANIMATION_H
+#define GAME_RENDER_ACTORANIMATION_H
+
+#include <map>
+
+#include <osg/ref_ptr>
+
+#include "../mwworld/containerstore.hpp"
+
+#include "animation.hpp"
+
+namespace osg
+{
+    class Node;
+}
+
+namespace MWWorld
+{
+    class ConstPtr;
+}
+
+namespace SceneUtil
+{
+    class LightSource;
+    class LightListCallback;
+}
+
+namespace MWRender
+{
+
+class ActorAnimation : public Animation, public MWWorld::ContainerStoreListener
+{
+    public:
+        ActorAnimation(const MWWorld::Ptr &ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem);
+        virtual ~ActorAnimation();
+
+        virtual void itemAdded(const MWWorld::ConstPtr& item, int count);
+        virtual void itemRemoved(const MWWorld::ConstPtr& item, int count);
+
+    private:
+        void addHiddenItemLight(const MWWorld::ConstPtr& item, const ESM::Light* esmLight);
+        void removeHiddenItemLight(const MWWorld::ConstPtr& item);
+
+        typedef std::map<MWWorld::ConstPtr, osg::ref_ptr<SceneUtil::LightSource> > ItemLightMap;
+        ItemLightMap mItemLights;
+};
+
+}
+
+#endif
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 398fe5322..0a1d5eb09 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -3,16 +3,14 @@
 #include <iomanip>
 #include <limits>
 
-#include <osg/PositionAttitudeTransform>
 #include <osg/TexGen>
 #include <osg/TexEnvCombine>
 #include <osg/MatrixTransform>
-#include <osg/Geode>
 #include <osg/BlendFunc>
 #include <osg/Material>
-#include <osg/Version>
 
 #include <osgParticle/ParticleSystem>
+#include <osgParticle/ParticleProcessor>
 
 #include <components/nifosg/nifloader.hpp>
 
@@ -50,46 +48,42 @@
 namespace
 {
 
-    class GlowUpdater : public SceneUtil::StateSetUpdater
+    /// Removes all particle systems and related nodes in a subgraph.
+    class RemoveParticlesVisitor : public osg::NodeVisitor
     {
     public:
-        GlowUpdater(osg::Vec4f color, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures)
-            : mTexUnit(1) // FIXME: might not always be 1
-            , mColor(color)
-            , mTextures(textures)
-        {
-        }
+        RemoveParticlesVisitor()
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        { }
 
-        virtual void setDefaults(osg::StateSet *stateset)
+        virtual void apply(osg::Node &node)
         {
-            stateset->setTextureMode(mTexUnit, GL_TEXTURE_2D, osg::StateAttribute::ON);
-
-            osg::TexGen* texGen = new osg::TexGen;
-            texGen->setMode(osg::TexGen::SPHERE_MAP);
-
-            stateset->setTextureAttributeAndModes(mTexUnit, texGen, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            if (dynamic_cast<osgParticle::ParticleProcessor*>(&node))
+                mToRemove.push_back(&node);
 
-            osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
-            texEnv->setSource0_RGB(osg::TexEnvCombine::CONSTANT);
-            texEnv->setConstantColor(mColor);
-            texEnv->setCombine_RGB(osg::TexEnvCombine::INTERPOLATE);
-            texEnv->setSource2_RGB(osg::TexEnvCombine::TEXTURE);
-            texEnv->setOperand2_RGB(osg::TexEnvCombine::SRC_COLOR);
+            traverse(node);
+        }
 
-            stateset->setTextureAttributeAndModes(mTexUnit, texEnv, osg::StateAttribute::ON);
+        virtual void apply(osg::Drawable& drw)
+        {
+            if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(&drw))
+                mToRemove.push_back(partsys);
         }
 
-        virtual void apply(osg::StateSet *stateset, osg::NodeVisitor *nv)
+        void remove()
         {
-            float time = nv->getFrameStamp()->getSimulationTime();
-            int index = (int)(time*16) % mTextures.size();
-            stateset->setTextureAttribute(mTexUnit, mTextures[index], osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            for (std::vector<osg::ref_ptr<osg::Node> >::iterator it = mToRemove.begin(); it != mToRemove.end(); ++it)
+            {
+                // FIXME: a Drawable might have more than one parent
+                osg::Node* node = *it;
+                if (node->getNumParents())
+                    node->getParent(0)->removeChild(node);
+            }
+            mToRemove.clear();
         }
 
     private:
-        int mTexUnit;
-        osg::Vec4f mColor;
-        std::vector<osg::ref_ptr<osg::Texture2D> > mTextures;
+        std::vector<osg::ref_ptr<osg::Node> > mToRemove;
     };
 
     class NodeMapVisitor : public osg::NodeVisitor
@@ -201,17 +195,19 @@ namespace
     class RemoveDrawableVisitor : public RemoveVisitor
     {
     public:
-        virtual void apply(osg::Geode &geode)
+        virtual void apply(osg::Drawable& drw)
         {
-            applyImpl(geode);
+            applyImpl(drw);
         }
 
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
-        virtual void apply(osg::Drawable& drw)
+        virtual void apply(osg::Group& node)
         {
-            applyImpl(drw);
+            traverse(node);
+        }
+        virtual void apply(osg::MatrixTransform& node)
+        {
+            traverse(node);
         }
-#endif
 
         void applyImpl(osg::Node& node)
         {
@@ -239,17 +235,19 @@ namespace
     class RemoveTriBipVisitor : public RemoveVisitor
     {
     public:
-        virtual void apply(osg::Geode &node)
+        virtual void apply(osg::Drawable& drw)
         {
-            applyImpl(node);
+            applyImpl(drw);
         }
 
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
-        virtual void apply(osg::Drawable& drw)
+        virtual void apply(osg::Group& node)
         {
-            applyImpl(drw);
+            traverse(node);
+        }
+        virtual void apply(osg::MatrixTransform& node)
+        {
+            traverse(node);
         }
-#endif
 
         void applyImpl(osg::Node& node)
         {
@@ -267,6 +265,134 @@ namespace
 
 namespace MWRender
 {
+    class GlowUpdater : public SceneUtil::StateSetUpdater
+    {
+    public:
+        GlowUpdater(int texUnit, osg::Vec4f color, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures,
+            osg::Node* node, float duration, Resource::ResourceSystem* resourcesystem)
+            : mTexUnit(texUnit)
+            , mColor(color)
+            , mOriginalColor(color)
+            , mTextures(textures)
+            , mNode(node)
+            , mDuration(duration)
+            , mOriginalDuration(duration)
+            , mStartingTime(0)
+            , mResourceSystem(resourcesystem)
+            , mColorChanged(false)
+            , mDone(false)
+        {
+        }
+
+        virtual void setDefaults(osg::StateSet *stateset)
+        {
+            if (mDone)
+                removeTexture(stateset);
+            else
+            {
+                stateset->setTextureMode(mTexUnit, GL_TEXTURE_2D, osg::StateAttribute::ON);
+                osg::TexGen* texGen = new osg::TexGen;
+                texGen->setMode(osg::TexGen::SPHERE_MAP);
+
+                stateset->setTextureAttributeAndModes(mTexUnit, texGen, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
+                osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
+                texEnv->setSource0_RGB(osg::TexEnvCombine::CONSTANT);
+                texEnv->setConstantColor(mColor);
+                texEnv->setCombine_RGB(osg::TexEnvCombine::INTERPOLATE);
+                texEnv->setSource2_RGB(osg::TexEnvCombine::TEXTURE);
+                texEnv->setOperand2_RGB(osg::TexEnvCombine::SRC_COLOR);
+
+                stateset->setTextureAttributeAndModes(mTexUnit, texEnv, osg::StateAttribute::ON);
+                stateset->addUniform(new osg::Uniform("envMapColor", mColor));
+            }
+        }
+
+        void removeTexture(osg::StateSet* stateset)
+        {
+            stateset->removeTextureAttribute(mTexUnit, osg::StateAttribute::TEXTURE);
+            stateset->removeTextureAttribute(mTexUnit, osg::StateAttribute::TEXGEN);
+            stateset->removeTextureAttribute(mTexUnit, osg::StateAttribute::TEXENV);
+            stateset->removeTextureMode(mTexUnit, GL_TEXTURE_2D);
+            stateset->removeUniform("envMapColor");
+
+            osg::StateSet::TextureAttributeList& list = stateset->getTextureAttributeList();
+            while (list.size() && list.rbegin()->empty())
+                list.pop_back();
+        }
+
+        virtual void apply(osg::StateSet *stateset, osg::NodeVisitor *nv)
+        {
+            if (mColorChanged){
+                this->reset();
+                setDefaults(stateset);
+                mColorChanged = false;
+            }
+            if (mDone)
+                return;
+            
+            // Set the starting time to measure glow duration from if this is a temporary glow
+            if ((mDuration >= 0) && mStartingTime == 0)
+                mStartingTime = nv->getFrameStamp()->getSimulationTime();
+
+            float time = nv->getFrameStamp()->getSimulationTime();
+            int index = (int)(time*16) % mTextures.size();
+            stateset->setTextureAttribute(mTexUnit, mTextures[index], osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
+            if ((mDuration >= 0) && (time - mStartingTime > mDuration)) // If this is a temporary glow and it has finished its duration
+            {
+                if (mOriginalDuration >= 0) // if this glowupdater was a temporary glow since its creation
+                {
+                    removeTexture(stateset);
+                    this->reset();
+                    mDone = true;
+                    mResourceSystem->getSceneManager()->recreateShaders(mNode);
+                }
+                if (mOriginalDuration < 0) // if this glowupdater was originally a permanent glow
+                {
+                    mDuration = mOriginalDuration;
+                    mStartingTime = 0;
+                    mColor = mOriginalColor;
+                    this->reset();
+                    setDefaults(stateset);
+                }
+            }
+        }
+
+        bool isPermanentGlowUpdater()
+        {
+            return (mDuration < 0);
+        }
+
+        bool isDone()
+        {
+            return mDone;
+        }
+
+        void setColor(osg::Vec4f color)
+        {
+            mColor = color;
+            mColorChanged = true;
+        }
+
+        void setDuration(float duration)
+        {
+            mDuration = duration;
+        }
+
+    private:
+        int mTexUnit;
+        osg::Vec4f mColor;
+        osg::Vec4f mOriginalColor; // for restoring the color of a permanent glow after a temporary glow on the object finishes
+        std::vector<osg::ref_ptr<osg::Texture2D> > mTextures;
+        osg::Node* mNode;
+        float mDuration;
+        float mOriginalDuration; // for recording that this is originally a permanent glow if it is changed to a temporary one
+        float mStartingTime;
+        Resource::ResourceSystem* mResourceSystem;
+        bool mColorChanged;
+        bool mDone;
+    };
 
     struct Animation::AnimSource
     {
@@ -276,7 +402,7 @@ namespace MWRender
 
         ControllerMap mControllerMap[Animation::sNumBlendMasks];
 
-        const std::multimap<float, std::string>& getTextKeys();
+        const std::multimap<float, std::string>& getTextKeys() const;
     };
 
     class ResetAccumRootCallback : public osg::NodeCallback
@@ -321,6 +447,8 @@ namespace MWRender
     {
         for(size_t i = 0;i < sNumBlendMasks;i++)
             mAnimationTimePtr[i].reset(new AnimationTime);
+
+        mLightListCallback = new SceneUtil::LightListCallback;
     }
 
     Animation::~Animation()
@@ -331,6 +459,11 @@ namespace MWRender
             mInsert->removeChild(mObjectRoot);
     }
 
+    MWWorld::ConstPtr Animation::getPtr() const
+    {
+        return mPtr;
+    }
+
     MWWorld::Ptr Animation::getPtr()
     {
         return mPtr;
@@ -355,7 +488,7 @@ namespace MWRender
             mResetAccumRootCallback->setAccumulate(mAccumulate);
     }
 
-    size_t Animation::detectBlendMask(osg::Node* node)
+    size_t Animation::detectBlendMask(const osg::Node* node) const
     {
         static const char sBlendMaskRoots[sNumBlendMasks][32] = {
             "", /* Lower body / character root */
@@ -381,7 +514,7 @@ namespace MWRender
         return 0;
     }
 
-    const std::multimap<float, std::string> &Animation::AnimSource::getTextKeys()
+    const std::multimap<float, std::string> &Animation::AnimSource::getTextKeys() const
     {
         return mKeyframes->mTextKeys;
     }
@@ -424,7 +557,7 @@ namespace MWRender
             size_t blendMask = detectBlendMask(node);
 
             // clone the controller, because each Animation needs its own ControllerSource
-            osg::ref_ptr<NifOsg::KeyframeController> cloned = osg::clone(it->second.get(), osg::CopyOp::DEEP_COPY_ALL);
+            osg::ref_ptr<NifOsg::KeyframeController> cloned = new NifOsg::KeyframeController(*it->second, osg::CopyOp::SHALLOW_COPY);
             cloned->setSource(mAnimationTimePtr[blendMask]);
 
             animsrc->mControllerMap[blendMask].insert(std::make_pair(bonename, cloned));
@@ -456,9 +589,11 @@ namespace MWRender
         mAccumCtrl = NULL;
 
         mAnimSources.clear();
+
+        mAnimVelocities.clear();
     }
 
-    bool Animation::hasAnimation(const std::string &anim)
+    bool Animation::hasAnimation(const std::string &anim) const
     {
         AnimSourceList::const_iterator iter(mAnimSources.begin());
         for(;iter != mAnimSources.end();++iter)
@@ -576,9 +711,9 @@ namespace MWRender
                 state.mAutoDisable = autodisable;
                 mStates[groupname] = state;
 
-                NifOsg::TextKeyMap::const_iterator textkey(textkeys.lower_bound(state.getTime()));
                 if (state.mPlaying)
                 {
+                    NifOsg::TextKeyMap::const_iterator textkey(textkeys.lower_bound(state.getTime()));
                     while(textkey != textkeys.end() && textkey->first <= state.getTime())
                     {
                         handleTextKey(state, groupname, textkey, textkeys);
@@ -765,16 +900,6 @@ namespace MWRender
         addControllers();
     }
 
-    void Animation::stopLooping(const std::string& groupname)
-    {
-        AnimStateMap::iterator stateiter = mStates.find(groupname);
-        if(stateiter != mStates.end())
-        {
-            stateiter->second.mLoopCount = 0;
-            return;
-        }
-    }
-
     void Animation::adjustSpeedMult(const std::string &groupname, float speedmult)
     {
         AnimStateMap::iterator state(mStates.find(groupname));
@@ -821,6 +946,15 @@ namespace MWRender
         return iter->second.getTime();
     }
 
+    size_t Animation::getCurrentLoopCount(const std::string& groupname) const
+    {
+        AnimStateMap::const_iterator iter = mStates.find(groupname);
+        if(iter == mStates.end())
+            return 0;
+
+        return iter->second.mLoopCount;
+    }
+
     void Animation::disable(const std::string &groupname)
     {
         AnimStateMap::iterator iter = mStates.find(groupname);
@@ -834,6 +968,10 @@ namespace MWRender
         if (!mAccumRoot)
             return 0.0f;
 
+        std::map<std::string, float>::const_iterator found = mAnimVelocities.find(groupname);
+        if (found != mAnimVelocities.end())
+            return found->second;
+
         // Look in reverse; last-inserted source has priority.
         AnimSourceList::const_reverse_iterator animsrc(mAnimSources.rbegin());
         for(;animsrc != mAnimSources.rend();++animsrc)
@@ -867,20 +1005,22 @@ namespace MWRender
 
             while(!(velocity > 1.0f) && ++animiter != mAnimSources.rend())
             {
-                const NifOsg::TextKeyMap &keys = (*animiter)->getTextKeys();
+                const NifOsg::TextKeyMap &keys2 = (*animiter)->getTextKeys();
 
-                const AnimSource::ControllerMap& ctrls = (*animiter)->mControllerMap[0];
-                for (AnimSource::ControllerMap::const_iterator it = ctrls.begin(); it != ctrls.end(); ++it)
+                const AnimSource::ControllerMap& ctrls2 = (*animiter)->mControllerMap[0];
+                for (AnimSource::ControllerMap::const_iterator it = ctrls2.begin(); it != ctrls2.end(); ++it)
                 {
                     if (Misc::StringUtils::ciEqual(it->first, mAccumRoot->getName()))
                     {
-                        velocity = calcAnimVelocity(keys, it->second, mAccumulate, groupname);
+                        velocity = calcAnimVelocity(keys2, it->second, mAccumulate, groupname);
                         break;
                     }
                 }
             }
         }
 
+        mAnimVelocities.insert(std::make_pair(groupname, velocity));
+
         return velocity;
     }
 
@@ -906,35 +1046,33 @@ namespace MWRender
             {
                 float targetTime;
 
-                if(state.getTime() >= state.mLoopStopTime && state.mLoopCount > 0)
-                    goto handle_loop;
-
-                targetTime = state.getTime() + timepassed;
-                if(textkey == textkeys.end() || textkey->first > targetTime)
-                {
-                    if(mAccumCtrl && state.mTime == mAnimationTimePtr[0]->getTimePtr())
-                        updatePosition(state.getTime(), targetTime, movement);
-                    state.setTime(std::min(targetTime, state.mStopTime));
-                }
-                else
+                if (!state.shouldLoop())
                 {
-                    if(mAccumCtrl && state.mTime == mAnimationTimePtr[0]->getTimePtr())
-                        updatePosition(state.getTime(), textkey->first, movement);
-                    state.setTime(textkey->first);
-                }
+                    targetTime = state.getTime() + timepassed;
+                    if(textkey == textkeys.end() || textkey->first > targetTime)
+                    {
+                        if(mAccumCtrl && state.mTime == mAnimationTimePtr[0]->getTimePtr())
+                            updatePosition(state.getTime(), targetTime, movement);
+                        state.setTime(std::min(targetTime, state.mStopTime));
+                    }
+                    else
+                    {
+                        if(mAccumCtrl && state.mTime == mAnimationTimePtr[0]->getTimePtr())
+                            updatePosition(state.getTime(), textkey->first, movement);
+                        state.setTime(textkey->first);
+                    }
 
-                state.mPlaying = (state.getTime() < state.mStopTime);
-                timepassed = targetTime - state.getTime();
+                    state.mPlaying = (state.getTime() < state.mStopTime);
+                    timepassed = targetTime - state.getTime();
 
-                while(textkey != textkeys.end() && textkey->first <= state.getTime())
-                {
-                    handleTextKey(state, stateiter->first, textkey, textkeys);
-                    ++textkey;
+                    while(textkey != textkeys.end() && textkey->first <= state.getTime())
+                    {
+                        handleTextKey(state, stateiter->first, textkey, textkeys);
+                        ++textkey;
+                    }
                 }
-
-                if(state.getTime() >= state.mLoopStopTime && state.mLoopCount > 0)
+                if(state.shouldLoop())
                 {
-                handle_loop:
                     state.mLoopCount--;
                     state.setTime(state.mLoopStartTime);
                     state.mPlaying = true;
@@ -948,7 +1086,7 @@ namespace MWRender
 
                     if(state.getTime() >= state.mLoopStopTime)
                         break;
-                }
+                } 
 
                 if(timepassed <= 0.0f)
                     break;
@@ -978,11 +1116,20 @@ namespace MWRender
         return movement;
     }
 
+    void Animation::setLoopingEnabled(const std::string &groupname, bool enabled)
+    {
+        AnimStateMap::iterator state(mStates.find(groupname));
+        if(state != mStates.end())
+            state->second.mLoopingEnabled = enabled;
+    }
+
     void Animation::setObjectRoot(const std::string &model, bool forceskeleton, bool baseonly, bool isCreature)
     {
         osg::ref_ptr<osg::StateSet> previousStateset;
         if (mObjectRoot)
         {
+            if (mLightListCallback)
+                mObjectRoot->removeCullCallback(mLightListCallback);
             previousStateset = mObjectRoot->getStateSet();
             mObjectRoot->getParent(0)->removeChild(mObjectRoot);
         }
@@ -1038,7 +1185,9 @@ namespace MWRender
             removeTriBipVisitor.remove();
         }
 
-        mObjectRoot->addCullCallback(new SceneUtil::LightListCallback);
+        if (!mLightListCallback)
+            mLightListCallback = new SceneUtil::LightListCallback;
+        mObjectRoot->addCullCallback(mLightListCallback);
     }
 
     osg::Group* Animation::getObjectRoot()
@@ -1056,7 +1205,48 @@ namespace MWRender
         return mObjectRoot.get();
     }
 
-    void Animation::addGlow(osg::ref_ptr<osg::Node> node, osg::Vec4f glowColor)
+    class FindLowestUnusedTexUnitVisitor : public osg::NodeVisitor
+    {
+    public:
+        FindLowestUnusedTexUnitVisitor()
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            , mLowestUnusedTexUnit(0)
+        {
+        }
+
+        virtual void apply(osg::Node& node)
+        {
+            if (osg::StateSet* stateset = node.getStateSet())
+                mLowestUnusedTexUnit = std::max(mLowestUnusedTexUnit, int(stateset->getTextureAttributeList().size()));
+
+            traverse(node);
+        }
+        int mLowestUnusedTexUnit;
+    };
+
+    void Animation::addSpellCastGlow(const ESM::MagicEffect *effect, float glowDuration)
+    {
+        osg::Vec4f glowColor(1,1,1,1);
+        glowColor.x() = effect->mData.mRed / 255.f;
+        glowColor.y() = effect->mData.mGreen / 255.f;
+        glowColor.z() = effect->mData.mBlue / 255.f;
+
+        if (!mGlowUpdater || (mGlowUpdater->isDone() || (mGlowUpdater->isPermanentGlowUpdater() == true)))
+        {
+            if (mGlowUpdater && mGlowUpdater->isDone())
+                mObjectRoot->removeUpdateCallback(mGlowUpdater);
+
+            if (mGlowUpdater && mGlowUpdater->isPermanentGlowUpdater())
+            {
+                mGlowUpdater->setColor(glowColor);
+                mGlowUpdater->setDuration(glowDuration);
+            }
+            else
+                addGlow(mObjectRoot, glowColor, glowDuration);
+        }
+    }
+
+    void Animation::addGlow(osg::ref_ptr<osg::Node> node, osg::Vec4f glowColor, float glowDuration)
     {
         std::vector<osg::ref_ptr<osg::Texture2D> > textures;
         for (int i=0; i<32; ++i)
@@ -1070,27 +1260,54 @@ namespace MWRender
 
             osg::ref_ptr<osg::Image> image = mResourceSystem->getImageManager()->getImage(stream.str());
             osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(image));
+            tex->setName("envMap");
             tex->setWrap(osg::Texture::WRAP_S, osg::Texture2D::REPEAT);
             tex->setWrap(osg::Texture::WRAP_T, osg::Texture2D::REPEAT);
             mResourceSystem->getSceneManager()->applyFilterSettings(tex);
             textures.push_back(tex);
         }
 
-        osg::ref_ptr<GlowUpdater> glowupdater (new GlowUpdater(glowColor, textures));
-        node->addUpdateCallback(glowupdater);
+        FindLowestUnusedTexUnitVisitor findLowestUnusedTexUnitVisitor;
+        node->accept(findLowestUnusedTexUnitVisitor);
+        int texUnit = findLowestUnusedTexUnitVisitor.mLowestUnusedTexUnit;
+
+        osg::ref_ptr<GlowUpdater> glowUpdater = new GlowUpdater(texUnit, glowColor, textures, node, glowDuration, mResourceSystem);
+        mGlowUpdater = glowUpdater;
+        node->addUpdateCallback(glowUpdater);
+        
+        // set a texture now so that the ShaderVisitor can find it
+        osg::ref_ptr<osg::StateSet> writableStateSet = NULL;
+        if (!node->getStateSet())
+            writableStateSet = node->getOrCreateStateSet();
+        else
+        {
+            writableStateSet = new osg::StateSet(*node->getStateSet(), osg::CopyOp::SHALLOW_COPY);
+            node->setStateSet(writableStateSet);
+        }
+        writableStateSet->setTextureAttributeAndModes(texUnit, textures.front(), osg::StateAttribute::ON);
+        writableStateSet->addUniform(new osg::Uniform("envMapColor", glowColor));
+        mResourceSystem->getSceneManager()->recreateShaders(node);
     }
 
     // TODO: Should not be here
-    osg::Vec4f Animation::getEnchantmentColor(MWWorld::Ptr item)
+    osg::Vec4f Animation::getEnchantmentColor(const MWWorld::ConstPtr& item) const
     {
         osg::Vec4f result(1,1,1,1);
         std::string enchantmentName = item.getClass().getEnchantment(item);
         if (enchantmentName.empty())
             return result;
-        const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(enchantmentName);
+
+        const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(enchantmentName);
+        if (!enchantment)
+            return result;
+
         assert (enchantment->mEffects.mList.size());
-        const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(
+
+        const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().search(
                 enchantment->mEffects.mList.front().mEffectID);
+        if (!magicEffect)
+            return result;
+
         result.x() = magicEffect->mData.mRed / 255.f;
         result.y() = magicEffect->mData.mGreen / 255.f;
         result.z() = magicEffect->mData.mBlue / 255.f;
@@ -1162,7 +1379,7 @@ namespace MWRender
         SceneUtil::AssignControllerSourcesVisitor assignVisitor(boost::shared_ptr<SceneUtil::ControllerSource>(params.mAnimTime));
         node->accept(assignVisitor);
 
-        overrideTexture(texture, mResourceSystem, node);
+        overrideFirstRootTexture(texture, mResourceSystem, node);
 
         // TODO: in vanilla morrowind the effect is scaled based on the host object's bounding box.
 
@@ -1181,9 +1398,9 @@ namespace MWRender
         }
     }
 
-    void Animation::getLoopingEffects(std::vector<int> &out)
+    void Animation::getLoopingEffects(std::vector<int> &out) const
     {
-        for (std::vector<EffectParams>::iterator it = mEffects.begin(); it != mEffects.end(); ++it)
+        for (std::vector<EffectParams>::const_iterator it = mEffects.begin(); it != mEffects.end(); ++it)
         {
             if (it->mLoop)
                 out.push_back(it->mEffectId);
@@ -1259,10 +1476,14 @@ namespace MWRender
             stateset->setAttributeAndModes(material, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
 
             mObjectRoot->setStateSet(stateset);
+
+            mResourceSystem->getSceneManager()->recreateShaders(mObjectRoot);
         }
         else
         {
             mObjectRoot->setStateSet(NULL);
+
+            mResourceSystem->getSceneManager()->recreateShaders(mObjectRoot);
         }
 
         setRenderBin();
@@ -1330,9 +1551,25 @@ namespace MWRender
             if (found != getNodeMap().end())
             {
                 osg::MatrixTransform* node = found->second;
-                mHeadController = new RotateController(mObjectRoot.get());
-                node->addUpdateCallback(mHeadController);
-                mActiveControllers.insert(std::make_pair(node, mHeadController));
+
+                bool foundKeyframeCtrl = false;
+                osg::Callback* cb = node->getUpdateCallback();
+                while (cb)
+                {
+                    if (dynamic_cast<NifOsg::KeyframeController*>(cb))
+                    {
+                        foundKeyframeCtrl = true;
+                        break;
+                    }
+                    cb = cb->getNestedCallback();
+                }
+
+                if (foundKeyframeCtrl)
+                {
+                    mHeadController = new RotateController(mObjectRoot.get());
+                    node->addUpdateCallback(mHeadController);
+                    mActiveControllers.insert(std::make_pair(node, mHeadController));
+                }
             }
         }
     }
@@ -1402,6 +1639,13 @@ namespace MWRender
         }
         if (ptr.getTypeName() == typeid(ESM::Light).name() && allowLight)
             addExtraLight(getOrCreateObjectRoot(), ptr.get<ESM::Light>()->mBase);
+
+        if (!allowLight && mObjectRoot)
+        {
+            RemoveParticlesVisitor visitor;
+            mObjectRoot->accept(visitor);
+            visitor.remove();
+        }
     }
 
     Animation::AnimState::~AnimState()
@@ -1418,13 +1662,15 @@ namespace MWRender
 
     PartHolder::~PartHolder()
     {
+        if (mNode.get() && !mNode->getNumParents())
+            std::cerr << "Warning: part has no parents " << std::endl;
+
         if (mNode.get() && mNode->getNumParents())
+        {
+            if (mNode->getNumParents() > 1)
+                std::cerr << "Warning: part has multiple parents " << mNode->getNumParents() << " " << mNode.get() << std::endl;
             mNode->getParent(0)->removeChild(mNode);
-    }
-
-    void PartHolder::unlink()
-    {
-        mNode = NULL;
+        }
     }
 
 }
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 1d7930566..27572544f 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -8,6 +8,7 @@
 namespace ESM
 {
     struct Light;
+    struct MagicEffect;
 }
 
 namespace Resource
@@ -24,6 +25,7 @@ namespace NifOsg
 namespace SceneUtil
 {
     class LightSource;
+    class LightListCallback;
     class Skeleton;
 }
 
@@ -32,6 +34,7 @@ namespace MWRender
 
 class ResetAccumRootCallback;
 class RotateController;
+class GlowUpdater;
 
 class EffectAnimationTime : public SceneUtil::ControllerSource
 {
@@ -55,9 +58,6 @@ public:
 
     ~PartHolder();
 
-    /// Unreferences mNode *without* detaching it from the graph. Only use if you know what you are doing.
-    void unlink();
-
     osg::ref_ptr<osg::Node> getNode()
     {
         return mNode;
@@ -71,7 +71,7 @@ private:
 };
 typedef boost::shared_ptr<PartHolder> PartHolderPtr;
 
-class Animation
+class Animation : public osg::Referenced
 {
 public:
     enum BoneGroup {
@@ -181,6 +181,7 @@ protected:
         float mSpeedMult;
 
         bool mPlaying;
+        bool mLoopingEnabled;
         size_t mLoopCount;
 
         AnimPriority mPriority;
@@ -188,8 +189,8 @@ protected:
         bool mAutoDisable;
 
         AnimState() : mStartTime(0.0f), mLoopStartTime(0.0f), mLoopStopTime(0.0f), mStopTime(0.0f),
-                      mTime(new float), mSpeedMult(1.0f), mPlaying(false), mLoopCount(0),
-                      mPriority(0), mBlendMask(0), mAutoDisable(true)
+                      mTime(new float), mSpeedMult(1.0f), mPlaying(false), mLoopingEnabled(true),
+                      mLoopCount(0), mPriority(0), mBlendMask(0), mAutoDisable(true)
         {
         }
         ~AnimState();
@@ -202,6 +203,11 @@ protected:
         {
             *mTime = time;
         }
+
+        bool shouldLoop() const
+        {
+            return getTime() >= mLoopStopTime && mLoopingEnabled && mLoopCount > 0;
+        }
     };
     typedef std::map<std::string,AnimState> AnimStateMap;
     AnimStateMap mStates;
@@ -261,16 +267,21 @@ protected:
     float mHeadPitchRadians;
 
     osg::ref_ptr<SceneUtil::LightSource> mGlowLight;
+    osg::ref_ptr<GlowUpdater> mGlowUpdater;
 
     float mAlpha;
 
+    mutable std::map<std::string, float> mAnimVelocities;
+
+    osg::ref_ptr<SceneUtil::LightListCallback> mLightListCallback;
+
     const NodeMap& getNodeMap() const;
 
     /* Sets the appropriate animations on the bone groups based on priority.
      */
     void resetActiveGroups();
 
-    size_t detectBlendMask(osg::Node* node);
+    size_t detectBlendMask(const osg::Node* node) const;
 
     /* Updates the position of the accum root node for the given time, and
      * returns the wanted movement vector from the previous time. */
@@ -290,7 +301,7 @@ protected:
 
     /** Sets the root model of the object.
      *
-     * Note that you must make sure all animation sources are cleared before reseting the object
+     * Note that you must make sure all animation sources are cleared before resetting the object
      * root. All nodes previously retrieved with getNode will also become invalidated.
      * @param forceskeleton Wrap the object root in a Skeleton, even if it contains no skinned parts. Use this if you intend to add skinned parts manually.
      * @param baseonly If true, then any meshes or particle systems in the model are ignored
@@ -315,9 +326,9 @@ protected:
      */
     virtual void addControllers();
 
-    osg::Vec4f getEnchantmentColor(MWWorld::Ptr item);
+    osg::Vec4f getEnchantmentColor(const MWWorld::ConstPtr& item) const;
 
-    void addGlow(osg::ref_ptr<osg::Node> node, osg::Vec4f glowColor);
+    void addGlow(osg::ref_ptr<osg::Node> node, osg::Vec4f glowColor, float glowDuration = -1);
 
     /// Set the render bin for this animation's object root. May be customized by subclasses.
     virtual void setRenderBin();
@@ -325,8 +336,12 @@ protected:
 public:
 
     Animation(const MWWorld::Ptr &ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem);
+
+    /// Must be thread safe
     virtual ~Animation();
 
+    MWWorld::ConstPtr getPtr() const;
+
     MWWorld::Ptr getPtr();
 
     /// Set active flag on the object skeleton, if one exists.
@@ -349,11 +364,15 @@ public:
      */
     void addEffect (const std::string& model, int effectId, bool loop = false, const std::string& bonename = "", std::string texture = "");
     void removeEffect (int effectId);
-    void getLoopingEffects (std::vector<int>& out);
+    void getLoopingEffects (std::vector<int>& out) const;
+
+    // Add a spell casting glow to an object. From measuring video taken from the original engine,
+    // the glow seems to be about 1.5 seconds except for telekinesis, which is 1 second.
+    void addSpellCastGlow(const ESM::MagicEffect *effect, float glowDuration = 1.5);
 
     virtual void updatePtr(const MWWorld::Ptr &ptr);
 
-    bool hasAnimation(const std::string &anim);
+    bool hasAnimation(const std::string &anim) const;
 
     // Specifies the axis' to accumulate on. Non-accumulated axis will just
     // move visually, but not affect the actual movement. Each x/y/z value
@@ -384,10 +403,6 @@ public:
               float speedmult, const std::string &start, const std::string &stop,
               float startpoint, size_t loops, bool loopfallback=false);
 
-    /** If the given animation group is currently playing, set its remaining loop count to '0'.
-     */
-    void stopLooping(const std::string& groupName);
-
     /** Adjust the speed multiplier of an already playing animation.
      */
     void adjustSpeedMult (const std::string& groupname, float speedmult);
@@ -415,6 +430,8 @@ public:
     /// Get the current absolute position in the animation track for the animation that is currently playing from the given group.
     float getCurrentTime(const std::string& groupname) const;
 
+    size_t getCurrentLoopCount(const std::string& groupname) const;
+
     /** Disables the specified animation group;
      * \param groupname Animation group to disable.
      */
@@ -425,6 +442,8 @@ public:
 
     virtual osg::Vec3f runAnimation(float duration);
 
+    void setLoopingEnabled(const std::string &groupname, bool enabled);
+
     /// This is typically called as part of runAnimation, but may be called manually if needed.
     void updateEffects(float duration);
 
diff --git a/apps/openmw/mwrender/bulletdebugdraw.cpp b/apps/openmw/mwrender/bulletdebugdraw.cpp
index eaf36cf85..d35c3ac5d 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.cpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.cpp
@@ -4,7 +4,6 @@
 
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
-#include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/Group>
 
@@ -26,13 +25,8 @@ DebugDrawer::DebugDrawer(osg::ref_ptr<osg::Group> parentNode, btCollisionWorld *
       mWorld(world),
       mDebugOn(true)
 {
-    mGeode = new osg::Geode;
-    mParentNode->addChild(mGeode);
-    mGeode->setNodeMask(Mask_Debug);
 
     createGeometry();
-
-    mParentNode->addChild(mGeode);
 }
 
 void DebugDrawer::createGeometry()
@@ -40,6 +34,7 @@ void DebugDrawer::createGeometry()
     if (!mGeometry)
     {
         mGeometry = new osg::Geometry;
+        mGeometry->setNodeMask(Mask_Debug);
 
         mVertices = new osg::Vec3Array;
 
@@ -50,7 +45,7 @@ void DebugDrawer::createGeometry()
         mGeometry->setDataVariance(osg::Object::DYNAMIC);
         mGeometry->addPrimitiveSet(mDrawArrays);
 
-        mGeode->addDrawable(mGeometry);
+        mParentNode->addChild(mGeometry);
     }
 }
 
@@ -58,7 +53,7 @@ void DebugDrawer::destroyGeometry()
 {
     if (mGeometry)
     {
-        mGeode->removeDrawable(mGeometry);
+        mParentNode->removeChild(mGeometry);
         mGeometry = NULL;
         mVertices = NULL;
         mDrawArrays = NULL;
@@ -67,7 +62,7 @@ void DebugDrawer::destroyGeometry()
 
 DebugDrawer::~DebugDrawer()
 {
-    mParentNode->removeChild(mGeode);
+    destroyGeometry();
 }
 
 void DebugDrawer::step()
diff --git a/apps/openmw/mwrender/bulletdebugdraw.hpp b/apps/openmw/mwrender/bulletdebugdraw.hpp
index 1bccc20bd..30da3aa72 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.hpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.hpp
@@ -12,7 +12,6 @@ class btCollisionWorld;
 namespace osg
 {
     class Group;
-    class Geode;
     class Geometry;
 }
 
@@ -24,7 +23,6 @@ class DebugDrawer : public btIDebugDraw
 protected:
     osg::ref_ptr<osg::Group> mParentNode;
     btCollisionWorld *mWorld;
-    osg::ref_ptr<osg::Geode> mGeode;
     osg::ref_ptr<osg::Geometry> mGeometry;
     osg::ref_ptr<osg::Vec3Array> mVertices;
     osg::ref_ptr<osg::DrawArrays> mDrawArrays;
diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index 88934414f..cb6188a54 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -54,8 +54,8 @@ namespace MWRender
       mIsNearest(false),
       mHeight(124.f),
       mMaxCameraDistance(192.f),
-      mDistanceAdjusted(false),
       mVanityToggleQueued(false),
+      mVanityToggleQueuedValue(false),
       mViewModeToggleQueued(false),
       mCameraDistance(0.f)
     {
@@ -69,6 +69,8 @@ namespace MWRender
         mMainCam.yaw = 0.f;
         mMainCam.offset = 400.f;
 
+        mCameraDistance = mMaxCameraDistance;
+
         mUpdateCallback = new UpdateRenderCameraCallback(this);
         mCamera->addUpdateCallback(mUpdateCallback);
     }
@@ -88,10 +90,10 @@ namespace MWRender
         const osg::Node* trackNode = mTrackingNode;
         if (!trackNode)
             return osg::Vec3d();
-        osg::MatrixList mats = trackNode->getWorldMatrices();
-        if (!mats.size())
+        osg::NodePathList nodepaths = trackNode->getParentalNodePaths();
+        if (nodepaths.empty())
             return osg::Vec3d();
-        const osg::Matrix& worldMat = mats[0];
+        osg::Matrix worldMat = osg::computeLocalToWorld(nodepaths[0]);
 
         osg::Vec3d position = worldMat.getTrans();
         if (!isFirstPerson())
@@ -108,7 +110,7 @@ namespace MWRender
 
         osg::Quat orient =  osg::Quat(getPitch(), osg::Vec3d(1,0,0)) * osg::Quat(getYaw(), osg::Vec3d(0,0,1));
 
-        osg::Vec3d offset = orient * osg::Vec3d(0, -mCameraDistance, 0);
+        osg::Vec3d offset = orient * osg::Vec3d(0, isFirstPerson() ? 0 : -mCameraDistance, 0);
         position += offset;
 
         osg::Vec3d forward = orient * osg::Vec3d(0,1,0);
@@ -148,7 +150,7 @@ namespace MWRender
             // Now process the view changes we queued earlier
             if (mVanityToggleQueued)
             {
-                toggleVanityMode(!mVanity.enabled);
+                toggleVanityMode(mVanityToggleQueuedValue);
                 mVanityToggleQueued = false;
             }
             if (mViewModeToggleQueued)
@@ -187,12 +189,6 @@ namespace MWRender
 
         mFirstPersonView = !mFirstPersonView;
         processViewChange();
-
-        if (mFirstPersonView) {
-            mCameraDistance = 0.f;
-        } else {
-            mCameraDistance = mMaxCameraDistance;
-        }
     }
     
     void Camera::allowVanityMode(bool allow)
@@ -206,9 +202,10 @@ namespace MWRender
     {
         // Changing the view will stop all playing animations, so if we are playing
         // anything important, queue the view change for later
-        if (isFirstPerson() && !mAnimation->upperBodyReady())
+        if (mFirstPersonView && !mAnimation->upperBodyReady())
         {
             mVanityToggleQueued = true;
+            mVanityToggleQueuedValue = enable;
             return false;
         }
 
@@ -313,6 +310,8 @@ namespace MWRender
 
     float Camera::getCameraDistance() const
     {
+        if (isFirstPerson())
+            return 0.f;
         return mCameraDistance;
     }
 
@@ -342,21 +341,16 @@ namespace MWRender
             } else if (!mFirstPersonView) {
                 mMaxCameraDistance = mCameraDistance;
             }
-        } else {
-            mDistanceAdjusted = true;
         }
     }
 
     void Camera::setCameraDistance()
     {
-        if (mDistanceAdjusted) {
-            if (mVanity.enabled || mPreviewMode) {
-                mCameraDistance = mPreviewCam.offset;
-            } else if (!mFirstPersonView) {
-                mCameraDistance = mMaxCameraDistance;
-            }
+        if (mVanity.enabled || mPreviewMode) {
+            mCameraDistance = mPreviewCam.offset;
+        } else if (!mFirstPersonView) {
+            mCameraDistance = mMaxCameraDistance;
         }
-        mDistanceAdjusted = false;
     }
 
     void Camera::setAnimation(NpcAnimation *anim)
@@ -395,7 +389,7 @@ namespace MWRender
 
         osg::Quat orient =  osg::Quat(getPitch(), osg::Vec3d(1,0,0)) * osg::Quat(getYaw(), osg::Vec3d(0,0,1));
 
-        osg::Vec3d offset = orient * osg::Vec3d(0, -mCameraDistance, 0);
+        osg::Vec3d offset = orient * osg::Vec3d(0, isFirstPerson() ? 0 : -mCameraDistance, 0);
         camera = focal + offset;
     }
 
diff --git a/apps/openmw/mwrender/camera.hpp b/apps/openmw/mwrender/camera.hpp
index fab63cd3f..db5ad25f0 100644
--- a/apps/openmw/mwrender/camera.hpp
+++ b/apps/openmw/mwrender/camera.hpp
@@ -49,9 +49,8 @@ namespace MWRender
         float mHeight, mMaxCameraDistance;
         CamData mMainCam, mPreviewCam;
 
-        bool mDistanceAdjusted;
-
         bool mVanityToggleQueued;
+        bool mVanityToggleQueuedValue;
         bool mViewModeToggleQueued;
 
         float mCameraDistance;
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 258854054..f412c1fac 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -2,11 +2,13 @@
 
 #include <iostream>
 
+#include <osg/Fog>
+#include <osg/BlendFunc>
 #include <osg/Texture2D>
 #include <osg/Camera>
 #include <osg/PositionAttitudeTransform>
-#include <osgViewer/Viewer>
 #include <osg/LightModel>
+#include <osg/LightSource>
 #include <osgUtil/IntersectionVisitor>
 #include <osgUtil/LineSegmentIntersector>
 
@@ -41,7 +43,16 @@ namespace MWRender
                 mRendered = true;
 
                 mLastRenderedFrame = nv->getTraversalNumber();
+
+                osg::ref_ptr<osg::FrameStamp> previousFramestamp = const_cast<osg::FrameStamp*>(nv->getFrameStamp());
+                osg::FrameStamp* fs = new osg::FrameStamp(*previousFramestamp);
+                fs->setSimulationTime(0.0);
+
+                nv->setFrameStamp(fs);
+
                 traverse(node, nv);
+
+                nv->setFrameStamp(previousFramestamp);
             }
             else
             {
@@ -64,9 +75,38 @@ namespace MWRender
         unsigned int mLastRenderedFrame;
     };
 
-    CharacterPreview::CharacterPreview(osgViewer::Viewer* viewer, Resource::ResourceSystem* resourceSystem,
+
+    // Set up alpha blending to Additive mode to avoid issues caused by transparent objects writing onto the alpha value of the FBO
+    class SetUpBlendVisitor : public osg::NodeVisitor
+    {
+    public:
+        SetUpBlendVisitor(): osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        {
+        }
+
+        virtual void apply(osg::Node& node)
+        {
+            if (osg::StateSet* stateset = node.getStateSet())
+            {
+                if (stateset->getAttribute(osg::StateAttribute::BLENDFUNC) || stateset->getBinNumber() == osg::StateSet::TRANSPARENT_BIN)
+                {
+                    osg::ref_ptr<osg::StateSet> newStateSet = new osg::StateSet(*stateset, osg::CopyOp::SHALLOW_COPY);
+                    osg::BlendFunc* blendFunc = static_cast<osg::BlendFunc*>(stateset->getAttribute(osg::StateAttribute::BLENDFUNC));
+                    osg::ref_ptr<osg::BlendFunc> newBlendFunc = blendFunc ? new osg::BlendFunc(*blendFunc) : new osg::BlendFunc;
+                    newBlendFunc->setDestinationAlpha(osg::BlendFunc::ONE);
+                    newBlendFunc->setDestinationRGB(osg::BlendFunc::ONE);
+                    newStateSet->setAttribute(newBlendFunc, osg::StateAttribute::ON);
+                    node.setStateSet(newStateSet);
+                }
+
+            }
+            traverse(node);
+        }
+    };
+
+    CharacterPreview::CharacterPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem,
                                        MWWorld::Ptr character, int sizeX, int sizeY, const osg::Vec3f& position, const osg::Vec3f& lookAt)
-        : mViewer(viewer)
+        : mParent(parent)
         , mResourceSystem(resourceSystem)
         , mPosition(position)
         , mLookAt(lookAt)
@@ -92,16 +132,22 @@ namespace MWRender
         mCamera->setViewport(0, 0, sizeX, sizeY);
         mCamera->setRenderOrder(osg::Camera::PRE_RENDER);
         mCamera->attach(osg::Camera::COLOR_BUFFER, mTexture);
-        mCamera->setGraphicsContext(mViewer->getCamera()->getGraphicsContext());
+        mCamera->setName("CharacterPreview");
 
         mCamera->setNodeMask(Mask_RenderToTexture);
 
         osg::ref_ptr<SceneUtil::LightManager> lightManager = new SceneUtil::LightManager;
         lightManager->setStartLight(1);
-        osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
+        osg::ref_ptr<osg::StateSet> stateset = lightManager->getOrCreateStateSet();
         stateset->setMode(GL_LIGHTING, osg::StateAttribute::ON);
         stateset->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
+        // assign large value to effectively turn off fog
+        // shaders don't respect glDisable(GL_FOG)
+        osg::ref_ptr<osg::Fog> fog (new osg::Fog);
+        fog->setStart(10000000);
+        fog->setEnd(10000000);
+        stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
 
         osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;
         lightmodel->setAmbientIntensity(osg::Vec4(0.25, 0.25, 0.25, 1.0));
@@ -123,7 +169,6 @@ namespace MWRender
 
         lightSource->setStateSetModes(*stateset, osg::StateAttribute::ON);
 
-        lightManager->setStateSet(stateset);
         lightManager->addChild(lightSource);
 
         mCamera->addChild(lightManager);
@@ -134,14 +179,15 @@ namespace MWRender
         mDrawOnceCallback = new DrawOnceCallback;
         mCamera->addUpdateCallback(mDrawOnceCallback);
 
-        mViewer->getSceneData()->asGroup()->addChild(mCamera);
+        mParent->addChild(mCamera);
 
         mCharacter.mCell = NULL;
     }
 
     CharacterPreview::~CharacterPreview ()
     {
-        mViewer->getSceneData()->asGroup()->removeChild(mCamera);
+        mCamera->removeChildren(0, mCamera->getNumChildren());
+        mParent->removeChild(mCamera);
     }
 
     int CharacterPreview::getTextureWidth() const
@@ -154,8 +200,15 @@ namespace MWRender
         return mSizeY;
     }
 
+    void CharacterPreview::setBlendMode()
+    {
+        SetUpBlendVisitor visitor;
+        mNode->accept(visitor);
+    }
+
     void CharacterPreview::onSetup()
     {
+        setBlendMode();
     }
 
     osg::ref_ptr<osg::Texture2D> CharacterPreview::getTexture()
@@ -165,10 +218,10 @@ namespace MWRender
 
     void CharacterPreview::rebuild()
     {
-        mAnimation.reset(NULL);
+        mAnimation = NULL;
 
-        mAnimation.reset(new NpcAnimation(mCharacter, mNode, mResourceSystem, true, true,
-                                      (renderHeadOnly() ? NpcAnimation::VM_HeadOnly : NpcAnimation::VM_Normal)));
+        mAnimation = new NpcAnimation(mCharacter, mNode, mResourceSystem, true,
+                                      (renderHeadOnly() ? NpcAnimation::VM_HeadOnly : NpcAnimation::VM_Normal));
 
         onSetup();
 
@@ -177,15 +230,15 @@ namespace MWRender
 
     void CharacterPreview::redraw()
     {
-        mCamera->setNodeMask(~0);
+        mCamera->setNodeMask(Mask_RenderToTexture);
         mDrawOnceCallback->redrawNextFrame();
     }
 
     // --------------------------------------------------------------------------------------------------
 
 
-    InventoryPreview::InventoryPreview(osgViewer::Viewer* viewer, Resource::ResourceSystem* resourceSystem, MWWorld::Ptr character)
-        : CharacterPreview(viewer, resourceSystem, character, 512, 1024, osg::Vec3f(0, 700, 71), osg::Vec3f(0,0,71))
+    InventoryPreview::InventoryPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem, MWWorld::Ptr character)
+        : CharacterPreview(parent, resourceSystem, character, 512, 1024, osg::Vec3f(0, 700, 71), osg::Vec3f(0,0,71))
     {
     }
 
@@ -215,10 +268,10 @@ namespace MWRender
             groupname = "inventoryhandtohand";
         else
         {
-            const std::string &type = iter->getTypeName();
-            if(type == typeid(ESM::Lockpick).name() || type == typeid(ESM::Probe).name())
+            const std::string &typeName = iter->getTypeName();
+            if(typeName == typeid(ESM::Lockpick).name() || typeName == typeid(ESM::Probe).name())
                 groupname = "inventoryweapononehand";
-            else if(type == typeid(ESM::Weapon).name())
+            else if(typeName == typeid(ESM::Weapon).name())
             {
                 MWWorld::LiveCellRef<ESM::Weapon> *ref = iter->get<ESM::Weapon>();
 
@@ -264,6 +317,8 @@ namespace MWRender
 
         mAnimation->runAnimation(0.0f);
 
+        setBlendMode();
+
         redraw();
     }
 
@@ -303,6 +358,7 @@ namespace MWRender
 
     void InventoryPreview::onSetup()
     {
+        CharacterPreview::onSetup();
         osg::Vec3f scale (1.f, 1.f, 1.f);
         mCharacter.getClass().adjustScale(mCharacter, scale, true);
 
@@ -313,8 +369,8 @@ namespace MWRender
 
     // --------------------------------------------------------------------------------------------------
 
-    RaceSelectionPreview::RaceSelectionPreview(osgViewer::Viewer* viewer, Resource::ResourceSystem* resourceSystem)
-        : CharacterPreview(viewer, resourceSystem, MWMechanics::getPlayer(),
+    RaceSelectionPreview::RaceSelectionPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem)
+        : CharacterPreview(parent, resourceSystem, MWMechanics::getPlayer(),
             512, 512, osg::Vec3f(0, 125, 8), osg::Vec3f(0,0,8))
         , mBase (*mCharacter.get<ESM::NPC>()->mBase)
         , mRef(&mBase)
@@ -359,10 +415,10 @@ namespace MWRender
             traverse(node, nv);
 
             // Now update camera utilizing the updated head position
-            osg::MatrixList mats = mNodeToFollow->getWorldMatrices();
-            if (!mats.size())
+            osg::NodePathList nodepaths = mNodeToFollow->getParentalNodePaths();
+            if (nodepaths.empty())
                 return;
-            osg::Matrix worldMat = mats[0];
+            osg::Matrix worldMat = osg::computeLocalToWorld(nodepaths[0]);
             osg::Vec3 headOffset = worldMat.getTrans();
 
             cam->setViewMatrixAsLookAt(headOffset + mPosOffset, headOffset + mLookAtOffset, osg::Vec3(0,0,1));
@@ -376,6 +432,7 @@ namespace MWRender
 
     void RaceSelectionPreview::onSetup ()
     {
+        CharacterPreview::onSetup();
         mAnimation->play("idle", 1, Animation::BlendMask_All, false, 1.0f, "start", "stop", 0.0f, 0);
         mAnimation->runAnimation(0.f);
 
diff --git a/apps/openmw/mwrender/characterpreview.hpp b/apps/openmw/mwrender/characterpreview.hpp
index 2b7984b00..273bacedb 100644
--- a/apps/openmw/mwrender/characterpreview.hpp
+++ b/apps/openmw/mwrender/characterpreview.hpp
@@ -16,11 +16,7 @@ namespace osg
 {
     class Texture2D;
     class Camera;
-}
-
-namespace osgViewer
-{
-    class Viewer;
+    class Group;
 }
 
 namespace MWRender
@@ -32,7 +28,7 @@ namespace MWRender
     class CharacterPreview
     {
     public:
-        CharacterPreview(osgViewer::Viewer* viewer, Resource::ResourceSystem* resourceSystem, MWWorld::Ptr character, int sizeX, int sizeY,
+        CharacterPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem, MWWorld::Ptr character, int sizeX, int sizeY,
                          const osg::Vec3f& position, const osg::Vec3f& lookAt);
         virtual ~CharacterPreview();
 
@@ -51,9 +47,10 @@ namespace MWRender
 
     protected:
         virtual bool renderHeadOnly() { return false; }
+        void setBlendMode();
         virtual void onSetup();
 
-        osg::ref_ptr<osgViewer::Viewer> mViewer;
+        osg::ref_ptr<osg::Group> mParent;
         Resource::ResourceSystem* mResourceSystem;
         osg::ref_ptr<osg::Texture2D> mTexture;
         osg::ref_ptr<osg::Camera> mCamera;
@@ -64,7 +61,7 @@ namespace MWRender
 
         MWWorld::Ptr mCharacter;
 
-        std::auto_ptr<MWRender::NpcAnimation> mAnimation;
+        osg::ref_ptr<MWRender::NpcAnimation> mAnimation;
         osg::ref_ptr<osg::PositionAttitudeTransform> mNode;
         std::string mCurrentAnimGroup;
 
@@ -76,7 +73,7 @@ namespace MWRender
     {
     public:
 
-        InventoryPreview(osgViewer::Viewer* viewer, Resource::ResourceSystem* resourceSystem, MWWorld::Ptr character);
+        InventoryPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem, MWWorld::Ptr character);
 
         void updatePtr(const MWWorld::Ptr& ptr);
 
@@ -102,7 +99,7 @@ namespace MWRender
         virtual void onSetup();
 
     public:
-        RaceSelectionPreview(osgViewer::Viewer* viewer, Resource::ResourceSystem* resourceSystem);
+        RaceSelectionPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem);
         virtual ~RaceSelectionPreview();
 
         void setAngle(float angleRadians);
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index 9cd35ecde..24732f866 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -1,5 +1,9 @@
 #include "creatureanimation.hpp"
 
+#include <iostream>
+
+#include <osg/MatrixTransform>
+
 #include <components/esm/loadcrea.hpp>
 
 #include <components/resource/resourcesystem.hpp>
@@ -7,6 +11,9 @@
 #include <components/sceneutil/attach.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/sceneutil/skeleton.hpp>
+
+#include <components/misc/stringops.hpp>
 
 #include "../mwbase/world.hpp"
 
@@ -17,7 +24,7 @@ namespace MWRender
 
 CreatureAnimation::CreatureAnimation(const MWWorld::Ptr &ptr,
                                      const std::string& model, Resource::ResourceSystem* resourceSystem)
-  : Animation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), resourceSystem)
+  : ActorAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), resourceSystem)
 {
     MWWorld::LiveCellRef<ESM::Creature> *ref = mPtr.get<ESM::Creature>();
 
@@ -33,7 +40,7 @@ CreatureAnimation::CreatureAnimation(const MWWorld::Ptr &ptr,
 
 
 CreatureWeaponAnimation::CreatureWeaponAnimation(const MWWorld::Ptr &ptr, const std::string& model, Resource::ResourceSystem* resourceSystem)
-    : Animation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), resourceSystem)
+    : ActorAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), resourceSystem)
     , mShowWeapons(false)
     , mShowCarriedLeft(false)
 {
@@ -47,7 +54,7 @@ CreatureWeaponAnimation::CreatureWeaponAnimation(const MWWorld::Ptr &ptr, const
             addAnimSource("meshes\\xbase_anim.nif");
         addAnimSource(model);
 
-        mPtr.getClass().getInventoryStore(mPtr).setListener(this, mPtr);
+        mPtr.getClass().getInventoryStore(mPtr).setInvListener(this, mPtr);
 
         updateParts();
     }
@@ -75,6 +82,7 @@ void CreatureWeaponAnimation::showCarriedLeft(bool show)
 
 void CreatureWeaponAnimation::updateParts()
 {
+    mAmmunition.reset();
     mWeapon.reset();
     mShield.reset();
 
@@ -105,39 +113,50 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
     else
         bonename = "Shield Bone";
 
-    osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(item.getClass().getModel(item));
-    osg::ref_ptr<osg::Node> attached = SceneUtil::attach(node, mObjectRoot, bonename, bonename);
-    mResourceSystem->getSceneManager()->notifyAttached(attached);
-
-    scene.reset(new PartHolder(attached));
-
-    if (!item.getClass().getEnchantment(item).empty())
-        addGlow(attached, getEnchantmentColor(item));
-
-    // Crossbows start out with a bolt attached
-    // FIXME: code duplicated from NpcAnimation
-    if (slot == MWWorld::InventoryStore::Slot_CarriedRight &&
-            item.getTypeName() == typeid(ESM::Weapon).name() &&
-            item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
+    try
     {
-        MWWorld::ContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
-        if (ammo != inv.end() && ammo->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::Bolt)
-            attachArrow();
+        osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(item.getClass().getModel(item));
+
+        const NodeMap& nodeMap = getNodeMap();
+        NodeMap::const_iterator found = getNodeMap().find(Misc::StringUtils::lowerCase(bonename));
+        if (found == nodeMap.end())
+            throw std::runtime_error("Can't find attachment node " + bonename);
+        osg::ref_ptr<osg::Node> attached = SceneUtil::attach(node, mObjectRoot, bonename, found->second.get());
+
+        scene.reset(new PartHolder(attached));
+
+        if (!item.getClass().getEnchantment(item).empty())
+            addGlow(attached, getEnchantmentColor(item));
+
+        // Crossbows start out with a bolt attached
+        // FIXME: code duplicated from NpcAnimation
+        if (slot == MWWorld::InventoryStore::Slot_CarriedRight &&
+                item.getTypeName() == typeid(ESM::Weapon).name() &&
+                item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
+        {
+            MWWorld::ContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
+            if (ammo != inv.end() && ammo->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::Bolt)
+                attachArrow();
+            else
+                mAmmunition.reset();
+        }
         else
             mAmmunition.reset();
-    }
-    else
-        mAmmunition.reset();
 
-    boost::shared_ptr<SceneUtil::ControllerSource> source;
+        boost::shared_ptr<SceneUtil::ControllerSource> source;
 
-    if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
-        source = mWeaponAnimationTime;
-    else
-        source.reset(new NullAnimationTime);
+        if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
+            source = mWeaponAnimationTime;
+        else
+            source.reset(new NullAnimationTime);
 
-    SceneUtil::AssignControllerSourcesVisitor assignVisitor(source);
-    attached->accept(assignVisitor);
+        SceneUtil::AssignControllerSourcesVisitor assignVisitor(source);
+        attached->accept(assignVisitor);
+    }
+    catch (std::exception& e)
+    {
+        std::cerr << "Error adding creature part: " << e.what() << std::endl;
+    }
 }
 
 void CreatureWeaponAnimation::attachArrow()
diff --git a/apps/openmw/mwrender/creatureanimation.hpp b/apps/openmw/mwrender/creatureanimation.hpp
index a62160253..bf813075e 100644
--- a/apps/openmw/mwrender/creatureanimation.hpp
+++ b/apps/openmw/mwrender/creatureanimation.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_RENDER_CREATUREANIMATION_H
 #define GAME_RENDER_CREATUREANIMATION_H
 
-#include "animation.hpp"
+#include "actoranimation.hpp"
 #include "weaponanimation.hpp"
 #include "../mwworld/inventorystore.hpp"
 
@@ -12,7 +12,7 @@ namespace MWWorld
 
 namespace MWRender
 {
-    class CreatureAnimation : public Animation
+    class CreatureAnimation : public ActorAnimation
     {
     public:
         CreatureAnimation(const MWWorld::Ptr &ptr, const std::string& model, Resource::ResourceSystem* resourceSystem);
@@ -22,7 +22,7 @@ namespace MWRender
     // For creatures with weapons and shields
     // Animation is already virtual anyway, so might as well make a separate class.
     // Most creatures don't need weapons/shields, so this will save some memory.
-    class CreatureWeaponAnimation : public Animation, public WeaponAnimation, public MWWorld::InventoryStoreListener
+    class CreatureWeaponAnimation : public ActorAnimation, public WeaponAnimation, public MWWorld::InventoryStoreListener
     {
     public:
         CreatureWeaponAnimation(const MWWorld::Ptr &ptr, const std::string& model, Resource::ResourceSystem* resourceSystem);
diff --git a/apps/openmw/mwrender/effectmanager.cpp b/apps/openmw/mwrender/effectmanager.cpp
index e2773f2dc..3e785a769 100644
--- a/apps/openmw/mwrender/effectmanager.cpp
+++ b/apps/openmw/mwrender/effectmanager.cpp
@@ -25,7 +25,7 @@ EffectManager::~EffectManager()
     clear();
 }
 
-void EffectManager::addEffect(const std::string &model, const std::string& textureOverride, const osg::Vec3f &worldPosition, float scale)
+void EffectManager::addEffect(const std::string &model, const std::string& textureOverride, const osg::Vec3f &worldPosition, float scale, bool isMagicVFX)
 {
     osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(model);
 
@@ -46,10 +46,12 @@ void EffectManager::addEffect(const std::string &model, const std::string& textu
     SceneUtil::AssignControllerSourcesVisitor assignVisitor(effect.mAnimTime);
     node->accept(assignVisitor);
 
-    overrideTexture(textureOverride, mResourceSystem, node);
+    if (isMagicVFX)
+        overrideFirstRootTexture(textureOverride, mResourceSystem, node);
+    else
+        overrideTexture(textureOverride, mResourceSystem, node);
 
     mParentNode->addChild(trans);
-    mResourceSystem->getSceneManager()->notifyAttached(node);
 
     mEffects[trans] = effect;
 }
diff --git a/apps/openmw/mwrender/effectmanager.hpp b/apps/openmw/mwrender/effectmanager.hpp
index 6d7aaaf4f..83acc4c60 100644
--- a/apps/openmw/mwrender/effectmanager.hpp
+++ b/apps/openmw/mwrender/effectmanager.hpp
@@ -33,7 +33,7 @@ namespace MWRender
         ~EffectManager();
 
         /// Add an effect. When it's finished playing, it will be removed automatically.
-        void addEffect (const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPosition, float scale);
+        void addEffect (const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPosition, float scale, bool isMagicVFX = true);
 
         void update(float dt);
 
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index 9e8a545f8..0d8a7a039 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -6,8 +6,8 @@
 #include <osg/Texture2D>
 #include <osg/Group>
 #include <osg/Geometry>
-#include <osg/Geode>
 #include <osg/Depth>
+#include <osg/TexEnvCombine>
 
 #include <osgDB/WriteFile>
 
@@ -15,6 +15,8 @@
 #include <components/settings/settings.hpp>
 #include <components/files/memorystream.hpp>
 
+#include <components/sceneutil/workqueue.hpp>
+
 #include <components/esm/globalmap.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -95,8 +97,132 @@ namespace
 namespace MWRender
 {
 
-    GlobalMap::GlobalMap(osg::Group* root)
+    class CreateMapWorkItem : public SceneUtil::WorkItem
+    {
+    public:
+        CreateMapWorkItem(int width, int height, int minX, int minY, int maxX, int maxY, int cellSize, const MWWorld::Store<ESM::Land>& landStore)
+            : mWidth(width), mHeight(height), mMinX(minX), mMinY(minY), mMaxX(maxX), mMaxY(maxY), mCellSize(cellSize), mLandStore(landStore)
+        {
+        }
+
+        virtual void doWork()
+        {
+            osg::ref_ptr<osg::Image> image = new osg::Image;
+            image->allocateImage(mWidth, mHeight, 1, GL_RGB, GL_UNSIGNED_BYTE);
+            unsigned char* data = image->data();
+
+            osg::ref_ptr<osg::Image> alphaImage = new osg::Image;
+            alphaImage->allocateImage(mWidth, mHeight, 1, GL_ALPHA, GL_UNSIGNED_BYTE);
+            unsigned char* alphaData = alphaImage->data();
+
+            for (int x = mMinX; x <= mMaxX; ++x)
+            {
+                for (int y = mMinY; y <= mMaxY; ++y)
+                {
+                    const ESM::Land* land = mLandStore.search (x,y);
+
+                    for (int cellY=0; cellY<mCellSize; ++cellY)
+                    {
+                        for (int cellX=0; cellX<mCellSize; ++cellX)
+                        {
+                            int vertexX = static_cast<int>(float(cellX)/float(mCellSize) * 9);
+                            int vertexY = static_cast<int>(float(cellY) / float(mCellSize) * 9);
+
+                            int texelX = (x-mMinX) * mCellSize + cellX;
+                            int texelY = (y-mMinY) * mCellSize + cellY;
+
+                            unsigned char r,g,b;
+
+                            float y2 = 0;
+                            if (land && (land->mDataTypes & ESM::Land::DATA_WNAM))
+                                y2 = (land->mWnam[vertexY * 9 + vertexX] << 4) / 2048.f;
+                            else
+                                y2 = (SCHAR_MIN << 4) / 2048.f;
+                            if (y2 < 0)
+                            {
+                                r = static_cast<unsigned char>(14 * y2 + 38);
+                                g = static_cast<unsigned char>(20 * y2 + 56);
+                                b = static_cast<unsigned char>(18 * y2 + 51);
+                            }
+                            else if (y2 < 0.3f)
+                            {
+                                if (y2 < 0.1f)
+                                    y2 *= 8.f;
+                                else
+                                {
+                                    y2 -= 0.1f;
+                                    y2 += 0.8f;
+                                }
+                                r = static_cast<unsigned char>(66 - 32 * y2);
+                                g = static_cast<unsigned char>(48 - 23 * y2);
+                                b = static_cast<unsigned char>(33 - 16 * y2);
+                            }
+                            else
+                            {
+                                y2 -= 0.3f;
+                                y2 *= 1.428f;
+                                r = static_cast<unsigned char>(34 - 29 * y2);
+                                g = static_cast<unsigned char>(25 - 20 * y2);
+                                b = static_cast<unsigned char>(17 - 12 * y2);
+                            }
+
+                            data[texelY * mWidth * 3 + texelX * 3] = r;
+                            data[texelY * mWidth * 3 + texelX * 3+1] = g;
+                            data[texelY * mWidth * 3 + texelX * 3+2] = b;
+
+                            alphaData[texelY * mWidth+ texelX] = (y2 < 0) ? static_cast<unsigned char>(0) : static_cast<unsigned char>(255);
+                        }
+                    }
+                }
+            }
+
+            mBaseTexture = new osg::Texture2D;
+            mBaseTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+            mBaseTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+            mBaseTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+            mBaseTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+            mBaseTexture->setImage(image);
+            mBaseTexture->setResizeNonPowerOfTwoHint(false);
+
+            mAlphaTexture = new osg::Texture2D;
+            mAlphaTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+            mAlphaTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+            mAlphaTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+            mAlphaTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+            mAlphaTexture->setImage(alphaImage);
+            mAlphaTexture->setResizeNonPowerOfTwoHint(false);
+
+            mOverlayImage = new osg::Image;
+            mOverlayImage->allocateImage(mWidth, mHeight, 1, GL_RGBA, GL_UNSIGNED_BYTE);
+            assert(mOverlayImage->isDataContiguous());
+
+            memset(mOverlayImage->data(), 0, mOverlayImage->getTotalSizeInBytes());
+
+            mOverlayTexture = new osg::Texture2D;
+            mOverlayTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+            mOverlayTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+            mOverlayTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+            mOverlayTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+            mOverlayTexture->setResizeNonPowerOfTwoHint(false);
+            mOverlayTexture->setInternalFormat(GL_RGBA);
+            mOverlayTexture->setTextureSize(mWidth, mHeight);
+        }
+
+        int mWidth, mHeight;
+        int mMinX, mMinY, mMaxX, mMaxY;
+        int mCellSize;
+        const MWWorld::Store<ESM::Land>& mLandStore;
+
+        osg::ref_ptr<osg::Texture2D> mBaseTexture;
+        osg::ref_ptr<osg::Texture2D> mAlphaTexture;
+
+        osg::ref_ptr<osg::Image> mOverlayImage;
+        osg::ref_ptr<osg::Texture2D> mOverlayTexture;
+    };
+
+    GlobalMap::GlobalMap(osg::Group* root, SceneUtil::WorkQueue* workQueue)
         : mRoot(root)
+        , mWorkQueue(workQueue)
         , mWidth(0)
         , mHeight(0)
         , mMinX(0), mMaxX(0)
@@ -108,9 +234,13 @@ namespace MWRender
 
     GlobalMap::~GlobalMap()
     {
+        for (CameraVector::iterator it = mCamerasPendingRemoval.begin(); it != mCamerasPendingRemoval.end(); ++it)
+            removeCamera(*it);
+        for (CameraVector::iterator it = mActiveCameras.begin(); it != mActiveCameras.end(); ++it)
+            removeCamera(*it);
     }
 
-    void GlobalMap::render (Loading::Listener* loadingListener)
+    void GlobalMap::render ()
     {
         const MWWorld::ESMStore &esmStore =
             MWBase::Environment::get().getWorld()->getStore();
@@ -132,98 +262,8 @@ namespace MWRender
         mWidth = mCellSize*(mMaxX-mMinX+1);
         mHeight = mCellSize*(mMaxY-mMinY+1);
 
-        loadingListener->loadingOn();
-        loadingListener->setLabel("Creating map");
-        loadingListener->setProgressRange((mMaxX-mMinX+1) * (mMaxY-mMinY+1));
-        loadingListener->setProgress(0);
-
-        osg::ref_ptr<osg::Image> image = new osg::Image;
-        image->allocateImage(mWidth, mHeight, 1, GL_RGB, GL_UNSIGNED_BYTE);
-        unsigned char* data = image->data();
-
-        for (int x = mMinX; x <= mMaxX; ++x)
-        {
-            for (int y = mMinY; y <= mMaxY; ++y)
-            {
-                ESM::Land* land = esmStore.get<ESM::Land>().search (x,y);
-
-                if (land)
-                {
-                    int mask = ESM::Land::DATA_WNAM;
-                    if (!land->isDataLoaded(mask))
-                        land->loadData(mask);
-                }
-
-                const ESM::Land::LandData *landData =
-                    land ? land->getLandData (ESM::Land::DATA_WNAM) : 0;
-
-                for (int cellY=0; cellY<mCellSize; ++cellY)
-                {
-                    for (int cellX=0; cellX<mCellSize; ++cellX)
-                    {
-                        int vertexX = static_cast<int>(float(cellX)/float(mCellSize) * 9);
-                        int vertexY = static_cast<int>(float(cellY) / float(mCellSize) * 9);
-
-                        int texelX = (x-mMinX) * mCellSize + cellX;
-                        int texelY = (y-mMinY) * mCellSize + cellY;
-
-                        unsigned char r,g,b;
-
-                        float y = 0;
-                        if (landData)
-                            y = (landData->mWnam[vertexY * 9 + vertexX] << 4) / 2048.f;
-                        else
-                            y = (SCHAR_MIN << 4) / 2048.f;
-                        if (y < 0)
-                        {
-                            r = static_cast<unsigned char>(14 * y + 38);
-                            g = static_cast<unsigned char>(20 * y + 56);
-                            b = static_cast<unsigned char>(18 * y + 51);
-                        }
-                        else if (y < 0.3f)
-                        {
-                            if (y < 0.1f)
-                                y *= 8.f;
-                            else
-                            {
-                                y -= 0.1f;
-                                y += 0.8f;
-                            }
-                            r = static_cast<unsigned char>(66 - 32 * y);
-                            g = static_cast<unsigned char>(48 - 23 * y);
-                            b = static_cast<unsigned char>(33 - 16 * y);
-                        }
-                        else
-                        {
-                            y -= 0.3f;
-                            y *= 1.428f;
-                            r = static_cast<unsigned char>(34 - 29 * y);
-                            g = static_cast<unsigned char>(25 - 20 * y);
-                            b = static_cast<unsigned char>(17 - 12 * y);
-                        }
-
-                        data[texelY * mWidth * 3 + texelX * 3] = r;
-                        data[texelY * mWidth * 3 + texelX * 3+1] = g;
-                        data[texelY * mWidth * 3 + texelX * 3+2] = b;
-                    }
-                }
-                loadingListener->increaseProgress();
-                if (land)
-                    land->unloadData();
-            }
-        }
-
-        mBaseTexture = new osg::Texture2D;
-        mBaseTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-        mBaseTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-        mBaseTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-        mBaseTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-        mBaseTexture->setImage(image);
-        mBaseTexture->setResizeNonPowerOfTwoHint(false);
-
-        clear();
-
-        loadingListener->loadingOff();
+        mWorkItem = new CreateMapWorkItem(mWidth, mHeight, mMinX, mMinY, mMaxX, mMaxY, mCellSize, esmStore.get<ESM::Land>());
+        mWorkQueue->addWorkItem(mWorkItem);
     }
 
     void GlobalMap::worldPosToImageSpace(float x, float z, float& imageX, float& imageY)
@@ -296,9 +336,29 @@ namespace MWRender
             stateset->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
             stateset->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
             stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
-            osg::ref_ptr<osg::Geode> geode = new osg::Geode;
-            geode->addDrawable(geom);
-            camera->addChild(geode);
+
+            if (mAlphaTexture)
+            {
+                osg::ref_ptr<osg::Vec2Array> texcoords = new osg::Vec2Array;
+
+                float x1 = x / static_cast<float>(mWidth);
+                float x2 = (x + width) / static_cast<float>(mWidth);
+                float y1 = y / static_cast<float>(mHeight);
+                float y2 = (y + height) / static_cast<float>(mHeight);
+                texcoords->push_back(osg::Vec2f(x1, y1));
+                texcoords->push_back(osg::Vec2f(x1, y2));
+                texcoords->push_back(osg::Vec2f(x2, y2));
+                texcoords->push_back(osg::Vec2f(x2, y1));
+                geom->setTexCoordArray(1, texcoords, osg::Array::BIND_PER_VERTEX);
+
+                stateset->setTextureAttributeAndModes(1, mAlphaTexture, osg::StateAttribute::ON);
+                osg::ref_ptr<osg::TexEnvCombine> texEnvCombine = new osg::TexEnvCombine;
+                texEnvCombine->setCombine_RGB(osg::TexEnvCombine::REPLACE);
+                texEnvCombine->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+                stateset->setTextureAttributeAndModes(1, texEnvCombine);
+            }
+
+            camera->addChild(geom);
         }
 
         mRoot->addChild(camera);
@@ -308,6 +368,8 @@ namespace MWRender
 
     void GlobalMap::exploreCell(int cellX, int cellY, osg::ref_ptr<osg::Texture2D> localMapTexture)
     {
+        ensureLoaded();
+
         if (!localMapTexture)
             return;
 
@@ -322,25 +384,9 @@ namespace MWRender
 
     void GlobalMap::clear()
     {
-        if (!mOverlayImage)
-        {
-            mOverlayImage = new osg::Image;
-            mOverlayImage->allocateImage(mWidth, mHeight, 1, GL_RGBA, GL_UNSIGNED_BYTE);
-            assert(mOverlayImage->isDataContiguous());
-        }
-        memset(mOverlayImage->data(), 0, mOverlayImage->getTotalSizeInBytes());
+        ensureLoaded();
 
-        if (!mOverlayTexture)
-        {
-            mOverlayTexture = new osg::Texture2D;
-            mOverlayTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-            mOverlayTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-            mOverlayTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-            mOverlayTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-            mOverlayTexture->setResizeNonPowerOfTwoHint(false);
-            mOverlayTexture->setInternalFormat(GL_RGBA);
-            mOverlayTexture->setTextureSize(mWidth, mHeight);
-        }
+        memset(mOverlayImage->data(), 0, mOverlayImage->getTotalSizeInBytes());
 
         mPendingImageDest.clear();
 
@@ -351,6 +397,8 @@ namespace MWRender
 
     void GlobalMap::write(ESM::GlobalMap& map)
     {
+        ensureLoaded();
+
         map.mBounds.mMinX = mMinX;
         map.mBounds.mMaxX = mMaxX;
         map.mBounds.mMinY = mMinY;
@@ -391,6 +439,8 @@ namespace MWRender
 
     void GlobalMap::read(ESM::GlobalMap& map)
     {
+        ensureLoaded();
+
         const ESM::GlobalMap::Bounds& bounds = map.mBounds;
 
         if (bounds.mMaxX-bounds.mMinX < 0)
@@ -402,7 +452,7 @@ namespace MWRender
                 || bounds.mMinY > bounds.mMaxY)
             throw std::runtime_error("invalid map bounds");
 
-        if (!map.mImageData.size())
+        if (map.mImageData.empty())
             return;
 
         Files::IMemStream istream(&map.mImageData[0], map.mImageData.size());
@@ -487,14 +537,33 @@ namespace MWRender
 
     osg::ref_ptr<osg::Texture2D> GlobalMap::getBaseTexture()
     {
+        ensureLoaded();
         return mBaseTexture;
     }
 
     osg::ref_ptr<osg::Texture2D> GlobalMap::getOverlayTexture()
     {
+        ensureLoaded();
         return mOverlayTexture;
     }
 
+    void GlobalMap::ensureLoaded()
+    {
+        if (mWorkItem)
+        {
+            mWorkItem->waitTillDone();
+
+            mOverlayImage = mWorkItem->mOverlayImage;
+            mBaseTexture = mWorkItem->mBaseTexture;
+            mAlphaTexture = mWorkItem->mAlphaTexture;
+            mOverlayTexture = mWorkItem->mOverlayTexture;
+
+            requestOverlayTextureUpdate(0, 0, mWidth, mHeight, osg::ref_ptr<osg::Texture2D>(), true, false);
+
+            mWorkItem = NULL;
+        }
+    }
+
     void GlobalMap::markForRemoval(osg::Camera *camera)
     {
         CameraVector::iterator found = std::find(mActiveCameras.begin(), mActiveCameras.end(), camera);
@@ -510,7 +579,8 @@ namespace MWRender
     void GlobalMap::cleanupCameras()
     {
         for (CameraVector::iterator it = mCamerasPendingRemoval.begin(); it != mCamerasPendingRemoval.end(); ++it)
-            mRoot->removeChild(*it);
+            removeCamera(*it);
+
         mCamerasPendingRemoval.clear();
 
         for (ImageDestVector::iterator it = mPendingImageDest.begin(); it != mPendingImageDest.end();)
@@ -522,9 +592,16 @@ namespace MWRender
                 continue;
             }
 
+            ensureLoaded();
             mOverlayImage->copySubImage(imageDest.mX, imageDest.mY, 0, imageDest.mImage);
 
             it = mPendingImageDest.erase(it);
         }
     }
+
+    void GlobalMap::removeCamera(osg::Camera *cam)
+    {
+        cam->removeChildren(0, cam->getNumChildren());
+        mRoot->removeChild(cam);
+    }
 }
diff --git a/apps/openmw/mwrender/globalmap.hpp b/apps/openmw/mwrender/globalmap.hpp
index 07ae7cdae..f19f4a91f 100644
--- a/apps/openmw/mwrender/globalmap.hpp
+++ b/apps/openmw/mwrender/globalmap.hpp
@@ -14,26 +14,28 @@ namespace osg
     class Camera;
 }
 
-namespace Loading
+namespace ESM
 {
-    class Listener;
+    struct GlobalMap;
 }
 
-namespace ESM
+namespace SceneUtil
 {
-    struct GlobalMap;
+    class WorkQueue;
 }
 
 namespace MWRender
 {
 
+    class CreateMapWorkItem;
+
     class GlobalMap
     {
     public:
-        GlobalMap(osg::Group* root);
+        GlobalMap(osg::Group* root, SceneUtil::WorkQueue* workQueue);
         ~GlobalMap();
 
-        void render(Loading::Listener* loadingListener);
+        void render();
 
         int getWidth() const { return mWidth; }
         int getHeight() const { return mHeight; }
@@ -56,6 +58,8 @@ namespace MWRender
          */
         void cleanupCameras();
 
+        void removeCamera(osg::Camera* cam);
+
         /**
          * Mark a camera for cleanup in the next update. For internal use only.
          */
@@ -67,6 +71,8 @@ namespace MWRender
         osg::ref_ptr<osg::Texture2D> getBaseTexture();
         osg::ref_ptr<osg::Texture2D> getOverlayTexture();
 
+        void ensureLoaded();
+
     private:
         /**
          * Request rendering a 2d quad onto mOverlayTexture.
@@ -105,6 +111,7 @@ namespace MWRender
         std::vector< std::pair<int,int> > mExploredCells;
 
         osg::ref_ptr<osg::Texture2D> mBaseTexture;
+        osg::ref_ptr<osg::Texture2D> mAlphaTexture;
 
         // GPU copy of overlay
         // Note, uploads are pushed through a Camera, instead of through mOverlayImage
@@ -113,6 +120,9 @@ namespace MWRender
         // CPU copy of overlay
         osg::ref_ptr<osg::Image> mOverlayImage;
 
+        osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
+        osg::ref_ptr<CreateMapWorkItem> mWorkItem;
+
         int mWidth;
         int mHeight;
 
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index fd224ba41..240ddc2e5 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -7,11 +7,10 @@
 #include <osg/LightModel>
 #include <osg/Texture2D>
 #include <osg/ComputeBoundsVisitor>
+#include <osg/LightSource>
 
 #include <osgDB/ReadFile>
 
-#include <osgViewer/Viewer>
-
 #include <components/esm/fogstate.hpp>
 #include <components/esm/loadcell.hpp>
 #include <components/settings/settings.hpp>
@@ -68,16 +67,14 @@ namespace
 namespace MWRender
 {
 
-LocalMap::LocalMap(osgViewer::Viewer* viewer)
-    : mViewer(viewer)
+LocalMap::LocalMap(osg::Group* root)
+    : mRoot(root)
     , mMapResolution(Settings::Manager::getInt("local map resolution", "Map"))
     , mMapWorldSize(8192.f)
     , mCellDistance(Settings::Manager::getInt("local map cell distance", "Map"))
     , mAngle(0.f)
     , mInterior(false)
 {
-    mRoot = mViewer->getSceneData()->asGroup();
-
     SceneUtil::FindByNameVisitor find("Scene Root");
     mRoot->accept(find);
     mSceneRoot = find.mFoundNode;
@@ -88,9 +85,9 @@ LocalMap::LocalMap(osgViewer::Viewer* viewer)
 LocalMap::~LocalMap()
 {
     for (CameraVector::iterator it = mActiveCameras.begin(); it != mActiveCameras.end(); ++it)
-        mRoot->removeChild(*it);
+        removeCamera(*it);
     for (CameraVector::iterator it = mCamerasPendingRemoval.begin(); it != mCamerasPendingRemoval.end(); ++it)
-        mRoot->removeChild(*it);
+        removeCamera(*it);
 }
 
 const osg::Vec2f LocalMap::rotatePoint(const osg::Vec2f& point, const osg::Vec2f& center, const float angle)
@@ -180,7 +177,12 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
     stateset->setMode(GL_LIGHTING, osg::StateAttribute::ON);
     stateset->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
     stateset->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
-    stateset->setMode(GL_FOG, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
+    // assign large value to effectively turn off fog
+    // shaders don't respect glDisable(GL_FOG)
+    osg::ref_ptr<osg::Fog> fog (new osg::Fog);
+    fog->setStart(10000000);
+    fog->setEnd(10000000);
+    stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
 
     osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;
     lightmodel->setAmbientIntensity(osg::Vec4(0.3f, 0.3f, 0.3f, 1.f));
@@ -203,7 +205,6 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
 
     camera->addChild(lightSource);
     camera->setStateSet(stateset);
-    camera->setGraphicsContext(mViewer->getCamera()->getGraphicsContext());
     camera->setViewport(0, 0, mMapResolution, mMapResolution);
     camera->setUpdateCallback(new CameraLocalUpdateCallback(this));
 
@@ -230,13 +231,51 @@ void LocalMap::setupRenderToTexture(osg::ref_ptr<osg::Camera> camera, int x, int
     segment.mMapTexture = texture;
 }
 
+bool needUpdate(std::set<std::pair<int, int> >& renderedGrid, std::set<std::pair<int, int> >& currentGrid, int cellX, int cellY)
+{
+    // if all the cells of the current grid are contained in the rendered grid then we can keep the old render
+    for (int dx=-1;dx<2;dx+=1)
+    {
+        for (int dy=-1;dy<2;dy+=1)
+        {
+            bool haveInRenderedGrid = renderedGrid.find(std::make_pair(cellX+dx,cellY+dy)) != renderedGrid.end();
+            bool haveInCurrentGrid = currentGrid.find(std::make_pair(cellX+dx,cellY+dy)) != currentGrid.end();
+            if (haveInCurrentGrid && !haveInRenderedGrid)
+                return true;
+        }
+    }
+    return false;
+}
+
 void LocalMap::requestMap(std::set<const MWWorld::CellStore*> cells)
 {
+    std::set<std::pair<int, int> > grid;
+    for (std::set<const MWWorld::CellStore*>::iterator it = cells.begin(); it != cells.end(); ++it)
+    {
+        const MWWorld::CellStore* cell = *it;
+        if (cell->isExterior())
+            grid.insert(std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY()));
+    }
+
     for (std::set<const MWWorld::CellStore*>::iterator it = cells.begin(); it != cells.end(); ++it)
     {
         const MWWorld::CellStore* cell = *it;
         if (cell->isExterior())
-            requestExteriorMap(cell);
+        {
+            int cellX = cell->getCell()->getGridX();
+            int cellY = cell->getCell()->getGridY();
+
+            MapSegment& segment = mSegments[std::make_pair(cellX, cellY)];
+            if (!needUpdate(segment.mGrid, grid, cellX, cellY))
+            {
+                continue;
+            }
+            else
+            {
+                segment.mGrid = grid;
+                requestExteriorMap(cell);
+            }
+        }
         else
             requestInteriorMap(cell);
     }
@@ -270,6 +309,12 @@ osg::ref_ptr<osg::Texture2D> LocalMap::getFogOfWarTexture(int x, int y)
         return found->second.mFogOfWarTexture;
 }
 
+void LocalMap::removeCamera(osg::Camera *cam)
+{
+    cam->removeChildren(0, cam->getNumChildren());
+    mRoot->removeChild(cam);
+}
+
 void LocalMap::markForRemoval(osg::Camera *cam)
 {
     CameraVector::iterator found = std::find(mActiveCameras.begin(), mActiveCameras.end(), cam);
@@ -288,11 +333,7 @@ void LocalMap::cleanupCameras()
         return;
 
     for (CameraVector::iterator it = mCamerasPendingRemoval.begin(); it != mCamerasPendingRemoval.end(); ++it)
-    {
-        (*it)->removeChildren(0, (*it)->getNumChildren());
-        (*it)->setGraphicsContext(NULL);
-        mRoot->removeChild(*it);
-    }
+        removeCamera(*it);
 
     mCamerasPendingRemoval.clear();
 }
@@ -304,7 +345,7 @@ void LocalMap::requestExteriorMap(const MWWorld::CellStore* cell)
     int x = cell->getCell()->getGridX();
     int y = cell->getCell()->getGridY();
 
-    osg::BoundingSphere bound = mViewer->getSceneData()->getBound();
+    osg::BoundingSphere bound = mSceneRoot->getBound();
     float zmin = bound.center().z() - bound.radius();
     float zmax = bound.center().z() + bound.radius();
 
@@ -627,7 +668,7 @@ void LocalMap::MapSegment::initFogOfWar()
 void LocalMap::MapSegment::loadFogOfWar(const ESM::FogTexture &esm)
 {
     const std::vector<char>& data = esm.mImageData;
-    if (!data.size())
+    if (data.empty())
     {
         initFogOfWar();
         return;
diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp
index d946f4c2b..febe79d84 100644
--- a/apps/openmw/mwrender/localmap.hpp
+++ b/apps/openmw/mwrender/localmap.hpp
@@ -19,11 +19,6 @@ namespace ESM
     struct FogTexture;
 }
 
-namespace osgViewer
-{
-    class Viewer;
-}
-
 namespace osg
 {
     class Texture2D;
@@ -41,7 +36,7 @@ namespace MWRender
     class LocalMap
     {
     public:
-        LocalMap(osgViewer::Viewer* viewer);
+        LocalMap(osg::Group* root);
         ~LocalMap();
 
         /**
@@ -63,6 +58,8 @@ namespace MWRender
 
         osg::ref_ptr<osg::Texture2D> getFogOfWarTexture (int x, int y);
 
+        void removeCamera(osg::Camera* cam);
+
         /**
          * Indicates a camera has been queued for rendering and can be cleaned up in the next frame. For internal use only.
          */
@@ -104,8 +101,6 @@ namespace MWRender
         osg::Group* getRoot();
 
     private:
-        osg::ref_ptr<osgViewer::Viewer> mViewer;
-
         osg::ref_ptr<osg::Group> mRoot;
         osg::ref_ptr<osg::Node> mSceneRoot;
 
@@ -129,6 +124,8 @@ namespace MWRender
             osg::ref_ptr<osg::Texture2D> mFogOfWarTexture;
             osg::ref_ptr<osg::Image> mFogOfWarImage;
 
+            std::set<std::pair<int, int> > mGrid; // the grid that was active at the time of rendering this segment
+
             bool mHasFogState;
         };
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index eee23aa31..6ead1611e 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -15,6 +15,8 @@
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/attach.hpp>
 #include <components/sceneutil/visitor.hpp>
+#include <components/sceneutil/skeleton.hpp>
+#include <components/sceneutil/lightmanager.hpp>
 
 #include <components/nifosg/nifloader.hpp> // TextKeyMapHolder
 
@@ -267,25 +269,12 @@ const NpcAnimation::PartBoneMap NpcAnimation::sPartList = createPartListMap();
 
 NpcAnimation::~NpcAnimation()
 {
-    if (!mListenerDisabled
-            // No need to getInventoryStore() to reset, if none exists
-            // This is to avoid triggering the listener via ensureCustomData()->autoEquip()->fireEquipmentChanged()
-            // all from within this destructor. ouch!
-           && mPtr.getRefData().getCustomData() && mPtr.getClass().getInventoryStore(mPtr).getListener() == this)
-        mPtr.getClass().getInventoryStore(mPtr).setListener(NULL, mPtr);
-
-    // do not detach (delete) parts yet, this is done so the background thread can handle the deletion
-    for(size_t i = 0;i < ESM::PRT_Count;i++)
-    {
-        if (mObjectParts[i].get())
-            mObjectParts[i]->unlink();
-    }
+    mAmmunition.reset();
 }
 
 NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem,
-                           bool disableListener, bool disableSounds, ViewMode viewMode, float firstPersonFieldOfView)
-  : Animation(ptr, parentNode, resourceSystem),
-    mListenerDisabled(disableListener),
+                           bool disableSounds, ViewMode viewMode, float firstPersonFieldOfView)
+  : ActorAnimation(ptr, parentNode, resourceSystem),
     mViewMode(viewMode),
     mShowWeapons(false),
     mShowCarriedLeft(true),
@@ -307,9 +296,6 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> par
     }
 
     updateNpcBase();
-
-    if (!disableListener)
-        mPtr.getClass().getInventoryStore(mPtr).setListener(this, mPtr);
 }
 
 void NpcAnimation::setViewMode(NpcAnimation::ViewMode viewMode)
@@ -401,6 +387,9 @@ void NpcAnimation::rebuild()
 {
     updateNpcBase();
 
+    if (mAlpha != 1.f)
+        mResourceSystem->getSceneManager()->recreateShaders(mObjectRoot);
+
     MWBase::Environment::get().getMechanicsManager()->forceStateUpdate(mPtr);
 }
 
@@ -422,6 +411,8 @@ int NpcAnimation::getSlot(const osg::NodePath &path) const
 void NpcAnimation::updateNpcBase()
 {
     clearAnimSources();
+    for(size_t i = 0;i < ESM::PRT_Count;i++)
+        removeIndividualPart((ESM::PartReferenceType)i);
 
     const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
     const ESM::Race *race = store.get<ESM::Race>().find(mNpc->mRace);
@@ -459,50 +450,64 @@ void NpcAnimation::updateNpcBase()
     }
 
     bool isBeast = (race->mData.mFlags & ESM::Race::Beast) != 0;
-    std::string smodel = (mViewMode != VM_FirstPerson) ?
-                         (!isWerewolf ? !isBeast ? "meshes\\base_anim.nif"
-                                                 : "meshes\\base_animkna.nif"
-                                      : "meshes\\wolf\\skin.nif") :
-                         (!isWerewolf ? !isBeast ? "meshes\\base_anim.1st.nif"
-                                                 : "meshes\\base_animkna.1st.nif"
-                                      : "meshes\\wolf\\skin.1st.nif");
+    bool isFemale = !mNpc->isMale();
+
+    std::string smodel;
+    if (mViewMode != VM_FirstPerson)
+    {
+        if (isWerewolf)
+            smodel = "meshes\\wolf\\skin.nif";
+        else if (isBeast)
+            smodel = "meshes\\base_animkna.nif";
+        else if (isFemale)
+            smodel = "meshes\\base_anim_female.nif";
+        else
+            smodel = "meshes\\base_anim.nif";
+    }
+    else
+    {
+        if (isWerewolf)
+            smodel = "meshes\\wolf\\skin.1st.nif";
+        else if (isBeast)
+            smodel = "meshes\\base_animkna.1st.nif";
+        else if (isFemale)
+            smodel = "meshes\\base_anim_female.1st.nif";
+        else
+            smodel = "meshes\\base_anim.1st.nif";
+    }
+
     smodel = Misc::ResourceHelpers::correctActorModelPath(smodel, mResourceSystem->getVFS());
 
     setObjectRoot(smodel, true, true, false);
 
     if(mViewMode != VM_FirstPerson)
     {
+        const std::string base = "meshes\\xbase_anim.nif";
+        if (smodel != base)
+            addAnimSource(base);
+
         addAnimSource(smodel);
+
         if(!isWerewolf)
         {
-            if(Misc::StringUtils::lowerCase(mNpc->mRace).find("argonian") != std::string::npos)
-                addAnimSource("meshes\\xargonian_swimkna.nif");
-            else if(!mNpc->isMale() && !isBeast)
-                addAnimSource("meshes\\xbase_anim_female.nif");
             if(mNpc->mModel.length() > 0)
                 addAnimSource(Misc::ResourceHelpers::correctActorModelPath("meshes\\" + mNpc->mModel, mResourceSystem->getVFS()));
+            if(Misc::StringUtils::lowerCase(mNpc->mRace).find("argonian") != std::string::npos)
+                addAnimSource("meshes\\xargonian_swimkna.nif");
         }
     }
     else
     {
+        const std::string base = "meshes\\xbase_anim.1st.nif";
+        if (smodel != base)
+            addAnimSource(base);
+
+        addAnimSource(smodel);
+
         mObjectRoot->setNodeMask(Mask_FirstPerson);
         mObjectRoot->addCullCallback(new OverrideFieldOfViewCallback(mFirstPersonFieldOfView));
-        if(isWerewolf)
-            addAnimSource(smodel);
-        else
-        {
-            // A bit counter-intuitive, but unlike third-person anims, it seems
-            // beast races get both base_anim.1st.nif and base_animkna.1st.nif.
-            addAnimSource("meshes\\xbase_anim.1st.nif");
-            if(isBeast)
-                addAnimSource("meshes\\xbase_animkna.1st.nif");
-            if(!mNpc->isMale() && !isBeast)
-                addAnimSource("meshes\\xbase_anim_female.1st.nif");
-        }
     }
 
-    for(size_t i = 0;i < ESM::PRT_Count;i++)
-        removeIndividualPart((ESM::PartReferenceType)i);
     updateParts();
 
     mWeaponAnimationTime->updateStartTime();
@@ -551,6 +556,7 @@ void NpcAnimation::updateParts()
     static const size_t slotlistsize = sizeof(slotlist)/sizeof(slotlist[0]);
 
     bool wasArrowAttached = (mAmmunition.get() != NULL);
+    mAmmunition.reset();
 
     MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
     for(size_t i = 0;i < slotlistsize && mViewMode != VM_HeadOnly;i++)
@@ -645,11 +651,18 @@ void NpcAnimation::updateParts()
         attachArrow();
 }
 
+
+
 PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, const std::string& bonename, const std::string& bonefilter, bool enchantedGlow, osg::Vec4f* glowColor)
 {
     osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model);
-    osg::ref_ptr<osg::Node> attached = SceneUtil::attach(instance, mObjectRoot, bonefilter, bonename);
-    mResourceSystem->getSceneManager()->notifyAttached(attached);
+
+    const NodeMap& nodeMap = getNodeMap();
+    NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(bonename));
+    if (found == nodeMap.end())
+        throw std::runtime_error("Can't find attachment node " + bonename);
+
+    osg::ref_ptr<osg::Node> attached = SceneUtil::attach(instance, mObjectRoot, bonefilter, found->second);
     if (enchantedGlow)
         addGlow(attached, *glowColor);
 
@@ -748,43 +761,46 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
         }
     }
 
-    boost::shared_ptr<SceneUtil::ControllerSource> src;
-    if (type == ESM::PRT_Head)
+    osg::Node* node = mObjectParts[type]->getNode();
+    if (node->getNumChildrenRequiringUpdateTraversal() > 0)
     {
-        src = mHeadAnimationTime;
-
-        osg::Node* node = mObjectParts[type]->getNode();
-        if (node->getUserDataContainer())
+        boost::shared_ptr<SceneUtil::ControllerSource> src;
+        if (type == ESM::PRT_Head)
         {
-            for (unsigned int i=0; i<node->getUserDataContainer()->getNumUserObjects(); ++i)
+            src = mHeadAnimationTime;
+
+            if (node->getUserDataContainer())
             {
-                osg::Object* obj = node->getUserDataContainer()->getUserObject(i);
-                if (NifOsg::TextKeyMapHolder* keys = dynamic_cast<NifOsg::TextKeyMapHolder*>(obj))
+                for (unsigned int i=0; i<node->getUserDataContainer()->getNumUserObjects(); ++i)
                 {
-                    for (NifOsg::TextKeyMap::const_iterator it = keys->mTextKeys.begin(); it != keys->mTextKeys.end(); ++it)
+                    osg::Object* obj = node->getUserDataContainer()->getUserObject(i);
+                    if (NifOsg::TextKeyMapHolder* keys = dynamic_cast<NifOsg::TextKeyMapHolder*>(obj))
                     {
-                        if (Misc::StringUtils::ciEqual(it->second, "talk: start"))
-                            mHeadAnimationTime->setTalkStart(it->first);
-                        if (Misc::StringUtils::ciEqual(it->second, "talk: stop"))
-                            mHeadAnimationTime->setTalkStop(it->first);
-                        if (Misc::StringUtils::ciEqual(it->second, "blink: start"))
-                            mHeadAnimationTime->setBlinkStart(it->first);
-                        if (Misc::StringUtils::ciEqual(it->second, "blink: stop"))
-                            mHeadAnimationTime->setBlinkStop(it->first);
+                        for (NifOsg::TextKeyMap::const_iterator it = keys->mTextKeys.begin(); it != keys->mTextKeys.end(); ++it)
+                        {
+                            if (Misc::StringUtils::ciEqual(it->second, "talk: start"))
+                                mHeadAnimationTime->setTalkStart(it->first);
+                            if (Misc::StringUtils::ciEqual(it->second, "talk: stop"))
+                                mHeadAnimationTime->setTalkStop(it->first);
+                            if (Misc::StringUtils::ciEqual(it->second, "blink: start"))
+                                mHeadAnimationTime->setBlinkStart(it->first);
+                            if (Misc::StringUtils::ciEqual(it->second, "blink: stop"))
+                                mHeadAnimationTime->setBlinkStop(it->first);
+                        }
+
+                        break;
                     }
-
-                    break;
                 }
             }
         }
-    }
-    else if (type == ESM::PRT_Weapon)
-        src = mWeaponAnimationTime;
-    else
-        src.reset(new NullAnimationTime);
+        else if (type == ESM::PRT_Weapon)
+            src = mWeaponAnimationTime;
+        else
+            src.reset(new NullAnimationTime);
 
-    SceneUtil::AssignControllerSourcesVisitor assignVisitor(src);
-    mObjectParts[type]->getNode()->accept(assignVisitor);
+        SceneUtil::AssignControllerSourcesVisitor assignVisitor(src);
+        node->accept(assignVisitor);
+    }
 
     return true;
 }
@@ -864,6 +880,7 @@ void NpcAnimation::addControllers()
 void NpcAnimation::showWeapons(bool showWeapon)
 {
     mShowWeapons = showWeapon;
+    mAmmunition.reset();
     if(showWeapon)
     {
         MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
@@ -882,11 +899,7 @@ void NpcAnimation::showWeapons(bool showWeapon)
                 MWWorld::ContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
                 if (ammo != inv.end() && ammo->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::Bolt)
                     attachArrow();
-                else
-                    mAmmunition.reset();
             }
-            else
-                mAmmunition.reset();
         }
     }
     else
@@ -950,12 +963,12 @@ Resource::ResourceSystem* NpcAnimation::getResourceSystem()
     return mResourceSystem;
 }
 
-void NpcAnimation::permanentEffectAdded(const ESM::MagicEffect *magicEffect, bool isNew, bool playSound)
+void NpcAnimation::permanentEffectAdded(const ESM::MagicEffect *magicEffect, bool isNew)
 {
     // During first auto equip, we don't play any sounds.
     // Basically we don't want sounds when the actor is first loaded,
     // the items should appear as if they'd always been equipped.
-    if (playSound)
+    if (isNew)
     {
         static const std::string schools[] = {
             "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
@@ -974,7 +987,7 @@ void NpcAnimation::permanentEffectAdded(const ESM::MagicEffect *magicEffect, boo
         bool loop = (magicEffect->mData.mFlags & ESM::MagicEffect::ContinuousVfx) != 0;
         // Don't play particle VFX unless the effect is new or it should be looping.
         if (isNew || loop)
-            addEffect("meshes\\" + castStatic->mModel, magicEffect->mIndex, loop, "");
+            addEffect("meshes\\" + castStatic->mModel, magicEffect->mIndex, loop, "", magicEffect->mParticle);
     }
 }
 
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index baf9c8c24..427a1baf8 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -5,6 +5,7 @@
 
 #include "../mwworld/inventorystore.hpp"
 
+#include "actoranimation.hpp"
 #include "weaponanimation.hpp"
 
 namespace ESM
@@ -19,11 +20,11 @@ namespace MWRender
 class NeckController;
 class HeadAnimationTime;
 
-class NpcAnimation : public Animation, public WeaponAnimation, public MWWorld::InventoryStoreListener
+class NpcAnimation : public ActorAnimation, public WeaponAnimation, public MWWorld::InventoryStoreListener
 {
 public:
     virtual void equipmentChanged();
-    virtual void permanentEffectAdded(const ESM::MagicEffect *magicEffect, bool isNew, bool playSound);
+    virtual void permanentEffectAdded(const ESM::MagicEffect *magicEffect, bool isNew);
 
 public:
     typedef std::map<ESM::PartReferenceType,std::string> PartBoneMap;
@@ -37,8 +38,6 @@ public:
 private:
     static const PartBoneMap sPartList;
 
-    bool mListenerDisabled;
-
     // Bounded Parts
     PartHolderPtr mObjectParts[ESM::PRT_Count];
     std::string mSoundIds[ESM::PRT_Count];
@@ -104,7 +103,7 @@ public:
      * @param disableSounds    Same as \a disableListener but for playing items sounds
      * @param viewMode
      */
-    NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem, bool disableListener = false,
+    NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem,
                  bool disableSounds = false, ViewMode viewMode=VM_Normal, float firstPersonFieldOfView=55.f);
     virtual ~NpcAnimation();
 
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index 516d10b95..ab627b6f6 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -3,16 +3,8 @@
 #include <cmath>
 
 #include <osg/Group>
-#include <osg/Geode>
 #include <osg/UserDataContainer>
-#include <osg/Version>
 
-#include <osgParticle/ParticleSystem>
-#include <osgParticle/ParticleProcessor>
-
-#include <components/resource/scenemanager.hpp>
-
-#include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/unrefqueue.hpp>
 
@@ -24,64 +16,6 @@
 #include "creatureanimation.hpp"
 #include "vismask.hpp"
 
-namespace
-{
-
-    /// Removes all particle systems and related nodes in a subgraph.
-    class RemoveParticlesVisitor : public osg::NodeVisitor
-    {
-    public:
-        RemoveParticlesVisitor()
-            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-        { }
-
-        virtual void apply(osg::Node &node)
-        {
-            if (dynamic_cast<osgParticle::ParticleProcessor*>(&node))
-                mToRemove.push_back(&node);
-
-            traverse(node);
-        }
-
-        virtual void apply(osg::Geode& geode)
-        {
-            std::vector<osgParticle::ParticleSystem*> partsysVector;
-            for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
-            {
-                osg::Drawable* drw = geode.getDrawable(i);
-                if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(drw))
-                    partsysVector.push_back(partsys);
-            }
-
-            for (std::vector<osgParticle::ParticleSystem*>::iterator it = partsysVector.begin(); it != partsysVector.end(); ++it)
-                geode.removeDrawable(*it);
-        }
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
-        virtual void apply(osg::Drawable& drw)
-        {
-            if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(&drw))
-                mToRemove.push_back(partsys);
-        }
-#endif
-
-        void remove()
-        {
-            for (std::vector<osg::ref_ptr<osg::Node> >::iterator it = mToRemove.begin(); it != mToRemove.end(); ++it)
-            {
-                // FIXME: a Drawable might have more than one parent
-                osg::Node* node = *it;
-                if (node->getNumParents())
-                    node->getParent(0)->removeChild(node);
-            }
-            mToRemove.clear();
-        }
-
-    private:
-        std::vector<osg::ref_ptr<osg::Node> > mToRemove;
-    };
-
-}
-
 
 namespace MWRender
 {
@@ -95,8 +29,6 @@ Objects::Objects(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Gro
 
 Objects::~Objects()
 {
-    for(PtrAnimationMap::iterator iter = mObjects.begin();iter != mObjects.end();++iter)
-        delete iter->second;
     mObjects.clear();
 
     for (CellMap::iterator iter = mCellSceneNodes.begin(); iter != mCellSceneNodes.end(); ++iter)
@@ -112,6 +44,7 @@ void Objects::insertBegin(const MWWorld::Ptr& ptr)
     if (found == mCellSceneNodes.end())
     {
         cellnode = new osg::Group;
+        cellnode->setName("Cell Root");
         mRootNode->addChild(cellnode);
         mCellSceneNodes[ptr.getCell()] = cellnode;
     }
@@ -139,16 +72,9 @@ void Objects::insertModel(const MWWorld::Ptr &ptr, const std::string &mesh, bool
 {
     insertBegin(ptr);
 
-    std::auto_ptr<ObjectAnimation> anim (new ObjectAnimation(ptr, mesh, mResourceSystem, animated, allowLight));
+    osg::ref_ptr<ObjectAnimation> anim (new ObjectAnimation(ptr, mesh, mResourceSystem, animated, allowLight));
 
-    if (!allowLight)
-    {
-        RemoveParticlesVisitor visitor;
-        anim->getObjectRoot()->accept(visitor);
-        visitor.remove();
-    }
-
-    mObjects.insert(std::make_pair(ptr, anim.release()));
+    mObjects.insert(std::make_pair(ptr, anim));
 }
 
 void Objects::insertCreature(const MWWorld::Ptr &ptr, const std::string &mesh, bool weaponsShields)
@@ -157,14 +83,16 @@ void Objects::insertCreature(const MWWorld::Ptr &ptr, const std::string &mesh, b
     ptr.getRefData().getBaseNode()->setNodeMask(Mask_Actor);
 
     // CreatureAnimation
-    std::auto_ptr<Animation> anim;
+    osg::ref_ptr<Animation> anim;
 
     if (weaponsShields)
-        anim.reset(new CreatureWeaponAnimation(ptr, mesh, mResourceSystem));
+        anim = new CreatureWeaponAnimation(ptr, mesh, mResourceSystem);
     else
-        anim.reset(new CreatureAnimation(ptr, mesh, mResourceSystem));
+        anim = new CreatureAnimation(ptr, mesh, mResourceSystem);
+
+    ptr.getClass().getContainerStore(ptr).setContListener(static_cast<ActorAnimation*>(anim.get()));
 
-    mObjects.insert(std::make_pair(ptr, anim.release()));
+    mObjects.insert(std::make_pair(ptr, anim));
 }
 
 void Objects::insertNPC(const MWWorld::Ptr &ptr)
@@ -172,9 +100,12 @@ void Objects::insertNPC(const MWWorld::Ptr &ptr)
     insertBegin(ptr);
     ptr.getRefData().getBaseNode()->setNodeMask(Mask_Actor);
 
-    std::auto_ptr<NpcAnimation> anim (new NpcAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), mResourceSystem));
+    osg::ref_ptr<NpcAnimation> anim (new NpcAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), mResourceSystem));
 
-    mObjects.insert(std::make_pair(ptr, anim.release()));
+    ptr.getClass().getInventoryStore(ptr).setInvListener(anim.get(), ptr);
+    ptr.getClass().getInventoryStore(ptr).setContListener(anim.get());
+
+    mObjects.insert(std::make_pair(ptr, anim));
 }
 
 bool Objects::removeObject (const MWWorld::Ptr& ptr)
@@ -185,11 +116,17 @@ bool Objects::removeObject (const MWWorld::Ptr& ptr)
     PtrAnimationMap::iterator iter = mObjects.find(ptr);
     if(iter != mObjects.end())
     {
-        delete iter->second;
+        if (mUnrefQueue.get())
+            mUnrefQueue->push(iter->second);
+
         mObjects.erase(iter);
 
-        if (mUnrefQueue.get())
-            mUnrefQueue->push(ptr.getRefData().getBaseNode());
+        if (ptr.getClass().isNpc())
+        {
+            MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
+            store.setInvListener(NULL, ptr);
+            store.setContListener(NULL);
+        }
 
         ptr.getRefData().getBaseNode()->getParent(0)->removeChild(ptr.getRefData().getBaseNode());
 
@@ -204,11 +141,19 @@ void Objects::removeCell(const MWWorld::CellStore* store)
 {
     for(PtrAnimationMap::iterator iter = mObjects.begin();iter != mObjects.end();)
     {
-        if(iter->first.getCell() == store)
+        MWWorld::Ptr ptr = iter->second->getPtr();
+        if(ptr.getCell() == store)
         {
             if (mUnrefQueue.get())
-                mUnrefQueue->push(iter->second->getObjectRoot());
-            delete iter->second;
+                mUnrefQueue->push(iter->second);
+
+            if (ptr.getClass().isNpc() && ptr.getRefData().getCustomData())
+            {
+                MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
+                store.setInvListener(NULL, ptr);
+                store.setContListener(NULL);
+            }
+
             mObjects.erase(iter++);
         }
         else
@@ -257,7 +202,7 @@ void Objects::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &cur)
     PtrAnimationMap::iterator iter = mObjects.find(old);
     if(iter != mObjects.end())
     {
-        Animation *anim = iter->second;
+        osg::ref_ptr<Animation> anim = iter->second;
         mObjects.erase(iter);
         anim->updatePtr(cur);
         mObjects[cur] = anim;
diff --git a/apps/openmw/mwrender/objects.hpp b/apps/openmw/mwrender/objects.hpp
index 5b91abea4..cc66ae20d 100644
--- a/apps/openmw/mwrender/objects.hpp
+++ b/apps/openmw/mwrender/objects.hpp
@@ -62,7 +62,7 @@ public:
 };
 
 class Objects{
-    typedef std::map<MWWorld::ConstPtr,Animation*> PtrAnimationMap;
+    typedef std::map<MWWorld::ConstPtr,osg::ref_ptr<Animation> > PtrAnimationMap;
 
     typedef std::map<const MWWorld::CellStore*, osg::ref_ptr<osg::Group> > CellMap;
     CellMap mCellSceneNodes;
diff --git a/apps/openmw/mwrender/pathgrid.cpp b/apps/openmw/mwrender/pathgrid.cpp
index ae8bda1fb..aae97fe35 100644
--- a/apps/openmw/mwrender/pathgrid.cpp
+++ b/apps/openmw/mwrender/pathgrid.cpp
@@ -4,11 +4,11 @@
 
 #include <osg/Geometry>
 #include <osg/PositionAttitudeTransform>
-#include <osg/Geode>
 #include <osg/Group>
 
 #include <components/esm/loadstat.hpp>
 #include <components/esm/loadpgrd.hpp>
+#include <components/sceneutil/pathgridutil.hpp>
 
 #include "../mwbase/world.hpp" // these includes can be removed once the static-hack is gone
 #include "../mwbase/environment.hpp"
@@ -24,107 +24,6 @@
 namespace MWRender
 {
 
-static const int POINT_MESH_BASE = 35;
-
-osg::ref_ptr<osg::Geometry> Pathgrid::createPathgridLines(const ESM::Pathgrid *pathgrid)
-{
-    osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
-
-    osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array;
-
-    for(ESM::Pathgrid::EdgeList::const_iterator it = pathgrid->mEdges.begin();
-        it != pathgrid->mEdges.end();
-        ++it)
-    {
-        const ESM::Pathgrid::Edge &edge = *it;
-        const ESM::Pathgrid::Point &p1 = pathgrid->mPoints[edge.mV0], &p2 = pathgrid->mPoints[edge.mV1];
-
-        osg::Vec3f direction = MWMechanics::PathFinder::MakeOsgVec3(p2) - MWMechanics::PathFinder::MakeOsgVec3(p1);
-        osg::Vec3f lineDisplacement = (direction^osg::Vec3f(0,0,1));
-        lineDisplacement.normalize();
-
-        lineDisplacement = lineDisplacement * POINT_MESH_BASE +
-                                osg::Vec3f(0, 0, 10); // move lines up a little, so they will be less covered by meshes/landscape
-
-        vertices->push_back(MWMechanics::PathFinder::MakeOsgVec3(p1) + lineDisplacement);
-        vertices->push_back(MWMechanics::PathFinder::MakeOsgVec3(p2) + lineDisplacement);
-    }
-
-    geom->setVertexArray(vertices);
-
-    geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::LINES, 0, vertices->size()));
-
-    osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array;
-    colors->push_back(osg::Vec4(1.f, 1.f, 0.f, 1.f));
-    geom->setColorArray(colors, osg::Array::BIND_OVERALL);
-
-    return geom;
-}
-
-osg::ref_ptr<osg::Geometry> Pathgrid::createPathgridPoints(const ESM::Pathgrid *pathgrid)
-{
-    osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
-
-    const float height = POINT_MESH_BASE * sqrtf(2);
-
-    osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array;
-    osg::ref_ptr<osg::UShortArray> indices = new osg::UShortArray;
-
-    bool first = true;
-    unsigned short startIndex = 0;
-    for(ESM::Pathgrid::PointList::const_iterator it = pathgrid->mPoints.begin();
-        it != pathgrid->mPoints.end();
-        ++it, startIndex += 6)
-    {
-        osg::Vec3f pointPos(MWMechanics::PathFinder::MakeOsgVec3(*it));
-
-        if (!first)
-        {
-            // degenerate triangle from previous octahedron
-            indices->push_back(startIndex - 4); // 2nd point of previous octahedron
-            indices->push_back(startIndex); // start point of current octahedron
-        }
-
-        float pointMeshBase = static_cast<float>(POINT_MESH_BASE);
-
-        vertices->push_back(pointPos + osg::Vec3f(0, 0, height)); // 0
-        vertices->push_back(pointPos + osg::Vec3f(-pointMeshBase, -pointMeshBase, 0)); // 1
-        vertices->push_back(pointPos + osg::Vec3f(pointMeshBase, -pointMeshBase, 0)); // 2
-        vertices->push_back(pointPos + osg::Vec3f(pointMeshBase, pointMeshBase, 0)); // 3
-        vertices->push_back(pointPos + osg::Vec3f(-pointMeshBase, pointMeshBase, 0)); // 4
-        vertices->push_back(pointPos + osg::Vec3f(0, 0, -height)); // 5
-
-        indices->push_back(startIndex + 0);
-        indices->push_back(startIndex + 1);
-        indices->push_back(startIndex + 2);
-        indices->push_back(startIndex + 5);
-        indices->push_back(startIndex + 3);
-        indices->push_back(startIndex + 4);
-        // degenerates
-        indices->push_back(startIndex + 4);
-        indices->push_back(startIndex + 5);
-        indices->push_back(startIndex + 5);
-        // end degenerates
-        indices->push_back(startIndex + 1);
-        indices->push_back(startIndex + 4);
-        indices->push_back(startIndex + 0);
-        indices->push_back(startIndex + 3);
-        indices->push_back(startIndex + 2);
-
-        first = false;
-    }
-
-    geom->setVertexArray(vertices);
-
-    geom->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_STRIP, indices->size(), &(*indices)[0]));
-
-    osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array;
-    colors->push_back(osg::Vec4(1.f, 0.f, 0.f, 1.f));
-    geom->setColorArray(colors, osg::Array::BIND_OVERALL);
-
-    return geom;
-}
-
 Pathgrid::Pathgrid(osg::ref_ptr<osg::Group> root)
     : mPathgridEnabled(false)
     , mRootNode(root)
@@ -213,16 +112,9 @@ void Pathgrid::enableCellPathgrid(const MWWorld::CellStore *store)
     osg::ref_ptr<osg::PositionAttitudeTransform> cellPathGrid = new osg::PositionAttitudeTransform;
     cellPathGrid->setPosition(cellPathGridPos);
 
-    osg::ref_ptr<osg::Geode> lineGeode = new osg::Geode;
-    osg::ref_ptr<osg::Geometry> lines = createPathgridLines(pathgrid);
-    lineGeode->addDrawable(lines);
-
-    osg::ref_ptr<osg::Geode> pointGeode = new osg::Geode;
-    osg::ref_ptr<osg::Geometry> points = createPathgridPoints(pathgrid);
-    pointGeode->addDrawable(points);
+    osg::ref_ptr<osg::Geometry> geometry = SceneUtil::createPathgridGeometry(*pathgrid);
 
-    cellPathGrid->addChild(lineGeode);
-    cellPathGrid->addChild(pointGeode);
+    cellPathGrid->addChild(geometry);
 
     mPathGridRoot->addChild(cellPathGrid);
 
diff --git a/apps/openmw/mwrender/pathgrid.hpp b/apps/openmw/mwrender/pathgrid.hpp
index 39a6d71ed..22bfa8e73 100644
--- a/apps/openmw/mwrender/pathgrid.hpp
+++ b/apps/openmw/mwrender/pathgrid.hpp
@@ -48,9 +48,6 @@ namespace MWRender
         void enableCellPathgrid(const MWWorld::CellStore *store);
         void disableCellPathgrid(const MWWorld::CellStore *store);
 
-        // path grid meshes
-        osg::ref_ptr<osg::Geometry> createPathgridLines(const ESM::Pathgrid *pathgrid);
-        osg::ref_ptr<osg::Geometry> createPathgridPoints(const ESM::Pathgrid *pathgrid);
     public:
         Pathgrid(osg::ref_ptr<osg::Group> root);
         ~Pathgrid();
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 177cee4ea..5879c14c6 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -2,10 +2,12 @@
 
 #include <stdexcept>
 #include <limits>
+#include <cstdlib>
 
 #include <osg/Light>
 #include <osg/LightModel>
 #include <osg/Fog>
+#include <osg/Material>
 #include <osg/PolygonMode>
 #include <osg/Group>
 #include <osg/UserDataContainer>
@@ -19,6 +21,7 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/resource/keyframemanager.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -28,6 +31,7 @@
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/workqueue.hpp>
 #include <components/sceneutil/unrefqueue.hpp>
+#include <components/sceneutil/writescene.hpp>
 
 #include <components/terrain/terraingrid.hpp>
 
@@ -138,25 +142,35 @@ namespace MWRender
 
         virtual void doWork()
         {
-            for (std::vector<std::string>::const_iterator it = mModels.begin(); it != mModels.end(); ++it)
-                mResourceSystem->getSceneManager()->getTemplate(*it);
-            for (std::vector<std::string>::const_iterator it = mTextures.begin(); it != mTextures.end(); ++it)
-                mResourceSystem->getImageManager()->getImage(*it);
+            try
+            {
+                for (std::vector<std::string>::const_iterator it = mModels.begin(); it != mModels.end(); ++it)
+                    mResourceSystem->getSceneManager()->cacheInstance(*it);
+                for (std::vector<std::string>::const_iterator it = mTextures.begin(); it != mTextures.end(); ++it)
+                    mResourceSystem->getImageManager()->getImage(*it);
+                for (std::vector<std::string>::const_iterator it = mKeyframes.begin(); it != mKeyframes.end(); ++it)
+                    mResourceSystem->getKeyframeManager()->get(*it);
+            }
+            catch (std::exception&)
+            {
+                // ignore error (will be shown when these are needed proper)
+            }
         }
 
         std::vector<std::string> mModels;
         std::vector<std::string> mTextures;
+        std::vector<std::string> mKeyframes;
 
     private:
         Resource::ResourceSystem* mResourceSystem;
     };
 
-    RenderingManager::RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, Resource::ResourceSystem* resourceSystem,
+    RenderingManager::RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
                                        const Fallback::Map* fallback, const std::string& resourcePath)
         : mViewer(viewer)
         , mRootNode(rootNode)
         , mResourceSystem(resourceSystem)
-        , mWorkQueue(new SceneUtil::WorkQueue)
+        , mWorkQueue(workQueue)
         , mUnrefQueue(new SceneUtil::UnrefQueue)
         , mFogDepth(0.f)
         , mUnderwaterColor(fallback->getFallbackColour("Water_UnderwaterColor"))
@@ -168,28 +182,41 @@ namespace MWRender
         , mFieldOfViewOverridden(false)
     {
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
-
-        osg::ref_ptr<SceneUtil::LightManager> lightRoot = new SceneUtil::LightManager;
-        lightRoot->setLightingMask(Mask_Lighting);
-        mLightRoot = lightRoot;
-        lightRoot->setStartLight(1);
-
-        mRootNode->addChild(lightRoot);
+        resourceSystem->getSceneManager()->setShaderPath(resourcePath + "/shaders");
+        resourceSystem->getSceneManager()->setForceShaders(Settings::Manager::getBool("force shaders", "Shaders"));
+        resourceSystem->getSceneManager()->setClampLighting(Settings::Manager::getBool("clamp lighting", "Shaders"));
+        resourceSystem->getSceneManager()->setForcePerPixelLighting(Settings::Manager::getBool("force per pixel lighting", "Shaders"));
+        resourceSystem->getSceneManager()->setAutoUseNormalMaps(Settings::Manager::getBool("auto use object normal maps", "Shaders"));
+        resourceSystem->getSceneManager()->setNormalMapPattern(Settings::Manager::getString("normal map pattern", "Shaders"));
+        resourceSystem->getSceneManager()->setNormalHeightMapPattern(Settings::Manager::getString("normal height map pattern", "Shaders"));
+        resourceSystem->getSceneManager()->setAutoUseSpecularMaps(Settings::Manager::getBool("auto use object specular maps", "Shaders"));
+        resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::Manager::getString("specular map pattern", "Shaders"));
+
+        osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager;
+        sceneRoot->setLightingMask(Mask_Lighting);
+        mSceneRoot = sceneRoot;
+        sceneRoot->setStartLight(1);
+
+        mRootNode->addChild(sceneRoot);
 
         mPathgrid.reset(new Pathgrid(mRootNode));
 
-        mObjects.reset(new Objects(mResourceSystem, lightRoot, mUnrefQueue.get()));
+        mObjects.reset(new Objects(mResourceSystem, sceneRoot, mUnrefQueue.get()));
 
-        mViewer->setIncrementalCompileOperation(new osgUtil::IncrementalCompileOperation);
+        if (getenv("OPENMW_DONT_PRECOMPILE") == NULL)
+            mViewer->setIncrementalCompileOperation(new osgUtil::IncrementalCompileOperation);
 
         mResourceSystem->getSceneManager()->setIncrementalCompileOperation(mViewer->getIncrementalCompileOperation());
 
-        mEffectManager.reset(new EffectManager(lightRoot, mResourceSystem));
+        mEffectManager.reset(new EffectManager(sceneRoot, mResourceSystem));
 
-        mWater.reset(new Water(mRootNode, lightRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), fallback, resourcePath));
+        mWater.reset(new Water(mRootNode, sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), fallback, resourcePath));
 
-        mTerrain.reset(new Terrain::TerrainGrid(lightRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(),
-                                                new TerrainStorage(mResourceSystem->getVFS(), false), Mask_Terrain, mUnrefQueue.get()));
+        mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(),
+                                                new TerrainStorage(mResourceSystem->getVFS(), Settings::Manager::getString("normal map pattern", "Shaders"), Settings::Manager::getString("normal height map pattern", "Shaders"),
+                                                                   Settings::Manager::getBool("auto use terrain normal maps", "Shaders"),
+                                                     Settings::Manager::getString("terrain specular map pattern", "Shaders"), Settings::Manager::getBool("auto use terrain specular maps", "Shaders")),
+                                                 Mask_Terrain, &mResourceSystem->getSceneManager()->getShaderManager(), mUnrefQueue.get()));
 
         mCamera.reset(new Camera(mViewer->getCamera()));
 
@@ -203,28 +230,37 @@ namespace MWRender
         mSunLight->setAmbient(osg::Vec4f(0,0,0,1));
         mSunLight->setSpecular(osg::Vec4f(0,0,0,0));
         mSunLight->setConstantAttenuation(1.f);
-        lightRoot->addChild(source);
+        sceneRoot->addChild(source);
 
-        lightRoot->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
-        lightRoot->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::ON);
-        lightRoot->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
+        sceneRoot->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
+        sceneRoot->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::ON);
+        sceneRoot->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
+        osg::ref_ptr<osg::Material> defaultMat (new osg::Material);
+        defaultMat->setColorMode(osg::Material::OFF);
+        defaultMat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+        defaultMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+        defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
+        sceneRoot->getOrCreateStateSet()->setAttribute(defaultMat);
 
-        lightRoot->setNodeMask(Mask_Scene);
-        lightRoot->setName("Scene Root");
+        sceneRoot->setNodeMask(Mask_Scene);
+        sceneRoot->setName("Scene Root");
 
-        mSky.reset(new SkyManager(lightRoot, resourceSystem->getSceneManager()));
+        mSky.reset(new SkyManager(sceneRoot, resourceSystem->getSceneManager()));
 
         source->setStateSetModes(*mRootNode->getOrCreateStateSet(), osg::StateAttribute::ON);
 
         mStateUpdater = new StateUpdater;
-        lightRoot->addUpdateCallback(mStateUpdater);
+        sceneRoot->addUpdateCallback(mStateUpdater);
 
         osg::Camera::CullingMode cullingMode = osg::Camera::DEFAULT_CULLING|osg::Camera::FAR_PLANE_CULLING;
 
         if (!Settings::Manager::getBool("small feature culling", "Camera"))
             cullingMode &= ~(osg::CullStack::SMALL_FEATURE_CULLING);
         else
+        {
+            mViewer->getCamera()->setSmallFeatureCullingPixelSize(Settings::Manager::getFloat("small feature culling pixel size", "Camera"));
             cullingMode |= osg::CullStack::SMALL_FEATURE_CULLING;
+        }
 
         mViewer->getCamera()->setCullingMode( cullingMode );
 
@@ -246,6 +282,8 @@ namespace MWRender
 
     RenderingManager::~RenderingManager()
     {
+        // let background loading thread finish before we delete anything else
+        mWorkQueue = NULL;
     }
 
     MWRender::Objects& RenderingManager::getObjects()
@@ -279,6 +317,13 @@ namespace MWRender
         mSky->listAssetsToPreload(workItem->mModels, workItem->mTextures);
         mWater->listAssetsToPreload(workItem->mTextures);
 
+        const char* basemodels[] = {"xbase_anim", "xbase_anim.1st", "xbase_anim_female", "xbase_animkna"};
+        for (size_t i=0; i<sizeof(basemodels)/sizeof(basemodels[0]); ++i)
+        {
+            workItem->mModels.push_back(std::string("meshes/") + basemodels[i] + ".nif");
+            workItem->mKeyframes.push_back(std::string("meshes/") + basemodels[i] + ".kf");
+        }
+
         workItem->mTextures.push_back("textures/_land_default.dds");
 
         mWorkQueue->addWorkItem(workItem);
@@ -291,7 +336,7 @@ namespace MWRender
 
     osg::Group* RenderingManager::getLightRoot()
     {
-        return mLightRoot.get();
+        return mSceneRoot.get();
     }
 
     void RenderingManager::setNightEyeFactor(float factor)
@@ -333,15 +378,17 @@ namespace MWRender
     {
         setAmbientColour(SceneUtil::colourFromRGB(cell->mAmbi.mAmbient));
 
-        mSunLight->setDiffuse(SceneUtil::colourFromRGB(cell->mAmbi.mSunlight));
+        osg::Vec4f diffuse = SceneUtil::colourFromRGB(cell->mAmbi.mSunlight);
+        mSunLight->setDiffuse(diffuse);
+        mSunLight->setSpecular(diffuse);
         mSunLight->setDirection(osg::Vec3f(1.f,-1.f,-1.f));
     }
 
-    void RenderingManager::setSunColour(const osg::Vec4f &colour)
+    void RenderingManager::setSunColour(const osg::Vec4f& diffuse, const osg::Vec4f& specular)
     {
         // need to wrap this in a StateUpdater?
-        mSunLight->setDiffuse(colour);
-        mSunLight->setSpecular(colour);
+        mSunLight->setDiffuse(diffuse);
+        mSunLight->setSpecular(specular);
     }
 
     void RenderingManager::setSunDirection(const osg::Vec3f &direction)
@@ -353,12 +400,6 @@ namespace MWRender
         mSky->setSunDirection(position);
     }
 
-    osg::Vec3f RenderingManager::getEyePos()
-    {
-        osg::Vec3d eye = mViewer->getCameraManipulator()->getMatrix().getTrans();
-        return eye;
-    }
-
     void RenderingManager::addCell(const MWWorld::CellStore *store)
     {
         mPathgrid->addCell(store);
@@ -368,7 +409,6 @@ namespace MWRender
         if (store->getCell()->isExterior())
             mTerrain->loadCell(store->getCell()->getGridX(), store->getCell()->getGridY());
     }
-
     void RenderingManager::removeCell(const MWWorld::CellStore *store)
     {
         mPathgrid->removeCell(store);
@@ -411,14 +451,6 @@ namespace MWRender
             mViewer->getCamera()->setCullMask(mask);
             return enabled;
         }
-        /*
-        else //if (mode == Render_BoundingBoxes)
-        {
-            bool show = !mRendering.getScene()->getShowBoundingBoxes();
-            mRendering.getScene()->showBoundingBoxes(show);
-            return show;
-        }
-        */
         return false;
     }
 
@@ -443,15 +475,17 @@ namespace MWRender
 
     void RenderingManager::update(float dt, bool paused)
     {
+        reportStats();
+
         mUnrefQueue->flush(mWorkQueue.get());
 
         if (!paused)
         {
             mEffectManager->update(dt);
             mSky->update(dt);
+            mWater->update(dt);
         }
 
-        mWater->update(dt);
         mCamera->update(dt, paused);
 
         osg::Vec3f focal, cameraPos;
@@ -589,7 +623,7 @@ namespace MWRender
         image->setPixelFormat(texture->getInternalFormat());
 
         rttCamera->setUpdateCallback(new NoTraverseCallback);
-        rttCamera->addChild(mLightRoot);
+        rttCamera->addChild(mSceneRoot);
         rttCamera->setCullMask(mViewer->getCamera()->getCullMask() & (~Mask_GUI));
 
         mRootNode->addChild(rttCamera);
@@ -611,7 +645,6 @@ namespace MWRender
         mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
 
         rttCamera->removeChildren(0, rttCamera->getNumChildren());
-        rttCamera->setGraphicsContext(NULL);
         mRootNode->removeChild(rttCamera);
     }
 
@@ -654,6 +687,7 @@ namespace MWRender
     {
         RenderingManager::RayResult result;
         result.mHit = false;
+        result.mRatio = 0;
         if (intersector->containsIntersections())
         {
             result.mHit = true;
@@ -661,6 +695,7 @@ namespace MWRender
 
             result.mHitPointWorld = intersection.getWorldIntersectPoint();
             result.mHitNormalWorld = intersection.getWorldIntersectNormal();
+            result.mRatio = intersection.ratio;
 
             PtrHolder* ptrHolder = NULL;
             for (osg::NodePath::const_iterator it = intersection.nodePath.begin(); it != intersection.nodePath.end(); ++it)
@@ -732,9 +767,9 @@ namespace MWRender
         mObjects->updatePtr(old, updated);
     }
 
-    void RenderingManager::spawnEffect(const std::string &model, const std::string &texture, const osg::Vec3f &worldPosition, float scale)
+    void RenderingManager::spawnEffect(const std::string &model, const std::string &texture, const osg::Vec3f &worldPosition, float scale, bool isMagicVFX)
     {
-        mEffectManager->addEffect(model, texture, worldPosition, scale);
+        mEffectManager->addEffect(model, texture, worldPosition, scale, isMagicVFX);
     }
 
     void RenderingManager::notifyWorldSpaceChanged()
@@ -772,7 +807,8 @@ namespace MWRender
         {
             mPlayerNode = new SceneUtil::PositionAttitudeTransform;
             mPlayerNode->setNodeMask(Mask_Player);
-            mLightRoot->addChild(mPlayerNode);
+            mPlayerNode->setName("Player Root");
+            mSceneRoot->addChild(mPlayerNode);
         }
 
         mPlayerNode->setUserDataContainer(new osg::DefaultUserDataContainer);
@@ -785,8 +821,8 @@ namespace MWRender
 
     void RenderingManager::renderPlayer(const MWWorld::Ptr &player)
     {
-        mPlayerAnimation.reset(new NpcAnimation(player, player.getRefData().getBaseNode(), mResourceSystem, 0, false, NpcAnimation::VM_Normal,
-                                                mFirstPersonFieldOfView));
+        mPlayerAnimation = new NpcAnimation(player, player.getRefData().getBaseNode(), mResourceSystem, 0, NpcAnimation::VM_Normal,
+                                                mFirstPersonFieldOfView);
 
         mCamera->setAnimation(mPlayerAnimation.get());
         mCamera->attachTo(player);
@@ -836,16 +872,18 @@ namespace MWRender
 
     void RenderingManager::updateTextureFiltering()
     {
-        if (mTerrain.get())
-            mTerrain->updateCache();
+        mViewer->stopThreading();
 
         mResourceSystem->getSceneManager()->setFilterSettings(
             Settings::Manager::getString("texture mag filter", "General"),
             Settings::Manager::getString("texture min filter", "General"),
             Settings::Manager::getString("texture mipmap", "General"),
-            Settings::Manager::getInt("anisotropy", "General"),
-            mViewer
+            Settings::Manager::getInt("anisotropy", "General")
         );
+
+        mTerrain->updateTextureFiltering();
+
+        mViewer->startThreading();
     }
 
     void RenderingManager::updateAmbient()
@@ -865,6 +903,18 @@ namespace MWRender
         mStateUpdater->setFogColor(color);
     }
 
+    void RenderingManager::reportStats()
+    {
+        osg::Stats* stats = mViewer->getViewerStats();
+        unsigned int frameNumber = mViewer->getFrameStamp()->getFrameNumber();
+        if (stats->collectStats("resource"))
+        {
+            stats->setAttribute(frameNumber, "UnrefQueue", mUnrefQueue->getNumItems());
+
+            mTerrain->reportStats(frameNumber, stats);
+        }
+    }
+
     void RenderingManager::processChangedSettings(const Settings::CategorySettingVector &changed)
     {
         for (Settings::CategorySettingVector::const_iterator it = changed.begin(); it != changed.end(); ++it)
@@ -990,8 +1040,17 @@ namespace MWRender
         if (mFieldOfViewOverridden == true)
         {
             mFieldOfViewOverridden = false;
+
             updateProjectionMatrix();
         }
     }
+    void RenderingManager::exportSceneGraph(const MWWorld::Ptr &ptr, const std::string &filename, const std::string &format)
+    {
+        osg::Node* node = mViewer->getSceneData();
+        if (!ptr.isEmpty())
+            node = ptr.getRefData().getBaseNode();
+
+        SceneUtil::writeScene(node, filename, format);
+    }
 
 }
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 4dda6f273..b1bb9fe0d 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -63,7 +63,7 @@ namespace MWRender
     class RenderingManager : public MWRender::RenderingInterface
     {
     public:
-        RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, Resource::ResourceSystem* resourceSystem,
+        RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
                          const Fallback::Map* fallback, const std::string& resourcePath);
         ~RenderingManager();
 
@@ -91,7 +91,7 @@ namespace MWRender
         void skySetMoonColour(bool red);
 
         void setSunDirection(const osg::Vec3f& direction);
-        void setSunColour(const osg::Vec4f& colour);
+        void setSunColour(const osg::Vec4f& diffuse, const osg::Vec4f& specular);
 
         void configureAmbient(const ESM::Cell* cell);
         void configureFog(const ESM::Cell* cell);
@@ -120,6 +120,7 @@ namespace MWRender
             osg::Vec3f mHitNormalWorld;
             osg::Vec3f mHitPointWorld;
             MWWorld::Ptr mHitObject;
+            float mRatio;
         };
 
         RayResult castRay(const osg::Vec3f& origin, const osg::Vec3f& dest, bool ignorePlayer, bool ignoreActors=false);
@@ -137,9 +138,7 @@ namespace MWRender
 
         SkyManager* getSkyManager();
 
-        osg::Vec3f getEyePos();
-
-        void spawnEffect(const std::string &model, const std::string &texture, const osg::Vec3f &worldPosition, float scale = 1.f);
+        void spawnEffect(const std::string &model, const std::string &texture, const osg::Vec3f &worldPosition, float scale = 1.f, bool isMagicVFX = true);
 
         /// Clear all savegame-specific data
         void clear();
@@ -189,15 +188,19 @@ namespace MWRender
         /// reset a previous overrideFieldOfView() call, i.e. revert to field of view specified in the settings file.
         void resetFieldOfView();
 
+        void exportSceneGraph(const MWWorld::Ptr& ptr, const std::string& filename, const std::string& format);
+
     private:
         void updateProjectionMatrix();
         void updateTextureFiltering();
         void updateAmbient();
         void setFogColor(const osg::Vec4f& color);
 
+        void reportStats();
+
         osg::ref_ptr<osgViewer::Viewer> mViewer;
         osg::ref_ptr<osg::Group> mRootNode;
-        osg::ref_ptr<osg::Group> mLightRoot;
+        osg::ref_ptr<osg::Group> mSceneRoot;
         Resource::ResourceSystem* mResourceSystem;
 
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
@@ -211,7 +214,7 @@ namespace MWRender
         std::auto_ptr<Terrain::World> mTerrain;
         std::auto_ptr<SkyManager> mSky;
         std::auto_ptr<EffectManager> mEffectManager;
-        std::auto_ptr<NpcAnimation> mPlayerAnimation;
+        osg::ref_ptr<NpcAnimation> mPlayerAnimation;
         osg::ref_ptr<SceneUtil::PositionAttitudeTransform> mPlayerNode;
         std::auto_ptr<Camera> mCamera;
         osg::Vec3f mCurrentCameraPos;
diff --git a/apps/openmw/mwrender/rendermode.hpp b/apps/openmw/mwrender/rendermode.hpp
index ba767bc55..2847888d1 100644
--- a/apps/openmw/mwrender/rendermode.hpp
+++ b/apps/openmw/mwrender/rendermode.hpp
@@ -9,7 +9,6 @@ namespace MWRender
         Render_CollisionDebug,
         Render_Wireframe,
         Render_Pathgrid,
-        Render_BoundingBoxes,
         Render_Water,
         Render_Scene
     };
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index f43f1ee5c..00082f033 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -3,7 +3,6 @@
 #include <iomanip>
 
 #include <osg/PolygonOffset>
-#include <osg/Geode>
 #include <osg/Texture2D>
 #include <osg/Material>
 #include <osg/Depth>
@@ -40,11 +39,11 @@ namespace
         {
             std::ostringstream texname;
             texname << "textures/water/" << tex << std::setw(2) << std::setfill('0') << i << ".dds";
-            osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(resourceSystem->getImageManager()->getImage(texname.str())));
-            tex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
-            tex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
-            resourceSystem->getSceneManager()->applyFilterSettings(tex);
-            textures.push_back(tex);
+            osg::ref_ptr<osg::Texture2D> tex2 (new osg::Texture2D(resourceSystem->getImageManager()->getImage(texname.str())));
+            tex2->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+            tex2->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+            resourceSystem->getSceneManager()->applyFilterSettings(tex2);
+            textures.push_back(tex2);
         }
 
         osg::ref_ptr<NifOsg::FlipController> controller (new NifOsg::FlipController(0, 0.3f/rippleFrameCount, textures));
@@ -85,10 +84,7 @@ namespace MWRender
 RippleSimulation::RippleSimulation(osg::Group *parent, Resource::ResourceSystem* resourceSystem, const Fallback::Map* fallback)
     : mParent(parent)
 {
-    osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-
     mParticleSystem = new osgParticle::ParticleSystem;
-    geode->addDrawable(mParticleSystem);
 
     mParticleSystem->setParticleAlignment(osgParticle::ParticleSystem::FIXED);
     mParticleSystem->setAlignVectorX(osg::Vec3f(1,0,0));
@@ -106,7 +102,7 @@ RippleSimulation::RippleSimulation(osg::Group *parent, Resource::ResourceSystem*
 
     mParticleNode = new osg::PositionAttitudeTransform;
     mParticleNode->addChild(updater);
-    mParticleNode->addChild(geode);
+    mParticleNode->addChild(mParticleSystem);
     mParticleNode->setNodeMask(Mask_Effect);
 
     createWaterRippleStateSet(resourceSystem, fallback, mParticleNode);
@@ -121,6 +117,7 @@ RippleSimulation::~RippleSimulation()
 
 void RippleSimulation::update(float dt)
 {
+    const MWBase::World* world = MWBase::Environment::get().getWorld();
     for (std::vector<Emitter>::iterator it=mEmitters.begin(); it !=mEmitters.end(); ++it)
     {
         if (it->mPtr == MWBase::Environment::get().getWorld ()->getPlayerPtr())
@@ -132,10 +129,8 @@ void RippleSimulation::update(float dt)
 
         osg::Vec3f currentPos (it->mPtr.getRefData().getPosition().asVec3());
 
-        if ( (currentPos - it->mLastEmitPosition).length() > 10
-             // Only emit when close to the water surface, not above it and not too deep in the water
-            && MWBase::Environment::get().getWorld ()->isUnderwater (it->mPtr.getCell(), it->mPtr.getRefData().getPosition().asVec3())
-             && !MWBase::Environment::get().getWorld()->isSubmerged(it->mPtr))
+        bool shouldEmit = ( world->isUnderwater (it->mPtr.getCell(), it->mPtr.getRefData().getPosition().asVec3()) && !world->isSubmerged(it->mPtr) ) || world->isWalkingOnWater(it->mPtr);
+        if ( shouldEmit && (currentPos - it->mLastEmitPosition).length() > 10 )
         {
             it->mLastEmitPosition = currentPos;
 
diff --git a/apps/openmw/mwrender/rotatecontroller.cpp b/apps/openmw/mwrender/rotatecontroller.cpp
index 11f5b943d..534cc7490 100644
--- a/apps/openmw/mwrender/rotatecontroller.cpp
+++ b/apps/openmw/mwrender/rotatecontroller.cpp
@@ -44,11 +44,11 @@ void RotateController::operator()(osg::Node *node, osg::NodeVisitor *nv)
 osg::Quat RotateController::getWorldOrientation(osg::Node *node)
 {
     // this could be optimized later, we just need the world orientation, not the full matrix
-    osg::MatrixList worldMats = node->getWorldMatrices(mRelativeTo);
+    osg::NodePathList nodepaths = node->getParentalNodePaths(mRelativeTo);
     osg::Quat worldOrient;
-    if (!worldMats.empty())
+    if (!nodepaths.empty())
     {
-        osg::Matrixf worldMat = worldMats[0];
+        osg::Matrixf worldMat = osg::computeLocalToWorld(nodepaths[0]);
         worldOrient = worldMat.getRotate();
     }
     return worldOrient;
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 40283ba27..13fbbc99c 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -5,18 +5,17 @@
 #include <osg/ClipPlane>
 #include <osg/Fog>
 #include <osg/Transform>
-#include <osg/Geode>
 #include <osg/Depth>
 #include <osg/Geometry>
 #include <osg/Material>
 #include <osg/TexEnvCombine>
 #include <osg/TexMat>
-#include <osg/Version>
 #include <osg/OcclusionQueryNode>
 #include <osg/ColorMask>
-#include <osg/MatrixTransform>
+#include <osg/PositionAttitudeTransform>
 #include <osg/BlendFunc>
 #include <osg/AlphaFunc>
+#include <osg/PolygonOffset>
 #include <osg/observer_ptr>
 
 #include <osgParticle/ParticleSystem>
@@ -348,14 +347,6 @@ public:
     {
     }
 
-    void apply(osg::Geode &geode)
-    {
-        for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
-        {
-            osg::Drawable* drw = geode.getDrawable(i);
-            apply(*drw);
-        }
-    }
     void apply(osg::Drawable& drw)
     {
         osg::Geometry* geom = drw.asGeometry();
@@ -439,12 +430,10 @@ class CelestialBody
 public:
     CelestialBody(osg::Group* parentNode, float scaleFactor, int numUvSets)
     {
-        mGeode = new osg::Geode;
-        osg::ref_ptr<osg::Geometry> geom = createTexturedQuad(numUvSets);
-        mGeode->addDrawable(geom);
+        mGeom = createTexturedQuad(numUvSets);
         mTransform = new osg::PositionAttitudeTransform;
         mTransform->setScale(osg::Vec3f(450,450,450) * scaleFactor);
-        mTransform->addChild(mGeode);
+        mTransform->addChild(mGeom);
 
         parentNode->addChild(mTransform);
     }
@@ -461,7 +450,7 @@ public:
 protected:
     static const float mDistance;
     osg::ref_ptr<osg::PositionAttitudeTransform> mTransform;
-    osg::ref_ptr<osg::Geode> mGeode;
+    osg::ref_ptr<osg::Geometry> mGeom;
 };
 
 const float CelestialBody::mDistance = 1000.0f;
@@ -480,18 +469,24 @@ public:
         sunTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         sunTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
-        mGeode->getOrCreateStateSet()->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
+        mGeom->getOrCreateStateSet()->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
 
         osg::ref_ptr<osg::Group> queryNode (new osg::Group);
         // Need to render after the world geometry so we can correctly test for occlusions
-        queryNode->getOrCreateStateSet()->setRenderBinDetails(RenderBin_OcclusionQuery, "RenderBin");
-        queryNode->getOrCreateStateSet()->setNestRenderBins(false);
+        osg::StateSet* stateset = queryNode->getOrCreateStateSet();
+        stateset->setRenderBinDetails(RenderBin_OcclusionQuery, "RenderBin");
+        stateset->setNestRenderBins(false);
         // Set up alpha testing on the occlusion testing subgraph, that way we can get the occlusion tested fragments to match the circular shape of the sun
         osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc);
         alphaFunc->setFunction(osg::AlphaFunc::GREATER, 0.8);
-        queryNode->getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
-        queryNode->getOrCreateStateSet()->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
-        queryNode->getOrCreateStateSet()->setAttributeAndModes(createUnlitMaterial(), osg::StateAttribute::ON);
+        stateset->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
+        stateset->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
+        stateset->setAttributeAndModes(createUnlitMaterial(), osg::StateAttribute::ON);
+        // Disable writing to the color buffer. We are using this geometry for visibility tests only.
+        osg::ref_ptr<osg::ColorMask> colormask (new osg::ColorMask(0, 0, 0, 0));
+        stateset->setAttributeAndModes(colormask, osg::StateAttribute::ON);
+        osg::ref_ptr<osg::PolygonOffset> po (new osg::PolygonOffset( -1., -1. ));
+        stateset->setAttributeAndModes(po, osg::StateAttribute::ON);
 
         mTransform->addChild(queryNode);
 
@@ -542,6 +537,12 @@ public:
     }
 
 private:
+    class DummyComputeBoundCallback : public osg::Node::ComputeBoundingSphereCallback
+    {
+    public:
+        virtual osg::BoundingSphere computeBound(const osg::Node& node) const { return osg::BoundingSphere(); }
+    };
+
     /// @param queryVisible If true, queries the amount of visible pixels. If false, queries the total amount of pixels.
     osg::ref_ptr<osg::OcclusionQueryNode> createOcclusionQueryNode(osg::Group* parent, bool queryVisible)
     {
@@ -554,33 +555,21 @@ private:
         // Note the debug geometry setDebugDisplay(true) is always DYNAMIC and that can't be changed, not a big deal.
         oqn->getQueryGeometry()->setDataVariance(osg::Object::STATIC);
 
-        osg::ref_ptr<osg::Geode> queryGeode = osg::clone(mGeode.get(), osg::CopyOp::DEEP_COPY_ALL);
-        // Disable writing to the color buffer. We are using this geode for visibility tests only.
-        osg::ref_ptr<osg::ColorMask> colormask (new osg::ColorMask(0, 0, 0, 0));
-        queryGeode->getOrCreateStateSet()->setAttributeAndModes(colormask, osg::StateAttribute::ON);
-
-        oqn->addChild(queryGeode);
-
-        // Remove the default OFF|PROTECTED setting for texturing. We *want* to enable texturing for alpha testing purposes
-        oqn->getQueryStateSet()->removeTextureMode(0, GL_TEXTURE_2D);
-
-        // Need to add texture coordinates so that texturing works. A bit ugly, relies on the vertex ordering
-        // used within OcclusionQueryNode.
-        osg::ref_ptr<osg::Vec2Array> texCoordArray (new osg::Vec2Array);
-        for (int i=0; i<8; ++i)
-        {
-            texCoordArray->push_back(osg::Vec2(0,0));
-            texCoordArray->push_back(osg::Vec2(1,0));
-            texCoordArray->push_back(osg::Vec2(0,0));
-            texCoordArray->push_back(osg::Vec2(1,0));
-            texCoordArray->push_back(osg::Vec2(1,1));
-            texCoordArray->push_back(osg::Vec2(0,1));
-            texCoordArray->push_back(osg::Vec2(0,1));
-            texCoordArray->push_back(osg::Vec2(1,1));
-        }
-
-        oqn->getQueryGeometry()->setTexCoordArray(0, texCoordArray, osg::Array::BIND_PER_VERTEX);
-
+        // Set up the query geometry to match the actual sun's rendering shape. osg::OcclusionQueryNode wasn't originally intended to allow this,
+        // normally it would automatically adjust the query geometry to match the sub graph's bounding box. The below hack is needed to
+        // circumvent this.
+        osg::Geometry* queryGeom = oqn->getQueryGeometry();
+        queryGeom->setVertexArray(mGeom->getVertexArray());
+        queryGeom->setTexCoordArray(0, mGeom->getTexCoordArray(0), osg::Array::BIND_PER_VERTEX);
+        queryGeom->removePrimitiveSet(0, oqn->getQueryGeometry()->getNumPrimitiveSets());
+        queryGeom->addPrimitiveSet(mGeom->getPrimitiveSet(0));
+
+        // Hack to disable unwanted awful code inside OcclusionQueryNode::computeBound.
+        oqn->setComputeBoundingSphereCallback(new DummyComputeBoundCallback);
+        // Still need a proper bounding sphere.
+        oqn->setInitialBound(queryGeom->getBound());
+
+        osg::StateSet* queryStateSet = new osg::StateSet;
         if (queryVisible)
         {
             osg::ref_ptr<osg::Depth> depth (new osg::Depth);
@@ -590,12 +579,14 @@ private:
             // We want the sun glare to be "infinitely" far away.
             depth->setZNear(1.0);
             depth->setZFar(1.0);
-            oqn->getQueryStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
+            depth->setWriteMask(false);
+            queryStateSet->setAttributeAndModes(depth, osg::StateAttribute::ON);
         }
         else
         {
-            oqn->getQueryStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+            queryStateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
         }
+        oqn->setQueryStateSet(queryStateSet);
 
         parent->addChild(oqn);
 
@@ -614,12 +605,10 @@ private:
 
         mTransform->addChild(transform);
 
-        osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-        transform->addChild(geode);
-
-        geode->addDrawable(createTexturedQuad());
+        osg::ref_ptr<osg::Geometry> geom = createTexturedQuad();
+        transform->addChild(geom);
 
-        osg::StateSet* stateset = geode->getOrCreateStateSet();
+        osg::StateSet* stateset = geom->getOrCreateStateSet();
 
         stateset->setTextureAttributeAndModes(0, tex, osg::StateAttribute::ON);
         stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
@@ -650,11 +639,9 @@ private:
         camera->setRenderOrder(osg::Camera::NESTED_RENDER);
         camera->setAllowEventFocus(false);
 
-        osg::ref_ptr<osg::Geode> geode (new osg::Geode);
         osg::ref_ptr<osg::Geometry> geom = osg::createTexturedQuadGeometry(osg::Vec3f(-1,-1,0), osg::Vec3f(2,0,0), osg::Vec3f(0,2,0));
-        geode->addDrawable(geom);
 
-        camera->addChild(geode);
+        camera->addChild(geom);
 
         osg::StateSet* stateset = geom->getOrCreateStateSet();
 
@@ -941,12 +928,12 @@ public:
         setPhase(MoonState::Phase_Full);
         setVisible(true);
 
-        mGeode->addUpdateCallback(mUpdater);
+        mGeom->addUpdateCallback(mUpdater);
     }
 
     ~Moon()
     {
-        mGeode->removeUpdateCallback(mUpdater);
+        mGeom->removeUpdateCallback(mUpdater);
     }
 
     virtual void adjustTransparency(const float ratio)
@@ -956,8 +943,8 @@ public:
 
     void setState(const MoonState& state)
     {
-        float radsX = ((state.mRotationFromHorizon) * M_PI) / 180.0f;
-        float radsZ = ((state.mRotationFromNorth) * M_PI) / 180.0f;
+        float radsX = ((state.mRotationFromHorizon) * static_cast<float>(osg::PI)) / 180.0f;
+        float radsZ = ((state.mRotationFromNorth) * static_cast<float>(osg::PI)) / 180.0f;
 
         osg::Quat rotX(radsX, osg::Vec3f(1.0f, 0.0f, 0.0f));
         osg::Quat rotZ(radsZ, osg::Vec3f(0.0f, 0.0f, 1.0f));
@@ -967,7 +954,7 @@ public:
 
         // The moon quad is initially oriented facing down, so we need to offset its X-axis
         // rotation to rotate it to face the camera when sitting at the horizon.
-        osg::Quat attX((-M_PI / 2.0f) + radsX, osg::Vec3f(1.0f, 0.0f, 0.0f));
+        osg::Quat attX((-static_cast<float>(osg::PI) / 2.0f) + radsX, osg::Vec3f(1.0f, 0.0f, 0.0f));
         mTransform->setAttitude(attX * rotZ);
 
         setPhase(state.mPhase);
@@ -1126,6 +1113,10 @@ SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneMana
     , mSunEnabled(true)
 {
     osg::ref_ptr<CameraRelativeTransform> skyroot (new CameraRelativeTransform);
+    skyroot->setName("Sky Root");
+    // Assign empty program to specify we don't want shaders
+    // The shaders generated by the SceneManager can't handle everything we need
+    skyroot->getOrCreateStateSet()->setAttributeAndModes(new osg::Program(), osg::StateAttribute::OVERRIDE);
 
     skyroot->setNodeMask(Mask_Sky);
     parentNode->addChild(skyroot);
@@ -1282,11 +1273,7 @@ public:
                 if (stateset->getAttribute(osg::StateAttribute::MATERIAL))
                 {
                     SceneUtil::CompositeStateSetUpdater* composite = NULL;
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
                     osg::Callback* callback = node.getUpdateCallback();
-#else
-                    osg::NodeCallback* callback = node.getUpdateCallback();
-#endif
                     while (callback)
                     {
                         if ((composite = dynamic_cast<SceneUtil::CompositeStateSetUpdater*>(callback)))
@@ -1343,7 +1330,7 @@ void SkyManager::createRain()
     mRainParticleSystem = new osgParticle::ParticleSystem;
     mRainParticleSystem->setParticleAlignment(osgParticle::ParticleSystem::FIXED);
     mRainParticleSystem->setAlignVectorX(osg::Vec3f(0.1,0,0));
-    mRainParticleSystem->setAlignVectorY(osg::Vec3f(0,0,-1));
+    mRainParticleSystem->setAlignVectorY(osg::Vec3f(0,0,1));
 
     osg::ref_ptr<osg::StateSet> stateset (mRainParticleSystem->getOrCreateStateSet());
 
@@ -1382,11 +1369,8 @@ void SkyManager::createRain()
     osg::ref_ptr<osgParticle::ParticleSystemUpdater> updater (new osgParticle::ParticleSystemUpdater);
     updater->addParticleSystem(mRainParticleSystem);
 
-    osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-    geode->addDrawable(mRainParticleSystem);
-
     mRainNode->addChild(emitter);
-    mRainNode->addChild(geode);
+    mRainNode->addChild(mRainParticleSystem);
     mRainNode->addChild(updater);
 
     mRainFader = new RainFader;
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index 741911b23..e047a9832 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -3,16 +3,17 @@
 
 #include <string>
 #include <memory>
+#include <vector>
 
 #include <osg/ref_ptr>
 #include <osg/Vec4f>
-#include <osg/PositionAttitudeTransform>
 
 namespace osg
 {
     class Group;
     class Node;
     class Material;
+    class PositionAttitudeTransform;
 }
 
 namespace osgParticle
@@ -210,7 +211,7 @@ namespace MWRender
 
         osg::Vec3f mStormDirection;
 
-        // remember some settings so we don't have to apply them again if they didnt change
+        // remember some settings so we don't have to apply them again if they didn't change
         std::string mClouds;
         std::string mNextClouds;
         float mCloudBlendFactor;
diff --git a/apps/openmw/mwrender/terrainstorage.cpp b/apps/openmw/mwrender/terrainstorage.cpp
index 02947b5dd..311eb1621 100644
--- a/apps/openmw/mwrender/terrainstorage.cpp
+++ b/apps/openmw/mwrender/terrainstorage.cpp
@@ -9,21 +9,9 @@
 namespace MWRender
 {
 
-    TerrainStorage::TerrainStorage(const VFS::Manager* vfs, bool preload)
-        : ESMTerrain::Storage(vfs)
+    TerrainStorage::TerrainStorage(const VFS::Manager* vfs, const std::string& normalMapPattern, const std::string& normalHeightMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern, bool autoUseSpecularMaps)
+        : ESMTerrain::Storage(vfs, normalMapPattern, normalHeightMapPattern, autoUseNormalMaps, specularMapPattern, autoUseSpecularMaps)
     {
-        if (preload)
-        {
-            const MWWorld::ESMStore &esmStore =
-                MWBase::Environment::get().getWorld()->getStore();
-
-            MWWorld::Store<ESM::Land>::iterator it = esmStore.get<ESM::Land>().begin();
-            for (; it != esmStore.get<ESM::Land>().end(); ++it)
-            {
-                const ESM::Land* land = &*it;
-                land->loadData(ESM::Land::DATA_VCLR|ESM::Land::DATA_VHGT|ESM::Land::DATA_VNML|ESM::Land::DATA_VTEX);
-            }
-        }
     }
 
     void TerrainStorage::getBounds(float& minX, float& maxX, float& minY, float& maxY)
@@ -55,7 +43,8 @@ namespace MWRender
     {
         const MWWorld::ESMStore &esmStore =
             MWBase::Environment::get().getWorld()->getStore();
-        ESM::Land* land = esmStore.get<ESM::Land>().search(cellX, cellY);
+
+        const ESM::Land* land = esmStore.get<ESM::Land>().search(cellX, cellY);
         if (!land)
             return NULL;
 
diff --git a/apps/openmw/mwrender/terrainstorage.hpp b/apps/openmw/mwrender/terrainstorage.hpp
index a12ffd540..6fa8b98ce 100644
--- a/apps/openmw/mwrender/terrainstorage.hpp
+++ b/apps/openmw/mwrender/terrainstorage.hpp
@@ -14,9 +14,7 @@ namespace MWRender
         virtual const ESM::LandTexture* getLandTexture(int index, short plugin);
     public:
 
-        ///@param preload Preload all Land records at startup? If using the multithreaded terrain component, this
-        /// should be set to "true" in order to avoid race conditions.
-        TerrainStorage(const VFS::Manager* vfs, bool preload);
+        TerrainStorage(const VFS::Manager* vfs, const std::string& normalMapPattern = "", const std::string& normalHeightMapPatteern = "", bool autoUseNormalMaps = false, const std::string& specularMapPattern = "", bool autoUseSpecularMaps = false);
 
         /// Get bounds of the whole terrain in cell units
         virtual void getBounds(float& minX, float& maxX, float& minY, float& maxY);
diff --git a/apps/openmw/mwrender/util.cpp b/apps/openmw/mwrender/util.cpp
index 0e1eaf0f4..74047b58b 100644
--- a/apps/openmw/mwrender/util.cpp
+++ b/apps/openmw/mwrender/util.cpp
@@ -1,14 +1,47 @@
 #include "util.hpp"
 
 #include <osg/Node>
+#include <osg/ValueObject>
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/sceneutil/visitor.hpp>
 
 namespace MWRender
 {
 
+class TextureOverrideVisitor : public osg::NodeVisitor
+    {
+    public:
+        TextureOverrideVisitor(std::string texture, Resource::ResourceSystem* resourcesystem)
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            , mTexture(texture)
+            , mResourcesystem(resourcesystem)
+        {
+        }
+
+        virtual void apply(osg::Node& node)
+        {
+            int index;
+            osg::ref_ptr<osg::Node> nodePtr(&node);
+            if (node.getUserValue("overrideFx", index))
+            {
+                if (index == 1) 
+                    overrideTexture(mTexture, mResourcesystem, nodePtr);
+            }
+            traverse(node);
+        }
+        std::string mTexture;
+        Resource::ResourceSystem* mResourcesystem;
+};
+
+void overrideFirstRootTexture(const std::string &texture, Resource::ResourceSystem *resourceSystem, osg::ref_ptr<osg::Node> node)
+{
+    TextureOverrideVisitor overrideVisitor(texture, resourceSystem);
+    node->accept(overrideVisitor);
+}
+
 void overrideTexture(const std::string &texture, Resource::ResourceSystem *resourceSystem, osg::ref_ptr<osg::Node> node)
 {
     if (texture.empty())
@@ -18,10 +51,11 @@ void overrideTexture(const std::string &texture, Resource::ResourceSystem *resou
     osg::ref_ptr<osg::Texture2D> tex = new osg::Texture2D(resourceSystem->getImageManager()->getImage(correctedTexture));
     tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
     tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+    tex->setName("diffuseMap");
 
     osg::ref_ptr<osg::StateSet> stateset;
     if (node->getStateSet())
-        stateset = static_cast<osg::StateSet*>(node->getStateSet()->clone(osg::CopyOp::SHALLOW_COPY));
+        stateset = new osg::StateSet(*node->getStateSet(), osg::CopyOp::SHALLOW_COPY);
     else
         stateset = new osg::StateSet;
 
diff --git a/apps/openmw/mwrender/util.hpp b/apps/openmw/mwrender/util.hpp
index 815e34596..eebcfd9b0 100644
--- a/apps/openmw/mwrender/util.hpp
+++ b/apps/openmw/mwrender/util.hpp
@@ -17,6 +17,10 @@ namespace Resource
 
 namespace MWRender
 {
+    // Overrides the texture of nodes in the mesh that had the same NiTexturingProperty as the first NiTexturingProperty of the .NIF file's root node,
+    // if it had a NiTexturingProperty. Used for applying "particle textures" to magic effects.
+    void overrideFirstRootTexture(const std::string &texture, Resource::ResourceSystem *resourceSystem, osg::ref_ptr<osg::Node> node);
+
     void overrideTexture(const std::string& texture, Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Node> node);
 
     // Node callback to entirely skip the traversal.
diff --git a/apps/openmw/mwrender/vismask.hpp b/apps/openmw/mwrender/vismask.hpp
index ce13758e3..c70bcc71b 100644
--- a/apps/openmw/mwrender/vismask.hpp
+++ b/apps/openmw/mwrender/vismask.hpp
@@ -42,7 +42,7 @@ namespace MWRender
         Mask_Scene = (1<<12),
         Mask_GUI = (1<<13),
 
-        // Set on a Geode
+        // Set on a ParticleSystem Drawable
         Mask_ParticleSystem = (1<<14),
 
         // Set on cameras within the main scene graph
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index dba85aeb7..2e10d42e5 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -5,17 +5,13 @@
 #include <osg/Fog>
 #include <osg/Depth>
 #include <osg/Group>
-#include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/Material>
 #include <osg/PositionAttitudeTransform>
-#include <osg/Depth>
 #include <osg/ClipNode>
-#include <osg/MatrixTransform>
 #include <osg/FrontFace>
 #include <osg/Shader>
 #include <osg/GLExtensions>
-#include <osg/UserDataContainer>
 
 #include <osgDB/ReadFile>
 
@@ -27,10 +23,15 @@
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
+#include <components/resource/scenemanager.hpp>
+
+#include <components/sceneutil/waterutil.hpp>
 
 #include <components/nifosg/controller.hpp>
 #include <components/sceneutil/controller.hpp>
 
+#include <components/shader/shadermanager.hpp>
+
 #include <components/settings/settings.hpp>
 
 #include <components/esm/loadcell.hpp>
@@ -44,58 +45,6 @@
 #include "renderbin.hpp"
 #include "util.hpp"
 
-namespace
-{
-
-    osg::ref_ptr<osg::Geometry> createWaterGeometry(float size, int segments, float textureRepeats)
-    {
-        osg::ref_ptr<osg::Vec3Array> verts (new osg::Vec3Array);
-        osg::ref_ptr<osg::Vec2Array> texcoords (new osg::Vec2Array);
-
-        // some drivers don't like huge triangles, so we do some subdivisons
-        // a paged solution would be even better
-        const float step = size/segments;
-        const float texCoordStep = textureRepeats / segments;
-        for (int x=0; x<segments; ++x)
-        {
-            for (int y=0; y<segments; ++y)
-            {
-                float x1 = -size/2.f + x*step;
-                float y1 = -size/2.f + y*step;
-                float x2 = x1 + step;
-                float y2 = y1 + step;
-
-                verts->push_back(osg::Vec3f(x1, y2, 0.f));
-                verts->push_back(osg::Vec3f(x1, y1, 0.f));
-                verts->push_back(osg::Vec3f(x2, y1, 0.f));
-                verts->push_back(osg::Vec3f(x2, y2, 0.f));
-
-                float u1 = x*texCoordStep;
-                float v1 = y*texCoordStep;
-                float u2 = u1 + texCoordStep;
-                float v2 = v1 + texCoordStep;
-
-                texcoords->push_back(osg::Vec2f(u1, v2));
-                texcoords->push_back(osg::Vec2f(u1, v1));
-                texcoords->push_back(osg::Vec2f(u2, v1));
-                texcoords->push_back(osg::Vec2f(u2, v2));
-            }
-        }
-
-        osg::ref_ptr<osg::Geometry> waterGeom (new osg::Geometry);
-        waterGeom->setVertexArray(verts);
-        waterGeom->setTexCoordArray(0, texcoords);
-
-        osg::ref_ptr<osg::Vec3Array> normal (new osg::Vec3Array);
-        normal->push_back(osg::Vec3f(0,0,1));
-        waterGeom->setNormalArray(normal, osg::Array::BIND_OVERALL);
-
-        waterGeom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS,0,verts->size()));
-        return waterGeom;
-    }
-
-}
-
 namespace MWRender
 {
 
@@ -213,7 +162,7 @@ private:
 };
 
 /// Moves water mesh away from the camera slightly if the camera gets too close on the Z axis.
-/// The offset works around graphics artifacts that occured with the GL_DEPTH_CLAMP when the camera gets extremely close to the mesh (seen on NVIDIA at least).
+/// The offset works around graphics artifacts that occurred with the GL_DEPTH_CLAMP when the camera gets extremely close to the mesh (seen on NVIDIA at least).
 /// Must be added as a Cull callback.
 class FudgeCallback : public osg::NodeCallback
 {
@@ -242,29 +191,6 @@ public:
     }
 };
 
-osg::ref_ptr<osg::Shader> readShader (osg::Shader::Type type, const std::string& file, const std::map<std::string, std::string>& defineMap = std::map<std::string, std::string>())
-{
-    osg::ref_ptr<osg::Shader> shader (new osg::Shader(type));
-
-    // use boost in favor of osg::Shader::readShaderFile, to handle utf-8 path issues on Windows
-    boost::filesystem::ifstream inStream;
-    inStream.open(boost::filesystem::path(file));
-    std::stringstream strstream;
-    strstream << inStream.rdbuf();
-
-    std::string shaderSource = strstream.str();
-
-    for (std::map<std::string, std::string>::const_iterator it = defineMap.begin(); it != defineMap.end(); ++it)
-    {
-        size_t pos = shaderSource.find(it->first);
-        if (pos != std::string::npos)
-            shaderSource.replace(pos, it->first.length(), it->second);
-    }
-
-    shader->setShaderSource(shaderSource);
-    return shader;
-}
-
 osg::ref_ptr<osg::Image> readPngImage (const std::string& file)
 {
     // use boost in favor of osgDB::readImage, to handle utf-8 path issues on Windows
@@ -296,6 +222,8 @@ public:
         setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
         setReferenceFrame(osg::Camera::RELATIVE_RF);
+        setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
+        setName("RefractionCamera");
 
         setCullMask(Mask_Effect|Mask_Scene|Mask_Terrain|Mask_Actor|Mask_ParticleSystem|Mask_Sky|Mask_Sun|Mask_Player|Mask_Lighting);
         setNodeMask(Mask_RenderToTexture);
@@ -306,7 +234,12 @@ public:
         setUpdateCallback(new NoTraverseCallback);
 
         // No need for fog here, we are already applying fog on the water surface itself as well as underwater fog
-        getOrCreateStateSet()->setMode(GL_FOG, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
+        // assign large value to effectively turn off fog
+        // shaders don't respect glDisable(GL_FOG)
+        osg::ref_ptr<osg::Fog> fog (new osg::Fog);
+        fog->setStart(10000000);
+        fog->setEnd(10000000);
+        getOrCreateStateSet()->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
 
         mClipCullNode = new ClipCullNode;
         addChild(mClipCullNode);
@@ -318,7 +251,6 @@ public:
         mRefractionTexture->setInternalFormat(GL_RGB);
         mRefractionTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
         mRefractionTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-        mRefractionTexture->getOrCreateUserDataContainer()->addDescription("dont_override_filter");
 
         attach(osg::Camera::COLOR_BUFFER, mRefractionTexture);
 
@@ -330,7 +262,6 @@ public:
         mRefractionDepthTexture->setSourceType(GL_UNSIGNED_INT);
         mRefractionDepthTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
         mRefractionDepthTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-        mRefractionDepthTexture->getOrCreateUserDataContainer()->addDescription("dont_override_filter");
 
         attach(osg::Camera::DEPTH_BUFFER, mRefractionDepthTexture);
     }
@@ -374,8 +305,12 @@ public:
         setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
         setReferenceFrame(osg::Camera::RELATIVE_RF);
+        setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
+        setName("ReflectionCamera");
+
+        bool reflectActors = Settings::Manager::getBool("reflect actors", "Water");
 
-        setCullMask(Mask_Effect|Mask_Scene|Mask_Terrain|Mask_Actor|Mask_ParticleSystem|Mask_Sky|Mask_Player|Mask_Lighting);
+        setCullMask(Mask_Effect|Mask_Scene|Mask_Terrain|Mask_ParticleSystem|Mask_Sky|Mask_Player|Mask_Lighting|(reflectActors ? Mask_Actor : 0));
         setNodeMask(Mask_RenderToTexture);
 
         unsigned int rttSize = Settings::Manager::getInt("rtt size", "Water");
@@ -391,7 +326,6 @@ public:
         mReflectionTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
         mReflectionTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         mReflectionTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-        mReflectionTexture->getOrCreateUserDataContainer()->addDescription("dont_override_filter");
 
         attach(osg::Camera::COLOR_BUFFER, mReflectionTexture);
 
@@ -465,25 +399,23 @@ Water::Water(osg::Group *parent, osg::Group* sceneRoot, Resource::ResourceSystem
 {
     mSimulation.reset(new RippleSimulation(parent, resourceSystem, fallback));
 
-    osg::ref_ptr<osg::Geometry> waterGeom = createWaterGeometry(CELL_SIZE*150, 40, 900);
-    waterGeom->setDrawCallback(new DepthClampCallback);
-
-    mWaterGeode = new osg::Geode;
-    mWaterGeode->addDrawable(waterGeom);
-    mWaterGeode->setNodeMask(Mask_Water);
+    mWaterGeom = SceneUtil::createWaterGeometry(CELL_SIZE*150, 40, 900);
+    mWaterGeom->setDrawCallback(new DepthClampCallback);
+    mWaterGeom->setNodeMask(Mask_Water);
 
     if (ico)
-        ico->add(mWaterGeode);
+        ico->add(mWaterGeom);
 
     mWaterNode = new osg::PositionAttitudeTransform;
-    mWaterNode->addChild(mWaterGeode);
+    mWaterNode->setName("Water Root");
+    mWaterNode->addChild(mWaterGeom);
     mWaterNode->addCullCallback(new FudgeCallback);
 
     // simple water fallback for the local map
-    osg::ref_ptr<osg::Geode> geode2 (osg::clone(mWaterGeode.get(), osg::CopyOp::DEEP_COPY_NODES));
-    createSimpleWaterStateSet(geode2, mFallback->getFallbackFloat("Water_Map_Alpha"));
-    geode2->setNodeMask(Mask_SimpleWater);
-    mWaterNode->addChild(geode2);
+    osg::ref_ptr<osg::Geometry> geom2 (osg::clone(mWaterGeom.get(), osg::CopyOp::DEEP_COPY_NODES));
+    createSimpleWaterStateSet(geom2, mFallback->getFallbackFloat("Water_Map_Alpha"));
+    geom2->setNodeMask(Mask_SimpleWater);
+    mWaterNode->addChild(geom2);
 
     mSceneRoot->addChild(mWaterNode);
 
@@ -496,11 +428,13 @@ void Water::updateWaterMaterial()
 {
     if (mReflection)
     {
+        mReflection->removeChildren(0, mReflection->getNumChildren());
         mParent->removeChild(mReflection);
         mReflection = NULL;
     }
     if (mRefraction)
     {
+        mRefraction->removeChildren(0, mRefraction->getNumChildren());
         mParent->removeChild(mRefraction);
         mRefraction = NULL;
     }
@@ -520,36 +454,21 @@ void Water::updateWaterMaterial()
             mParent->addChild(mRefraction);
         }
 
-        createShaderWaterStateSet(mWaterGeode, mReflection, mRefraction);
+        createShaderWaterStateSet(mWaterGeom, mReflection, mRefraction);
     }
     else
-        createSimpleWaterStateSet(mWaterGeode, mFallback->getFallbackFloat("Water_World_Alpha"));
+        createSimpleWaterStateSet(mWaterGeom, mFallback->getFallbackFloat("Water_World_Alpha"));
 
     updateVisible();
 }
 
 void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
 {
-    osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);
-
-    osg::ref_ptr<osg::Material> material (new osg::Material);
-    material->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
-    material->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, alpha));
-    material->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, 1.f));
-    material->setColorMode(osg::Material::OFF);
-    stateset->setAttributeAndModes(material, osg::StateAttribute::ON);
-
-    stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
-    stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
-
-    osg::ref_ptr<osg::Depth> depth (new osg::Depth);
-    depth->setWriteMask(false);
-    stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
-
-    stateset->setRenderBinDetails(MWRender::RenderBin_Water, "RenderBin");
+    osg::ref_ptr<osg::StateSet> stateset = SceneUtil::createSimpleWaterStateSet(alpha, MWRender::RenderBin_Water);
 
     node->setStateSet(stateset);
 
+    // Add animated textures
     std::vector<osg::ref_ptr<osg::Texture2D> > textures;
     int frameCount = mFallback->getFallbackInt("Water_SurfaceFrameCount");
     std::string texture = mFallback->getFallbackString("Water_SurfaceTexture");
@@ -563,7 +482,7 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
         textures.push_back(tex);
     }
 
-    if (!textures.size())
+    if (textures.empty())
         return;
 
     float fps = mFallback->getFallbackFloat("Water_SurfaceFPS");
@@ -573,16 +492,27 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
     node->setUpdateCallback(controller);
 
     stateset->setTextureAttributeAndModes(0, textures[0], osg::StateAttribute::ON);
+
+    // use a shader to render the simple water, ensuring that fog is applied per pixel as required.
+    // this could be removed if a more detailed water mesh, using some sort of paging solution, is implemented.
+#if !defined(OPENGL_ES) && !defined(ANDROID)
+    Resource::SceneManager* sceneManager = mResourceSystem->getSceneManager();
+    bool oldValue = sceneManager->getForceShaders();
+    sceneManager->setForceShaders(true);
+    sceneManager->recreateShaders(node);
+    sceneManager->setForceShaders(oldValue);
+#endif
 }
 
 void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, Refraction* refraction)
 {
     // use a define map to conditionally compile the shader
     std::map<std::string, std::string> defineMap;
-    defineMap.insert(std::make_pair(std::string("@refraction_enabled"), std::string(refraction ? "1" : "0")));
+    defineMap.insert(std::make_pair(std::string("refraction_enabled"), std::string(refraction ? "1" : "0")));
 
-    osg::ref_ptr<osg::Shader> vertexShader (readShader(osg::Shader::VERTEX, mResourcePath + "/shaders/water_vertex.glsl", defineMap));
-    osg::ref_ptr<osg::Shader> fragmentShader (readShader(osg::Shader::FRAGMENT, mResourcePath + "/shaders/water_fragment.glsl", defineMap));
+    Shader::ShaderManager& shaderMgr = mResourceSystem->getSceneManager()->getShaderManager();
+    osg::ref_ptr<osg::Shader> vertexShader (shaderMgr.getShader("water_vertex.glsl", defineMap, osg::Shader::VERTEX));
+    osg::ref_ptr<osg::Shader> fragmentShader (shaderMgr.getShader("water_fragment.glsl", defineMap, osg::Shader::FRAGMENT));
 
     osg::ref_ptr<osg::Texture2D> normalMap (new osg::Texture2D(readPngImage(mResourcePath + "/shaders/water_nm.png")));
     if (normalMap->getImage())
@@ -640,11 +570,13 @@ Water::~Water()
 
     if (mReflection)
     {
+        mReflection->removeChildren(0, mReflection->getNumChildren());
         mParent->removeChild(mReflection);
         mReflection = NULL;
     }
     if (mRefraction)
     {
+        mRefraction->removeChildren(0, mRefraction->getNumChildren());
         mParent->removeChild(mRefraction);
         mRefraction = NULL;
     }
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
index e03728d5f..29e78cf52 100644
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@@ -13,7 +13,7 @@ namespace osg
 {
     class Group;
     class PositionAttitudeTransform;
-    class Geode;
+    class Geometry;
     class Node;
 }
 
@@ -53,7 +53,7 @@ namespace MWRender
         osg::ref_ptr<osg::Group> mParent;
         osg::ref_ptr<osg::Group> mSceneRoot;
         osg::ref_ptr<osg::PositionAttitudeTransform> mWaterNode;
-        osg::ref_ptr<osg::Geode> mWaterGeode;
+        osg::ref_ptr<osg::Geometry> mWaterGeom;
         Resource::ResourceSystem* mResourceSystem;
         const Fallback::Map* mFallback;
         osg::ref_ptr<osgUtil::IncrementalCompileOperation> mIncrementalCompileOperation;
diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp
index 8fd294ccd..d5fb70d16 100644
--- a/apps/openmw/mwrender/weaponanimation.cpp
+++ b/apps/openmw/mwrender/weaponanimation.cpp
@@ -114,10 +114,10 @@ void WeaponAnimation::releaseArrow(MWWorld::Ptr actor, float attackStrength)
         osg::Node* weaponNode = getWeaponNode();
         if (!weaponNode)
             return;
-        osg::MatrixList mats = weaponNode->getWorldMatrices();
-        if (mats.empty())
+        osg::NodePathList nodepaths = weaponNode->getParentalNodePaths();
+        if (nodepaths.empty())
             return;
-        osg::Vec3f launchPos = mats[0].getTrans();
+        osg::Vec3f launchPos = osg::computeLocalToWorld(nodepaths[0]).getTrans();
 
         float fThrownWeaponMinSpeed = gmst.find("fThrownWeaponMinSpeed")->getFloat();
         float fThrownWeaponMaxSpeed = gmst.find("fThrownWeaponMaxSpeed")->getFloat();
@@ -140,10 +140,10 @@ void WeaponAnimation::releaseArrow(MWWorld::Ptr actor, float attackStrength)
             return;
 
         osg::ref_ptr<osg::Node> ammoNode = mAmmunition->getNode();
-        osg::MatrixList mats = ammoNode->getWorldMatrices();
-        if (mats.empty())
+        osg::NodePathList nodepaths = ammoNode->getParentalNodePaths();
+        if (nodepaths.empty())
             return;
-        osg::Vec3f launchPos = mats[0].getTrans();
+        osg::Vec3f launchPos = osg::computeLocalToWorld(nodepaths[0]).getTrans();
 
         float fProjectileMinSpeed = gmst.find("fProjectileMinSpeed")->getFloat();
         float fProjectileMaxSpeed = gmst.find("fProjectileMaxSpeed")->getFloat();
@@ -182,23 +182,30 @@ void WeaponAnimation::deleteControllers()
 
 void WeaponAnimation::configureControllers(float characterPitchRadians)
 {
-    if (!mSpineControllers[0])
-        return;
-
     if (mPitchFactor == 0.f || characterPitchRadians == 0.f)
     {
-        for (int i=0; i<2; ++i)
-            mSpineControllers[i]->setEnabled(false);
+        setControllerEnabled(false);
         return;
     }
 
     float pitch = characterPitchRadians * mPitchFactor;
     osg::Quat rotate (pitch/2, osg::Vec3f(-1,0,0));
+    setControllerRotate(rotate);
+    setControllerEnabled(true);
+}
+
+void WeaponAnimation::setControllerRotate(const osg::Quat& rotate)
+{
     for (int i=0; i<2; ++i)
-    {
-        mSpineControllers[i]->setRotate(rotate);
-        mSpineControllers[i]->setEnabled(true);
-    }
+        if (mSpineControllers[i])
+            mSpineControllers[i]->setRotate(rotate);
+}
+
+void WeaponAnimation::setControllerEnabled(bool enabled)
+{
+    for (int i=0; i<2; ++i)
+        if (mSpineControllers[i])
+            mSpineControllers[i]->setEnabled(enabled);
 }
 
 }
diff --git a/apps/openmw/mwrender/weaponanimation.hpp b/apps/openmw/mwrender/weaponanimation.hpp
index 3bf0fb721..d50729c62 100644
--- a/apps/openmw/mwrender/weaponanimation.hpp
+++ b/apps/openmw/mwrender/weaponanimation.hpp
@@ -52,6 +52,9 @@ namespace MWRender
 
         osg::ref_ptr<RotateController> mSpineControllers[2];
 
+        void setControllerRotate(const osg::Quat& rotate);
+        void setControllerEnabled(bool enabled);
+
         virtual osg::Group* getArrowBone() = 0;
         virtual osg::Node* getWeaponNode() = 0;
         virtual Resource::ResourceSystem* getResourceSystem() = 0;
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index db60d14d1..76130be24 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -19,6 +19,7 @@
 #include "../mwmechanics/aifollow.hpp"
 #include "../mwmechanics/aitravel.hpp"
 #include "../mwmechanics/aiwander.hpp"
+#include "../mwmechanics/aiface.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -465,7 +466,6 @@ namespace MWScript
                 }
         };
 
-        template<class R>
         class OpToggleAI : public Interpreter::Opcode0
         {
             public:
@@ -484,7 +484,16 @@ namespace MWScript
         public:
             virtual void execute(Interpreter::Runtime& runtime)
             {
-                /// \todo implement
+                MWWorld::Ptr actor = R()(runtime);
+
+                Interpreter::Type_Float x = runtime[0].mFloat;
+                runtime.pop();
+
+                Interpreter::Type_Float y = runtime[0].mFloat;
+                runtime.pop();
+
+                MWMechanics::AiFace facePackage(x, y);
+                actor.getClass().getCreatureStats(actor).getAiSequence().stack(facePackage, actor);
             }
         };
 
@@ -520,8 +529,7 @@ namespace MWScript
             interpreter.installSegment5 (Compiler::Ai::opcodeStartCombatExplicit, new OpStartCombat<ExplicitRef>);
             interpreter.installSegment5 (Compiler::Ai::opcodeStopCombat, new OpStopCombat<ImplicitRef>);
             interpreter.installSegment5 (Compiler::Ai::opcodeStopCombatExplicit, new OpStopCombat<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeToggleAI, new OpToggleAI<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeToggleAIExplicit, new OpToggleAI<ExplicitRef>);
+            interpreter.installSegment5 (Compiler::Ai::opcodeToggleAI, new OpToggleAI);
 
             interpreter.installSegment5 (Compiler::Ai::opcodeSetHello, new OpSetAiSetting<ImplicitRef>(0));
             interpreter.installSegment5 (Compiler::Ai::opcodeSetHelloExplicit, new OpSetAiSetting<ExplicitRef>(0));
diff --git a/apps/openmw/mwscript/animationextensions.cpp b/apps/openmw/mwscript/animationextensions.cpp
index 07a8a300a..1a87723ff 100644
--- a/apps/openmw/mwscript/animationextensions.cpp
+++ b/apps/openmw/mwscript/animationextensions.cpp
@@ -3,6 +3,13 @@
 #include <stdexcept>
 #include <limits>
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/WorldEvent.hpp"
+
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
+
 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
@@ -56,7 +63,23 @@ namespace MWScript
                             throw std::runtime_error ("animation mode out of range");
                     }
 
-                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup (ptr, group, mode, std::numeric_limits<int>::max());
+                    // Added by tes3mp to check and set whether packets should be sent about this script
+                    if (mwmp::Main::isValidPacketScript(ptr.getClass().getScript(ptr)))
+                    {
+                        mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+                        worldEvent->cell = *ptr.getCell()->getCell();
+
+                        mwmp::WorldObject worldObject;
+                        worldObject.refId = ptr.getCellRef().getRefId();
+                        worldObject.refNumIndex = ptr.getCellRef().getRefNum().mIndex;
+                        worldObject.animGroup = group;
+                        worldObject.animMode = mode;
+                        worldEvent->addObject(worldObject);
+
+                        mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_ANIM_PLAY)->Send(worldEvent);
+                    }
+
+                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup (ptr, group, mode, std::numeric_limits<int>::max(), true);
                }
         };
 
@@ -89,7 +112,7 @@ namespace MWScript
                             throw std::runtime_error ("animation mode out of range");
                     }
 
-                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup (ptr, group, mode, loops);
+                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup (ptr, group, mode, loops + 1, true);
                }
         };
         
diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index 513c1cc42..2cb76ef88 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -15,6 +15,7 @@
 #include "../mwbase/world.hpp"
 #include "../mwworld/player.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/actionteleport.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
@@ -46,10 +47,9 @@ namespace MWScript
                     ESM::Position pos;
                     MWBase::World *world = MWBase::Environment::get().getWorld();
 
-                    world->getPlayer().setTeleported(true);
                     if (world->findExteriorPosition(cell, pos))
                     {
-                        world->changeToExteriorCell(pos);
+                        MWWorld::ActionTeleport("", pos, false).execute(world->getPlayerPtr());
                         world->fixPosition(world->getPlayerPtr());
                     }
                     else
@@ -57,7 +57,7 @@ namespace MWScript
                         // Change to interior even if findInteriorPosition()
                         // yields false. In this case position will be zero-point.
                         world->findInteriorPosition(cell, pos);
-                        world->changeToInteriorCell(cell, pos);
+                        MWWorld::ActionTeleport(cell, pos, false).execute(world->getPlayerPtr());
                     }
                 }
         };
@@ -76,13 +76,13 @@ namespace MWScript
 
                     ESM::Position pos;
                     MWBase::World *world = MWBase::Environment::get().getWorld();
-                    world->getPlayer().setTeleported(true);
+
                     world->indexToPosition (x, y, pos.pos[0], pos.pos[1], true);
                     pos.pos[2] = 0;
 
                     pos.rot[0] = pos.rot[1] = pos.rot[2] = 0;
 
-                    world->changeToExteriorCell (pos);
+                    MWWorld::ActionTeleport("", pos, false).execute(world->getPlayerPtr());
                     world->fixPosition(world->getPlayerPtr());
                 }
         };
diff --git a/apps/openmw/mwscript/compilercontext.hpp b/apps/openmw/mwscript/compilercontext.hpp
index 010926f45..ca7efd77a 100644
--- a/apps/openmw/mwscript/compilercontext.hpp
+++ b/apps/openmw/mwscript/compilercontext.hpp
@@ -11,7 +11,7 @@ namespace MWScript
 
             enum Type
             {
-                Type_Full, // global, local, targetted
+                Type_Full, // global, local, targeted
                 Type_Dialogue,
                 Type_Console
             };
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 4e3e010f7..277710487 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -6,6 +6,9 @@
 
 #include <MyGUI_LanguageManager.h>
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/LocalPlayer.hpp"
+
 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
@@ -67,6 +70,11 @@ namespace MWScript
                     // Spawn a messagebox (only for items added to player's inventory and if player is talking to someone)
                     if (ptr == MWBase::Environment::get().getWorld ()->getPlayerPtr() )
                     {
+                        // Added by tes3mp
+                        //
+                        // LocalPlayer's inventory has changed, so send a packet with it
+                        mwmp::Main::get().getLocalPlayer()->sendInventory();
+
                         // The two GMST entries below expand to strings informing the player of what, and how many of it has been added to their inventory
                         std::string msgBox;
                         std::string itemName = itemPtr.getClass().getName(itemPtr);
@@ -102,7 +110,7 @@ namespace MWScript
                             || ::Misc::StringUtils::ciEqual(item, "gold_025")
                             || ::Misc::StringUtils::ciEqual(item, "gold_100"))
                         item = "gold_001";
-                    
+
                     MWWorld::ContainerStore& store = ptr.getClass().getContainerStore (ptr);
 
                     runtime.push (store.count(item));
@@ -136,7 +144,7 @@ namespace MWScript
                             || ::Misc::StringUtils::ciEqual(item, "gold_025")
                             || ::Misc::StringUtils::ciEqual(item, "gold_100"))
                         item = "gold_001";
-                        
+
                     MWWorld::ContainerStore& store = ptr.getClass().getContainerStore (ptr);
 
                     std::string itemName;
@@ -188,7 +196,11 @@ namespace MWScript
                             break;
                     }
                     if (it == invStore.end())
-                        throw std::runtime_error("Item to equip not found");
+                    {
+                        it = ptr.getClass().getContainerStore (ptr).add (item, 1, ptr);
+                        std::cerr << "Implicitly adding one " << item << " to container "
+                            "to fulfil requirements of Equip instruction" << std::endl;
+                    }
 
                     if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
                         MWBase::Environment::get().getWindowManager()->useItem(*it);
@@ -317,7 +329,7 @@ namespace MWScript
                          it != invStore.end(); ++it)
                     {
                         if (::Misc::StringUtils::ciEqual(it->getCellRef().getSoul(), name))
-                            ++count;
+                            count += it->getRefData().getCount();
                     }
                     runtime.push(count);
                 }
diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp
index fcb7e8f3b..b52b95508 100644
--- a/apps/openmw/mwscript/dialogueextensions.cpp
+++ b/apps/openmw/mwscript/dialogueextensions.cpp
@@ -1,5 +1,8 @@
 #include "dialogueextensions.hpp"
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/LocalPlayer.hpp"
+
 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
@@ -43,6 +46,11 @@ namespace MWScript
                     try
                     {
                         MWBase::Environment::get().getJournal()->addEntry (quest, index, ptr);
+
+                        // Added by tes3mp
+                        //
+                        // LocalPlayer has gained a journal entry, so send a packet with it
+                        mwmp::Main::get().getLocalPlayer()->sendJournalEntry(quest, index, ptr);
                     }
                     catch (...)
                     {
@@ -65,6 +73,11 @@ namespace MWScript
                     runtime.pop();
 
                     MWBase::Environment::get().getJournal()->setJournalIndex (quest, index);
+
+                    // Added by tes3mp
+                    //
+                    // LocalPlayer has gained a journal index, so send a packet with it
+                    mwmp::Main::get().getLocalPlayer()->sendJournalIndex(quest, index);
                 }
         };
 
diff --git a/apps/openmw/mwscript/docs/vmformat.txt b/apps/openmw/mwscript/docs/vmformat.txt
index 93219c649..851a6a29c 100644
--- a/apps/openmw/mwscript/docs/vmformat.txt
+++ b/apps/openmw/mwscript/docs/vmformat.txt
@@ -60,7 +60,9 @@ op 0x2002b: PCJoinFaction, explicit reference
 op 0x2002c: MenuTest
 op 0x2002d: BetaComment
 op 0x2002e: BetaComment, explicit reference
-opcodes 0x2002d-0x3ffff unused
+op 0x2002f: ShowSceneGraph
+op 0x20030: ShowSceneGraph, explicit
+opcodes 0x20031-0x3ffff unused
 
 Segment 4:
 (not implemented yet)
@@ -364,7 +366,7 @@ op 0x2000221: EnableLevitation
 op 0x2000222: GetLineOfSight
 op 0x2000223: GetLineOfSightExplicit
 op 0x2000224: ToggleAI
-op 0x2000225: ToggleAIExplicit
+op 0x2000225: unused
 op 0x2000226: COE
 op 0x2000227: Cast
 op 0x2000228: Cast, explicit
@@ -449,5 +451,7 @@ op 0x2000300: EnableLevelupMenu
 op 0x2000301: ToggleScripts
 op 0x2000302: Fixme
 op 0x2000303: Fixme, explicit
+op 0x2000304: Show
+op 0x2000305: Show, explicit
 
 opcodes 0x2000304-0x3ffffff unused
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 7a6afe2e0..32939063e 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -10,6 +10,11 @@
 
 #include <components/esm/cellid.hpp>
 
+#include <components/openmw-mp/Log.hpp>
+#include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/WorldEvent.hpp"
+
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/environment.hpp"
@@ -138,14 +143,16 @@ namespace MWScript
 
     InterpreterContext::InterpreterContext (
         MWScript::Locals *locals, MWWorld::Ptr reference, const std::string& targetId)
-    : mLocals (locals), mReference (reference),
-      mActivationHandled (false), mTargetId (targetId)
+    : mLocals (locals), mReference (reference), mTargetId (targetId)
     {
         // If we run on a reference (local script, dialogue script or console with object
         // selected), store the ID of that reference store it so it can be inherited by
         // targeted scripts started from this one.
         if (targetId.empty() && !reference.isEmpty())
             mTargetId = reference.getCellRef().getRefId();
+
+        // Added by tes3mp
+        sendPackets = false;
     }
 
     int InterpreterContext::getLocalShort (int index) const
@@ -178,6 +185,29 @@ namespace MWScript
             throw std::runtime_error ("local variables not available in this context");
 
         mLocals->mShorts.at (index) = value;
+
+        // Added by tes3mp
+        if (sendPackets)
+        {
+            mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+            worldEvent->cell = *mReference.getCell()->getCell();
+
+            mwmp::WorldObject worldObject;
+            worldObject.refId = mReference.getCellRef().getRefId();
+            worldObject.refNumIndex = mReference.getCellRef().getRefNum().mIndex;
+            worldObject.index = index;
+            worldObject.shortVal = value;
+            worldEvent->addObject(worldObject);
+
+            mwmp::Main::get().getNetworking()->getWorldPacket(ID_SCRIPT_LOCAL_SHORT)->Send(worldEvent);
+
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Sending ID_SCRIPT_LOCAL_SHORT\n- cellRef: %s, %i\n- cell: %s\n- index: %i\n- shortVal: %i",
+                worldObject.refId.c_str(),
+                worldObject.refNumIndex,
+                worldEvent->cell.getDescription().c_str(),
+                worldObject.index,
+                worldObject.shortVal);
+        }
     }
 
     void InterpreterContext::setLocalLong (int index, int value)
@@ -194,6 +224,31 @@ namespace MWScript
             throw std::runtime_error ("local variables not available in this context");
 
         mLocals->mFloats.at (index) = value;
+
+        // Added by tes3mp
+        //
+        // Only send a packet if this float has no decimals (to avoid spam)
+        if (sendPackets && value == (int) value)
+        {
+            mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+            worldEvent->cell = *mReference.getCell()->getCell();
+
+            mwmp::WorldObject worldObject;
+            worldObject.refId = mReference.getCellRef().getRefId();
+            worldObject.refNumIndex = mReference.getCellRef().getRefNum().mIndex;
+            worldObject.index = index;
+            worldObject.floatVal = value;
+            worldEvent->addObject(worldObject);
+
+            mwmp::Main::get().getNetworking()->getWorldPacket(ID_SCRIPT_LOCAL_FLOAT)->Send(worldEvent);
+
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Sending ID_SCRIPT_LOCAL_FLOAT\n- cellRef: %s, %i\n- cell: %s\n- index: %i\n- floatVal: %f",
+                worldObject.refId.c_str(),
+                worldObject.refNumIndex,
+                worldEvent->cell.getDescription().c_str(),
+                worldObject.index,
+                worldObject.floatVal);
+        }
     }
 
     void InterpreterContext::messageBox (const std::string& message,
@@ -211,7 +266,12 @@ namespace MWScript
 
     bool InterpreterContext::menuMode()
     {
+        /* Disabled by tes3mp, because being in a menu should not pause scripts in it
+
         return MWBase::Environment::get().getWindowManager()->isGuiMode();
+        */
+
+        return false;
     }
 
     int InterpreterContext::getGlobalShort (const std::string& name) const
@@ -232,6 +292,23 @@ namespace MWScript
 
     void InterpreterContext::setGlobalShort (const std::string& name, int value)
     {
+        // Added by tes3mp
+        if (sendPackets)
+        {
+            mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+
+            mwmp::WorldObject worldObject;
+            worldObject.varName = name;
+            worldObject.shortVal = value;
+            worldEvent->addObject(worldObject);
+
+            mwmp::Main::get().getNetworking()->getWorldPacket(ID_SCRIPT_GLOBAL_SHORT)->Send(worldEvent);
+
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Sending ID_SCRIPT_GLOBAL_SHORT\n- varName: %s\n- shortVal: %i",
+                worldObject.varName.c_str(),
+                worldObject.shortVal);
+        }
+
         MWBase::Environment::get().getWorld()->setGlobalInt (name, value);
     }
 
@@ -477,36 +554,13 @@ namespace MWScript
         return static_cast<float>(std::sqrt(diff[0] * diff[0] + diff[1] * diff[1] + diff[2] * diff[2]));
     }
 
-    bool InterpreterContext::hasBeenActivated (const MWWorld::Ptr& ptr)
-    {
-        if (!mActivated.isEmpty() && mActivated==ptr)
-        {
-            mActivationHandled = true;
-            return true;
-        }
-
-        return false;
-    }
-
-    bool InterpreterContext::hasActivationBeenHandled() const
-    {
-        return mActivationHandled;
-    }
-
-    void InterpreterContext::activate (const MWWorld::Ptr& ptr)
-    {
-        mActivated = ptr;
-        mActivationHandled = false;
-    }
-
     void InterpreterContext::executeActivation(MWWorld::Ptr ptr, MWWorld::Ptr actor)
     {
         boost::shared_ptr<MWWorld::Action> action = (ptr.getClass().activate(ptr, actor));
         action->execute (actor);
-        if (mActivated == ptr)
+        if (action->getTarget() != MWWorld::Ptr() && action->getTarget() != ptr)
         {
-            mActivationHandled = true;
-            mActivated = MWWorld::Ptr();
+            updatePtr(ptr, action->getTarget());
         }
     }
 
@@ -570,7 +624,29 @@ namespace MWScript
 
         Locals& locals = getMemberLocals (scriptId, global);
 
-        locals.mShorts[findLocalVariableIndex (scriptId, name, 's')] = value;
+        // Added by tes3mp so it can be reused by it
+        int index = findLocalVariableIndex(scriptId, name, 's');
+
+        locals.mShorts[index] = value;
+
+        // Added by tes3mp
+        if (sendPackets && !global)
+        {
+            mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+
+            mwmp::WorldObject worldObject;
+            worldObject.refId = id;
+            worldObject.index = index;
+            worldObject.shortVal = value;
+            worldEvent->addObject(worldObject);
+
+            mwmp::Main::get().getNetworking()->getWorldPacket(ID_SCRIPT_MEMBER_SHORT)->Send(worldEvent);
+
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Sending ID_SCRIPT_MEMBER_SHORT\n- cellRef: %s\n- index: %i\n- shortVal: %i",
+                worldObject.refId.c_str(),
+                worldObject.index,
+                worldObject.shortVal);
+        }
     }
 
     void InterpreterContext::setMemberLong (const std::string& id, const std::string& name, int value, bool global)
@@ -604,6 +680,10 @@ namespace MWScript
     void InterpreterContext::updatePtr(const MWWorld::Ptr& base, const MWWorld::Ptr& updated)
     {
         if (!mReference.isEmpty() && base == mReference)
+        {
             mReference = updated;
+            if (mLocals == &base.getRefData().getLocals())
+                mLocals = &mReference.getRefData().getLocals();
+        }
     }
 }
diff --git a/apps/openmw/mwscript/interpretercontext.hpp b/apps/openmw/mwscript/interpretercontext.hpp
index 3c43444cc..55c4e4efe 100644
--- a/apps/openmw/mwscript/interpretercontext.hpp
+++ b/apps/openmw/mwscript/interpretercontext.hpp
@@ -27,9 +27,6 @@ namespace MWScript
             Locals *mLocals;
             mutable MWWorld::Ptr mReference;
 
-            MWWorld::Ptr mActivated;
-            bool mActivationHandled;
-
             std::string mTargetId;
 
             /// If \a id is empty, a reference the script is run from is returned or in case
@@ -58,6 +55,9 @@ namespace MWScript
                 const std::string& targetId = "");
             ///< The ownership of \a locals is not transferred. 0-pointer allowed.
 
+            // Added by tes3mp
+            bool sendPackets;
+
             virtual int getLocalShort (int index) const;
 
             virtual int getLocalLong (int index) const;
@@ -131,16 +131,6 @@ namespace MWScript
             virtual float getDistance (const std::string& name, const std::string& id = "") const;
             ///< @note if \a id is empty, assumes an implicit reference
 
-            bool hasBeenActivated (const MWWorld::Ptr& ptr);
-            ///< \attention Calling this function for the right reference will mark the action as
-            /// been handled.
-
-            bool hasActivationBeenHandled() const;
-
-            void activate (const MWWorld::Ptr& ptr);
-            ///< Store reference acted upon. The actual execution of the action does not
-            /// take place here.
-
             void executeActivation(MWWorld::Ptr ptr, MWWorld::Ptr actor);
             ///< Execute the activation action for this ptr. If ptr is mActivated, mark activation as handled.
 
diff --git a/apps/openmw/mwscript/locals.cpp b/apps/openmw/mwscript/locals.cpp
index ee93ea2e7..9dd9d338e 100644
--- a/apps/openmw/mwscript/locals.cpp
+++ b/apps/openmw/mwscript/locals.cpp
@@ -97,6 +97,32 @@ namespace MWScript
         return 0;
     }
 
+    float Locals::getFloatVar(const std::string &script, const std::string &var)
+    {
+        ensure (script);
+
+        const Compiler::Locals& locals = MWBase::Environment::get().getScriptManager()->getLocals(script);
+        int index = locals.getIndex(var);
+        char type = locals.getType(var);
+        if(index != -1)
+        {
+            switch(type)
+            {
+                case 's':
+                    return mShorts.at (index);
+
+                case 'l':
+                    return mLongs.at (index);
+
+                case 'f':
+                    return mFloats.at(index);
+                default:
+                    return 0;
+            }
+        }
+        return 0;
+    }
+
     bool Locals::setVarByInt(const std::string& script, const std::string& var, int val)
     {
         ensure (script);
@@ -212,15 +238,15 @@ namespace MWScript
                 else
                 {
                     char type =  declarations.getType (iter->first);
-                    char index = declarations.getIndex (iter->first);
+                    int index2 = declarations.getIndex (iter->first);
 
                     try
                     {
                         switch (type)
                         {
-                            case 's': mShorts.at (index) = iter->second.getInteger(); break;
-                            case 'l': mLongs.at (index) = iter->second.getInteger(); break;
-                            case 'f': mFloats.at (index) = iter->second.getFloat(); break;
+                            case 's': mShorts.at (index2) = iter->second.getInteger(); break;
+                            case 'l': mLongs.at (index2) = iter->second.getInteger(); break;
+                            case 'f': mFloats.at (index2) = iter->second.getFloat(); break;
 
                             // silently ignore locals that don't exist anymore
                         }
diff --git a/apps/openmw/mwscript/locals.hpp b/apps/openmw/mwscript/locals.hpp
index bb4df42bf..d63411a94 100644
--- a/apps/openmw/mwscript/locals.hpp
+++ b/apps/openmw/mwscript/locals.hpp
@@ -51,6 +51,12 @@ namespace MWScript
             /// \note Locals will be automatically configured first, if necessary
             int getIntVar (const std::string& script, const std::string& var);
 
+            /// if var does not exist, returns 0
+            /// @note var needs to be in lowercase
+            ///
+            /// \note Locals will be automatically configured first, if necessary
+            float getFloatVar (const std::string& script, const std::string& var);
+
             /// \note If locals have not been configured yet, no data is written.
             ///
             /// \return Locals written?
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 51f0c6c55..1ab485437 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -2,6 +2,10 @@
 
 #include <cstdlib>
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/WorldEvent.hpp"
+
 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 #include <components/compiler/locals.hpp>
@@ -85,6 +89,16 @@ namespace MWScript
                 bool allowSkipping = runtime[0].mInteger != 0;
                 runtime.pop();
 
+                // Added by tes3mp
+                mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+
+                mwmp::WorldObject worldObject;
+                worldObject.filename = name;
+                worldObject.allowSkipping = allowSkipping;
+                worldEvent->addObject(worldObject);
+
+                mwmp::Main::get().getNetworking()->getWorldPacket(ID_VIDEO_PLAY)->Send(worldEvent);
+
                 MWBase::Environment::get().getWindowManager()->playVideo (name, allowSkipping);
             }
         };
@@ -142,7 +156,7 @@ namespace MWScript
 
                     MWWorld::Ptr ptr = context.getReference();
 
-                    runtime.push (context.hasBeenActivated (ptr));
+                    runtime.push (ptr.getRefData().onActivate());
                 }
         };
 
@@ -158,7 +172,8 @@ namespace MWScript
 
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    context.executeActivation(ptr, MWMechanics::getPlayer());
+                    if (ptr.getRefData().activateByScript())
+                        context.executeActivation(ptr, MWMechanics::getPlayer());
                 }
         };
 
@@ -182,6 +197,18 @@ namespace MWScript
                         runtime.pop();
                     }
 
+                    // Added by tes3mp
+                    mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+                    worldEvent->cell = *ptr.getCell()->getCell();
+
+                    mwmp::WorldObject worldObject;
+                    worldObject.refId = ptr.getCellRef().getRefId();
+                    worldObject.refNumIndex = ptr.getCellRef().getRefNum().mIndex;
+                    worldObject.lockLevel = lockLevel;
+                    worldEvent->addObject(worldObject);
+
+                    mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_LOCK)->Send(worldEvent);
+
                     ptr.getClass().lock (ptr, lockLevel);
 
                     // Instantly reset door to closed state
@@ -208,6 +235,17 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
+                    // Added by tes3mp
+                    mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+                    worldEvent->cell = *ptr.getCell()->getCell();
+
+                    mwmp::WorldObject worldObject;
+                    worldObject.refId = ptr.getCellRef().getRefId();
+                    worldObject.refNumIndex = ptr.getCellRef().getRefNum().mIndex;
+                    worldEvent->addObject(worldObject);
+
+                    mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_UNLOCK)->Send(worldEvent);
+
                     ptr.getClass().unlock (ptr);
                 }
         };
@@ -234,10 +272,10 @@ namespace MWScript
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     bool enabled =
-                        MWBase::Environment::get().getWorld()->toggleRenderMode (MWRender::Render_BoundingBoxes);
+                        MWBase::Environment::get().getWorld()->toggleRenderMode (MWRender::Render_CollisionDebug);
 
                     runtime.getContext().report (enabled ?
-                        "Bounding Box Rendering -> On" : "Bounding Box Rendering -> Off");
+                        "Collision Mesh Rendering -> On" : "Collision Mesh Rendering -> Off");
                 }
         };
 
@@ -667,7 +705,20 @@ namespace MWScript
                     runtime.pop();
 
                     if (parameter == 1)
+                    {
+                        // Added by tes3mp
+                        mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+                        worldEvent->cell = *ptr.getCell()->getCell();
+
+                        mwmp::WorldObject worldObject;
+                        worldObject.refId = ptr.getCellRef().getRefId();
+                        worldObject.refNumIndex = ptr.getCellRef().getRefNum().mIndex;
+                        worldEvent->addObject(worldObject);
+
+                        mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_DELETE)->Send(worldEvent);
+
                         MWBase::Environment::get().getWorld()->deleteObject(ptr);
+                    }
                     else if (parameter == 0)
                         MWBase::Environment::get().getWorld()->undeleteObject(ptr);
                     else
@@ -848,6 +899,70 @@ namespace MWScript
                 }
         };
 
+        template <class R>
+        class OpShow : public Interpreter::Opcode0
+        {
+        public:
+
+            virtual void execute (Interpreter::Runtime& runtime)
+            {
+                MWWorld::Ptr ptr = R()(runtime, false);
+                std::string var = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+
+                std::stringstream output;
+
+                if (!ptr.isEmpty())
+                {
+                    const std::string& script = ptr.getClass().getScript(ptr);
+                    if (script.empty())
+                    {
+                        output << ptr.getCellRef().getRefId() << " has no script " << std::endl;
+                    }
+                    else
+                    {
+                        const Compiler::Locals& locals =
+                            MWBase::Environment::get().getScriptManager()->getLocals(script);
+                        char type = locals.getType(var);
+                        switch (type)
+                        {
+                        case 'l':
+                        case 's':
+                            output << ptr.getCellRef().getRefId() << "." << var << ": " << ptr.getRefData().getLocals().getIntVar(script, var);
+                            break;
+                        case 'f':
+                            output << ptr.getCellRef().getRefId() << "." << var << ": " << ptr.getRefData().getLocals().getFloatVar(script, var);
+                            break;
+                        default:
+                            output << "unknown local '" << var << "' for '" << ptr.getCellRef().getRefId() << "'";
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    MWBase::World *world = MWBase::Environment::get().getWorld();
+                    char type = world->getGlobalVariableType (var);
+
+                    switch (type)
+                    {
+                    case 's':
+                        output << runtime.getContext().getGlobalShort (var);
+                        break;
+                    case 'l':
+                        output << runtime.getContext().getGlobalLong (var);
+                        break;
+                    case 'f':
+                        output << runtime.getContext().getGlobalFloat (var);
+                        break;
+                    default:
+                        output << "unknown global variable";
+                    }
+                }
+                runtime.getContext().report(output.str());
+            }
+        };
+
         template <class R>
         class OpShowVars : public Interpreter::Opcode0
         {
@@ -1187,6 +1302,31 @@ namespace MWScript
             }
         };
 
+        template <class R>
+        class OpShowSceneGraph : public Interpreter::Opcode1
+        {
+        public:
+            virtual void execute(Interpreter::Runtime &runtime, unsigned int arg0)
+            {
+                MWWorld::Ptr ptr = R()(runtime, false);
+
+                int confirmed = 0;
+                if (arg0==1)
+                {
+                    confirmed = runtime[0].mInteger;
+                    runtime.pop();
+                }
+
+                if (ptr.isEmpty() && !confirmed)
+                    runtime.getContext().report("Exporting the entire scene graph will result in a large file. Confirm this action using 'showscenegraph 1' or select an object instead.");
+                else
+                {
+                    const std::string& filename = MWBase::Environment::get().getWorld()->exportSceneGraph(ptr);
+                    runtime.getContext().report("Wrote '" + filename + "'");
+                }
+            }
+        };
+
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5 (Compiler::Misc::opcodeXBox, new OpXBox);
@@ -1265,6 +1405,8 @@ namespace MWScript
             interpreter.installSegment5 (Compiler::Misc::opcodeEnableTeleporting, new OpEnableTeleporting<true>);
             interpreter.installSegment5 (Compiler::Misc::opcodeShowVars, new OpShowVars<ImplicitRef>);
             interpreter.installSegment5 (Compiler::Misc::opcodeShowVarsExplicit, new OpShowVars<ExplicitRef>);
+            interpreter.installSegment5 (Compiler::Misc::opcodeShow, new OpShow<ImplicitRef>);
+            interpreter.installSegment5 (Compiler::Misc::opcodeShowExplicit, new OpShow<ExplicitRef>);
             interpreter.installSegment5 (Compiler::Misc::opcodeToggleGodMode, new OpToggleGodMode);
             interpreter.installSegment5 (Compiler::Misc::opcodeToggleScripts, new OpToggleScripts);
             interpreter.installSegment5 (Compiler::Misc::opcodeDisableLevitation, new OpEnableLevitation<false>);
@@ -1281,6 +1423,8 @@ namespace MWScript
             interpreter.installSegment5 (Compiler::Misc::opcodeRemoveFromLevCreature, new OpRemoveFromLevCreature);
             interpreter.installSegment5 (Compiler::Misc::opcodeAddToLevItem, new OpAddToLevItem);
             interpreter.installSegment5 (Compiler::Misc::opcodeRemoveFromLevItem, new OpRemoveFromLevItem);
+            interpreter.installSegment3 (Compiler::Misc::opcodeShowSceneGraph, new OpShowSceneGraph<ImplicitRef>);
+            interpreter.installSegment3 (Compiler::Misc::opcodeShowSceneGraphExplicit, new OpShowSceneGraph<ExplicitRef>);
         }
     }
 }
diff --git a/apps/openmw/mwscript/scriptmanagerimp.cpp b/apps/openmw/mwscript/scriptmanagerimp.cpp
index b73c9a642..97ea19a63 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.cpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.cpp
@@ -21,10 +21,10 @@
 
 namespace MWScript
 {
-    ScriptManager::ScriptManager (const MWWorld::ESMStore& store, bool verbose,
+    ScriptManager::ScriptManager (const MWWorld::ESMStore& store,
         Compiler::Context& compilerContext, int warningsMode,
         const std::vector<std::string>& scriptBlacklist)
-    : mErrorHandler (std::cerr), mStore (store), mVerbose (verbose),
+    : mErrorHandler (std::cerr), mStore (store),
       mCompilerContext (compilerContext), mParser (mErrorHandler, mCompilerContext),
       mOpcodesInstalled (false), mGlobalScripts (store)
     {
@@ -44,8 +44,7 @@ namespace MWScript
 
         if (const ESM::Script *script = mStore.get<ESM::Script>().find (name))
         {
-            if (mVerbose)
-                std::cout << "compiling script: " << name << std::endl;
+            mErrorHandler.setContext(name);
 
             bool Success = true;
             try
@@ -74,8 +73,6 @@ namespace MWScript
             {
                 std::cerr
                     << "compiling failed: " << name << std::endl;
-                if (mVerbose)
-                    std::cerr << script->mScriptText << std::endl << std::endl;
             }
 
             if (Success)
@@ -172,13 +169,10 @@ namespace MWScript
 
         if (const ESM::Script *script = mStore.get<ESM::Script>().search (name2))
         {
-            if (mVerbose)
-                std::cout
-                    << "scanning script for local variable declarations: " << name2
-                    << std::endl;
-
             Compiler::Locals locals;
 
+            mErrorHandler.setContext(name2 + "[local variables]");
+
             std::istringstream stream (script->mScriptText);
             Compiler::QuickFileParser parser (mErrorHandler, mCompilerContext, locals);
             Compiler::Scanner scanner (mErrorHandler, stream, mCompilerContext.getExtensions());
diff --git a/apps/openmw/mwscript/scriptmanagerimp.hpp b/apps/openmw/mwscript/scriptmanagerimp.hpp
index e4a123b86..c22a5da81 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.hpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.hpp
@@ -36,7 +36,6 @@ namespace MWScript
     {
             Compiler::StreamErrorHandler mErrorHandler;
             const MWWorld::ESMStore& mStore;
-            bool mVerbose;
             Compiler::Context& mCompilerContext;
             Compiler::FileParser mParser;
             Interpreter::Interpreter mInterpreter;
@@ -52,7 +51,7 @@ namespace MWScript
 
         public:
 
-            ScriptManager (const MWWorld::ESMStore& store, bool verbose,
+            ScriptManager (const MWWorld::ESMStore& store,
                 Compiler::Context& compilerContext, int warningsMode,
                 const std::vector<std::string>& scriptBlacklist);
 
diff --git a/apps/openmw/mwscript/soundextensions.cpp b/apps/openmw/mwscript/soundextensions.cpp
index a9896d203..973a071f2 100644
--- a/apps/openmw/mwscript/soundextensions.cpp
+++ b/apps/openmw/mwscript/soundextensions.cpp
@@ -1,5 +1,9 @@
 #include "extensions.hpp"
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/WorldEvent.hpp"
+
 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
@@ -66,6 +70,15 @@ namespace MWScript
                     std::string sound = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
+                    // Added by tes3mp
+                    mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+                    
+                    mwmp::WorldObject worldObject;
+                    worldObject.filename = sound;
+                    worldEvent->addObject(worldObject);
+
+                    mwmp::Main::get().getNetworking()->getWorldPacket(ID_MUSIC_PLAY)->Send(worldEvent);
+
                     MWBase::Environment::get().getSoundManager()->streamMusic (sound);
                 }
         };
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index d5b64b7d7..8b327f94a 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -3,6 +3,9 @@
 #include <iostream>
 #include <cmath>
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/LocalPlayer.hpp"
+
 #include <components/esm/loadnpc.hpp>
 
 #include "../mwworld/esmstore.hpp"
@@ -442,6 +445,12 @@ namespace MWScript
                     MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (id);
 
                     ptr.getClass().getCreatureStats (ptr).getSpells().add (id);
+
+                    // Added by tes3mp
+                    //
+                    // LocalPlayer has gained a spell, so send a packet with it
+                    if (ptr == MWMechanics::getPlayer())
+                        mwmp::Main::get().getLocalPlayer()->sendSpellAddition(id);
                 }
         };
 
@@ -466,6 +475,12 @@ namespace MWScript
                     {
                         wm->unsetSelectedSpell();
                     }
+
+                    // Added by tes3mp
+                    //
+                    // LocalPlayer has lost a spell, so send a packet with it
+                    if (ptr == MWMechanics::getPlayer())
+                        mwmp::Main::get().getLocalPlayer()->sendSpellRemoval(id);
                 }
         };
 
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 64c126de1..a8e88e063 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -1,5 +1,9 @@
 #include <iostream>
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/WorldEvent.hpp"
+
 #include <components/sceneutil/positionattitudetransform.hpp>
 
 #include <components/esm/loadcell.hpp>
@@ -10,6 +14,7 @@
 #include <components/interpreter/interpreter.hpp>
 #include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
+#include <components/openmw-mp/Log.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -41,6 +46,18 @@ namespace MWScript
                     Interpreter::Type_Float scale = runtime[0].mFloat;
                     runtime.pop();
 
+                    // Added by tes3mp
+                    mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+                    worldEvent->cell = *ptr.getCell()->getCell();
+
+                    mwmp::WorldObject worldObject;
+                    worldObject.refId = ptr.getCellRef().getRefId();
+                    worldObject.refNumIndex = ptr.getCellRef().getRefNum().mIndex;
+                    worldObject.scale = scale;
+                    worldEvent->addObject(worldObject);
+
+                    mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_SCALE)->Send(worldEvent);
+
                     MWBase::Environment::get().getWorld()->scaleObject(ptr,scale);
                 }
         };
@@ -318,8 +335,8 @@ namespace MWScript
                         ptr = MWBase::Environment::get().getWorld()->moveObject(ptr,store,x,y,z);
                         dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(base,ptr);
 
-                        float ax = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[0]);
-                        float ay = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[1]);
+                        float ax = ptr.getRefData().getPosition().rot[0];
+                        float ay = ptr.getRefData().getPosition().rot[1];
                         // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south = 10800, west = 16200)
                         // except for when you position the player, then degrees must be used.
                         // See "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
@@ -374,14 +391,14 @@ namespace MWScript
                     }
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(base,ptr);
 
-                    float ax = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[0]);
-                    float ay = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[1]);
+                    float ax = ptr.getRefData().getPosition().rot[0];
+                    float ay = ptr.getRefData().getPosition().rot[1];
                     // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south = 10800, west = 16200)
                     // except for when you position the player, then degrees must be used.
                     // See "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
                     if(ptr != MWMechanics::getPlayer())
                         zRot = zRot/60.0f;
-                    MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot);
+                    MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,osg::DegreesToRadians(zRot));
                     ptr.getClass().adjustPosition(ptr, false);
                 }
         };
@@ -434,7 +451,7 @@ namespace MWScript
                         pos.rot[2] = osg::DegreesToRadians(zRotDegrees);
                         MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(),itemID);
                         ref.getPtr().getCellRef().setPosition(pos);
-                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),store,pos);
+                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(),store,pos);
                         placed.getClass().adjustPosition(placed, true);
                     }
                 }
@@ -482,7 +499,7 @@ namespace MWScript
                     pos.rot[2] = osg::DegreesToRadians(zRotDegrees);
                     MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(),itemID);
                     ref.getPtr().getCellRef().setPosition(pos);
-                    MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),store,pos);
+                    MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(),store,pos);
                     placed.getClass().adjustPosition(placed, true);
                 }
         };
@@ -508,6 +525,9 @@ namespace MWScript
                     Interpreter::Type_Integer direction = runtime[0].mInteger;
                     runtime.pop();
 
+                    if (direction < 0 || direction > 3)
+                        throw std::runtime_error ("invalid direction");
+
                     if (count<0)
                         throw std::runtime_error ("count must be non-negative");
 
@@ -516,38 +536,41 @@ namespace MWScript
 
                     for (int i=0; i<count; ++i)
                     {
-                        ESM::Position ipos = actor.getRefData().getPosition();
-                        osg::Vec3f pos(ipos.asVec3());
-                        osg::Quat rot(ipos.rot[2], osg::Vec3f(0,0,-1));
-                        if(direction == 0) pos = pos + (rot * osg::Vec3f(0,1,0)) * distance;
-                        else if(direction == 1) pos = pos - (rot * osg::Vec3f(0,1,0)) * distance;
-                        else if(direction == 2) pos = pos - (rot * osg::Vec3f(1,0,0)) * distance;
-                        else if(direction == 3) pos = pos + (rot * osg::Vec3f(1,0,0)) * distance;
-                        else throw std::runtime_error ("direction must be 0,1,2 or 3");
-
-                        ipos.pos[0] = pos.x();
-                        ipos.pos[1] = pos.y();
-                        ipos.pos[2] = pos.z();
-
-                        if (actor.getClass().isActor())
-                        {
-                            // TODO: should this depend on the 'direction' parameter?
-                            ipos.rot[0] = 0;
-                            ipos.rot[1] = 0;
-                            ipos.rot[2] = 0;
-                        }
-                        else
-                        {
-                            ipos.rot[0] = actor.getRefData().getPosition().rot[0];
-                            ipos.rot[1] = actor.getRefData().getPosition().rot[1];
-                            ipos.rot[2] = actor.getRefData().getPosition().rot[2];
-                        }
                         // create item
-                        MWWorld::CellStore* store = actor.getCell();
                         MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), itemID, 1);
-                        ref.getPtr().getCellRef().setPosition(ipos);
 
-                        MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),store,ipos);
+                        MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(), actor, actor.getCell(), direction, distance);
+
+                        // Major change done by tes3mp:
+                        // When the object is dropped, generate a new RefNum index for it that follows the last one
+                        // in the cell, so that packets can be sent and received specifically about it, instead
+                        // of giving it a RefNum index of 0 as in regular OpenMW
+                        MWWorld::CellStore *cellStore = ptr.getCell();
+                        cellStore->setLastRefNumIndex(cellStore->getLastRefNumIndex() + 1);
+                        ptr.getCellRef().setRefNumIndex(cellStore->getLastRefNumIndex());
+
+                        // Added by tes3mp
+                        mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+                        worldEvent->cell = *ptr.getCell()->getCell();
+
+                        mwmp::WorldObject worldObject;
+                        worldObject.refId = ptr.getCellRef().getRefId();
+                        worldObject.refNumIndex = ptr.getCellRef().getRefNum().mIndex;
+                        worldObject.charge = ptr.getCellRef().getCharge();
+                        worldObject.count = 1;
+
+                        // Make sure we send the RefData position instead of the CellRef one, because that's what
+                        // we actually see on this client
+                        worldObject.pos = ptr.getRefData().getPosition();
+
+                        worldEvent->addObject(worldObject);
+
+                        mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_PLACE)->Send(worldEvent);
+
+                        LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Sending ID_OBJECT_PLACE\n- cellRef: %s, %i\n- count: %i",
+                            worldObject.refId.c_str(),
+                            worldObject.refNumIndex,
+                            worldObject.count);
                     }
                 }
         };
@@ -639,7 +662,6 @@ namespace MWScript
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
                         MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().pos[0],
                             ptr.getCellRef().getPosition().pos[1], ptr.getCellRef().getPosition().pos[2]));
-
                 }
         };
 
@@ -683,6 +705,7 @@ namespace MWScript
                     osg::Vec3f diff = ptr.getRefData().getBaseNode()->getAttitude() * posChange;
                     osg::Vec3f worldPos(ptr.getRefData().getPosition().asVec3());
                     worldPos += diff;
+
                     MWBase::Environment::get().getWorld()->moveObject(ptr, worldPos.x(), worldPos.y(), worldPos.z());
                 }
         };
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index 66b7e09e3..038b2338b 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -242,6 +242,10 @@ void FFmpeg_Decoder::open(const std::string &fname)
     }
     catch(std::exception&)
     {
+        if(mStream)
+            avcodec_close((*mStream)->codec);
+        mStream = NULL;
+
         if (mFormatCtx->pb->buffer != NULL)
         {
           av_free(mFormatCtx->pb->buffer);
@@ -389,16 +393,6 @@ void FFmpeg_Decoder::readAll(std::vector<char> &output)
     }
 }
 
-void FFmpeg_Decoder::rewind()
-{
-    int stream_idx = mStream - mFormatCtx->streams;
-    if(av_seek_frame(mFormatCtx, stream_idx, 0, 0) < 0)
-        fail("Failed to seek in audio stream");
-    av_free_packet(&mPacket);
-    mFrameSize = mFramePos = 0;
-    mNextPts = 0.0;
-}
-
 size_t FFmpeg_Decoder::getSampleOffset()
 {
     int delay = (mFrameSize-mFramePos) / av_get_channel_layout_nb_channels(mOutputChannelLayout) /
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index b27e60c9f..cc553b161 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -74,7 +74,6 @@ namespace MWSound
 
         virtual size_t read(char *buffer, size_t bytes);
         virtual void readAll(std::vector<char> &output);
-        virtual void rewind();
         virtual size_t getSampleOffset();
 
         void fail(const std::string &msg);
diff --git a/apps/openmw/mwsound/loudness.cpp b/apps/openmw/mwsound/loudness.cpp
index 326c59c07..19e5cd586 100644
--- a/apps/openmw/mwsound/loudness.cpp
+++ b/apps/openmw/mwsound/loudness.cpp
@@ -8,15 +8,16 @@
 namespace MWSound
 {
 
-void Sound_Loudness::analyzeLoudness(const std::vector< char >& data, int sampleRate, ChannelConfig chans, SampleType type, float valuesPerSecond)
+void Sound_Loudness::analyzeLoudness(const std::vector< char >& data)
 {
-    int samplesPerSegment = static_cast<int>(sampleRate / valuesPerSecond);
-    int numSamples = bytesToFrames(data.size(), chans, type);
-    int advance = framesToBytes(1, chans, type);
+    mQueue.insert( mQueue.end(), data.begin(), data.end() );
+    if (!mQueue.size())
+        return;
+
+    int samplesPerSegment = static_cast<int>(mSampleRate / mSamplesPerSec);
+    int numSamples = bytesToFrames(mQueue.size(), mChannelConfig, mSampleType);
+    int advance = framesToBytes(1, mChannelConfig, mSampleType);
 
-    mSamplesPerSec = valuesPerSecond;
-    mSamples.clear();
-    mSamples.reserve(numSamples/samplesPerSegment);
 
     int segment=0;
     int sample=0;
@@ -28,16 +29,16 @@ void Sound_Loudness::analyzeLoudness(const std::vector< char >& data, int sample
         {
             // get sample on a scale from -1 to 1
             float value = 0;
-            if (type == SampleType_UInt8)
-                value = ((char)(data[sample*advance]^0x80))/128.f;
-            else if (type == SampleType_Int16)
+            if (mSampleType == SampleType_UInt8)
+                value = ((char)(mQueue[sample*advance]^0x80))/128.f;
+            else if (mSampleType == SampleType_Int16)
             {
-                value = *reinterpret_cast<const int16_t*>(&data[sample*advance]);
+                value = *reinterpret_cast<const int16_t*>(&mQueue[sample*advance]);
                 value /= float(std::numeric_limits<int16_t>::max());
             }
-            else if (type == SampleType_Float32)
+            else if (mSampleType == SampleType_Float32)
             {
-                value = *reinterpret_cast<const float*>(&data[sample*advance]);
+                value = *reinterpret_cast<const float*>(&mQueue[sample*advance]);
                 value = std::max(-1.f, std::min(1.f, value)); // Float samples *should* be scaled to [-1,1] already.
             }
 
@@ -53,7 +54,7 @@ void Sound_Loudness::analyzeLoudness(const std::vector< char >& data, int sample
         ++segment;
     }
 
-    mReady = true;
+    mQueue.erase(mQueue.begin(), mQueue.begin() + sample*advance);
 }
 
 
diff --git a/apps/openmw/mwsound/loudness.hpp b/apps/openmw/mwsound/loudness.hpp
index 366d29de5..939d83dee 100644
--- a/apps/openmw/mwsound/loudness.hpp
+++ b/apps/openmw/mwsound/loudness.hpp
@@ -2,6 +2,7 @@
 #define GAME_SOUND_LOUDNESS_H
 
 #include <vector>
+#include <deque>
 
 #include "sound_decoder.hpp"
 
@@ -9,29 +10,45 @@ namespace MWSound
 {
 
 class Sound_Loudness {
-    // Loudness sample info
     float mSamplesPerSec;
+    int mSampleRate;
+    ChannelConfig mChannelConfig;
+    SampleType mSampleType;
+
+    // Loudness sample info
     std::vector<float> mSamples;
-    volatile bool mReady;
+
+    std::deque<char> mQueue;
 
 public:
-    Sound_Loudness() : mSamplesPerSec(0.0f), mReady(false) { }
+    /**
+     * @param samplesPerSecond How many loudness values per second of audio to compute.
+     * @param sampleRate the sample rate of the sound buffer
+     * @param chans channel layout of the buffer
+     * @param type sample type of the buffer
+    */
+    Sound_Loudness(float samplesPerSecond, int sampleRate, ChannelConfig chans, SampleType type)
+        : mSamplesPerSec(samplesPerSecond)
+        , mSampleRate(sampleRate)
+        , mChannelConfig(chans)
+        , mSampleType(type)
+    { }
 
     /**
      * Analyzes the energy (closely related to loudness) of a sound buffer.
      * The buffer will be divided into segments according to \a valuesPerSecond,
      * and for each segment a loudness value in the range of [0,1] will be computed.
+     * The computed values are then added to the mSamples vector. This method should be called continuously
+     * with chunks of audio until the whole audio file is processed.
+     * If the size of \a data does not exactly fit a number of loudness samples, the remainder
+     * will be kept in the mQueue and used in the next call to analyzeLoudness.
      * @param data the sound buffer to analyze, containing raw samples
-     * @param sampleRate the sample rate of the sound buffer
-     * @param chans channel layout of the buffer
-     * @param type sample type of the buffer
-     * @param valuesPerSecond How many loudness values per second of audio to compute.
      */
-    void analyzeLoudness(const std::vector<char>& data, int sampleRate,
-                         ChannelConfig chans, SampleType type,
-                         float valuesPerSecond);
+    void analyzeLoudness(const std::vector<char>& data);
 
-    bool isReady() { return mReady; }
+    /**
+     * Get loudness at a particular time. Before calling this, the stream has to be analyzed up to that point in time (see analyzeLoudness()).
+     */
     float getLoudnessAtTime(float sec) const;
 };
 
diff --git a/apps/openmw/mwsound/movieaudiofactory.cpp b/apps/openmw/mwsound/movieaudiofactory.cpp
index 554b62d26..af9932f74 100644
--- a/apps/openmw/mwsound/movieaudiofactory.cpp
+++ b/apps/openmw/mwsound/movieaudiofactory.cpp
@@ -27,7 +27,6 @@ namespace MWSound
 
         virtual void open(const std::string &fname);
         virtual void close();
-        virtual void rewind();
         virtual std::string getName();
         virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type);
         virtual size_t read(char *buffer, size_t bytes);
@@ -102,7 +101,6 @@ namespace MWSound
         throw std::runtime_error("unimplemented");
     }
     void MWSoundDecoderBridge::close() {}
-    void MWSoundDecoderBridge::rewind() {}
 
     std::string MWSoundDecoderBridge::getName()
     {
diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index d44020632..fb259ff5f 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -2,12 +2,17 @@
 #include <stdexcept>
 #include <iostream>
 #include <vector>
+#include <memory>
+#include <cstring>
 
 #include <stdint.h>
 
 #include <components/vfs/manager.hpp>
 
-#include <boost/thread.hpp>
+#include <OpenThreads/Thread>
+#include <OpenThreads/Condition>
+#include <OpenThreads/Mutex>
+#include <OpenThreads/ScopedLock>
 
 #include "openal_output.hpp"
 #include "sound_decoder.hpp"
@@ -212,6 +217,8 @@ private:
 
     DecoderPtr mDecoder;
 
+    std::auto_ptr<Sound_Loudness> mLoudnessAnalyzer;
+
     volatile bool mIsFinished;
 
     void updateAll(bool local);
@@ -222,13 +229,15 @@ private:
     friend class OpenAL_Output;
 
 public:
-    OpenAL_SoundStream(ALuint src, DecoderPtr decoder);
+    OpenAL_SoundStream(ALuint src, DecoderPtr decoder, bool getLoudnessData=false);
     ~OpenAL_SoundStream();
 
     bool isPlaying();
     double getStreamDelay() const;
     double getStreamOffset() const;
 
+    float getCurrentLoudness() const;
+
     bool process();
     ALint refillQueue();
 };
@@ -238,34 +247,31 @@ const ALfloat OpenAL_SoundStream::sBufferLength = 0.125f;
 //
 // A background streaming thread (keeps active streams processed)
 //
-struct OpenAL_Output::StreamThread {
+struct OpenAL_Output::StreamThread : public OpenThreads::Thread {
     typedef std::vector<OpenAL_SoundStream*> StreamVec;
     StreamVec mStreams;
 
-    typedef std::vector<std::pair<DecoderPtr,Sound_Loudness*> > DecoderLoudnessVec;
-    DecoderLoudnessVec mDecoderLoudness;
-
     volatile bool mQuitNow;
-    boost::mutex mMutex;
-    boost::condition_variable mCondVar;
-    boost::thread mThread;
+    OpenThreads::Mutex mMutex;
+    OpenThreads::Condition mCondVar;
 
     StreamThread()
-      : mQuitNow(false), mThread(boost::ref(*this))
+      : mQuitNow(false)
     {
+        start();
     }
     ~StreamThread()
     {
         mQuitNow = true;
         mMutex.lock(); mMutex.unlock();
-        mCondVar.notify_all();
-        mThread.join();
+        mCondVar.broadcast();
+        join();
     }
 
-    // boost::thread entry point
-    void operator()()
+    // thread entry point
+    virtual void run()
     {
-        boost::unique_lock<boost::mutex> lock(mMutex);
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
         while(!mQuitNow)
         {
             StreamVec::iterator iter = mStreams.begin();
@@ -277,67 +283,31 @@ struct OpenAL_Output::StreamThread {
                     ++iter;
             }
 
-            // Only do one loudness decode at a time, in case it takes particularly long we don't
-            // want to block up anything.
-            DecoderLoudnessVec::iterator dliter = mDecoderLoudness.begin();
-            if(dliter != mDecoderLoudness.end())
-            {
-                DecoderPtr decoder = dliter->first;
-                Sound_Loudness *loudness = dliter->second;
-                mDecoderLoudness.erase(dliter);
-                lock.unlock();
-
-                std::vector<char> data;
-                ChannelConfig chans = ChannelConfig_Mono;
-                SampleType type = SampleType_Int16;
-                int srate = 48000;
-                try {
-                    decoder->getInfo(&srate, &chans, &type);
-                    decoder->readAll(data);
-                }
-                catch(std::exception &e) {
-                    std::cerr<< "Failed to decode audio: "<<e.what() <<std::endl;
-                }
-
-                loudness->analyzeLoudness(data, srate, chans, type, static_cast<float>(sLoudnessFPS));
-                lock.lock();
-                continue;
-            }
-            mCondVar.timed_wait(lock, boost::posix_time::milliseconds(50));
+            mCondVar.wait(&mMutex, 50);
         }
     }
 
     void add(OpenAL_SoundStream *stream)
     {
-        boost::unique_lock<boost::mutex> lock(mMutex);
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
         if(std::find(mStreams.begin(), mStreams.end(), stream) == mStreams.end())
         {
             mStreams.push_back(stream);
-            lock.unlock();
-            mCondVar.notify_all();
+            mCondVar.broadcast();
         }
     }
 
     void remove(OpenAL_SoundStream *stream)
     {
-        boost::lock_guard<boost::mutex> lock(mMutex);
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
         StreamVec::iterator iter = std::find(mStreams.begin(), mStreams.end(), stream);
         if(iter != mStreams.end()) mStreams.erase(iter);
     }
 
     void removeAll()
     {
-        boost::lock_guard<boost::mutex> lock(mMutex);
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
         mStreams.clear();
-        mDecoderLoudness.clear();
-    }
-
-    void add(DecoderPtr decoder, Sound_Loudness *loudness)
-    {
-        boost::unique_lock<boost::mutex> lock(mMutex);
-        mDecoderLoudness.push_back(std::make_pair(decoder, loudness));
-        lock.unlock();
-        mCondVar.notify_all();
     }
 
 private:
@@ -346,7 +316,7 @@ private:
 };
 
 
-OpenAL_SoundStream::OpenAL_SoundStream(ALuint src, DecoderPtr decoder)
+OpenAL_SoundStream::OpenAL_SoundStream(ALuint src, DecoderPtr decoder, bool getLoudnessData)
   : mSource(src), mCurrentBufIdx(0), mFrameSize(0), mSilence(0), mDecoder(decoder), mIsFinished(false)
 {
     alGenBuffers(sNumBuffers, mBuffers);
@@ -371,6 +341,9 @@ OpenAL_SoundStream::OpenAL_SoundStream(ALuint src, DecoderPtr decoder)
         mFrameSize = framesToBytes(1, chans, type);
         mBufferSize = static_cast<ALuint>(sBufferLength*srate);
         mBufferSize *= mFrameSize;
+
+        if (getLoudnessData)
+            mLoudnessAnalyzer.reset(new Sound_Loudness(sLoudnessFPS, mSampleRate, chans, type));
     }
     catch(std::exception&)
     {
@@ -446,6 +419,15 @@ double OpenAL_SoundStream::getStreamOffset() const
     return t;
 }
 
+float OpenAL_SoundStream::getCurrentLoudness() const
+{
+    if (!mLoudnessAnalyzer.get())
+        return 0.f;
+
+    float time = getStreamOffset();
+    return mLoudnessAnalyzer->getLoudnessAtTime(time);
+}
+
 bool OpenAL_SoundStream::process()
 {
     try {
@@ -455,7 +437,9 @@ bool OpenAL_SoundStream::process()
             alGetSourcei(mSource, AL_SOURCE_STATE, &state);
             if(state != AL_PLAYING && state != AL_PAUSED)
             {
+                // Ensure all processed buffers are removed so we don't replay them.
                 refillQueue();
+
                 alSourcePlay(mSource);
             }
         }
@@ -489,10 +473,13 @@ ALint OpenAL_SoundStream::refillQueue()
             if(got < data.size())
             {
                 mIsFinished = true;
-                memset(&data[got], mSilence, data.size()-got);
+                std::memset(&data[got], mSilence, data.size()-got);
             }
             if(got > 0)
             {
+                if (mLoudnessAnalyzer.get())
+                    mLoudnessAnalyzer->analyzeLoudness(data);
+
                 ALuint bufid = mBuffers[mCurrentBufIdx];
                 alBufferData(bufid, mFormat, &data[0], data.size(), mSampleRate);
                 alSourceQueueBuffers(mSource, 1, &bufid);
@@ -921,7 +908,10 @@ void OpenAL_Output::finishSound(MWBase::SoundPtr sound)
     ALuint source = GET_PTRID(sound->mHandle);
     sound->mHandle = 0;
 
-    alSourceStop(source);
+    // Rewind the stream instead of stopping it, this puts the source into an AL_INITIAL state,
+    // which works around a bug in the MacOS OpenAL implementation which would otherwise think
+    // the initial queue already played when it hasn't.
+    alSourceRewind(source);
     alSourcei(source, AL_BUFFER, 0);
 
     mFreeSources.push_back(source);
@@ -981,7 +971,7 @@ void OpenAL_Output::streamSound(DecoderPtr decoder, MWBase::SoundStreamPtr sound
     sound->mHandle = stream;
 }
 
-void OpenAL_Output::streamSound3D(DecoderPtr decoder, MWBase::SoundStreamPtr sound)
+void OpenAL_Output::streamSound3D(DecoderPtr decoder, MWBase::SoundStreamPtr sound, bool getLoudnessData)
 {
     OpenAL_SoundStream *stream = 0;
     ALuint source;
@@ -998,7 +988,7 @@ void OpenAL_Output::streamSound3D(DecoderPtr decoder, MWBase::SoundStreamPtr sou
                      sound->getRealVolume(), sound->getPitch(), false, sound->getUseEnv());
         throwALerror();
 
-        stream = new OpenAL_SoundStream(source, decoder);
+        stream = new OpenAL_SoundStream(source, decoder, getLoudnessData);
         mStreamThread->add(stream);
         mActiveStreams.push_back(sound);
     }
@@ -1021,7 +1011,10 @@ void OpenAL_Output::finishStream(MWBase::SoundStreamPtr sound)
     sound->mHandle = 0;
     mStreamThread->remove(stream);
 
-    alSourceStop(source);
+    // Rewind the stream instead of stopping it, this puts the source into an AL_INITIAL state,
+    // which works around a bug in the MacOS OpenAL implementation which would otherwise think
+    // the initial queue already played when it hasn't.
+    alSourceRewind(source);
     alSourcei(source, AL_BUFFER, 0);
 
     mFreeSources.push_back(source);
@@ -1041,15 +1034,23 @@ double OpenAL_Output::getStreamOffset(MWBase::SoundStreamPtr sound)
 {
     if(!sound->mHandle) return 0.0;
     OpenAL_SoundStream *stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
-    boost::lock_guard<boost::mutex> lock(mStreamThread->mMutex);
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mStreamThread->mMutex);
     return stream->getStreamOffset();
 }
 
+float OpenAL_Output::getStreamLoudness(MWBase::SoundStreamPtr sound)
+{
+    if(!sound->mHandle) return 0.0;
+    OpenAL_SoundStream *stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mStreamThread->mMutex);
+    return stream->getCurrentLoudness();
+}
+
 bool OpenAL_Output::isStreamPlaying(MWBase::SoundStreamPtr sound)
 {
     if(!sound->mHandle) return false;
     OpenAL_SoundStream *stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
-    boost::lock_guard<boost::mutex> lock(mStreamThread->mMutex);
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mStreamThread->mMutex);
     return stream->isPlaying();
 }
 
@@ -1144,12 +1145,6 @@ void OpenAL_Output::resumeSounds(int types)
 }
 
 
-void OpenAL_Output::loadLoudnessAsync(DecoderPtr decoder, Sound_Loudness *loudness)
-{
-    mStreamThread->add(decoder, loudness);
-}
-
-
 OpenAL_Output::OpenAL_Output(SoundManager &mgr)
   : Sound_Output(mgr), mDevice(0), mContext(0)
   , mListenerPos(0.0f, 0.0f, 0.0f), mListenerEnv(Env_Normal)
diff --git a/apps/openmw/mwsound/openal_output.hpp b/apps/openmw/mwsound/openal_output.hpp
index 4986cd3a0..24c8609d6 100644
--- a/apps/openmw/mwsound/openal_output.hpp
+++ b/apps/openmw/mwsound/openal_output.hpp
@@ -63,10 +63,11 @@ namespace MWSound
         virtual void updateSound(MWBase::SoundPtr sound);
 
         virtual void streamSound(DecoderPtr decoder, MWBase::SoundStreamPtr sound);
-        virtual void streamSound3D(DecoderPtr decoder, MWBase::SoundStreamPtr sound);
+        virtual void streamSound3D(DecoderPtr decoder, MWBase::SoundStreamPtr sound, bool getLoudnessData);
         virtual void finishStream(MWBase::SoundStreamPtr sound);
         virtual double getStreamDelay(MWBase::SoundStreamPtr sound);
         virtual double getStreamOffset(MWBase::SoundStreamPtr sound);
+        virtual float getStreamLoudness(MWBase::SoundStreamPtr sound);
         virtual bool isStreamPlaying(MWBase::SoundStreamPtr sound);
         virtual void updateStream(MWBase::SoundStreamPtr sound);
 
@@ -78,8 +79,6 @@ namespace MWSound
         virtual void pauseSounds(int types);
         virtual void resumeSounds(int types);
 
-        virtual void loadLoudnessAsync(DecoderPtr decoder, Sound_Loudness *loudness);
-
         OpenAL_Output(SoundManager &mgr);
         virtual ~OpenAL_Output();
     };
diff --git a/apps/openmw/mwsound/sound_buffer.hpp b/apps/openmw/mwsound/sound_buffer.hpp
index 8f8e43da4..5ca3a45da 100644
--- a/apps/openmw/mwsound/sound_buffer.hpp
+++ b/apps/openmw/mwsound/sound_buffer.hpp
@@ -3,11 +3,7 @@
 
 #include <string>
 
-#include "soundmanagerimp.hpp"
 #include "sound_output.hpp"
-#include "loudness.hpp"
-
-#include "../mwworld/ptr.hpp"
 
 namespace MWSound
 {
diff --git a/apps/openmw/mwsound/sound_decoder.hpp b/apps/openmw/mwsound/sound_decoder.hpp
index 1be9dd374..34bae87d7 100644
--- a/apps/openmw/mwsound/sound_decoder.hpp
+++ b/apps/openmw/mwsound/sound_decoder.hpp
@@ -42,7 +42,6 @@ namespace MWSound
 
         virtual size_t read(char *buffer, size_t bytes) = 0;
         virtual void readAll(std::vector<char> &output);
-        virtual void rewind() = 0;
         virtual size_t getSampleOffset() = 0;
 
         Sound_Decoder(const VFS::Manager* resourceMgr) : mResourceMgr(resourceMgr)
diff --git a/apps/openmw/mwsound/sound_output.hpp b/apps/openmw/mwsound/sound_output.hpp
index 98eba8466..e34d888ee 100644
--- a/apps/openmw/mwsound/sound_output.hpp
+++ b/apps/openmw/mwsound/sound_output.hpp
@@ -12,7 +12,6 @@ namespace MWSound
     class SoundManager;
     struct Sound_Decoder;
     class Sound;
-    class Sound_Loudness;
 
     // An opaque handle for the implementation's sound buffers.
     typedef void *Sound_Handle;
@@ -42,10 +41,11 @@ namespace MWSound
         virtual void updateSound(MWBase::SoundPtr sound) = 0;
 
         virtual void streamSound(DecoderPtr decoder, MWBase::SoundStreamPtr sound) = 0;
-        virtual void streamSound3D(DecoderPtr decoder, MWBase::SoundStreamPtr sound) = 0;
+        virtual void streamSound3D(DecoderPtr decoder, MWBase::SoundStreamPtr sound, bool getLoudnessData) = 0;
         virtual void finishStream(MWBase::SoundStreamPtr sound) = 0;
         virtual double getStreamDelay(MWBase::SoundStreamPtr sound) = 0;
         virtual double getStreamOffset(MWBase::SoundStreamPtr sound) = 0;
+        virtual float getStreamLoudness(MWBase::SoundStreamPtr sound) = 0;
         virtual bool isStreamPlaying(MWBase::SoundStreamPtr sound) = 0;
         virtual void updateStream(MWBase::SoundStreamPtr sound) = 0;
 
@@ -57,11 +57,6 @@ namespace MWSound
         virtual void pauseSounds(int types) = 0;
         virtual void resumeSounds(int types) = 0;
 
-        // HACK: The sound output implementation really shouldn't be handling
-        // asynchronous loudness data loading, but it's currently where we have
-        // a background processing thread.
-        virtual void loadLoudnessAsync(DecoderPtr decoder, Sound_Loudness *loudness) = 0;
-
         Sound_Output& operator=(const Sound_Output &rhs);
         Sound_Output(const Sound_Output &rhs);
 
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index e8ceaa40f..9b5fb1b3d 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -34,8 +34,9 @@
 
 namespace MWSound
 {
-    SoundManager::SoundManager(const VFS::Manager* vfs, bool useSound)
+    SoundManager::SoundManager(const VFS::Manager* vfs, const std::map<std::string,std::string>& fallbackMap, bool useSound)
         : mVFS(vfs)
+        , mFallback(fallbackMap)
         , mOutput(new DEFAULT_OUTPUT(*this))
         , mMasterVolume(1.0f)
         , mSFXVolume(1.0f)
@@ -61,6 +62,13 @@ namespace MWSound
         mFootstepsVolume = Settings::Manager::getFloat("footsteps volume", "Sound");
         mFootstepsVolume = std::min(std::max(mFootstepsVolume, 0.0f), 1.0f);
 
+        mNearWaterRadius = mFallback.getFallbackInt("Water_NearWaterRadius");
+        mNearWaterPoints = mFallback.getFallbackInt("Water_NearWaterPoints");
+        mNearWaterIndoorTolerance = mFallback.getFallbackFloat("Water_NearWaterIndoorTolerance");
+        mNearWaterOutdoorTolerance = mFallback.getFallbackFloat("Water_NearWaterOutdoorTolerance");
+        mNearWaterIndoorID = mFallback.getFallbackString("Water_NearWaterIndoorID");
+        mNearWaterOutdoorID = mFallback.getFallbackString("Water_NearWaterOutdoorID");
+
         mBufferCacheMin = std::max(Settings::Manager::getInt("buffer cache min", "Sound"), 1);
         mBufferCacheMax = std::max(Settings::Manager::getInt("buffer cache max", "Sound"), 1);
         mBufferCacheMax *= 1024*1024;
@@ -219,7 +227,7 @@ namespace MWSound
         return sfx;
     }
 
-    DecoderPtr SoundManager::loadVoice(const std::string &voicefile, Sound_Loudness **lipdata)
+    DecoderPtr SoundManager::loadVoice(const std::string &voicefile)
     {
         DecoderPtr decoder = getDecoder();
         // Workaround: Bethesda at some point converted some of the files to mp3, but the references were kept as .wav.
@@ -234,21 +242,6 @@ namespace MWSound
             decoder->open(file);
         }
 
-        NameLoudnessRefMap::iterator lipiter = mVoiceLipNameMap.find(voicefile);
-        if(lipiter != mVoiceLipNameMap.end())
-        {
-            *lipdata = lipiter->second;
-            return decoder;
-        }
-
-        mVoiceLipBuffers.insert(mVoiceLipBuffers.end(), Sound_Loudness());
-        lipiter = mVoiceLipNameMap.insert(
-            std::make_pair(voicefile, &mVoiceLipBuffers.back())
-        ).first;
-
-        mOutput->loadLoudnessAsync(decoder, lipiter->second);
-
-        *lipdata = lipiter->second;
         return decoder;
     }
 
@@ -273,7 +266,7 @@ namespace MWSound
         {
             sound.reset(new Stream(pos, 1.0f, basevol, 1.0f, minDistance, maxDistance,
                                    Play_Normal|Play_TypeVoice|Play_3D));
-            mOutput->streamSound3D(decoder, sound);
+            mOutput->streamSound3D(decoder, sound, true);
         }
         return sound;
     }
@@ -366,7 +359,7 @@ namespace MWSound
         else
             filelist = mMusicFiles[mCurrentPlaylist];
 
-        if(!filelist.size())
+        if(filelist.empty())
             return;
 
         int i = Misc::Rng::rollDice(filelist.size());
@@ -400,28 +393,22 @@ namespace MWSound
         {
             std::string voicefile = "Sound/"+filename;
 
-            Sound_Loudness *loudness;
             mVFS->normalizeFilename(voicefile);
-            DecoderPtr decoder = loadVoice(voicefile, &loudness);
+            DecoderPtr decoder = loadVoice(voicefile);
 
-            if(!loudness->isReady())
-                mPendingSaySounds[ptr] = std::make_pair(decoder, loudness);
-            else
-            {
-                MWBase::World *world = MWBase::Environment::get().getWorld();
-                const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans();
+            MWBase::World *world = MWBase::Environment::get().getWorld();
+            const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans();
 
-                SaySoundMap::iterator oldIt = mActiveSaySounds.find(ptr);
-                if (oldIt != mActiveSaySounds.end())
-                {
-                    mOutput->finishStream(oldIt->second.first);
-                    mActiveSaySounds.erase(oldIt);
-                }
+            SaySoundMap::iterator oldIt = mActiveSaySounds.find(ptr);
+            if (oldIt != mActiveSaySounds.end())
+            {
+                mOutput->finishStream(oldIt->second);
+                mActiveSaySounds.erase(oldIt);
+            }
 
-                MWBase::SoundStreamPtr sound = playVoice(decoder, pos, (ptr == MWMechanics::getPlayer()));
+            MWBase::SoundStreamPtr sound = playVoice(decoder, pos, (ptr == MWMechanics::getPlayer()));
 
-                mActiveSaySounds.insert(std::make_pair(ptr, std::make_pair(sound, loudness)));
-            }
+            mActiveSaySounds.insert(std::make_pair(ptr, sound));
         }
         catch(std::exception &e)
         {
@@ -434,10 +421,8 @@ namespace MWSound
         SaySoundMap::const_iterator snditer = mActiveSaySounds.find(ptr);
         if(snditer != mActiveSaySounds.end())
         {
-            MWBase::SoundStreamPtr sound = snditer->second.first;
-            Sound_Loudness *loudness = snditer->second.second;
-            float sec = mOutput->getStreamOffset(sound);
-            return loudness->getLoudnessAtTime(sec);
+            MWBase::SoundStreamPtr sound = snditer->second;
+            return mOutput->getStreamLoudness(sound);
         }
 
         return 0.0f;
@@ -451,24 +436,18 @@ namespace MWSound
         {
             std::string voicefile = "Sound/"+filename;
 
-            Sound_Loudness *loudness;
             mVFS->normalizeFilename(voicefile);
-            DecoderPtr decoder = loadVoice(voicefile, &loudness);
+            DecoderPtr decoder = loadVoice(voicefile);
 
-            if(!loudness->isReady())
-                mPendingSaySounds[MWWorld::ConstPtr()] = std::make_pair(decoder, loudness);
-            else
+            SaySoundMap::iterator oldIt = mActiveSaySounds.find(MWWorld::ConstPtr());
+            if (oldIt != mActiveSaySounds.end())
             {
-                SaySoundMap::iterator oldIt = mActiveSaySounds.find(MWWorld::ConstPtr());
-                if (oldIt != mActiveSaySounds.end())
-                {
-                    mOutput->finishStream(oldIt->second.first);
-                    mActiveSaySounds.erase(oldIt);
-                }
-
-                mActiveSaySounds.insert(std::make_pair(MWWorld::ConstPtr(),
-                                                       std::make_pair(playVoice(decoder, osg::Vec3f(), true), loudness)));
+                mOutput->finishStream(oldIt->second);
+                mActiveSaySounds.erase(oldIt);
             }
+
+            mActiveSaySounds.insert(std::make_pair(MWWorld::ConstPtr(),
+                                                   playVoice(decoder, osg::Vec3f(), true)));
         }
         catch(std::exception &e)
         {
@@ -481,11 +460,11 @@ namespace MWSound
         SaySoundMap::const_iterator snditer = mActiveSaySounds.find(ptr);
         if(snditer != mActiveSaySounds.end())
         {
-            if(mOutput->isStreamPlaying(snditer->second.first))
+            if(mOutput->isStreamPlaying(snditer->second))
                 return false;
             return true;
         }
-        return mPendingSaySounds.find(ptr) == mPendingSaySounds.end();
+        return true;
     }
 
     void SoundManager::stopSay(const MWWorld::ConstPtr &ptr)
@@ -493,10 +472,9 @@ namespace MWSound
         SaySoundMap::iterator snditer = mActiveSaySounds.find(ptr);
         if(snditer != mActiveSaySounds.end())
         {
-            mOutput->finishStream(snditer->second.first);
+            mOutput->finishStream(snditer->second);
             mActiveSaySounds.erase(snditer);
         }
-        mPendingSaySounds.erase(ptr);
     }
 
 
@@ -691,7 +669,7 @@ namespace MWSound
                sayiter->first != MWMechanics::getPlayer() &&
                sayiter->first.getCell() == cell)
             {
-                mOutput->finishStream(sayiter->second.first);
+                mOutput->finishStream(sayiter->second);
             }
             ++sayiter;
         }
@@ -826,6 +804,96 @@ namespace MWSound
         }
     }
 
+    void SoundManager::updateWaterSound(float /*duration*/)
+    {
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWWorld::ConstPtr player = world->getPlayerPtr();
+        osg::Vec3f pos = player.getRefData().getPosition().asVec3();
+
+        float volume = 0.0f;
+        const std::string& soundId = player.getCell()->isExterior() ? mNearWaterOutdoorID : mNearWaterIndoorID;
+
+        if (!mListenerUnderwater)
+        {
+            if (player.getCell()->getCell()->hasWater())
+            {
+                float dist = std::abs(player.getCell()->getWaterLevel() - pos.z());
+
+                if (player.getCell()->isExterior() && dist < mNearWaterOutdoorTolerance)
+                {
+                    volume = (mNearWaterOutdoorTolerance - dist) / mNearWaterOutdoorTolerance;
+
+                    if (mNearWaterPoints > 1)
+                    {
+                        int underwaterPoints = 0;
+
+                        float step = mNearWaterRadius * 2.0f / (mNearWaterPoints - 1);
+
+                        for (int x = 0; x < mNearWaterPoints; x++)
+                        {
+                            for (int y = 0; y < mNearWaterPoints; y++)
+                            {
+                                float height = world->getTerrainHeightAt(
+                                            osg::Vec3f(pos.x() - mNearWaterRadius + x*step, pos.y() - mNearWaterRadius + y*step, 0.0f));
+
+                                if (height < 0)
+                                    underwaterPoints++;
+                            }
+                        }
+
+                        volume *= underwaterPoints * 2.0f / (mNearWaterPoints*mNearWaterPoints);
+                    }
+                }
+                else if (!player.getCell()->isExterior() && dist < mNearWaterIndoorTolerance)
+                {
+                    volume = (mNearWaterIndoorTolerance - dist) / mNearWaterIndoorTolerance;
+                }
+            }
+        }
+        else
+            volume = 1.0f;
+
+        volume = std::min(volume, 1.0f);
+
+        if (mNearWaterSound)
+        {
+            if (volume == 0.0f)
+            {
+                mOutput->finishSound(mNearWaterSound);
+                mNearWaterSound.reset();
+            }
+            else
+            {
+                bool soundIdChanged = false;
+
+                Sound_Buffer* sfx = lookupSound(Misc::StringUtils::lowerCase(soundId));
+
+                for (SoundMap::const_iterator snditer = mActiveSounds.begin(); snditer != mActiveSounds.end(); ++snditer)
+                {
+                    for (SoundBufferRefPairList::const_iterator pairiter = snditer->second.begin(); pairiter != snditer->second.end(); ++pairiter)
+                    {
+                        if (pairiter->first == mNearWaterSound)
+                        {
+                            if (pairiter->second != sfx)
+                                soundIdChanged = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (soundIdChanged)
+                {
+                    mOutput->finishSound(mNearWaterSound);
+                    mNearWaterSound = playSound(soundId, volume, 1.0f, Play_TypeSfx, Play_Loop);
+                }
+                else if (sfx)
+                    mNearWaterSound->setVolume(volume * sfx->mVolume);
+            }
+        }
+        else if (volume > 0.0f)
+            mNearWaterSound = playSound(soundId, volume, 1.0f, Play_TypeSfx, Play_Loop);
+    }
+
     void SoundManager::updateSounds(float duration)
     {
         static float timePassed = 0.0;
@@ -837,7 +905,7 @@ namespace MWSound
         timePassed = 0.0f;
 
         // Make sure music is still playing
-        if(!isMusicPlaying())
+        if(!isMusicPlaying() && !mCurrentPlaylist.empty())
             startRandomTitle();
 
         Environment env = Env_Normal;
@@ -901,51 +969,11 @@ namespace MWSound
                 ++snditer;
         }
 
-        SayDecoderMap::iterator penditer = mPendingSaySounds.begin();
-        while(penditer != mPendingSaySounds.end())
-        {
-            Sound_Loudness *loudness = penditer->second.second;
-            if(loudness->isReady())
-            {
-                try {
-                    DecoderPtr decoder = penditer->second.first;
-                    decoder->rewind();
-
-                    MWBase::SoundStreamPtr sound;
-                    MWWorld::ConstPtr ptr = penditer->first;
-
-                    SaySoundMap::iterator old = mActiveSaySounds.find(ptr);
-                    if (old != mActiveSaySounds.end())
-                    {
-                        mOutput->finishStream(old->second.first);
-                        mActiveSaySounds.erase(old);
-                    }
-
-                    if(ptr == MWWorld::ConstPtr())
-                        sound = playVoice(decoder, osg::Vec3f(), true);
-                    else
-                    {
-                        MWBase::World *world = MWBase::Environment::get().getWorld();
-                        const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans();
-                        sound = playVoice(decoder, pos, (ptr == MWMechanics::getPlayer()));
-                    }
-                    mActiveSaySounds.insert(std::make_pair(ptr, std::make_pair(sound, loudness)));
-                }
-                catch(std::exception &e) {
-                    std::cerr<< "Sound Error: "<<e.what() <<std::endl;
-                }
-
-                mPendingSaySounds.erase(penditer++);
-            }
-            else
-                ++penditer;
-        }
-
         SaySoundMap::iterator sayiter = mActiveSaySounds.begin();
         while(sayiter != mActiveSaySounds.end())
         {
             MWWorld::ConstPtr ptr = sayiter->first;
-            MWBase::SoundStreamPtr sound = sayiter->second.first;
+            MWBase::SoundStreamPtr sound = sayiter->second;
             if(!ptr.isEmpty() && sound->getIs3D())
             {
                 MWBase::World *world = MWBase::Environment::get().getWorld();
@@ -1011,6 +1039,7 @@ namespace MWSound
         {
             updateSounds(duration);
             updateRegionSound(duration);
+            updateWaterSound(duration);
         }
     }
 
@@ -1040,7 +1069,7 @@ namespace MWSound
         SaySoundMap::iterator sayiter = mActiveSaySounds.begin();
         for(;sayiter != mActiveSaySounds.end();++sayiter)
         {
-            MWBase::SoundStreamPtr sound = sayiter->second.first;
+            MWBase::SoundStreamPtr sound = sayiter->second;
             sound->setBaseVolume(volumeFromType(sound->getPlayType()));
             mOutput->updateStream(sound);
         }
@@ -1080,16 +1109,9 @@ namespace MWSound
         SaySoundMap::iterator sayiter = mActiveSaySounds.find(old);
         if(sayiter != mActiveSaySounds.end())
         {
-            SoundLoudnessPair sndlist = sayiter->second;
+            MWBase::SoundStreamPtr stream = sayiter->second;
             mActiveSaySounds.erase(sayiter);
-            mActiveSaySounds[updated] = sndlist;
-        }
-        SayDecoderMap::iterator penditer = mPendingSaySounds.find(old);
-        if(penditer != mPendingSaySounds.end())
-        {
-            DecoderLoudnessPair dl = penditer->second;
-            mPendingSaySounds.erase(penditer);
-            mPendingSaySounds[updated] = dl;
+            mActiveSaySounds[updated] = stream;
         }
     }
 
@@ -1175,14 +1197,14 @@ namespace MWSound
         mActiveSounds.clear();
         SaySoundMap::iterator sayiter = mActiveSaySounds.begin();
         for(;sayiter != mActiveSaySounds.end();++sayiter)
-            mOutput->finishStream(sayiter->second.first);
+            mOutput->finishStream(sayiter->second);
         mActiveSaySounds.clear();
         TrackList::iterator trkiter = mActiveTracks.begin();
         for(;trkiter != mActiveTracks.end();++trkiter)
             mOutput->finishStream(*trkiter);
         mActiveTracks.clear();
-        mPendingSaySounds.clear();
         mUnderwaterSound.reset();
+        mNearWaterSound.reset();
         stopMusic();
     }
 }
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index 695ca92a2..abf5edb97 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -11,7 +11,8 @@
 
 #include <components/settings/settings.hpp>
 
-#include "loudness.hpp"
+#include <components/fallback/fallback.hpp>
+
 #include "../mwbase/soundmanager.hpp"
 
 namespace VFS
@@ -45,6 +46,8 @@ namespace MWSound
     {
         const VFS::Manager* mVFS;
 
+        Fallback::Map mFallback;
+
         std::auto_ptr<Sound_Output> mOutput;
 
         // Caches available music tracks by <playlist name, (sound files) >
@@ -57,6 +60,13 @@ namespace MWSound
         float mVoiceVolume;
         float mFootstepsVolume;
 
+        int mNearWaterRadius;
+        int mNearWaterPoints;
+        float mNearWaterIndoorTolerance;
+        float mNearWaterOutdoorTolerance;
+        std::string mNearWaterIndoorID;
+        std::string mNearWaterOutdoorID;
+
         typedef std::auto_ptr<std::deque<Sound_Buffer> > SoundBufferList;
         // List of sound buffers, grown as needed. New enties are added to the
         // back, allowing existing Sound_Buffer references/pointers to remain
@@ -69,12 +79,6 @@ namespace MWSound
         typedef std::map<std::string,Sound_Buffer*> NameBufferMap;
         NameBufferMap mBufferNameMap;
 
-        typedef std::deque<Sound_Loudness> LoudnessList;
-        LoudnessList mVoiceLipBuffers;
-
-        typedef std::map<std::string,Sound_Loudness*> NameLoudnessRefMap;
-        NameLoudnessRefMap mVoiceLipNameMap;
-
         // NOTE: unused buffers are stored in front-newest order.
         typedef std::deque<Sound_Buffer*> SoundList;
         SoundList mUnusedBuffers;
@@ -84,14 +88,9 @@ namespace MWSound
         typedef std::map<MWWorld::ConstPtr,SoundBufferRefPairList> SoundMap;
         SoundMap mActiveSounds;
 
-        typedef std::pair<MWBase::SoundStreamPtr,Sound_Loudness*> SoundLoudnessPair;
-        typedef std::map<MWWorld::ConstPtr,SoundLoudnessPair> SaySoundMap;
+        typedef std::map<MWWorld::ConstPtr,MWBase::SoundStreamPtr> SaySoundMap;
         SaySoundMap mActiveSaySounds;
 
-        typedef std::pair<DecoderPtr,Sound_Loudness*> DecoderLoudnessPair;
-        typedef std::map<MWWorld::ConstPtr,DecoderLoudnessPair> SayDecoderMap;
-        SayDecoderMap mPendingSaySounds;
-
         typedef std::vector<MWBase::SoundStreamPtr> TrackList;
         TrackList mActiveTracks;
 
@@ -106,21 +105,22 @@ namespace MWSound
         int mPausedSoundTypes;
 
         MWBase::SoundPtr mUnderwaterSound;
+        MWBase::SoundPtr mNearWaterSound;
 
         Sound_Buffer *insertSound(const std::string &soundId, const ESM::Sound *sound);
 
         Sound_Buffer *lookupSound(const std::string &soundId) const;
         Sound_Buffer *loadSound(const std::string &soundId);
 
-        // Ensures the loudness/"lip" data gets loaded, and returns a decoder
-        // to start streaming
-        DecoderPtr loadVoice(const std::string &voicefile, Sound_Loudness **lipdata);
+        // returns a decoder to start streaming
+        DecoderPtr loadVoice(const std::string &voicefile);
 
         MWBase::SoundStreamPtr playVoice(DecoderPtr decoder, const osg::Vec3f &pos, bool playlocal);
 
         void streamMusicFull(const std::string& filename);
         void updateSounds(float duration);
         void updateRegionSound(float duration);
+        void updateWaterSound(float duration);
 
         float volumeFromType(PlayType type) const;
 
@@ -132,7 +132,7 @@ namespace MWSound
         friend class OpenAL_Output;
 
     public:
-        SoundManager(const VFS::Manager* vfs, bool useSound);
+        SoundManager(const VFS::Manager* vfs, const std::map<std::string, std::string>& fallbackMap, bool useSound);
         virtual ~SoundManager();
 
         virtual void processChangedSettings(const Settings::CategorySettingVector& settings);
diff --git a/apps/openmw/mwstate/charactermanager.cpp b/apps/openmw/mwstate/charactermanager.cpp
index 22192c355..90b25ab5a 100644
--- a/apps/openmw/mwstate/charactermanager.cpp
+++ b/apps/openmw/mwstate/charactermanager.cpp
@@ -32,11 +32,8 @@ MWState::CharacterManager::CharacterManager (const boost::filesystem::path& save
     }
 }
 
-MWState::Character *MWState::CharacterManager::getCurrentCharacter (bool create, const std::string& name)
+MWState::Character *MWState::CharacterManager::getCurrentCharacter ()
 {
-    if (!mCurrent && create)
-        createCharacter(name);
-
     return mCurrent;
 }
 
@@ -56,7 +53,7 @@ void MWState::CharacterManager::deleteSlot(const MWState::Character *character,
     }
 }
 
-void MWState::CharacterManager::createCharacter(const std::string& name)
+MWState::Character* MWState::CharacterManager::createCharacter(const std::string& name)
 {
     std::ostringstream stream;
 
@@ -82,8 +79,7 @@ void MWState::CharacterManager::createCharacter(const std::string& name)
     }
 
     mCharacters.push_back (Character (path, mGame));
-
-    mCurrent = &mCharacters.back();
+    return &mCharacters.back();
 }
 
 std::list<MWState::Character>::iterator MWState::CharacterManager::findCharacter(const MWState::Character* character)
@@ -101,15 +97,16 @@ std::list<MWState::Character>::iterator MWState::CharacterManager::findCharacter
 
 void MWState::CharacterManager::setCurrentCharacter (const Character *character)
 {
-    std::list<Character>::iterator it = findCharacter(character);
+    if (!character)
+        mCurrent = NULL;
+    else
+    {
+        std::list<Character>::iterator it = findCharacter(character);
 
-    mCurrent = &*it;
+        mCurrent = &*it;
+    }
 }
 
-void MWState::CharacterManager::clearCurrentCharacter()
-{
-    mCurrent = 0;
-}
 
 std::list<MWState::Character>::const_iterator MWState::CharacterManager::begin() const
 {
diff --git a/apps/openmw/mwstate/charactermanager.hpp b/apps/openmw/mwstate/charactermanager.hpp
index c44c10b5a..2daf73401 100644
--- a/apps/openmw/mwstate/charactermanager.hpp
+++ b/apps/openmw/mwstate/charactermanager.hpp
@@ -31,20 +31,17 @@ namespace MWState
 
             CharacterManager (const boost::filesystem::path& saves, const std::string& game);
 
-            Character *getCurrentCharacter (bool create, const std::string& name);
-            ///< \param create Create a new character, if there is no current character.
-            /// \param name The character name to use in case a new character is created.
+            Character *getCurrentCharacter ();
+            ///< @note May return null
 
             void deleteSlot(const MWState::Character *character, const MWState::Slot *slot);
 
-            void createCharacter(const std::string& name);
+            Character* createCharacter(const std::string& name);
             ///< Create new character within saved game management
             /// \param name Name for the character (does not need to be unique)
 
             void setCurrentCharacter (const Character *character);
 
-            void clearCurrentCharacter();
-
             std::list<Character>::const_iterator begin() const;
 
             std::list<Character>::const_iterator end() const;
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 89d31c485..58d85fe5b 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -54,7 +54,7 @@ void MWState::StateManager::cleanup (bool force)
         MWBase::Environment::get().getMechanicsManager()->clear();
 
         mState = State_NoGame;
-        mCharacterManager.clearCurrentCharacter();
+        mCharacterManager.setCurrentCharacter(NULL);
         mTimePlayed = 0;
 
         MWMechanics::CreatureStats::cleanup();
@@ -109,13 +109,14 @@ void MWState::StateManager::askLoadRecent()
 
     if( !mAskLoadRecent )
     {
-        if(getCurrentCharacter()->begin() == getCurrentCharacter()->end() )//no saves
+        const MWState::Character* character = getCurrentCharacter();
+        if(!character || character->begin() == character->end())//no saves
         {
             MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
         }
         else
         {
-            MWState::Slot lastSave = *getCurrentCharacter()->begin();
+            MWState::Slot lastSave = *character->begin();
             std::vector<std::string> buttons;
             buttons.push_back("#{sYes}");
             buttons.push_back("#{sNo}");
@@ -172,8 +173,19 @@ void MWState::StateManager::endGame()
 
 void MWState::StateManager::saveGame (const std::string& description, const Slot *slot)
 {
+    MWState::Character* character = getCurrentCharacter();
+
     try
     {
+        if (!character)
+        {
+            MWWorld::ConstPtr player = MWMechanics::getPlayer();
+            std::string name = player.get<ESM::NPC>()->mBase->mName;
+
+            character = mCharacterManager.createCharacter(name);
+            mCharacterManager.setCurrentCharacter(character);
+        }
+
         ESM::SavedGame profile;
 
         MWBase::World& world = *MWBase::Environment::get().getWorld();
@@ -203,9 +215,12 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
         writeScreenshot(profile.mScreenshot);
 
         if (!slot)
-            slot = getCurrentCharacter()->createSlot (profile);
+            slot = character->createSlot (profile);
         else
-            slot = getCurrentCharacter()->updateSlot (slot, profile);
+            slot = character->updateSlot (slot, profile);
+
+        // Make sure the animation state held by references is up to date before saving the game.
+        MWBase::Environment::get().getMechanicsManager()->persistAnimationStates();
 
         // Write to a memory stream first. If there is an exception during the save process, we don't want to trash the
         // existing save file we are overwriting.
@@ -234,7 +249,8 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
                 +MWBase::Environment::get().getScriptManager()->getGlobalScripts().countSavedGameRecords()
                 +MWBase::Environment::get().getDialogueManager()->countSavedGameRecords()
                 +MWBase::Environment::get().getWindowManager()->countSavedGameRecords()
-                +MWBase::Environment::get().getMechanicsManager()->countSavedGameRecords();
+                +MWBase::Environment::get().getMechanicsManager()->countSavedGameRecords()
+                +MWBase::Environment::get().getInputManager()->countSavedGameRecords();
         writer.setRecordCount (recordCount);
 
         writer.save (stream);
@@ -256,6 +272,7 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
         MWBase::Environment::get().getScriptManager()->getGlobalScripts().write (writer, listener);
         MWBase::Environment::get().getWindowManager()->write(writer, listener);
         MWBase::Environment::get().getMechanicsManager()->write(writer, listener);
+        MWBase::Environment::get().getInputManager()->write(writer, listener);
 
         // Ensure we have written the number of records that was estimated
         if (writer.getRecordCount() != recordCount+1) // 1 extra for TES3 record
@@ -288,8 +305,11 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
         MWBase::Environment::get().getWindowManager()->interactiveMessageBox(error.str(), buttons);
 
         // If no file was written, clean up the slot
-        if (slot && !boost::filesystem::exists(slot->mPath))
-            getCurrentCharacter()->deleteSlot(slot);
+        if (character && slot && !boost::filesystem::exists(slot->mPath))
+        {
+            character->deleteSlot(slot);
+            character->cleanup();
+        }
     }
 }
 
@@ -305,13 +325,16 @@ void MWState::StateManager::quickSave (std::string name)
     }
 
     const Slot* slot = NULL;
-    Character* mCurrentCharacter = getCurrentCharacter(true); //Get current character
+    Character* currentCharacter = getCurrentCharacter(); //Get current character
 
     //Find quicksave slot
-    for (Character::SlotIterator it = mCurrentCharacter->begin(); it != mCurrentCharacter->end(); ++it)
+    if (currentCharacter)
     {
-        if (it->mProfile.mDescription == name)
-            slot = &*it;
+        for (Character::SlotIterator it = currentCharacter->begin(); it != currentCharacter->end(); ++it)
+        {
+            if (it->mProfile.mDescription == name)
+                slot = &*it;
+        }
     }
 
     saveGame(name, slot);
@@ -333,19 +356,8 @@ void MWState::StateManager::loadGame(const std::string& filepath)
         }
     }
 
-    // have to peek into the save file to get the player name
-    ESM::ESMReader reader;
-    reader.open (filepath);
-    if (reader.getRecName()!=ESM::REC_SAVE)
-        return; // invalid save file -> ignore
-    reader.getRecHeader();
-    ESM::SavedGame profile;
-    profile.load (reader);
-    reader.close();
-
-    MWState::Character* character = mCharacterManager.getCurrentCharacter(true, profile.mPlayerName);
+    MWState::Character* character = getCurrentCharacter();
     loadGame(character, filepath);
-    mTimePlayed = profile.mTimePlayed;
 }
 
 void MWState::StateManager::loadGame (const Character *character, const std::string& filepath)
@@ -378,7 +390,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
             ESM::NAME n = reader.getRecName();
             reader.getRecHeader();
 
-            switch (n.val)
+            switch (n.intval)
             {
                 case ESM::REC_SAVE:
                     {
@@ -398,12 +410,12 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
                 case ESM::REC_JOUR_LEGACY:
                 case ESM::REC_QUES:
 
-                    MWBase::Environment::get().getJournal()->readRecord (reader, n.val);
+                    MWBase::Environment::get().getJournal()->readRecord (reader, n.intval);
                     break;
 
                 case ESM::REC_DIAS:
 
-                    MWBase::Environment::get().getDialogueManager()->readRecord (reader, n.val);
+                    MWBase::Environment::get().getDialogueManager()->readRecord (reader, n.intval);
                     break;
 
                 case ESM::REC_ALCH:
@@ -426,7 +438,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
                 case ESM::REC_ENAB:
                 case ESM::REC_LEVC:
                 case ESM::REC_LEVI:
-                    MWBase::Environment::get().getWorld()->readRecord(reader, n.val, contentFileMap);
+                    MWBase::Environment::get().getWorld()->readRecord(reader, n.intval, contentFileMap);
                     break;
 
                 case ESM::REC_CAM_:
@@ -435,7 +447,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
 
                 case ESM::REC_GSCR:
 
-                    MWBase::Environment::get().getScriptManager()->getGlobalScripts().readRecord (reader, n.val);
+                    MWBase::Environment::get().getScriptManager()->getGlobalScripts().readRecord (reader, n.intval);
                     break;
 
                 case ESM::REC_GMAP:
@@ -443,13 +455,17 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
                 case ESM::REC_ASPL:
                 case ESM::REC_MARK:
 
-                    MWBase::Environment::get().getWindowManager()->readRecord(reader, n.val);
+                    MWBase::Environment::get().getWindowManager()->readRecord(reader, n.intval);
                     break;
 
                 case ESM::REC_DCOU:
                 case ESM::REC_STLN:
 
-                    MWBase::Environment::get().getMechanicsManager()->readRecord(reader, n.val);
+                    MWBase::Environment::get().getMechanicsManager()->readRecord(reader, n.intval);
+                    break;
+
+                case ESM::REC_INPU:
+                    MWBase::Environment::get().getInputManager()->readRecord(reader, n.intval);
                     break;
 
                 default:
@@ -470,7 +486,8 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
 
         mState = State_Running;
 
-        Settings::Manager::setString ("character", "Saves",
+        if (character)
+            Settings::Manager::setString ("character", "Saves",
                                       character->getPath().filename().string());
 
         MWBase::Environment::get().getWindowManager()->setNewGame(false);
@@ -484,16 +501,35 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
 
         MWWorld::ConstPtr ptr = MWMechanics::getPlayer();
 
-        const ESM::CellId& cellId = ptr.getCell()->getCell()->getCellId();
+        if (ptr.isInCell())
+        {
+            const ESM::CellId& cellId = ptr.getCell()->getCell()->getCellId();
 
-        // Use detectWorldSpaceChange=false, otherwise some of the data we just loaded would be cleared again
-        MWBase::Environment::get().getWorld()->changeToCell (cellId, ptr.getRefData().getPosition(), false);
+            // Use detectWorldSpaceChange=false, otherwise some of the data we just loaded would be cleared again
+            MWBase::Environment::get().getWorld()->changeToCell (cellId, ptr.getRefData().getPosition(), false, false);
+        }
+        else
+        {
+            // Cell no longer exists (i.e. changed game files), choose a default cell
+            MWWorld::CellStore* cell = MWBase::Environment::get().getWorld()->getExterior(0,0);
+            float x,y;
+            MWBase::Environment::get().getWorld()->indexToPosition(0,0,x,y,false);
+            ESM::Position pos;
+            pos.pos[0] = x;
+            pos.pos[1] = y;
+            pos.pos[2] = 0; // should be adjusted automatically (adjustPlayerPos=true)
+            pos.rot[0] = 0;
+            pos.rot[1] = 0;
+            pos.rot[2] = 0;
+            MWBase::Environment::get().getWorld()->changeToCell(cell->getCell()->getCellId(), pos, true, false);
+        }
 
         // Vanilla MW will restart startup scripts when a save game is loaded. This is unintuitive,
         // but some mods may be using it as a reload detector.
         MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
 
-        // Do not trigger erroneous cellChanged events
+        // Since we passed "changeEvent=false" to changeCell, we shouldn't have triggered the cell change flag.
+        // But make sure the flag is cleared anyway in case it was set from an earlier game.
         MWBase::Environment::get().getWorld()->markCellAsUnchanged();
     }
     catch (const std::exception& e)
@@ -514,11 +550,11 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
 
 void MWState::StateManager::quickLoad()
 {
-    if (Character* mCurrentCharacter = getCurrentCharacter (false))
+    if (Character* currentCharacter = getCurrentCharacter ())
     {
-        if (mCurrentCharacter->begin() == mCurrentCharacter->end())
+        if (currentCharacter->begin() == currentCharacter->end())
             return;
-        loadGame (mCurrentCharacter, mCurrentCharacter->begin()->mPath.string()); //Get newest save
+        loadGame (currentCharacter, currentCharacter->begin()->mPath.string()); //Get newest save
     }
 }
 
@@ -527,12 +563,9 @@ void MWState::StateManager::deleteGame(const MWState::Character *character, cons
     mCharacterManager.deleteSlot(character, slot);
 }
 
-MWState::Character *MWState::StateManager::getCurrentCharacter (bool create)
+MWState::Character *MWState::StateManager::getCurrentCharacter ()
 {
-    MWWorld::ConstPtr player = MWMechanics::getPlayer();
-    std::string name = player.get<ESM::NPC>()->mBase->mName;
-
-    return mCharacterManager.getCurrentCharacter (create, name);
+    return mCharacterManager.getCurrentCharacter();
 }
 
 MWState::StateManager::CharacterIterator MWState::StateManager::characterBegin()
@@ -553,7 +586,7 @@ void MWState::StateManager::update (float duration)
     if (mAskLoadRecent)
     {
         int iButton = MWBase::Environment::get().getWindowManager()->readPressedButton();
-        MWState::Character *curCharacter = getCurrentCharacter(false);
+        MWState::Character *curCharacter = getCurrentCharacter();
         if(iButton==0 && curCharacter)
         {
             mAskLoadRecent = false;
diff --git a/apps/openmw/mwstate/statemanagerimp.hpp b/apps/openmw/mwstate/statemanagerimp.hpp
index 59dc919d1..5defcdea3 100644
--- a/apps/openmw/mwstate/statemanagerimp.hpp
+++ b/apps/openmw/mwstate/statemanagerimp.hpp
@@ -73,8 +73,8 @@ namespace MWState
             virtual void loadGame (const Character *character, const std::string &filepath);
             ///< Load a saved game file belonging to the given character.
 
-            virtual Character *getCurrentCharacter (bool create = true);
-            ///< \param create Create a new character, if there is no current character.
+            virtual Character *getCurrentCharacter ();
+            ///< @note May return null.
 
             virtual CharacterIterator characterBegin();
             ///< Any call to SaveGame and getCurrentCharacter can invalidate the returned
diff --git a/apps/openmw/mwworld/action.cpp b/apps/openmw/mwworld/action.cpp
index c29377ecb..5663ba38f 100644
--- a/apps/openmw/mwworld/action.cpp
+++ b/apps/openmw/mwworld/action.cpp
@@ -12,6 +12,11 @@ const MWWorld::Ptr& MWWorld::Action::getTarget() const
     return mTarget;
 }
 
+void MWWorld::Action::setTarget(const MWWorld::Ptr& target)
+{
+    mTarget = target;
+}
+
 MWWorld::Action::Action (bool keepSound, const Ptr& target) : mKeepSound (keepSound), mSoundOffset(0), mTarget (target)
 {}
 
diff --git a/apps/openmw/mwworld/action.hpp b/apps/openmw/mwworld/action.hpp
index 3e0e8ad1b..6b4dff6aa 100644
--- a/apps/openmw/mwworld/action.hpp
+++ b/apps/openmw/mwworld/action.hpp
@@ -23,15 +23,20 @@ namespace MWWorld
 
         protected:
 
-            const Ptr& getTarget() const;
+            void setTarget(const Ptr&);
 
         public:
 
+            const Ptr& getTarget() const;
+
             Action (bool keepSound = false, const Ptr& target = Ptr());
             ///< \param keepSound Keep playing the sound even if the object the sound is played on is removed.
 
             virtual ~Action();
 
+            virtual bool isNullAction() { return false; }
+            ///< Is running this action a no-op? (default false)
+
             void execute (const Ptr& actor);
 
             void setSound (const std::string& id);
diff --git a/apps/openmw/mwworld/actionread.cpp b/apps/openmw/mwworld/actionread.cpp
index 90e9a375b..b3ac772ae 100644
--- a/apps/openmw/mwworld/actionread.cpp
+++ b/apps/openmw/mwworld/actionread.cpp
@@ -44,7 +44,7 @@ namespace MWWorld
         MWMechanics::NpcStats& npcStats = actor.getClass().getNpcStats (actor);
 
         // Skill gain from books
-        if (ref->mBase->mData.mSkillID >= 0 && ref->mBase->mData.mSkillID < ESM::Skill::Length
+        if (ref->mBase->mData.mSkillId >= 0 && ref->mBase->mData.mSkillId < ESM::Skill::Length
                 && !npcStats.hasBeenUsed (ref->mBase->mId))
         {
             MWWorld::LiveCellRef<ESM::NPC> *playerRef = actor.get<ESM::NPC>();
@@ -54,7 +54,7 @@ namespace MWWorld
                     playerRef->mBase->mClass
                 );
 
-            npcStats.increaseSkill (ref->mBase->mData.mSkillID, *class_, true);
+            npcStats.increaseSkill (ref->mBase->mData.mSkillId, *class_, true);
 
             npcStats.flagAsUsed (ref->mBase->mId);
         }
diff --git a/apps/openmw/mwworld/actiontake.cpp b/apps/openmw/mwworld/actiontake.cpp
index 4e6135764..c75cb53ed 100644
--- a/apps/openmw/mwworld/actiontake.cpp
+++ b/apps/openmw/mwworld/actiontake.cpp
@@ -1,5 +1,12 @@
 #include "actiontake.hpp"
 
+#include <components/openmw-mp/Log.hpp>
+#include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/WorldEvent.hpp"
+#include "../mwmp/LocalPlayer.hpp"
+#include "../mwworld/cellstore.hpp"
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -16,7 +23,28 @@ namespace MWWorld
     {
         MWBase::Environment::get().getMechanicsManager()->itemTaken(
                     actor, getTarget(), MWWorld::Ptr(), getTarget().getRefData().getCount());
-        actor.getClass().getContainerStore (actor).add (getTarget(), getTarget().getRefData().getCount(), actor);
+        MWWorld::Ptr newitem = *actor.getClass().getContainerStore (actor).add (getTarget(), getTarget().getRefData().getCount(), actor);
+
+        // Added by tes3mp
+        mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+        worldEvent->cell = *getTarget().getCell()->getCell();
+
+        mwmp::WorldObject worldObject;
+        worldObject.refId = getTarget().getCellRef().getRefId();
+        worldObject.refNumIndex = getTarget().getCellRef().getRefNum().mIndex;
+        worldEvent->addObject(worldObject);
+
+        mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_DELETE)->Send(worldEvent);
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Sending ID_OBJECT_DELETE about\n- cellRef: %s, %i\n- cell: %s",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex,
+            worldEvent->cell.getDescription().c_str());
+
+        // LocalPlayer's inventory has changed, so send a packet with it
+        mwmp::Main::get().getLocalPlayer()->sendInventory();
+
         MWBase::Environment::get().getWorld()->deleteObject (getTarget());
+        setTarget(newitem);
     }
 }
diff --git a/apps/openmw/mwworld/actionteleport.cpp b/apps/openmw/mwworld/actionteleport.cpp
index 031f07258..93705f005 100644
--- a/apps/openmw/mwworld/actionteleport.cpp
+++ b/apps/openmw/mwworld/actionteleport.cpp
@@ -4,27 +4,12 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
+#include "../mwmechanics/creaturestats.hpp"
+
 #include "../mwworld/class.hpp"
 
 #include "player.hpp"
 
-namespace
-{
-
-    void getFollowers (const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out)
-    {
-        std::list<MWWorld::Ptr> followers = MWBase::Environment::get().getMechanicsManager()->getActorsFollowing(actor);
-        for(std::list<MWWorld::Ptr>::iterator it = followers.begin();it != followers.end();++it)
-        {
-            if (out.insert(*it).second)
-            {
-                getFollowers(*it, out);
-            }
-        }
-    }
-
-}
-
 namespace MWWorld
 {
     ActionTeleport::ActionTeleport (const std::string& cellName,
@@ -37,21 +22,12 @@ namespace MWWorld
     {
         if (mTeleportFollowers)
         {
-            //find any NPC that is following the actor and teleport him too
+            // Find any NPCs that are following the actor and teleport them with him
             std::set<MWWorld::Ptr> followers;
-            getFollowers(actor, followers);
-            for(std::set<MWWorld::Ptr>::iterator it = followers.begin();it != followers.end();++it)
-            {
-                MWWorld::Ptr follower = *it;
-
-                std::string script = follower.getClass().getScript(follower);
-                if (!script.empty() && follower.getRefData().getLocals().getIntVar(script, "stayoutside") == 1)
-                    continue;
+            getFollowersToTeleport(actor, followers);
 
-                if ((follower.getRefData().getPosition().asVec3() - actor.getRefData().getPosition().asVec3()).length2()
-                        <= 800*800)
-                    teleport(*it);
-            }
+            for (std::set<MWWorld::Ptr>::iterator it = followers.begin(); it != followers.end(); ++it)
+                teleport(*it);
         }
 
         teleport(actor);
@@ -60,13 +36,14 @@ namespace MWWorld
     void ActionTeleport::teleport(const Ptr &actor)
     {
         MWBase::World* world = MWBase::Environment::get().getWorld();
+        actor.getClass().getCreatureStats(actor).land();
         if(actor == world->getPlayerPtr())
         {
             world->getPlayer().setTeleported(true);
             if (mCellName.empty())
-                world->changeToExteriorCell (mPosition);
+                world->changeToExteriorCell (mPosition, true);
             else
-                world->changeToInteriorCell (mCellName, mPosition);
+                world->changeToInteriorCell (mCellName, mPosition, true);
         }
         else
         {
@@ -82,4 +59,21 @@ namespace MWWorld
                 world->moveObject(actor,world->getInterior(mCellName),mPosition.pos[0],mPosition.pos[1],mPosition.pos[2]);
         }
     }
+
+    void ActionTeleport::getFollowersToTeleport(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) {
+        std::set<MWWorld::Ptr> followers;
+        MWBase::Environment::get().getMechanicsManager()->getActorsFollowing(actor, followers);
+
+        for(std::set<MWWorld::Ptr>::iterator it = followers.begin();it != followers.end();++it)
+        {
+            MWWorld::Ptr follower = *it;
+
+            std::string script = follower.getClass().getScript(follower);
+            if (!script.empty() && follower.getRefData().getLocals().getIntVar(script, "stayoutside") == 1)
+                continue;
+
+            if ((follower.getRefData().getPosition().asVec3() - actor.getRefData().getPosition().asVec3()).length2() <= 800*800)
+                out.insert(follower);
+        }
+    }
 }
diff --git a/apps/openmw/mwworld/actionteleport.hpp b/apps/openmw/mwworld/actionteleport.hpp
index 6191ee9f6..c58218750 100644
--- a/apps/openmw/mwworld/actionteleport.hpp
+++ b/apps/openmw/mwworld/actionteleport.hpp
@@ -1,6 +1,7 @@
 #ifndef GAME_MWWORLD_ACTIONTELEPORT_H
 #define GAME_MWWORLD_ACTIONTELEPORT_H
 
+#include <set>
 #include <string>
 
 #include <components/esm/defs.hpp>
@@ -23,9 +24,12 @@ namespace MWWorld
 
         public:
 
-            ActionTeleport (const std::string& cellName, const ESM::Position& position, bool teleportFollowers);
-            ///< If cellName is empty, an exterior cell is assumed.
+            /// If cellName is empty, an exterior cell is assumed.
             /// @param teleportFollowers Whether to teleport any following actors of the target actor as well.
+            ActionTeleport (const std::string& cellName, const ESM::Position& position, bool teleportFollowers);
+
+            /// Outputs every actor follower who is in teleport range and wasn't ordered to not enter interiors
+            static void getFollowersToTeleport(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out);
     };
 }
 
diff --git a/apps/openmw/mwworld/actiontrap.cpp b/apps/openmw/mwworld/actiontrap.cpp
index 68d7c69e9..cdabaf8c8 100644
--- a/apps/openmw/mwworld/actiontrap.cpp
+++ b/apps/openmw/mwworld/actiontrap.cpp
@@ -1,40 +1,34 @@
 #include "actiontrap.hpp"
 
 #include "../mwmechanics/spellcasting.hpp"
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
 namespace MWWorld
 {
-
     void ActionTrap::executeImp(const Ptr &actor)
     {
         osg::Vec3f actorPosition(actor.getRefData().getPosition().asVec3());
         osg::Vec3f trapPosition(mTrapSource.getRefData().getPosition().asVec3());
-        float activationDistance = MWBase::Environment::get().getWorld()->getMaxActivationDistance();
+        float trapRange = MWBase::Environment::get().getWorld()->getMaxActivationDistance();
 
-        // GUI calcs if object in activation distance include object and player geometry
-        const float fudgeFactor = 1.25f;
-
-        // Hack: if actor is beyond activation range, then assume actor is using telekinesis
-        // to open door/container.
-        // Note, can't just detonate the trap at the trapped object's location and use the blast
+        // Note: can't just detonate the trap at the trapped object's location and use the blast
         // radius, because for most trap spells this is 1 foot, much less than the activation distance.
-        if ((trapPosition - actorPosition).length() < (activationDistance * fudgeFactor))
-        {
-            // assume actor touched trap
-            MWMechanics::CastSpell cast(mTrapSource, actor);
-            cast.mHitPosition = actorPosition;
-            cast.cast(mSpellId);
-        }
-        else
+        // Using activation distance as the trap range.
+
+        if (actor == MWBase::Environment::get().getWorld()->getPlayerPtr() && MWBase::Environment::get().getWorld()->getDistanceToFacedObject() > trapRange) // player activated object outside range of trap
         {
-            // assume telekinesis used
             MWMechanics::CastSpell cast(mTrapSource, mTrapSource);
             cast.mHitPosition = trapPosition;
             cast.cast(mSpellId);
         }
+        else // player activated object within range of trap, or NPC activated trap
+        {
+            MWMechanics::CastSpell cast(mTrapSource, actor);
+            cast.mHitPosition = actorPosition;
+            cast.cast(mSpellId);
+        }   
         mTrapSource.getCellRef().setTrap("");
     }
-
 }
diff --git a/apps/openmw/mwworld/actiontrap.hpp b/apps/openmw/mwworld/actiontrap.hpp
index 4c2f4139f..5ff91613f 100644
--- a/apps/openmw/mwworld/actiontrap.hpp
+++ b/apps/openmw/mwworld/actiontrap.hpp
@@ -18,10 +18,9 @@ namespace MWWorld
         public:
 
             /// @param spellId
-            /// @param actor Actor that activated the trap
             /// @param trapSource
-            ActionTrap (const Ptr& actor, const std::string& spellId, const Ptr& trapSource)
-                : Action(false, actor), mSpellId(spellId), mTrapSource(trapSource) {}
+            ActionTrap (const std::string& spellId, const Ptr& trapSource)
+                : Action(false, trapSource), mSpellId(spellId), mTrapSource(trapSource) {}
     };
 }
 
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index ce9a87beb..7b90da43b 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -9,6 +9,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/nifosg/nifloader.hpp>
 #include <components/terrain/world.hpp>
+#include <components/sceneutil/unrefqueue.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -45,7 +46,7 @@ namespace MWWorld
     {
     public:
         /// Constructor to be called from the main thread.
-        PreloadItem(MWWorld::CellStore* cell, Resource::SceneManager* sceneManager, Resource::BulletShapeManager* bulletShapeManager, Resource::KeyframeManager* keyframeManager, Terrain::World* terrain)
+        PreloadItem(MWWorld::CellStore* cell, Resource::SceneManager* sceneManager, Resource::BulletShapeManager* bulletShapeManager, Resource::KeyframeManager* keyframeManager, Terrain::World* terrain, bool preloadInstances)
             : mIsExterior(cell->getCell()->isExterior())
             , mX(cell->getCell()->getGridX())
             , mY(cell->getCell()->getGridY())
@@ -53,6 +54,8 @@ namespace MWWorld
             , mBulletShapeManager(bulletShapeManager)
             , mKeyframeManager(keyframeManager)
             , mTerrain(terrain)
+            , mPreloadInstances(preloadInstances)
+            , mAbort(false)
         {
             ListModelsVisitor visitor (mMeshes);
             if (cell->getState() == MWWorld::CellStore::State_Loaded)
@@ -74,18 +77,45 @@ namespace MWWorld
             }
         }
 
+        virtual void abort()
+        {
+            mAbort = true;
+        }
+
         /// Preload work to be called from the worker thread.
         virtual void doWork()
         {
+            if (mIsExterior)
+            {
+                try
+                {
+                    mPreloadedObjects.push_back(mTerrain->cacheCell(mX, mY));
+                }
+                catch(std::exception& e)
+                {
+                }
+            }
+
             for (MeshList::const_iterator it = mMeshes.begin(); it != mMeshes.end(); ++it)
             {
+                if (mAbort)
+                    break;
+
                 try
                 {
                     std::string mesh  = *it;
                     mesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mSceneManager->getVFS());
 
-                    mPreloadedObjects.push_back(mSceneManager->cacheInstance(mesh));
-                    mPreloadedObjects.push_back(mBulletShapeManager->cacheInstance(mesh));
+                    if (mPreloadInstances)
+                    {
+                        mPreloadedObjects.push_back(mSceneManager->cacheInstance(mesh));
+                        mPreloadedObjects.push_back(mBulletShapeManager->cacheInstance(mesh));
+                    }
+                    else
+                    {
+                        mPreloadedObjects.push_back(mSceneManager->getTemplate(mesh));
+                        mPreloadedObjects.push_back(mBulletShapeManager->getShape(mesh));
+                    }
 
                     size_t slashpos = mesh.find_last_of("/\\");
                     if (slashpos != std::string::npos && slashpos != mesh.size()-1)
@@ -109,17 +139,6 @@ namespace MWWorld
                     // error will be shown when visiting the cell
                 }
             }
-
-            if (mIsExterior)
-            {
-                try
-                {
-                    mPreloadedObjects.push_back(mTerrain->cacheCell(mX, mY));
-                }
-                catch(std::exception& e)
-                {
-                }
-            }
         }
 
     private:
@@ -132,6 +151,9 @@ namespace MWWorld
         Resource::BulletShapeManager* mBulletShapeManager;
         Resource::KeyframeManager* mKeyframeManager;
         Terrain::World* mTerrain;
+        bool mPreloadInstances;
+
+        volatile bool mAbort;
 
         // keep a ref to the loaded objects to make sure it stays loaded as long as this cell is in the preloaded state
         std::vector<osg::ref_ptr<const osg::Object> > mPreloadedObjects;
@@ -166,9 +188,23 @@ namespace MWWorld
         , mBulletShapeManager(bulletShapeManager)
         , mTerrain(terrain)
         , mExpiryDelay(0.0)
+        , mMinCacheSize(0)
+        , mMaxCacheSize(0)
+        , mPreloadInstances(true)
+        , mLastResourceCacheUpdate(0.0)
     {
     }
 
+    CellPreloader::~CellPreloader()
+    {
+        for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end();++it)
+        {
+            it->second.mWorkItem->abort();
+            it->second.mWorkItem->waitTillDone();
+        }
+        mPreloadCells.clear();
+    }
+
     void CellPreloader::preload(CellStore *cell, double timestamp)
     {
         if (!mWorkQueue)
@@ -190,7 +226,31 @@ namespace MWWorld
             return;
         }
 
-        osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager, mResourceSystem->getKeyframeManager(), mTerrain));
+        while (mPreloadCells.size() >= mMaxCacheSize)
+        {
+            // throw out oldest cell to make room
+            PreloadMap::iterator oldestCell = mPreloadCells.begin();
+            double oldestTimestamp = DBL_MAX;
+            double threshold = 1.0; // seconds
+            for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end(); ++it)
+            {
+                if (it->second.mTimeStamp < oldestTimestamp)
+                {
+                    oldestTimestamp = it->second.mTimeStamp;
+                    oldestCell = it;
+                }
+            }
+
+            if (oldestTimestamp + threshold < timestamp)
+            {
+                oldestCell->second.mWorkItem->abort();
+                mPreloadCells.erase(oldestCell);
+            }
+            else
+                return;
+        }
+
+        osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager, mResourceSystem->getKeyframeManager(), mTerrain, mPreloadInstances));
         mWorkQueue->addWorkItem(item);
 
         mPreloadCells[cell] = PreloadEntry(timestamp, item);
@@ -198,23 +258,57 @@ namespace MWWorld
 
     void CellPreloader::notifyLoaded(CellStore *cell)
     {
-        mPreloadCells.erase(cell);
+        PreloadMap::iterator found = mPreloadCells.find(cell);
+        if (found != mPreloadCells.end())
+        {
+            // do the deletion in the background thread
+            if (found->second.mWorkItem)
+            {
+                found->second.mWorkItem->abort();
+                mUnrefQueue->push(mPreloadCells[cell].mWorkItem);
+            }
+
+            mPreloadCells.erase(found);
+        }
     }
 
-    void CellPreloader::updateCache(double timestamp)
+    void CellPreloader::clear()
     {
-        // TODO: add settings for a minimum/maximum size of the cache
+        for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end();)
+        {
+            if (it->second.mWorkItem)
+            {
+                it->second.mWorkItem->abort();
+                mUnrefQueue->push(it->second.mWorkItem);
+            }
 
+            mPreloadCells.erase(it++);
+        }
+    }
+
+    void CellPreloader::updateCache(double timestamp)
+    {
         for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end();)
         {
-            if (it->second.mTimeStamp < timestamp - mExpiryDelay)
+            if (mPreloadCells.size() >= mMinCacheSize && it->second.mTimeStamp < timestamp - mExpiryDelay)
+            {
+                if (it->second.mWorkItem)
+                {
+                    it->second.mWorkItem->abort();
+                    mUnrefQueue->push(it->second.mWorkItem);
+                }
                 mPreloadCells.erase(it++);
+            }
             else
                 ++it;
         }
 
-        // the resource cache is cleared from the worker thread so that we're not holding up the main thread with delete operations
-        mWorkQueue->addWorkItem(new UpdateCacheItem(mResourceSystem, mTerrain, timestamp));
+        if (timestamp - mLastResourceCacheUpdate > 1.0)
+        {
+            // the resource cache is cleared from the worker thread so that we're not holding up the main thread with delete operations
+            mWorkQueue->addWorkItem(new UpdateCacheItem(mResourceSystem, mTerrain, timestamp), true);
+            mLastResourceCacheUpdate = timestamp;
+        }
     }
 
     void CellPreloader::setExpiryDelay(double expiryDelay)
@@ -222,9 +316,34 @@ namespace MWWorld
         mExpiryDelay = expiryDelay;
     }
 
+    void CellPreloader::setMinCacheSize(unsigned int num)
+    {
+        mMinCacheSize = num;
+    }
+
+    void CellPreloader::setMaxCacheSize(unsigned int num)
+    {
+        mMaxCacheSize = num;
+    }
+
+    void CellPreloader::setPreloadInstances(bool preload)
+    {
+        mPreloadInstances = preload;
+    }
+
+    unsigned int CellPreloader::getMaxCacheSize() const
+    {
+        return mMaxCacheSize;
+    }
+
     void CellPreloader::setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue)
     {
         mWorkQueue = workQueue;
     }
 
+    void CellPreloader::setUnrefQueue(SceneUtil::UnrefQueue* unrefQueue)
+    {
+        mUnrefQueue = unrefQueue;
+    }
+
 }
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index 32ea194c6..e8e59a3a2 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -16,6 +16,11 @@ namespace Terrain
     class World;
 }
 
+namespace SceneUtil
+{
+    class UnrefQueue;
+}
+
 namespace MWWorld
 {
     class CellStore;
@@ -24,6 +29,7 @@ namespace MWWorld
     {
     public:
         CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager, Terrain::World* terrain);
+        ~CellPreloader();
 
         /// Ask a background thread to preload rendering meshes and collision shapes for objects in this cell.
         /// @note The cell itself must be in State_Loaded or State_Preloaded.
@@ -31,20 +37,41 @@ namespace MWWorld
 
         void notifyLoaded(MWWorld::CellStore* cell);
 
+        void clear();
+
         /// Removes preloaded cells that have not had a preload request for a while.
         void updateCache(double timestamp);
 
         /// How long to keep a preloaded cell in cache after it's no longer requested.
         void setExpiryDelay(double expiryDelay);
 
+        /// The minimum number of preloaded cells before unused cells get thrown out.
+        void setMinCacheSize(unsigned int num);
+
+        /// The maximum number of preloaded cells.
+        void setMaxCacheSize(unsigned int num);
+
+        /// Enables the creation of instances in the preloading thread.
+        void setPreloadInstances(bool preload);
+
+        unsigned int getMaxCacheSize() const;
+
         void setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue);
 
+        void setUnrefQueue(SceneUtil::UnrefQueue* unrefQueue);
+
     private:
         Resource::ResourceSystem* mResourceSystem;
         Resource::BulletShapeManager* mBulletShapeManager;
         Terrain::World* mTerrain;
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
+        osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
         double mExpiryDelay;
+        unsigned int mMinCacheSize;
+        unsigned int mMaxCacheSize;
+        bool mPreloadInstances;
+
+        double mLastResourceCacheUpdate;
 
         struct PreloadEntry
         {
diff --git a/apps/openmw/mwworld/cellref.cpp b/apps/openmw/mwworld/cellref.cpp
index 0d81e0636..0d3435dc5 100644
--- a/apps/openmw/mwworld/cellref.cpp
+++ b/apps/openmw/mwworld/cellref.cpp
@@ -20,6 +20,13 @@ namespace MWWorld
         mCellRef.mRefNum.unset();
     }
 
+    // Added by tes3mp to allow creation of new items with RefNum indexes
+    // specific to them
+    void CellRef::setRefNumIndex(int index)
+    {
+        mCellRef.mRefNum.mIndex = index;
+    }
+
     std::string CellRef::getRefId() const
     {
         return mCellRef.mRefID;
@@ -93,6 +100,24 @@ namespace MWWorld
         }
     }
 
+    void CellRef::applyChargeRemainderToBeSubtracted(float chargeRemainder)
+    {
+        mCellRef.mChargeIntRemainder += std::abs(chargeRemainder);
+        if (mCellRef.mChargeIntRemainder > 1.0f)
+        {
+            float newChargeRemainder = (mCellRef.mChargeIntRemainder - std::floor(mCellRef.mChargeIntRemainder));
+            if (mCellRef.mChargeInt <= static_cast<int>(mCellRef.mChargeIntRemainder))
+            {
+                mCellRef.mChargeInt = 0;
+            }
+            else
+            {
+                mCellRef.mChargeInt -= static_cast<int>(mCellRef.mChargeIntRemainder);
+            }
+            mCellRef.mChargeIntRemainder = newChargeRemainder;
+        }
+    }
+
     float CellRef::getChargeFloat() const
     {
         return mCellRef.mChargeFloat;
diff --git a/apps/openmw/mwworld/cellref.hpp b/apps/openmw/mwworld/cellref.hpp
index b8e85f286..f0a6a4cb7 100644
--- a/apps/openmw/mwworld/cellref.hpp
+++ b/apps/openmw/mwworld/cellref.hpp
@@ -28,6 +28,10 @@ namespace MWWorld
         // Set RefNum to its default state.
         void unsetRefNum();
 
+        // Added by tes3mp to allow creation of new items with RefNum indexes
+        // specific to them
+        void setRefNumIndex(int index);
+
         /// Does the RefNum have a content file?
         bool hasContentFile() const;
 
@@ -65,6 +69,7 @@ namespace MWWorld
         float getChargeFloat() const; // Implemented as union with int charge
         void setCharge(int charge);
         void setChargeFloat(float charge);
+        void applyChargeRemainderToBeSubtracted(float chargeRemainder); // Stores remainders and applies if > 1
 
         // The NPC that owns this object (and will get angry if you steal it)
         std::string getOwner() const;
diff --git a/apps/openmw/mwworld/cellreflist.hpp b/apps/openmw/mwworld/cellreflist.hpp
index 4d503dcc8..30be4a661 100644
--- a/apps/openmw/mwworld/cellreflist.hpp
+++ b/apps/openmw/mwworld/cellreflist.hpp
@@ -29,6 +29,18 @@ namespace MWWorld
             mList.push_back(item);
             return mList.back();
         }
+
+        /// Remove all references with the given refNum from this list.
+        void remove (const ESM::RefNum &refNum)
+        {
+            for (typename List::iterator it = mList.begin(); it != mList.end();)
+            {
+                if (*it == refNum)
+                    mList.erase(it++);
+                else
+                    ++it;
+            }
+        }
     };
 }
 
diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index 75d908db8..384d7e124 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -105,6 +105,10 @@ MWWorld::CellStore *MWWorld::Cells::getExterior (int x, int y)
         {
             // Cell isn't predefined. Make one on the fly.
             ESM::Cell record;
+            record.mCellId.mWorldspace = ESM::CellId::sDefaultWorldspace;
+            record.mCellId.mPaged = true;
+            record.mCellId.mIndex.mX = x;
+            record.mCellId.mIndex.mY = y;
 
             record.mData.mFlags = ESM::Cell::HasWater;
             record.mData.mX = x;
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index dcaa73e93..59fa1f5e2 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -1,5 +1,7 @@
 #include "cellstore.hpp"
 
+#include <stdio.h>
+
 #include <iostream>
 #include <algorithm>
 
@@ -137,6 +139,9 @@ namespace
                     iter->load (state);
                     return;
                 }
+
+            std::cerr << "Dropping reference to " << state.mRef.mRefID << " (invalid content file link)" << std::endl;
+            return;
         }
 
         // new reference
@@ -194,7 +199,7 @@ namespace MWWorld
         else
         {
             std::cerr
-                << "Error: could not resolve cell reference " << ref.mRefID
+                << "Error: could not resolve cell reference '" << ref.mRefID << "'"
                 << " (dropping reference)" << std::endl;
         }
     }
@@ -204,6 +209,14 @@ namespace MWWorld
         return (ref.mRef.mRefnum == pRefnum);
     }
 
+    Ptr CellStore::getCurrentPtr(LiveCellRefBase *ref)
+    {
+        MovedRefTracker::iterator found = mMovedToAnotherCell.find(ref);
+        if (found != mMovedToAnotherCell.end())
+            return Ptr(ref, found->second);
+        return Ptr(ref, this);
+    }
+
     void CellStore::moveFrom(const Ptr &object, CellStore *from)
     {
         if (mState != State_Loaded)
@@ -214,6 +227,18 @@ namespace MWWorld
         if (found != mMovedToAnotherCell.end())
         {
             // A cell we had previously moved an object to is returning it to us.
+            
+            // tes3mp debug start
+            if (found->second != from) {
+                    
+                printf("Storage: %s owned %s which it gave to %s which isn't %s therefore CRASH\n",
+                    this->getCell()->getDescription().c_str(),
+                    object.getBase()->mRef.getRefId().c_str(),
+                    found->second->getCell()->getDescription().c_str(),
+                    from->getCell()->getDescription().c_str());   
+            }
+            // tes3mp debug end
+            
             assert (found->second == from);
             mMovedToAnotherCell.erase(found);
         }
@@ -242,6 +267,10 @@ namespace MWWorld
 
         // Objects with no refnum can't be handled correctly in the merging process that happens
         // on a save/load, so do a simple copy & delete for these objects.
+
+        // The code below is disabled for tes3mp for as long as player objects lack refnums,
+        // because it will break exterior cell transitions for them
+        /*
         if (!object.getCellRef().getRefNum().hasContentFile())
         {
             MWWorld::Ptr copied = object.getClass().copyToCell(object, *cellToMoveTo, object.getRefData().getCount());
@@ -249,6 +278,7 @@ namespace MWWorld
             object.getRefData().setBaseNode(NULL);
             return copied;
         }
+        */
 
         MovedRefTracker::iterator found = mMovedHere.find(object.getBase());
         if (found != mMovedHere.end())
@@ -264,6 +294,14 @@ namespace MWWorld
             // Now that object is back to its rightful owner, we can move it
             if (cellToMoveTo != originalCell)
             {
+                // tes3mp debug start
+                printf("Storage: %s's original cell %s gives it from %s to %s\n",
+                    object.getBase()->mRef.getRefId().c_str(),
+                    originalCell->getCell()->getDescription().c_str(),
+                    this->getCell()->getDescription().c_str(),
+                    cellToMoveTo->getCell()->getDescription().c_str());
+                // tes3mp debug end
+                
                 originalCell->moveTo(object, cellToMoveTo);
             }
 
@@ -321,6 +359,9 @@ namespace MWWorld
         : mStore(esmStore), mReader(readerList), mCell (cell), mState (State_Unloaded), mHasState (false), mLastRespawn(0,0)
     {
         mWaterLevel = cell->mWater;
+
+        // Added by tes3mp
+        lastRefNumIndex = 0;
     }
 
     const ESM::Cell *CellStore::getCell() const
@@ -406,6 +447,56 @@ namespace MWWorld
         return Ptr();
     }
 
+    // Added by tes3mp
+    template <typename PtrType>
+    struct SearchExactVisitor
+    {
+        PtrType mFound;
+        std::string mIdToFind;
+        unsigned int mRefNumIndexToFind;
+
+        bool operator()(const PtrType& ptr)
+        {
+            if (ptr.getCellRef().getRefNum().mIndex == mRefNumIndexToFind)
+            {
+                if (ptr.getCellRef().getRefId() == mIdToFind)
+                {
+                    mFound = ptr;
+                    return false;
+                }
+            }
+            return true;
+        }
+    };
+
+    ///< Added by tes3mp and used to find an object by both its ID and its reference number
+    Ptr CellStore::searchExact (const std::string& id, unsigned int numIndex)
+    {
+        SearchExactVisitor<MWWorld::Ptr> searchVisitor;
+        searchVisitor.mIdToFind = id;
+        searchVisitor.mRefNumIndexToFind = numIndex;
+        forEach(searchVisitor);
+        return searchVisitor.mFound;
+    }
+
+    // Added by tes3mp and used to get the last reference number in the cell
+    unsigned int CellStore::getLastRefNumIndex() const
+    {
+        return lastRefNumIndex;
+    }
+
+    // Added by tes3mp and used to record the last reference number in the cell
+    void CellStore::setLastRefNumIndex(unsigned int value)
+    {
+        lastRefNumIndex = value;
+    }
+
+    // Added by tes3mp and used to get all the containers in the cell
+    CellRefList<ESM::Container> *CellStore::getContainers()
+    {
+        return &mContainers;
+    }
+
     float CellStore::getWaterLevel() const
     {
         if (isExterior())
@@ -463,36 +554,45 @@ namespace MWWorld
         // Load references from all plugins that do something with this cell.
         for (size_t i = 0; i < mCell->mContextList.size(); i++)
         {
-            // Reopen the ESM reader and seek to the right position.
-            int index = mCell->mContextList.at(i).index;
-            mCell->restore (esm[index], i);
+            try
+            {
+                // Reopen the ESM reader and seek to the right position.
+                int index = mCell->mContextList.at(i).index;
+                mCell->restore (esm[index], i);
 
-            ESM::CellRef ref;
+                ESM::CellRef ref;
 
-            // Get each reference in turn
-            bool deleted = false;
-            while (mCell->getNextRef (esm[index], ref, deleted))
-            {
-                if (deleted)
-                    continue;
+                // Get each reference in turn
+                bool deleted = false;
+                while (mCell->getNextRef (esm[index], ref, deleted))
+                {
+                    if (deleted)
+                        continue;
 
-                // Don't list reference if it was moved to a different cell.
-                ESM::MovedCellRefTracker::const_iterator iter =
-                    std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
-                if (iter != mCell->mMovedRefs.end()) {
-                    continue;
-                }
+                    // Don't list reference if it was moved to a different cell.
+                    ESM::MovedCellRefTracker::const_iterator iter =
+                        std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
+                    if (iter != mCell->mMovedRefs.end()) {
+                        continue;
+                    }
 
-                mIds.push_back (Misc::StringUtils::lowerCase (ref.mRefID));
+                    mIds.push_back (Misc::StringUtils::lowerCase (ref.mRefID));
+                }
+            }
+            catch (std::exception& e)
+            {
+                std::cerr << "An error occurred listing references for cell " << getCell()->getDescription() << ": " << e.what() << std::endl;
             }
         }
 
         // List moved references, from separately tracked list.
         for (ESM::CellRefTracker::const_iterator it = mCell->mLeasedRefs.begin(); it != mCell->mLeasedRefs.end(); ++it)
         {
-            const ESM::CellRef &ref = *it;
+            const ESM::CellRef &ref = it->first;
+            bool deleted = it->second;
 
-            mIds.push_back(Misc::StringUtils::lowerCase(ref.mRefID));
+            if (!deleted)
+                mIds.push_back(Misc::StringUtils::lowerCase(ref.mRefID));
         }
 
         std::sort (mIds.begin(), mIds.end());
@@ -507,39 +607,52 @@ namespace MWWorld
         if (mCell->mContextList.empty())
             return; // this is a dynamically generated cell -> skipping.
 
+        std::map<ESM::RefNum, std::string> refNumToID; // used to detect refID modifications
+
         // Load references from all plugins that do something with this cell.
         for (size_t i = 0; i < mCell->mContextList.size(); i++)
         {
-            // Reopen the ESM reader and seek to the right position.
-            int index = mCell->mContextList.at(i).index;
-            mCell->restore (esm[index], i);
+            try
+            {
+                // Reopen the ESM reader and seek to the right position.
+                int index = mCell->mContextList.at(i).index;
+                mCell->restore (esm[index], i);
 
-            ESM::CellRef ref;
-            ref.mRefNum.mContentFile = ESM::RefNum::RefNum_NoContentFile;
+                ESM::CellRef ref;
+                ref.mRefNum.mContentFile = ESM::RefNum::RefNum_NoContentFile;
 
-            // Get each reference in turn
-            bool deleted = false;
-            while(mCell->getNextRef(esm[index], ref, deleted))
-            {
-                // Don't load reference if it was moved to a different cell.
-                ESM::MovedCellRefTracker::const_iterator iter =
-                    std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
-                if (iter != mCell->mMovedRefs.end()) {
-                    continue;
+                // Get each reference in turn
+                bool deleted = false;
+                while(mCell->getNextRef(esm[index], ref, deleted))
+                {
+                    // Don't load reference if it was moved to a different cell.
+                    ESM::MovedCellRefTracker::const_iterator iter =
+                        std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
+                    if (iter != mCell->mMovedRefs.end()) {
+                        continue;
+                    }
+
+                    loadRef (ref, deleted, refNumToID);
                 }
-
-                loadRef (ref, deleted);
+            }
+            catch (std::exception& e)
+            {
+                std::cerr << "An error occurred loading references for cell " << getCell()->getDescription() << ": " << e.what() << std::endl;
             }
         }
 
         // Load moved references, from separately tracked list.
         for (ESM::CellRefTracker::const_iterator it = mCell->mLeasedRefs.begin(); it != mCell->mLeasedRefs.end(); ++it)
         {
-            ESM::CellRef &ref = const_cast<ESM::CellRef&>(*it);
+            ESM::CellRef &ref = const_cast<ESM::CellRef&>(it->first);
+            bool deleted = it->second;
 
-            loadRef (ref, false);
+            loadRef (ref, deleted, refNumToID);
         }
 
+        if(refNumToID.size() != 0)
+            setLastRefNumIndex(refNumToID.rbegin()->first.mIndex);
+
         updateMergedRefs();
     }
 
@@ -568,12 +681,47 @@ namespace MWWorld
         return Ptr();
     }
 
-    void CellStore::loadRef (ESM::CellRef& ref, bool deleted)
+    void CellStore::loadRef (ESM::CellRef& ref, bool deleted, std::map<ESM::RefNum, std::string>& refNumToID)
     {
         Misc::StringUtils::lowerCaseInPlace (ref.mRefID);
 
         const MWWorld::ESMStore& store = mStore;
 
+        std::map<ESM::RefNum, std::string>::iterator it = refNumToID.find(ref.mRefNum);
+        if (it != refNumToID.end())
+        {
+            if (it->second != ref.mRefID)
+            {
+                // refID was modified, make sure we don't end up with duplicated refs
+                switch (store.find(it->second))
+                {
+                    case ESM::REC_ACTI: mActivators.remove(ref.mRefNum); break;
+                    case ESM::REC_ALCH: mPotions.remove(ref.mRefNum); break;
+                    case ESM::REC_APPA: mAppas.remove(ref.mRefNum); break;
+                    case ESM::REC_ARMO: mArmors.remove(ref.mRefNum); break;
+                    case ESM::REC_BOOK: mBooks.remove(ref.mRefNum); break;
+                    case ESM::REC_CLOT: mClothes.remove(ref.mRefNum); break;
+                    case ESM::REC_CONT: mContainers.remove(ref.mRefNum); break;
+                    case ESM::REC_CREA: mCreatures.remove(ref.mRefNum); break;
+                    case ESM::REC_DOOR: mDoors.remove(ref.mRefNum); break;
+                    case ESM::REC_INGR: mIngreds.remove(ref.mRefNum); break;
+                    case ESM::REC_LEVC: mCreatureLists.remove(ref.mRefNum); break;
+                    case ESM::REC_LEVI: mItemLists.remove(ref.mRefNum); break;
+                    case ESM::REC_LIGH: mLights.remove(ref.mRefNum); break;
+                    case ESM::REC_LOCK: mLockpicks.remove(ref.mRefNum); break;
+                    case ESM::REC_MISC: mMiscItems.remove(ref.mRefNum); break;
+                    case ESM::REC_NPC_: mNpcs.remove(ref.mRefNum); break;
+                    case ESM::REC_PROB: mProbes.remove(ref.mRefNum); break;
+                    case ESM::REC_REPA: mRepairs.remove(ref.mRefNum); break;
+                    case ESM::REC_STAT: mStatics.remove(ref.mRefNum); break;
+                    case ESM::REC_WEAP: mWeapons.remove(ref.mRefNum); break;
+                    case ESM::REC_BODY: mBodyParts.remove(ref.mRefNum); break;
+                    default:
+                        break;
+                }
+            }
+        }
+
         switch (store.find (ref.mRefID))
         {
             case ESM::REC_ACTI: mActivators.load(ref, deleted, store); break;
@@ -598,12 +746,15 @@ namespace MWWorld
             case ESM::REC_WEAP: mWeapons.load(ref, deleted, store); break;
             case ESM::REC_BODY: mBodyParts.load(ref, deleted, store); break;
 
-            case 0: std::cerr << "Cell reference " + ref.mRefID + " not found!\n"; break;
+            case 0: std::cerr << "Cell reference '" + ref.mRefID + "' not found!\n"; return;
 
             default:
                 std::cerr
                     << "WARNING: Ignoring reference '" << ref.mRefID << "' of unhandled type\n";
+                return;
         }
+
+        refNumToID[ref.mRefNum] = ref.mRefID;
     }
 
     void CellStore::loadState (const ESM::CellState& state)
@@ -889,35 +1040,47 @@ namespace MWWorld
         return mFogState.get();
     }
 
+    void clearCorpse(const MWWorld::Ptr& ptr)
+    {
+        const MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
+        static const float fCorpseClearDelay = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fCorpseClearDelay")->getFloat();
+        if (creatureStats.isDead() && !ptr.getClass().isPersistent(ptr) && creatureStats.getTimeOfDeath() + fCorpseClearDelay <= MWBase::Environment::get().getWorld()->getTimeStamp())
+            MWBase::Environment::get().getWorld()->deleteObject(ptr);
+    }
+
     void CellStore::respawn()
     {
         if (mState == State_Loaded)
         {
-            static int iMonthsToRespawn = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("iMonthsToRespawn")->getInt();
+            static const int iMonthsToRespawn = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("iMonthsToRespawn")->getInt();
             if (MWBase::Environment::get().getWorld()->getTimeStamp() - mLastRespawn > 24*30*iMonthsToRespawn)
             {
                 mLastRespawn = MWBase::Environment::get().getWorld()->getTimeStamp();
                 for (CellRefList<ESM::Container>::List::iterator it (mContainers.mList.begin()); it!=mContainers.mList.end(); ++it)
                 {
-                    Ptr ptr (&*it, this);
-                    ptr.getClass().respawn(ptr);
-                }
-                for (CellRefList<ESM::Creature>::List::iterator it (mCreatures.mList.begin()); it!=mCreatures.mList.end(); ++it)
-                {
-                    Ptr ptr (&*it, this);
-                    ptr.getClass().respawn(ptr);
-                }
-                for (CellRefList<ESM::NPC>::List::iterator it (mNpcs.mList.begin()); it!=mNpcs.mList.end(); ++it)
-                {
-                    Ptr ptr (&*it, this);
-                    ptr.getClass().respawn(ptr);
-                }
-                for (CellRefList<ESM::CreatureLevList>::List::iterator it (mCreatureLists.mList.begin()); it!=mCreatureLists.mList.end(); ++it)
-                {
-                    Ptr ptr (&*it, this);
+                    Ptr ptr = getCurrentPtr(&*it);
                     ptr.getClass().respawn(ptr);
                 }
             }
+
+            for (CellRefList<ESM::Creature>::List::iterator it (mCreatures.mList.begin()); it!=mCreatures.mList.end(); ++it)
+            {
+                Ptr ptr = getCurrentPtr(&*it);
+                clearCorpse(ptr);
+                ptr.getClass().respawn(ptr);
+            }
+            for (CellRefList<ESM::NPC>::List::iterator it (mNpcs.mList.begin()); it!=mNpcs.mList.end(); ++it)
+            {
+                Ptr ptr = getCurrentPtr(&*it);
+                clearCorpse(ptr);
+                ptr.getClass().respawn(ptr);
+            }
+            for (CellRefList<ESM::CreatureLevList>::List::iterator it (mCreatureLists.mList.begin()); it!=mCreatureLists.mList.end(); ++it)
+            {
+                Ptr ptr = getCurrentPtr(&*it);
+                // no need to clearCorpse, handled as part of mCreatures
+                ptr.getClass().respawn(ptr);
+            }
         }
     }
 }
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index d753c9745..d0667520d 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -75,6 +75,9 @@ namespace MWWorld
             std::vector<std::string> mIds;
             float mWaterLevel;
 
+            // Added by tes3mp
+            unsigned int lastRefNumIndex;
+
             MWWorld::TimeStamp mLastRespawn;
 
             // List of refs owned by this cell
@@ -111,6 +114,9 @@ namespace MWWorld
             // Merged list of ref's currently in this cell - i.e. with added refs from mMovedHere, removed refs from mMovedToAnotherCell
             std::vector<LiveCellRefBase*> mMergedRefs;
 
+            // Get the Ptr for the given ref which originated from this cell (possibly moved to another cell at this point).
+            Ptr getCurrentPtr(MWWorld::LiveCellRefBase* ref);
+
             /// Moves object from the given cell to this cell.
             void moveFrom(const MWWorld::Ptr& object, MWWorld::CellStore* from);
 
@@ -228,6 +234,18 @@ namespace MWWorld
             Ptr searchViaActorId (int id);
             ///< Will return an empty Ptr if cell is not loaded.
 
+            Ptr searchExact (const std::string& id, unsigned int numIndex);
+            ///< Added by tes3mp and used to find an object by both its ID and its reference number
+
+            unsigned int getLastRefNumIndex() const;
+            // Added by tes3mp and used to get the last reference number in the cell
+            
+            void setLastRefNumIndex(unsigned int value);
+            // Added by tes3mp and used to record the last reference number in the cell
+
+            CellRefList<ESM::Container> *getContainers();
+            // Added by tes3mp and used to get all the containers in the cell
+
             float getWaterLevel() const;
 
             void setWaterLevel (float level);
@@ -258,6 +276,9 @@ namespace MWWorld
                 if (mState != State_Loaded)
                     return false;
 
+                if (mMergedRefs.empty())
+                    return true;
+
                 mHasState = true;
 
                 for (unsigned int i=0; i<mMergedRefs.size(); ++i)
@@ -305,6 +326,9 @@ namespace MWWorld
                 if (mState != State_Loaded)
                     return false;
 
+                if (mMergedRefs.empty())
+                    return true;
+
                 mHasState = true;
 
                 CellRefList<T>& list = get<T>();
@@ -379,7 +403,7 @@ namespace MWWorld
 
             void loadRefs();
 
-            void loadRef (ESM::CellRef& ref, bool deleted);
+            void loadRef (ESM::CellRef& ref, bool deleted, std::map<ESM::RefNum, std::string>& refNumToID);
             ///< Make case-adjustments to \a ref and insert it into the respective container.
             ///
             /// Invalid \a ref objects are silently dropped.
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index ecfe7cb7c..72696e209 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -98,7 +98,12 @@ namespace MWWorld
         throw std::runtime_error("class cannot block");
     }
 
-    void Class::onHit(const Ptr& ptr, float damage, bool ishealth, const Ptr& object, const Ptr& attacker, bool successful) const
+    bool Class::canBeActivated(const Ptr& ptr) const
+    {
+        return !getName(ptr).empty();
+    }
+
+    void Class::onHit(const Ptr& ptr, float damage, bool ishealth, const Ptr& object, const Ptr& attacker, const osg::Vec3f& hitPosition, bool successful) const
     {
         throw std::runtime_error("class cannot be hit");
     }
@@ -272,6 +277,14 @@ namespace MWWorld
         throw std::runtime_error ("class does not have a tool tip");
     }
 
+    bool Class::showsInInventory (const ConstPtr& ptr) const
+    {
+        // NOTE: Don't show WerewolfRobe objects in the inventory, or allow them to be taken.
+        // Vanilla likely uses a hack like this since there's no other way to prevent it from
+        // being shown or taken.
+        return (ptr.getCellRef().getRefId() != "werewolfrobe");
+    }
+
     bool Class::hasToolTip (const ConstPtr& ptr) const
     {
         return false;
@@ -291,6 +304,11 @@ namespace MWWorld
         return "";
     }
 
+    bool Class::useAnim() const
+    {
+        return false;
+    }
+
     void Class::getModelsToPreload(const Ptr &ptr, std::vector<std::string> &models) const
     {
         std::string model = getModel(ptr);
@@ -380,7 +398,26 @@ namespace MWWorld
 
     bool Class::isPureWaterCreature(const MWWorld::Ptr& ptr) const
     {
-        return canSwim(ptr) && !canWalk(ptr);
+        return canSwim(ptr)
+                && !isBipedal(ptr)
+                && !canFly(ptr)
+                && !canWalk(ptr);
+    }
+
+    bool Class::isPureFlyingCreature(const Ptr& ptr) const
+    {
+        return canFly(ptr)
+                && !isBipedal(ptr)
+                && !canSwim(ptr)
+                && !canWalk(ptr);
+    }
+
+    bool Class::isPureLandCreature(const Ptr& ptr) const
+    {
+        return canWalk(ptr)
+                && !isBipedal(ptr)
+                && !canFly(ptr)
+                && !canSwim(ptr);
     }
 
     bool Class::isMobile(const MWWorld::Ptr& ptr) const
@@ -450,7 +487,7 @@ namespace MWWorld
         return -1;
     }
 
-    int Class::getEffectiveArmorRating(const ConstPtr &armor, const Ptr &actor) const
+    float Class::getEffectiveArmorRating(const ConstPtr &armor, const Ptr &actor) const
     {
         throw std::runtime_error("class does not support armor ratings");
     }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 0bb3edbee..3b1ddb647 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -98,6 +98,11 @@ namespace MWWorld
             virtual MWGui::ToolTipInfo getToolTipInfo (const ConstPtr& ptr, int count) const;
             ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
+            virtual bool showsInInventory (const ConstPtr& ptr) const;
+            ///< Return whether ptr shows in inventory views.
+            /// Hidden items are not displayed and cannot be (re)moved by the user.
+            /// \return True if shown, false if hidden.
+
             virtual MWMechanics::NpcStats& getNpcStats (const Ptr& ptr) const;
             ///< Return NPC stats or throw an exception, if class does not have NPC stats
             /// (default implementation: throw an exception)
@@ -120,7 +125,7 @@ namespace MWWorld
             ///               enums. ignored for creature attacks.
             /// (default implementation: throw an exception)
 
-            virtual void onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, bool successful) const;
+            virtual void onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) const;
             ///< Alerts \a ptr that it's being hit for \a damage points to health if \a ishealth is
             /// true (else fatigue) by \a object (sword, arrow, etc). \a attacker specifies the
             /// actor responsible for the attack, and \a successful specifies if the hit is
@@ -130,6 +135,10 @@ namespace MWWorld
             ///< Play the appropriate sound for a blocked attack, depending on the currently equipped shield
             /// (default implementation: throw an exception)
 
+            virtual bool canBeActivated(const Ptr& ptr) const;
+            ///< \return Can the player activate this object?
+            /// (default implementation: true if object's user-readable name is not empty, false otherwise)
+
             virtual boost::shared_ptr<Action> activate (const Ptr& ptr, const Ptr& actor) const;
             ///< Generate action for activation (default implementation: return a null action).
 
@@ -262,6 +271,9 @@ namespace MWWorld
 
             virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
 
+            virtual bool useAnim() const;
+            ///< Whether or not to use animated variant of model (default false)
+
             virtual void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const;
             ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation: list getModel().
 
@@ -279,6 +291,9 @@ namespace MWWorld
             virtual bool isKey (const MWWorld::ConstPtr& ptr) const { return false; }
 
             virtual bool isGold(const MWWorld::ConstPtr& ptr) const { return false; }
+
+            virtual bool allowTelekinesis(const MWWorld::ConstPtr& ptr) const { return true; }
+            ///< Return whether this class of object can be activated with telekinesis
             
             /// Get a blood texture suitable for \a ptr (see Blood Texture 0-2 in Morrowind.ini)
             virtual int getBloodTexture (const MWWorld::ConstPtr& ptr) const;
@@ -300,6 +315,8 @@ namespace MWWorld
             virtual bool canSwim(const MWWorld::ConstPtr& ptr) const;
             virtual bool canWalk(const MWWorld::ConstPtr& ptr) const;
             bool isPureWaterCreature(const MWWorld::Ptr& ptr) const;
+            bool isPureFlyingCreature(const MWWorld::Ptr& ptr) const;
+            bool isPureLandCreature(const MWWorld::Ptr& ptr) const;
             bool isMobile(const MWWorld::Ptr& ptr) const;
 
             virtual int getSkill(const MWWorld::Ptr& ptr, int skill) const;
@@ -339,7 +356,7 @@ namespace MWWorld
             virtual int getPrimaryFactionRank (const MWWorld::ConstPtr& ptr) const;
 
             /// Get the effective armor rating, factoring in the actor's skills, for the given armor.
-            virtual int getEffectiveArmorRating(const MWWorld::ConstPtr& armor, const MWWorld::Ptr& actor) const;
+            virtual float getEffectiveArmorRating(const MWWorld::ConstPtr& armor, const MWWorld::Ptr& actor) const;
     };
 }
 
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 7ac0d9d4e..10388a3b0 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -113,7 +113,7 @@ void MWWorld::ContainerStore::storeStates (const CellRefList<T>& collection,
 
 const std::string MWWorld::ContainerStore::sGoldId = "gold_001";
 
-MWWorld::ContainerStore::ContainerStore() : mCachedWeight (0), mWeightUpToDate (false) {}
+MWWorld::ContainerStore::ContainerStore() : mListener(NULL), mCachedWeight (0), mWeightUpToDate (false) {}
 
 MWWorld::ContainerStore::~ContainerStore() {}
 
@@ -136,6 +136,17 @@ int MWWorld::ContainerStore::count(const std::string &id)
     return total;
 }
 
+MWWorld::ContainerStoreListener* MWWorld::ContainerStore::getContListener() const
+{
+    return mListener;
+}
+
+
+void MWWorld::ContainerStore::setContListener(MWWorld::ContainerStoreListener* listener)
+{
+    mListener = listener;
+}
+
 MWWorld::ContainerStoreIterator MWWorld::ContainerStore::unstack(const Ptr &ptr, const Ptr& container, int count)
 {
     if (ptr.getRefData().getCount() <= count)
@@ -292,6 +303,9 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& itemPtr
             item.getRefData().getLocals().setVarByInt(script, "onpcadd", 1);
     }
 
+    if (mListener)
+        mListener->itemAdded(item, count);
+
     return it;
 }
 
@@ -398,6 +412,9 @@ int MWWorld::ContainerStore::remove(const Ptr& item, int count, const Ptr& actor
 
     flagAsModified();
 
+    if (mListener)
+        mListener->itemRemoved(item, count - toRemove);
+
     // number of removed items
     return count - toRemove;
 }
@@ -423,20 +440,20 @@ void MWWorld::ContainerStore::addInitialItem (const std::string& id, const std::
 
         if (ref.getPtr().getTypeName()==typeid (ESM::ItemLevList).name())
         {
-            const ESM::ItemLevList* levItem = ref.getPtr().get<ESM::ItemLevList>()->mBase;
+            const ESM::ItemLevList* levItemList = ref.getPtr().get<ESM::ItemLevList>()->mBase;
 
-            if (topLevel && std::abs(count) > 1 && levItem->mFlags & ESM::ItemLevList::Each)
+            if (topLevel && std::abs(count) > 1 && levItemList->mFlags & ESM::ItemLevList::Each)
             {
                 for (int i=0; i<std::abs(count); ++i)
-                    addInitialItem(id, owner, count > 0 ? 1 : -1, true, levItem->mId);
+                    addInitialItem(id, owner, count > 0 ? 1 : -1, true, levItemList->mId);
                 return;
             }
             else
             {
-                std::string id = MWMechanics::getLevelledItem(ref.getPtr().get<ESM::ItemLevList>()->mBase, false);
-                if (id.empty())
+                std::string itemId = MWMechanics::getLevelledItem(ref.getPtr().get<ESM::ItemLevList>()->mBase, false);
+                if (itemId.empty())
                     return;
-                addInitialItem(id, owner, count, false, levItem->mId);
+                addInitialItem(itemId, owner, count, false, levItemList->mId);
             }
         }
         else
@@ -536,14 +553,14 @@ void MWWorld::ContainerStore::restock (const ESM::InventoryList& items, const MW
             if(listInMap != allowedForReplace.end())
                 restockNum -= std::min(restockNum, listInMap->second);
             //restock
-            addInitialItem(itemOrList, owner, restockNum, true);
+            addInitialItem(itemOrList, owner, -restockNum, true);
         }
         else
         {
             //Restocking static item - just restock to the max count
             int currentCount = count(itemOrList);
             if (currentCount < std::abs(it->mCount))
-                addInitialItem(itemOrList, owner, std::abs(it->mCount) - currentCount, true);
+                addInitialItem(itemOrList, owner, -(std::abs(it->mCount) - currentCount), true);
         }
     }
     flagAsModified();
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index 6a8fc4761..0c95d2dba 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -31,6 +31,13 @@ namespace MWWorld
 {
     class ContainerStoreIterator;
 
+    class ContainerStoreListener
+    {
+        public:
+            virtual void itemAdded(const ConstPtr& item, int count) {}
+            virtual void itemRemoved(const ConstPtr& item, int count) {}
+    };
+
     class ContainerStore
     {
         public:
@@ -73,6 +80,8 @@ namespace MWWorld
             ///< Stores result of levelled item spawns. <(refId, spawningGroup), count>
             /// This is used to restock levelled items(s) if the old item was sold.
 
+            ContainerStoreListener* mListener;
+
             mutable float mCachedWeight;
             mutable bool mWeightUpToDate;
             ContainerStoreIterator addImp (const Ptr& ptr, int count);
@@ -143,6 +152,9 @@ namespace MWWorld
             /// @return How many items with refID \a id are in this container?
             int count (const std::string& id);
 
+            ContainerStoreListener* getContListener() const;
+            void setContListener(ContainerStoreListener* listener);
+
         protected:
             ContainerStoreIterator addNewStack (const ConstPtr& ptr, int count);
             ///< Add the item to this container (do not try to stack it onto existing items)
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 7a1f222c7..4a1763d0a 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -74,10 +74,10 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
         esm.getRecHeader();
 
         // Look up the record type.
-        std::map<int, StoreBase *>::iterator it = mStores.find(n.val);
+        std::map<int, StoreBase *>::iterator it = mStores.find(n.intval);
 
         if (it == mStores.end()) {
-            if (n.val == ESM::REC_INFO) {
+            if (n.intval == ESM::REC_INFO) {
                 if (dialogue)
                 {
                     dialogue->readInfo(esm, esm.getIndex() != 0);
@@ -87,12 +87,12 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
                     std::cerr << "error: info record without dialog" << std::endl;
                     esm.skipRecord();
                 }
-            } else if (n.val == ESM::REC_MGEF) {
+            } else if (n.intval == ESM::REC_MGEF) {
                 mMagicEffects.load (esm);
-            } else if (n.val == ESM::REC_SKIL) {
+            } else if (n.intval == ESM::REC_SKIL) {
                 mSkills.load (esm);
             }
-            else if (n.val==ESM::REC_FILT || n.val == ESM::REC_DBGP)
+            else if (n.intval==ESM::REC_FILT || n.intval == ESM::REC_DBGP)
             {
                 // ignore project file only records
                 esm.skipRecord();
@@ -110,7 +110,7 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
                 continue;
             }
 
-            if (n.val==ESM::REC_DIAL) {
+            if (n.intval==ESM::REC_DIAL) {
                 dialogue = const_cast<ESM::Dialogue*>(mDialogs.find(id.mId));
             } else {
                 dialogue = 0;
diff --git a/apps/openmw/mwworld/failedaction.cpp b/apps/openmw/mwworld/failedaction.cpp
index 49ca9dae0..45df75a32 100644
--- a/apps/openmw/mwworld/failedaction.cpp
+++ b/apps/openmw/mwworld/failedaction.cpp
@@ -8,8 +8,8 @@
 
 namespace MWWorld
 {
-    FailedAction::FailedAction(const std::string &msg)
-      : Action(false), mMessage(msg)
+    FailedAction::FailedAction(const std::string &msg, const Ptr& target)
+      : Action(false, target), mMessage(msg)
     {   }
 
     void FailedAction::executeImp(const Ptr &actor)
diff --git a/apps/openmw/mwworld/failedaction.hpp b/apps/openmw/mwworld/failedaction.hpp
index f248ee3bd..bafbb6f2d 100644
--- a/apps/openmw/mwworld/failedaction.hpp
+++ b/apps/openmw/mwworld/failedaction.hpp
@@ -13,7 +13,7 @@ namespace MWWorld
         virtual void executeImp(const Ptr &actor);
 
     public:
-        FailedAction(const std::string &message = std::string());
+        FailedAction(const std::string &message = std::string(), const Ptr& target = Ptr());
     };
 }
 
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 318b7c5ec..34b6fcf69 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -6,6 +6,7 @@
 #include <components/esm/loadench.hpp>
 #include <components/esm/inventorystate.hpp>
 #include <components/misc/rng.hpp>
+#include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -138,7 +139,7 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::add(const Ptr& itemPtr,
 
     // Auto-equip items if an armor/clothing or weapon item is added, but not for the player nor werewolves
     if (actorPtr != MWMechanics::getPlayer()
-            && !(actorPtr.getClass().isNpc() && actorPtr.getClass().getNpcStats(actorPtr).isWerewolf()))
+            && actorPtr.getClass().isNpc() && !actorPtr.getClass().getNpcStats(actorPtr).isWerewolf())
     {
         std::string type = itemPtr.getTypeName();
         if (type == typeid(ESM::Armor).name() || type == typeid(ESM::Clothing).name())
@@ -214,36 +215,73 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getSlot (int slot)
     return mSlots[slot];
 }
 
+bool MWWorld::InventoryStore::canActorAutoEquip(const MWWorld::Ptr& actor, const MWWorld::Ptr& item)
+{
+    if (!Settings::Manager::getBool("prevent merchant equipping", "Game"))
+        return true;
+
+    // Only autoEquip if we are the original owner of the item.
+    // This stops merchants from auto equipping anything you sell to them.
+    // ...unless this is a companion, he should always equip items given to him.
+    if (!Misc::StringUtils::ciEqual(item.getCellRef().getOwner(), actor.getCellRef().getRefId()) &&
+            (actor.getClass().getScript(actor).empty() ||
+            !actor.getRefData().getLocals().getIntVar(actor.getClass().getScript(actor), "companion"))
+            && !actor.getClass().getCreatureStats(actor).isDead() // Corpses can be dressed up by the player as desired
+            )
+    {
+        return false;
+    }
+
+    // tes3mp needs player-controlled NPCs to wear whatever their players are
+    // actually wearing, so a condition has been added that should return
+    // false only for them
+    else if (!actor.getBase()->canChangeCell)
+        return false;
+
+    return true;
+}
+
 void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
 {
+    const MWBase::World *world = MWBase::Environment::get().getWorld();
+    const MWWorld::Store<ESM::GameSetting> &store = world->getStore().get<ESM::GameSetting>();
+    MWMechanics::NpcStats& stats = actor.getClass().getNpcStats(actor);
+
+    static float fUnarmoredBase1 = store.find("fUnarmoredBase1")->getFloat();
+    static float fUnarmoredBase2 = store.find("fUnarmoredBase2")->getFloat();
+    int unarmoredSkill = stats.getSkill(ESM::Skill::Unarmored).getModified();
+
+    float unarmoredRating = (fUnarmoredBase1 * unarmoredSkill) * (fUnarmoredBase2 * unarmoredSkill);
+
     TSlots slots_;
     initSlots (slots_);
 
     // Disable model update during auto-equip
     mUpdatesEnabled = false;
 
-    for (ContainerStoreIterator iter (begin()); iter!=end(); ++iter)
+    // Autoequip clothing, armor and weapons.
+    // Equipping lights is handled in Actors::updateEquippedLight based on environment light.
+
+    for (ContainerStoreIterator iter (begin(ContainerStore::Type_Clothing | ContainerStore::Type_Armor)); iter!=end(); ++iter)
     {
         Ptr test = *iter;
 
-        // Don't autoEquip lights. Handled in Actors::updateEquippedLight based on environment light.
-        if (test.getTypeName() == typeid(ESM::Light).name())
-        {
+        if (!canActorAutoEquip(actor, test))
             continue;
+
+        switch(test.getClass().canBeEquipped (test, actor).first)
+        {
+            case 0:
+                continue;
+            default:
+                break;
         }
 
-        // Only autoEquip if we are the original owner of the item.
-        // This stops merchants from auto equipping anything you sell to them.
-        // ...unless this is a companion, he should always equip items given to him.
-        if (!Misc::StringUtils::ciEqual(test.getCellRef().getOwner(), actor.getCellRef().getRefId()) &&
-                (actor.getClass().getScript(actor).empty() ||
-                !actor.getRefData().getLocals().getIntVar(actor.getClass().getScript(actor), "companion"))
-                && !actor.getClass().getCreatureStats(actor).isDead() // Corpses can be dressed up by the player as desired
-                )
+        if (iter.getType() == ContainerStore::Type_Armor &&
+                test.getClass().getEffectiveArmorRating(test, actor) <= std::max(unarmoredRating, 0.f))
         {
             continue;
         }
-        int testSkill = test.getClass().getEquipmentSkill (test);
 
         std::pair<std::vector<int>, bool> itemsSlots =
             iter->getClass().getEquipmentSlots (*iter);
@@ -251,48 +289,41 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
         for (std::vector<int>::const_iterator iter2 (itemsSlots.first.begin());
             iter2!=itemsSlots.first.end(); ++iter2)
         {
-            if (*iter2 == Slot_CarriedRight) // Items in right hand are situational use, so don't equip them.
-                // Equipping weapons is handled by AiCombat. Anything else (lockpicks, probes) can't be used by NPCs anyway (yet)
-                continue;
-
             if (slots_.at (*iter2)!=end())
             {
                 Ptr old = *slots_.at (*iter2);
 
-                // check skill
-                int oldSkill = old.getClass().getEquipmentSkill (old);
-
-                bool use = false;
-                if (testSkill!=-1 && oldSkill==-1)
-                    use = true;
-                else if (testSkill!=-1 && oldSkill!=-1 && testSkill!=oldSkill)
+                if (iter.getType() == ContainerStore::Type_Armor)
                 {
-                    if (actor.getClass().getSkill(actor, oldSkill) > actor.getClass().getSkill (actor, testSkill))
-                        continue; // rejected, because old item better matched the NPC's skills.
-
-                    if (actor.getClass().getSkill(actor, oldSkill) < actor.getClass().getSkill (actor, testSkill))
-                        use = true;
+                    if (old.getTypeName() == typeid(ESM::Armor).name())
+                    {
+                        if (old.get<ESM::Armor>()->mBase->mData.mType < test.get<ESM::Armor>()->mBase->mData.mType)
+                            continue;
+
+                        if (old.get<ESM::Armor>()->mBase->mData.mType == test.get<ESM::Armor>()->mBase->mData.mType)
+                        {
+                            if (old.getClass().getEffectiveArmorRating(old, actor) >= test.getClass().getEffectiveArmorRating(test, actor))
+                                // old armor had better armor rating
+                                continue;
+                        }
+                    }
+                    // suitable armor should replace already equipped clothing
                 }
-
-                if (!use)
+                else if (iter.getType() == ContainerStore::Type_Clothing)
                 {
-                    // check value
-                    if (old.getClass().getValue (old)>=
-                        test.getClass().getValue (test))
+                    if (old.getTypeName() == typeid(ESM::Clothing).name())
                     {
-                        continue;
+                        // check value
+                        if (old.getClass().getValue (old) > test.getClass().getValue (test))
+                            // old clothing was more valuable
+                            continue;
                     }
+                    else
+                        // suitable clothing should NOT replace already equipped armor
+                        continue;
                 }
             }
 
-            switch(test.getClass().canBeEquipped (test, actor).first)
-            {
-                case 0:
-                    continue;
-                default:
-                    break;
-            }
-
             if (!itemsSlots.second) // if itemsSlots.second is true, item can stay stacked when equipped
             {
                 // unstack item pointed to by iterator if required
@@ -307,6 +338,98 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
         }
     }
 
+    static const ESM::Skill::SkillEnum weaponSkills[] =
+    {
+        ESM::Skill::LongBlade,
+        ESM::Skill::Axe,
+        ESM::Skill::Spear,
+        ESM::Skill::ShortBlade,
+        ESM::Skill::Marksman,
+        ESM::Skill::BluntWeapon
+    };
+    const size_t weaponSkillsLength = sizeof(weaponSkills) / sizeof(weaponSkills[0]);
+
+    bool weaponSkillVisited[weaponSkillsLength] = { false };
+
+    for (int i = 0; i < static_cast<int>(weaponSkillsLength); ++i)
+    {
+        int max = 0;
+        int maxWeaponSkill = -1;
+
+        for (int j = 0; j < static_cast<int>(weaponSkillsLength); ++j)
+        {
+            int skillValue = stats.getSkill(static_cast<int>(weaponSkills[j])).getModified();
+
+            if (skillValue > max && !weaponSkillVisited[j])
+            {
+                max = skillValue;
+                maxWeaponSkill = j;
+            }
+        }
+
+        if (maxWeaponSkill == -1)
+            break;
+
+        max = 0;
+        ContainerStoreIterator weapon(end());
+
+        for (ContainerStoreIterator iter(begin(ContainerStore::Type_Weapon)); iter!=end(); ++iter)
+        {
+            if (!canActorAutoEquip(actor, *iter))
+                continue;
+
+            const ESM::Weapon* esmWeapon = iter->get<ESM::Weapon>()->mBase;
+
+            if (esmWeapon->mData.mType == ESM::Weapon::Arrow || esmWeapon->mData.mType == ESM::Weapon::Bolt)
+                continue;
+
+            if (iter->getClass().getEquipmentSkill(*iter) == weaponSkills[maxWeaponSkill])
+            {
+                if (esmWeapon->mData.mChop[1] >= max)
+                {
+                    max = esmWeapon->mData.mChop[1];
+                    weapon = iter;
+                }
+
+                if (esmWeapon->mData.mSlash[1] >= max)
+                {
+                    max = esmWeapon->mData.mSlash[1];
+                    weapon = iter;
+                }
+
+                if (esmWeapon->mData.mThrust[1] >= max)
+                {
+                    max = esmWeapon->mData.mThrust[1];
+                    weapon = iter;
+                }
+            }
+        }
+
+        if (weapon != end() && weapon->getClass().canBeEquipped(*weapon, actor).first)
+        {
+            std::pair<std::vector<int>, bool> itemsSlots =
+                weapon->getClass().getEquipmentSlots (*weapon);
+
+            if (!itemsSlots.first.empty())
+            {
+                if (!itemsSlots.second)
+                {
+                    if (weapon->getRefData().getCount() > 1)
+                    {
+                        unstack(*weapon, actor);
+                    }
+                }
+
+                int slot = itemsSlots.first.front();
+                slots_[slot] = weapon;
+            }
+
+            break;
+        }
+
+        weaponSkillVisited[maxWeaponSkill] = true;
+    }
+
     bool changed = false;
 
     for (std::size_t i=0; i<slots_.size(); ++i)
@@ -328,6 +451,50 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
     }
 }
 
+void MWWorld::InventoryStore::autoEquipShield(const MWWorld::Ptr& actor)
+{
+    bool updated = false;
+
+    mUpdatesEnabled = false;
+    for (ContainerStoreIterator iter(begin(ContainerStore::Type_Armor)); iter != end(); ++iter)
+    {
+        if (iter->get<ESM::Armor>()->mBase->mData.mType != ESM::Armor::Shield)
+            continue;
+
+        if (iter->getClass().canBeEquipped(*iter, actor).first != 1)
+            continue;
+
+        if (iter->getClass().getItemHealth(*iter) <= 0)
+            continue;
+
+        std::pair<std::vector<int>, bool> shieldSlots =
+            iter->getClass().getEquipmentSlots(*iter);
+
+        if (shieldSlots.first.empty())
+            continue;
+
+        int slot = shieldSlots.first[0];
+        const ContainerStoreIterator& shield = mSlots[slot];
+
+        if (shield != end()
+                && shield.getType() == Type_Armor && shield->get<ESM::Armor>()->mBase->mData.mType == ESM::Armor::Shield)
+        {
+            if (shield->getClass().getItemHealth(*shield) >= iter->getClass().getItemHealth(*iter))
+                continue;
+        }
+
+        equip(slot, iter, actor);
+        updated = true;
+    }
+    mUpdatesEnabled = true;
+
+    if (updated)
+    {
+        fireEquipmentChangedEvent(actor);
+        updateMagicEffects(actor);
+    }
+}
+
 const MWMechanics::MagicEffects& MWWorld::InventoryStore::getMagicEffects() const
 {
     return mMagicEffects;
@@ -399,8 +566,8 @@ void MWWorld::InventoryStore::updateMagicEffects(const Ptr& actor)
                     MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find (
                     effectIt->mEffectID);
 
-                // Fully resisted?
-                if (params[i].mMultiplier == 0)
+                // Fully resisted or can't be applied to target?
+                if (params[i].mMultiplier == 0 || !MWMechanics::checkEffectTarget(effectIt->mEffectID, actor, actor, actor == MWMechanics::getPlayer()))
                     continue;
 
                 float magnitude = effectIt->mMagnMin + (effectIt->mMagnMax - effectIt->mMagnMin) * params[i].mRandom;
@@ -411,8 +578,7 @@ void MWWorld::InventoryStore::updateMagicEffects(const Ptr& actor)
                     // During first auto equip, we don't play any sounds.
                     // Basically we don't want sounds when the actor is first loaded,
                     // the items should appear as if they'd always been equipped.
-                    mListener->permanentEffectAdded(magicEffect, !mFirstAutoEquip,
-                                                        !mFirstAutoEquip && effectIt == enchantment.mEffects.mList.begin());
+                    mListener->permanentEffectAdded(magicEffect, !mFirstAutoEquip);
                 }
 
                 if (magnitude)
@@ -508,7 +674,7 @@ int MWWorld::InventoryStore::remove(const Ptr& item, int count, const Ptr& actor
     // If an armor/clothing item is removed, try to find a replacement,
     // but not for the player nor werewolves.
     if (wasEquipped && (actor != MWMechanics::getPlayer())
-            && !(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf()))
+            && actor.getClass().isNpc() && !actor.getClass().getNpcStats(actor).isWerewolf())
     {
         std::string type = item.getTypeName();
         if (type == typeid(ESM::Armor).name() || type == typeid(ESM::Clothing).name())
@@ -604,12 +770,12 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipItemQuantity(con
     return unstack(item, actor, item.getRefData().getCount() - count);
 }
 
-MWWorld::InventoryStoreListener* MWWorld::InventoryStore::getListener()
+MWWorld::InventoryStoreListener* MWWorld::InventoryStore::getInvListener()
 {
     return mListener;
 }
 
-void MWWorld::InventoryStore::setListener(InventoryStoreListener *listener, const Ptr& actor)
+void MWWorld::InventoryStore::setInvListener(InventoryStoreListener *listener, const Ptr& actor)
 {
     mListener = listener;
     updateMagicEffects(actor);
@@ -655,6 +821,9 @@ void MWWorld::InventoryStore::visitEffectSources(MWMechanics::EffectSourceVisito
         for (std::vector<ESM::ENAMstruct>::const_iterator effectIt (enchantment.mEffects.mList.begin());
             effectIt!=enchantment.mEffects.mList.end(); ++effectIt)
         {
+            // Don't get spell icon display information for enchantments that weren't actually applied
+            if (mMagicEffects.get(MWMechanics::EffectKey(*effectIt)).getMagnitude() == 0)
+                continue;
             const EffectParams& params = mPermanentMagicEffectMagnitudes[(**iter).getCellRef().getRefId()][i];
             float magnitude = effectIt->mMagnMin + (effectIt->mMagnMax - effectIt->mMagnMin) * params.mRandom;
             magnitude *= params.mMultiplier;
@@ -719,7 +888,11 @@ void MWWorld::InventoryStore::rechargeItems(float duration)
 
 void MWWorld::InventoryStore::purgeEffect(short effectId)
 {
-    mMagicEffects.remove(MWMechanics::EffectKey(effectId));
+    for (TSlots::const_iterator it = mSlots.begin(); it != mSlots.end(); ++it)
+    {
+        if (*it != end())
+            purgeEffect(effectId, (*it)->getCellRef().getRefId());
+    }
 }
 
 void MWWorld::InventoryStore::purgeEffect(short effectId, const std::string &sourceId)
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index 2d7c9f6e9..f625e4cd1 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -32,7 +32,7 @@ namespace MWWorld
          *              If it isn't new, non-looping VFX should not be played.
          * @param playSound Play effect sound?
          */
-        virtual void permanentEffectAdded (const ESM::MagicEffect *magicEffect, bool isNew, bool playSound) {}
+        virtual void permanentEffectAdded (const ESM::MagicEffect *magicEffect, bool isNew) {}
 
     };
 
@@ -115,6 +115,8 @@ namespace MWWorld
             virtual void storeEquipmentState (const MWWorld::LiveCellRefBase& ref, int index, ESM::InventoryState& inventory) const;
             virtual void readEquipmentState (const MWWorld::ContainerStoreIterator& iter, int index, const ESM::InventoryState& inventory);
 
+            bool canActorAutoEquip(const MWWorld::Ptr& actor, const MWWorld::Ptr& item);
+
         public:
 
             InventoryStore();
@@ -160,6 +162,9 @@ namespace MWWorld
             void autoEquip (const MWWorld::Ptr& actor);
             ///< Auto equip items according to stats and item value.
 
+            void autoEquipShield(const MWWorld::Ptr& actor);
+            ///< Auto-equip the shield with most health.
+
             const MWMechanics::MagicEffects& getMagicEffects() const;
             ///< Return magic effects from worn items.
 
@@ -197,10 +202,10 @@ namespace MWWorld
             /// in the slot (they can be re-stacked so its count may be different
             /// than the requested count).
 
-            void setListener (InventoryStoreListener* listener, const Ptr& actor);
+            void setInvListener (InventoryStoreListener* listener, const Ptr& actor);
             ///< Set a listener for various events, see \a InventoryStoreListener
 
-            InventoryStoreListener* getListener();
+            InventoryStoreListener* getInvListener();
 
             void visitEffectSources (MWMechanics::EffectSourceVisitor& visitor);
 
diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp
index 32830b5fb..6d138d7e1 100644
--- a/apps/openmw/mwworld/livecellref.cpp
+++ b/apps/openmw/mwworld/livecellref.cpp
@@ -14,6 +14,7 @@
 MWWorld::LiveCellRefBase::LiveCellRefBase(const std::string& type, const ESM::CellRef &cref)
   : mClass(&Class::get(type)), mRef(cref), mData(cref)
 {
+    canChangeCell = true;
 }
 
 void MWWorld::LiveCellRefBase::loadImp (const ESM::ObjectState& state)
diff --git a/apps/openmw/mwworld/livecellref.hpp b/apps/openmw/mwworld/livecellref.hpp
index 2631f513f..91495eed2 100644
--- a/apps/openmw/mwworld/livecellref.hpp
+++ b/apps/openmw/mwworld/livecellref.hpp
@@ -27,6 +27,11 @@ namespace MWWorld
          * and individual type-dependent data.
          */
         MWWorld::CellRef mRef;
+    
+        /* Added by tes3mp to prevent dedicated players' references from automatically
+         * and unpredictably moving across exterior cell boundaries on clients
+         */
+        bool canChangeCell;
 
         /** runtime-data */
         RefData mData;
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index f0174ac52..5f6d10b31 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -66,11 +66,6 @@ MWWorld::LocalScripts::LocalScripts (const MWWorld::ESMStore& store) : mStore (s
     mIter = mScripts.end();
 }
 
-void MWWorld::LocalScripts::setIgnore (const ConstPtr& ptr)
-{
-    mIgnore = ptr;
-}
-
 void MWWorld::LocalScripts::startIteration()
 {
     mIter = mScripts.begin();
@@ -81,11 +76,8 @@ bool MWWorld::LocalScripts::getNext(std::pair<std::string, Ptr>& script)
     while (mIter!=mScripts.end())
     {
         std::list<std::pair<std::string, Ptr> >::iterator iter = mIter++;
-        if (mIgnore.isEmpty() || iter->second!=mIgnore)
-        {
-            script = *iter;
-            return true;
-        }
+        script = *iter;
+        return true;
     }
     return false;
 }
diff --git a/apps/openmw/mwworld/localscripts.hpp b/apps/openmw/mwworld/localscripts.hpp
index 6c2118ea8..c698daf04 100644
--- a/apps/openmw/mwworld/localscripts.hpp
+++ b/apps/openmw/mwworld/localscripts.hpp
@@ -17,17 +17,12 @@ namespace MWWorld
     {
             std::list<std::pair<std::string, Ptr> > mScripts;
             std::list<std::pair<std::string, Ptr> >::iterator mIter;
-            MWWorld::ConstPtr mIgnore;
             const MWWorld::ESMStore& mStore;
 
         public:
 
             LocalScripts (const MWWorld::ESMStore& store);
 
-            void setIgnore (const ConstPtr& ptr);
-            ///< Mark a single reference for ignoring during iteration over local scripts (will revoke
-            /// previous ignores).
-
             void startIteration();
             ///< Set the iterator to the begin of the script list.
 
diff --git a/apps/openmw/mwworld/manualref.cpp b/apps/openmw/mwworld/manualref.cpp
index c683f7e03..48270d224 100644
--- a/apps/openmw/mwworld/manualref.cpp
+++ b/apps/openmw/mwworld/manualref.cpp
@@ -16,6 +16,7 @@ namespace
         cellRef.mScale = 1;
         cellRef.mFactionRank = 0;
         cellRef.mChargeInt = -1;
+        cellRef.mChargeIntRemainder = 0.0f;
         cellRef.mGoldValue = 1;
         cellRef.mEnchantmentCharge = -1;
         cellRef.mTeleport = false;
diff --git a/apps/openmw/mwworld/nullaction.hpp b/apps/openmw/mwworld/nullaction.hpp
index 7ef8b4a06..5461d8711 100644
--- a/apps/openmw/mwworld/nullaction.hpp
+++ b/apps/openmw/mwworld/nullaction.hpp
@@ -9,6 +9,8 @@ namespace MWWorld
     class NullAction : public Action
     {
             virtual void executeImp (const Ptr& actor) {}
+
+            virtual bool isNullAction() { return true; }
     };
 }
 
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 19b66c3c9..a44d79157 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -212,7 +212,7 @@ namespace MWWorld
 
         MWWorld::Ptr player = getPlayer();
         const MWMechanics::NpcStats &playerStats = player.getClass().getNpcStats(player);
-        if (playerStats.isParalyzed() || playerStats.getKnockedDown())
+        if (playerStats.isParalyzed() || playerStats.getKnockedDown() || playerStats.isDead())
             return;
 
         MWWorld::Ptr toActivate = MWBase::Environment::get().getWorld()->getFacedObject();
@@ -220,17 +220,9 @@ namespace MWWorld
         if (toActivate.isEmpty())
             return;
 
-        if (toActivate.getClass().getName(toActivate) == "") // objects without name presented to user can never be activated
+        if (!toActivate.getClass().canBeActivated(toActivate))
             return;
 
-        if (toActivate.getClass().isActor())
-        {
-            MWMechanics::CreatureStats &stats = toActivate.getClass().getCreatureStats(toActivate);
-
-            if (stats.getAiSequence().isInCombat() && !stats.isDead())
-                return;
-        }
-
         MWBase::Environment::get().getWorld()->activate(toActivate, player);
     }
 
@@ -258,6 +250,11 @@ namespace MWWorld
         return MWBase::Environment::get().getMechanicsManager()->getActorsFighting(getPlayer()).size() != 0;
     }
 
+    bool Player::enemiesNearby()
+    {
+        return MWBase::Environment::get().getMechanicsManager()->getEnemiesNearby(getPlayer()).size() != 0;
+    }
+
     void Player::markPosition(CellStore *markedCell, ESM::Position markedPosition)
     {
         mMarkedCell = markedCell;
@@ -331,6 +328,12 @@ namespace MWWorld
                 throw std::runtime_error ("invalid player state record (object state)");
             }
 
+            if (!player.mObject.mEnabled)
+            {
+                std::cerr << "Savegame attempted to disable the player." << std::endl;
+                player.mObject.mEnabled = true;
+            }
+
             mPlayer.load (player.mObject);
 
             for (int i=0; i<ESM::Attribute::Length; ++i)
@@ -355,12 +358,8 @@ namespace MWWorld
             catch (...)
             {
                 std::cerr << "Player cell '" << player.mCellId.mWorldspace << "' no longer exists" << std::endl;
-                // Cell no longer exists. Place the player in a default cell.
-                ESM::Position pos = mPlayer.mData.getPosition();
-                MWBase::Environment::get().getWorld()->indexToPosition(0, 0, pos.pos[0], pos.pos[1], true);
-                pos.pos[2] = 0;
-                mPlayer.mData.setPosition(pos);
-                mCellStore = world.getExterior(0,0);
+                // Cell no longer exists. The loader will have to choose a default cell.
+                mCellStore = NULL;
             }
 
             if (!player.mBirthsign.empty())
diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index 595dd89fc..157501803 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -109,6 +109,8 @@ namespace MWWorld
         ///Checks all nearby actors to see if anyone has an aipackage against you
         bool isInCombat();
 
+        bool enemiesNearby();
+
         void clear();
 
         void write (ESM::ESMWriter& writer, Loading::Listener& progress) const;
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index b8150ce9c..5afdce700 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -1,11 +1,15 @@
 #include "projectilemanager.hpp"
 
+#include <iomanip>
+
 #include <osg/PositionAttitudeTransform>
 
 #include <components/esm/esmwriter.hpp>
 #include <components/esm/projectilestate.hpp>
+
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
+
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/lightmanager.hpp>
@@ -23,16 +27,101 @@
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/spellcasting.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/aipackage.hpp"
 
 #include "../mwrender/effectmanager.hpp"
 #include "../mwrender/animation.hpp"
 #include "../mwrender/vismask.hpp"
 #include "../mwrender/renderingmanager.hpp"
+#include "../mwrender/util.hpp"
 
 #include "../mwsound/sound.hpp"
 
 #include "../mwphysics/physicssystem.hpp"
 
+namespace
+{
+    ESM::EffectList getMagicBoltData(std::vector<std::string>& projectileIDs, std::vector<std::string>& sounds, float& speed, std::string& texture, const ESM::EffectList& effects)
+    {
+        int count = 0;
+        speed = 0.0f;
+        ESM::EffectList projectileEffects;
+        for (std::vector<ESM::ENAMstruct>::const_iterator iter (effects.mList.begin());
+            iter!=effects.mList.end(); ++iter)
+        {
+            const ESM::MagicEffect *magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find (
+                iter->mEffectID);
+
+            // Speed of multi-effect projectiles should be the average of the constituent effects,
+            // based on observation of the original engine.
+            speed += magicEffect->mData.mSpeed;
+            count++;
+
+            if (iter->mRange != ESM::RT_Target)
+                continue;
+
+            if (magicEffect->mBolt.empty())
+                projectileIDs.push_back("VFX_DefaultBolt");
+            else
+                projectileIDs.push_back(magicEffect->mBolt);
+
+            static const std::string schools[] = {
+                "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
+            };
+            if (!magicEffect->mBoltSound.empty())
+                sounds.push_back(magicEffect->mBoltSound);
+            else
+                sounds.push_back(schools[magicEffect->mData.mSchool] + " bolt");
+            projectileEffects.mList.push_back(*iter);
+        }
+        
+        if (count != 0)
+            speed /= count;
+
+        // the particle texture is only used if there is only one projectile
+        if (projectileEffects.mList.size() == 1) 
+        {
+            const ESM::MagicEffect *magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find (
+                effects.mList.begin()->mEffectID);
+            texture = magicEffect->mParticle;
+        }
+        
+        if (projectileEffects.mList.size() > 1) // insert a VFX_Multiple projectile if there are multiple projectile effects
+        {
+            std::ostringstream ID;
+            ID << "VFX_Multiple" << effects.mList.size();
+            std::vector<std::string>::iterator it;
+            it = projectileIDs.begin();
+            it = projectileIDs.insert(it, ID.str());
+        }
+        return projectileEffects;
+    }
+
+    osg::Vec4 getMagicBoltLightDiffuseColor(const ESM::EffectList& effects)
+    {
+        // Calculate combined light diffuse color from magical effects
+        osg::Vec4 lightDiffuseColor;
+        float lightDiffuseRed = 0.0f;
+        float lightDiffuseGreen = 0.0f;
+        float lightDiffuseBlue = 0.0f;
+        for (std::vector<ESM::ENAMstruct>::const_iterator iter(effects.mList.begin());
+            iter != effects.mList.end(); ++iter)
+        {
+            const ESM::MagicEffect *magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(
+                iter->mEffectID);
+            lightDiffuseRed += (static_cast<float>(magicEffect->mData.mRed) / 255.f);
+            lightDiffuseGreen += (static_cast<float>(magicEffect->mData.mGreen) / 255.f);
+            lightDiffuseBlue += (static_cast<float>(magicEffect->mData.mBlue) / 255.f);
+        }
+        int numberOfEffects = effects.mList.size();
+        lightDiffuseColor = osg::Vec4(lightDiffuseRed / numberOfEffects
+            , lightDiffuseGreen / numberOfEffects
+            , lightDiffuseBlue / numberOfEffects
+            , 1.0f);
+
+        return lightDiffuseColor;
+    }
+}
 
 namespace MWWorld
 {
@@ -75,7 +164,8 @@ namespace MWWorld
     };
 
 
-    void ProjectileManager::createModel(State &state, const std::string &model, const osg::Vec3f& pos, const osg::Quat& orient, bool rotate)
+    void ProjectileManager::createModel(State &state, const std::string &model, const osg::Vec3f& pos, const osg::Quat& orient,
+                                        bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, std::string texture)
     {
         state.mNode = new osg::PositionAttitudeTransform;
         state.mNode->setNodeMask(MWRender::Mask_Effect);
@@ -92,8 +182,39 @@ namespace MWWorld
             attachTo = rotateNode;
         }
 
-        mResourceSystem->getSceneManager()->getInstance(model, attachTo);
+        osg::ref_ptr<osg::Node> projectile = mResourceSystem->getSceneManager()->getInstance(model, attachTo);
+
+        if (state.mIdMagic.size() > 1)
+            for (size_t iter = 1; iter != state.mIdMagic.size(); ++iter)
+            {
+                std::ostringstream nodeName;
+                nodeName << "Dummy" << std::setw(2) << std::setfill('0') << iter;
+                const ESM::Weapon* weapon = MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>().find (state.mIdMagic.at(iter));
+                SceneUtil::FindByNameVisitor findVisitor(nodeName.str());
+                attachTo->accept(findVisitor);
+                if (findVisitor.mFoundNode)
+                    mResourceSystem->getSceneManager()->getInstance("meshes\\" + weapon->mModel, findVisitor.mFoundNode);
+            }
 
+        if (createLight)
+        {
+            osg::ref_ptr<osg::Light> projectileLight(new osg::Light);
+            projectileLight->setAmbient(osg::Vec4(1.0f, 1.0f, 1.0f, 1.0f));
+            projectileLight->setDiffuse(lightDiffuseColor);
+            projectileLight->setSpecular(osg::Vec4(0.0f, 0.0f, 0.0f, 0.0f));
+            projectileLight->setConstantAttenuation(0.f);
+            projectileLight->setLinearAttenuation(0.1f);
+            projectileLight->setQuadraticAttenuation(0.f);
+            projectileLight->setPosition(osg::Vec4(pos, 1.0));
+            
+            SceneUtil::LightSource* projectileLightSource = new SceneUtil::LightSource;
+            projectileLightSource->setNodeMask(MWRender::Mask_Lighting);
+            projectileLightSource->setRadius(66.f);
+            
+            state.mNode->addChild(projectileLightSource);
+            projectileLightSource->setLight(projectileLight);
+        }
+        
         SceneUtil::DisableFreezeOnCullVisitor disableFreezeOnCullVisitor;
         state.mNode->accept(disableFreezeOnCullVisitor);
 
@@ -105,6 +226,8 @@ namespace MWWorld
 
         SceneUtil::AssignControllerSourcesVisitor assignVisitor (state.mEffectAnimationTime);
         state.mNode->accept(assignVisitor);
+
+        MWRender::overrideFirstRootTexture(texture, mResourceSystem, projectile);
     }
 
     void ProjectileManager::update(State& state, float duration)
@@ -112,12 +235,16 @@ namespace MWWorld
         state.mEffectAnimationTime->addTime(duration);
     }
 
-    void ProjectileManager::launchMagicBolt(const std::string &model, const std::string &sound,
-                                            const std::string &spellId, float speed, bool stack,
-                                            const ESM::EffectList &effects, const Ptr &caster, const std::string &sourceName,
-                                            const osg::Vec3f& fallbackDirection)
+    void ProjectileManager::launchMagicBolt(const std::string &spellId, bool stack, const ESM::EffectList &effects, const Ptr &caster,
+                                             const std::string &sourceName, const osg::Vec3f& fallbackDirection)
     {
-        osg::Vec3f pos = mPhysics->getPosition(caster) + osg::Vec3f(0,0,mPhysics->getHalfExtents(caster).z() * 0.5); // Spawn at 0.75 * ActorHeight
+        osg::Vec3f pos = caster.getRefData().getPosition().asVec3();
+        if (caster.getClass().isActor())
+        {
+            // Spawn at 0.75 * ActorHeight
+            // Note: we ignore the collision box offset, this is required to make some flying creatures work as intended.
+            pos.z() += mPhysics->getHalfExtents(caster).z() * 2 * 0.75;
+        }
 
         if (MWBase::Environment::get().getWorld()->isUnderwater(caster.getCell(), pos)) // Underwater casting not possible
             return;
@@ -131,33 +258,36 @@ namespace MWWorld
 
         MagicBoltState state;
         state.mSourceName = sourceName;
-        state.mId = model;
         state.mSpellId = spellId;
         state.mCasterHandle = caster;
         if (caster.getClass().isActor())
             state.mActorId = caster.getClass().getCreatureStats(caster).getActorId();
         else
             state.mActorId = -1;
-        state.mSpeed = speed;
         state.mStack = stack;
-        state.mSoundId = sound;
 
-        // Only interested in "on target" effects
-        for (std::vector<ESM::ENAMstruct>::const_iterator iter (effects.mList.begin());
-            iter!=effects.mList.end(); ++iter)
-        {
-            if (iter->mRange == ESM::RT_Target)
-                state.mEffects.mList.push_back(*iter);
-        }
+        std::string texture = "";
+
+        state.mEffects = getMagicBoltData(state.mIdMagic, state.mSoundIds, state.mSpeed, texture, effects);
+
+        // Non-projectile should have been removed by getMagicBoltData
+        if (state.mEffects.mList.empty())
+            return;
 
-        MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), model);
+        MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), state.mIdMagic.at(0));
         MWWorld::Ptr ptr = ref.getPtr();
 
-        createModel(state, ptr.getClass().getModel(ptr), pos, orient, true);
+        osg::Vec4 lightDiffuseColor = getMagicBoltLightDiffuseColor(effects);
+        createModel(state, ptr.getClass().getModel(ptr), pos, orient, true, true, lightDiffuseColor, texture);
 
         MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-        state.mSound = sndMgr->playSound3D(pos, sound, 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Loop);
-
+        for (size_t it = 0; it != state.mSoundIds.size(); it++)
+        {
+            MWBase::SoundPtr sound = sndMgr->playSound3D(pos, state.mSoundIds.at(it), 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Loop);
+            if (sound)
+                state.mSounds.push_back(sound);
+        }
+            
         mMagicBolts.push_back(state);
     }
 
@@ -167,14 +297,14 @@ namespace MWWorld
         state.mActorId = actor.getClass().getCreatureStats(actor).getActorId();
         state.mBowId = bow.getCellRef().getRefId();
         state.mVelocity = orient * osg::Vec3f(0,1,0) * speed;
-        state.mId = projectile.getCellRef().getRefId();
+        state.mIdArrow = projectile.getCellRef().getRefId();
         state.mCasterHandle = actor;
         state.mAttackStrength = attackStrength;
 
         MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), projectile.getCellRef().getRefId());
         MWWorld::Ptr ptr = ref.getPtr();
 
-        createModel(state, ptr.getClass().getModel(ptr), pos, orient, false);
+        createModel(state, ptr.getClass().getModel(ptr), pos, orient, false, false, osg::Vec4(0,0,0,0));
 
         mProjectiles.push_back(state);
     }
@@ -199,8 +329,10 @@ namespace MWWorld
             osg::Vec3f pos(it->mNode->getPosition());
             osg::Vec3f newPos = pos + direction * duration * speed;
 
-            if (it->mSound.get())
-                it->mSound->setPosition(newPos);
+            for (size_t soundIter = 0; soundIter != it->mSounds.size(); soundIter++)
+            {
+                it->mSounds.at(soundIter)->setPosition(newPos);
+            }
 
             it->mNode->setPosition(newPos);
 
@@ -208,9 +340,14 @@ namespace MWWorld
 
             MWWorld::Ptr caster = it->getCaster();
 
+            // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
+            std::vector<MWWorld::Ptr> targetActors;
+            if (!caster.isEmpty() && caster.getClass().isActor() && caster != MWMechanics::getPlayer())
+                caster.getClass().getCreatureStats(caster).getAiSequence().getCombatTargets(targetActors);
+
             // Check for impact
             // TODO: use a proper btRigidBody / btGhostObject?
-            MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(pos, newPos, caster, 0xff, MWPhysics::CollisionType_Projectile);
+            MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(pos, newPos, caster, targetActors, 0xff, MWPhysics::CollisionType_Projectile);
 
             bool hit = false;
             if (result.mHit)
@@ -240,7 +377,11 @@ namespace MWWorld
                 MWBase::Environment::get().getWorld()->explodeSpell(pos, it->mEffects, caster, result.mHitObject,
                                                                     ESM::RT_Target, it->mSpellId, it->mSourceName);
 
-                MWBase::Environment::get().getSoundManager()->stopSound(it->mSound);
+                for (size_t soundIter = 0; soundIter != it->mSounds.size(); soundIter++)
+                {
+                    MWBase::Environment::get().getSoundManager()->stopSound(it->mSounds.at(soundIter));
+                }
+
                 mParent->removeChild(it->mNode);
 
                 it = mMagicBolts.erase(it);
@@ -271,33 +412,36 @@ namespace MWWorld
 
             MWWorld::Ptr caster = it->getCaster();
 
+            // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
+            std::vector<MWWorld::Ptr> targetActors;
+            if (!caster.isEmpty() && caster.getClass().isActor() && caster != MWMechanics::getPlayer())
+                caster.getClass().getCreatureStats(caster).getAiSequence().getCombatTargets(targetActors);
+
             // Check for impact
             // TODO: use a proper btRigidBody / btGhostObject?
-            MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(pos, newPos, caster, 0xff, MWPhysics::CollisionType_Projectile);
+            MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(pos, newPos, caster, targetActors, 0xff, MWPhysics::CollisionType_Projectile);
 
             bool underwater = MWBase::Environment::get().getWorld()->isUnderwater(MWMechanics::getPlayer().getCell(), newPos);
+
             if (result.mHit || underwater)
             {
-                if (result.mHit)
+                MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), it->mIdArrow);
+
+                // Try to get a Ptr to the bow that was used. It might no longer exist.
+                MWWorld::Ptr bow = projectileRef.getPtr();
+                if (!caster.isEmpty() && it->mIdArrow != it->mBowId)
                 {
-                    MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), it->mId);
-
-                    // Try to get a Ptr to the bow that was used. It might no longer exist.
-                    MWWorld::Ptr bow = projectileRef.getPtr();
-                    if (!caster.isEmpty())
-                    {
-                        MWWorld::InventoryStore& inv = caster.getClass().getInventoryStore(caster);
-                        MWWorld::ContainerStoreIterator invIt = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-                        if (invIt != inv.end() && Misc::StringUtils::ciEqual(invIt->getCellRef().getRefId(), it->mBowId))
-                            bow = *invIt;
-                    }
-
-                    if (caster.isEmpty())
-                        caster = result.mHitObject;
-
-                    MWMechanics::projectileHit(caster, result.mHitObject, bow, projectileRef.getPtr(), result.mHitPos, it->mAttackStrength);
+                    MWWorld::InventoryStore& inv = caster.getClass().getInventoryStore(caster);
+                    MWWorld::ContainerStoreIterator invIt = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+                    if (invIt != inv.end() && Misc::StringUtils::ciEqual(invIt->getCellRef().getRefId(), it->mBowId))
+                        bow = *invIt;
                 }
 
+                if (caster.isEmpty())
+                    caster = result.mHitObject;
+
+                MWMechanics::projectileHit(caster, result.mHitObject, bow, projectileRef.getPtr(), result.mHit ? result.mHitPos : newPos, it->mAttackStrength);
+
                 if (underwater)
                     mRendering->emitWaterRipple(newPos);
 
@@ -320,7 +464,10 @@ namespace MWWorld
         for (std::vector<MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end(); ++it)
         {
             mParent->removeChild(it->mNode);
-            MWBase::Environment::get().getSoundManager()->stopSound(it->mSound);
+            for (size_t soundIter = 0; soundIter != it->mSounds.size(); soundIter++)
+            {
+                MWBase::Environment::get().getSoundManager()->stopSound(it->mSounds.at(soundIter));
+            }
         }
         mMagicBolts.clear();
     }
@@ -332,7 +479,7 @@ namespace MWWorld
             writer.startRecord(ESM::REC_PROJ);
 
             ESM::ProjectileState state;
-            state.mId = it->mId;
+            state.mId = it->mIdArrow;
             state.mPosition = ESM::Vector3(osg::Vec3f(it->mNode->getPosition()));
             state.mOrientation = ESM::Quaternion(osg::Quat(it->mNode->getAttitude()));
             state.mActorId = it->mActorId;
@@ -351,14 +498,14 @@ namespace MWWorld
             writer.startRecord(ESM::REC_MPRJ);
 
             ESM::MagicBoltState state;
-            state.mId = it->mId;
+            state.mId = it->mIdMagic.at(0);
             state.mPosition = ESM::Vector3(osg::Vec3f(it->mNode->getPosition()));
             state.mOrientation = ESM::Quaternion(osg::Quat(it->mNode->getAttitude()));
             state.mActorId = it->mActorId;
 
             state.mSpellId = it->mSpellId;
             state.mEffects = it->mEffects;
-            state.mSound = it->mSoundId;
+            state.mSound = it->mSoundIds.at(0);
             state.mSourceName = it->mSourceName;
             state.mSpeed = it->mSpeed;
             state.mStack = it->mStack;
@@ -380,7 +527,7 @@ namespace MWWorld
             state.mActorId = esm.mActorId;
             state.mBowId = esm.mBowId;
             state.mVelocity = esm.mVelocity;
-            state.mId = esm.mId;
+            state.mIdArrow = esm.mId;
             state.mAttackStrength = esm.mAttackStrength;
 
             std::string model;
@@ -395,7 +542,7 @@ namespace MWWorld
                 return true;
             }
 
-            createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), false);
+            createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), false, false, osg::Vec4(0,0,0,0));
 
             mProjectiles.push_back(state);
             return true;
@@ -407,17 +554,21 @@ namespace MWWorld
 
             MagicBoltState state;
             state.mSourceName = esm.mSourceName;
-            state.mId = esm.mId;
+            state.mIdMagic.push_back(esm.mId);
             state.mSpellId = esm.mSpellId;
             state.mActorId = esm.mActorId;
-            state.mSpeed = esm.mSpeed;
             state.mStack = esm.mStack;
-            state.mEffects = esm.mEffects;
+            std::string texture = "";
+            state.mEffects = getMagicBoltData(state.mIdMagic, state.mSoundIds, state.mSpeed, texture, esm.mEffects);
+            state.mSpeed = esm.mSpeed; // speed is derived from non-projectile effects as well as
+                                       // projectile effects, so we can't calculate it from the save
+                                       // file's effect list, which is already trimmed of non-projectile
+                                       // effects. We need to use the stored value.
 
             std::string model;
             try
             {
-                MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), esm.mId);
+                MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), state.mIdMagic.at(0));
                 MWWorld::Ptr ptr = ref.getPtr();
                 model = ptr.getClass().getModel(ptr);
             }
@@ -426,12 +577,18 @@ namespace MWWorld
                 return true;
             }
 
-            createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), true);
+            osg::Vec4 lightDiffuseColor = getMagicBoltLightDiffuseColor(esm.mEffects);
+            createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), true, true, lightDiffuseColor, texture);
 
             MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-            state.mSound = sndMgr->playSound3D(esm.mPosition, esm.mSound, 1.0f, 1.0f,
-                                               MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Loop);
-            state.mSoundId = esm.mSound;
+            
+            for (size_t soundIter = 0; soundIter != state.mSoundIds.size(); soundIter++)
+            {
+                MWBase::SoundPtr sound = sndMgr->playSound3D(esm.mPosition, state.mSoundIds.at(soundIter), 1.0f, 1.0f,
+                                                             MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Loop);
+                if (sound)
+                    state.mSounds.push_back(sound);
+            }
 
             mMagicBolts.push_back(state);
             return true;
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index 74d4c1dc5..2289706d3 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -49,9 +49,8 @@ namespace MWWorld
                 MWRender::RenderingManager* rendering, MWPhysics::PhysicsSystem* physics);
 
         /// If caster is an actor, the actor's facing orientation is used. Otherwise fallbackDirection is used.
-        void launchMagicBolt (const std::string& model, const std::string &sound, const std::string &spellId,
-                                     float speed, bool stack, const ESM::EffectList& effects,
-                                       const MWWorld::Ptr& caster, const std::string& sourceName, const osg::Vec3f& fallbackDirection);
+        void launchMagicBolt (const std::string &spellId, bool stack, const ESM::EffectList& effects,
+                              const MWWorld::Ptr& caster, const std::string& sourceName, const osg::Vec3f& fallbackDirection);
 
         void launchProjectile (MWWorld::Ptr actor, MWWorld::ConstPtr projectile,
                                        const osg::Vec3f& pos, const osg::Quat& orient, MWWorld::Ptr bow, float speed, float attackStrength);
@@ -84,8 +83,11 @@ namespace MWWorld
 
             MWWorld::Ptr getCaster();
 
-            // MW-id of this projectile
-            std::string mId;
+            // MW-ids of a magic projectile
+            std::vector<std::string> mIdMagic;
+
+            // MW-id of an arrow projectile
+            std::string mIdArrow;
         };
 
         struct MagicBoltState : public State
@@ -101,8 +103,8 @@ namespace MWWorld
 
             bool mStack;
 
-            MWBase::SoundPtr mSound;
-            std::string mSoundId;
+            std::vector<MWBase::SoundPtr> mSounds;
+            std::vector<std::string> mSoundIds;
         };
 
         struct ProjectileState : public State
@@ -120,7 +122,8 @@ namespace MWWorld
         void moveProjectiles(float dt);
         void moveMagicBolts(float dt);
 
-        void createModel (State& state, const std::string& model, const osg::Vec3f& pos, const osg::Quat& orient, bool rotate);
+        void createModel (State& state, const std::string& model, const osg::Vec3f& pos, const osg::Quat& orient,
+                            bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, std::string texture = "");
         void update (State& state, float duration);
 
         void operator=(const ProjectileManager&);
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 1da6b53fa..f6fa3556f 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -8,8 +8,19 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
+namespace
+{
+enum RefDataFlags
+{
+    Flag_SuppressActivate = 1, // If set, activation will be suppressed and redirected to the OnActivate flag, which can then be handled by a script.
+    Flag_OnActivate = 2,
+    Flag_ActivationBuffered = 4
+};
+}
+
 namespace MWWorld
 {
+
     void RefData::copy (const RefData& refData)
     {
         mBaseNode = refData.mBaseNode;
@@ -19,6 +30,9 @@ namespace MWWorld
         mPosition = refData.mPosition;
         mChanged = refData.mChanged;
         mDeletedByContentFile = refData.mDeletedByContentFile;
+        mFlags = refData.mFlags;
+
+        mAnimationState = refData.mAnimationState;
 
         mCustomData = refData.mCustomData ? refData.mCustomData->clone() : 0;
     }
@@ -32,7 +46,7 @@ namespace MWWorld
     }
 
     RefData::RefData()
-    : mBaseNode(0), mDeletedByContentFile(false), mEnabled (true), mCount (1), mCustomData (0), mChanged(false)
+    : mBaseNode(0), mDeletedByContentFile(false), mEnabled (true), mCount (1), mCustomData (0), mChanged(false), mFlags(0)
     {
         for (int i=0; i<3; ++i)
         {
@@ -45,7 +59,7 @@ namespace MWWorld
     : mBaseNode(0), mDeletedByContentFile(false), mEnabled (true),
       mCount (1), mPosition (cellRef.mPos),
       mCustomData (0),
-      mChanged(false) // Loading from ESM/ESP files -> assume unchanged
+      mChanged(false), mFlags(0) // Loading from ESM/ESP files -> assume unchanged
     {
     }
 
@@ -54,9 +68,14 @@ namespace MWWorld
       mEnabled (objectState.mEnabled != 0),
       mCount (objectState.mCount),
       mPosition (objectState.mPosition),
+      mAnimationState(objectState.mAnimationState),
       mCustomData (0),
-      mChanged(true) // Loading from a savegame -> assume changed
+      mChanged(true), mFlags(objectState.mFlags) // Loading from a savegame -> assume changed
     {
+        // "Note that the ActivationFlag_UseEnabled is saved to the reference,
+        // which will result in permanently suppressed activation if the reference script is removed.
+        // This occurred when removing the animated containers mod, and the fix in MCP is to reset UseEnabled to true on loading a game."
+        mFlags &= (~Flag_SuppressActivate);
     }
 
     RefData::RefData (const RefData& refData)
@@ -65,6 +84,7 @@ namespace MWWorld
         try
         {
             copy (refData);
+            mFlags &= ~(Flag_SuppressActivate|Flag_OnActivate|Flag_ActivationBuffered);
         }
         catch (...)
         {
@@ -80,6 +100,9 @@ namespace MWWorld
         objectState.mEnabled = mEnabled;
         objectState.mCount = mCount;
         objectState.mPosition = mPosition;
+        objectState.mFlags = mFlags;
+
+        objectState.mAnimationState = mAnimationState;
     }
 
     RefData& RefData::operator= (const RefData& refData)
@@ -217,6 +240,45 @@ namespace MWWorld
 
     bool RefData::hasChanged() const
     {
-        return mChanged;
+        return mChanged || !mAnimationState.empty();
     }
+
+    bool RefData::activateByScript()
+    {
+        bool ret = (mFlags & Flag_ActivationBuffered);
+        mFlags &= ~(Flag_SuppressActivate|Flag_OnActivate);
+        return ret;
+    }
+
+    bool RefData::activate()
+    {
+        if (mFlags & Flag_SuppressActivate)
+        {
+            mFlags |= Flag_OnActivate|Flag_ActivationBuffered;
+            return false;
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    bool RefData::onActivate()
+    {
+        bool ret = mFlags & Flag_OnActivate;
+        mFlags |= Flag_SuppressActivate;
+        mFlags &= (~Flag_OnActivate);
+        return ret;
+    }
+
+    const ESM::AnimationState& RefData::getAnimationState() const
+    {
+        return mAnimationState;
+    }
+
+    ESM::AnimationState& RefData::getAnimationState()
+    {
+        return mAnimationState;
+    }
+
 }
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index d87ffdb70..75eec6742 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -2,6 +2,7 @@
 #define GAME_MWWORLD_REFDATA_H
 
 #include <components/esm/defs.hpp>
+#include <components/esm/animationstate.hpp>
 
 #include "../mwscript/locals.hpp"
 
@@ -42,6 +43,8 @@ namespace MWWorld
 
             ESM::Position mPosition;
 
+            ESM::AnimationState mAnimationState;
+
             CustomData *mCustomData;
 
             void copy (const RefData& refData);
@@ -50,6 +53,8 @@ namespace MWWorld
 
             bool mChanged;
 
+            unsigned int mFlags;
+
         public:
 
             RefData();
@@ -122,8 +127,17 @@ namespace MWWorld
 
             const CustomData *getCustomData() const;
 
+            bool activate();
+
+            bool onActivate();
+
+            bool activateByScript();
+
             bool hasChanged() const;
             ///< Has this RefData changed since it was originally loaded?
+
+            const ESM::AnimationState& getAnimationState() const;
+            ESM::AnimationState& getAnimationState();
     };
 }
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 308809bd2..a95ad05a6 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -3,10 +3,14 @@
 #include <limits>
 #include <iostream>
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/LocalPlayer.hpp"
+
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/settings/settings.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -29,16 +33,46 @@
 namespace
 {
 
+    void setNodeRotation(const MWWorld::Ptr& ptr, MWRender::RenderingManager& rendering, bool inverseRotationOrder)
+    {
+        if (!ptr.getRefData().getBaseNode())
+            return;
+
+        osg::Quat worldRotQuat(ptr.getRefData().getPosition().rot[2], osg::Vec3(0,0,-1));
+        if (!ptr.getClass().isActor())
+        {
+            float xr = ptr.getRefData().getPosition().rot[0];
+            float yr = ptr.getRefData().getPosition().rot[1];
+            if (!inverseRotationOrder)
+                worldRotQuat = worldRotQuat * osg::Quat(yr, osg::Vec3(0,-1,0)) *
+                    osg::Quat(xr, osg::Vec3(-1,0,0));
+            else
+                worldRotQuat = osg::Quat(xr, osg::Vec3(-1,0,0)) * osg::Quat(yr, osg::Vec3(0,-1,0)) * worldRotQuat;
+        }
+
+        rendering.rotateObject(ptr, worldRotQuat);
+    }
+
     void addObject(const MWWorld::Ptr& ptr, MWPhysics::PhysicsSystem& physics,
                    MWRender::RenderingManager& rendering)
     {
-        std::string model = Misc::ResourceHelpers::correctActorModelPath(ptr.getClass().getModel(ptr), rendering.getResourceSystem()->getVFS());
+        bool useAnim = ptr.getClass().useAnim();
+        std::string model = ptr.getClass().getModel(ptr);
+        if (useAnim)
+            model = Misc::ResourceHelpers::correctActorModelPath(model, rendering.getResourceSystem()->getVFS());
+
         std::string id = ptr.getCellRef().getRefId();
         if (id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker")
             model = ""; // marker objects that have a hardcoded function in the game logic, should be hidden from the player
+
         ptr.getClass().insertObjectRendering(ptr, model, rendering);
+        setNodeRotation(ptr, rendering, false);
+
         ptr.getClass().insertObject (ptr, model, physics);
 
+        if (useAnim)
+            MWBase::Environment::get().getMechanicsManager()->add(ptr);
+
         if (ptr.getClass().isActor())
             rendering.addWaterRippleEmitter(ptr);
     }
@@ -46,23 +80,8 @@ namespace
     void updateObjectRotation (const MWWorld::Ptr& ptr, MWPhysics::PhysicsSystem& physics,
                                     MWRender::RenderingManager& rendering, bool inverseRotationOrder)
     {
-        if (ptr.getRefData().getBaseNode() != NULL)
-        {
-            osg::Quat worldRotQuat(ptr.getRefData().getPosition().rot[2], osg::Vec3(0,0,-1));
-            if (!ptr.getClass().isActor())
-            {
-                float xr = ptr.getRefData().getPosition().rot[0];
-                float yr = ptr.getRefData().getPosition().rot[1];
-                if (!inverseRotationOrder)
-                    worldRotQuat = worldRotQuat * osg::Quat(yr, osg::Vec3(0,-1,0)) *
-                        osg::Quat(xr, osg::Vec3(-1,0,0));
-                else
-                    worldRotQuat = osg::Quat(xr, osg::Vec3(-1,0,0)) * osg::Quat(yr, osg::Vec3(0,-1,0)) * worldRotQuat;
-            }
-
-            rendering.rotateObject(ptr, worldRotQuat);
-            physics.updateRotation(ptr);
-        }
+        setNodeRotation(ptr, rendering, inverseRotationOrder);
+        physics.updateRotation(ptr);
     }
 
     void updateObjectScale(const MWWorld::Ptr& ptr, MWPhysics::PhysicsSystem& physics,
@@ -130,7 +149,6 @@ namespace
                 try
                 {
                     addObject(ptr, mPhysics, mRendering);
-                    updateObjectRotation(ptr, mPhysics, mRendering, false);
                 }
                 catch (const std::exception& e)
                 {
@@ -196,14 +214,16 @@ namespace MWWorld
         if (mPreloadEnabled)
         {
             mPreloadTimer += duration;
-            if (mPreloadTimer > 0.25f)
+            if (mPreloadTimer > 0.1f)
             {
-                preloadCells();
+                preloadCells(0.1f);
                 mPreloadTimer = 0.f;
             }
         }
 
         mRendering.update (duration, paused);
+
+        mPreloader->updateCache(mRendering.getReferenceTime());
     }
 
     void Scene::unloadCell (CellStoreCollection::iterator iter)
@@ -220,7 +240,7 @@ namespace MWWorld
 
         if ((*iter)->getCell()->isExterior())
         {
-            ESM::Land* land =
+            const ESM::Land* land =
                 MWBase::Environment::get().getWorld()->getStore().get<ESM::Land>().search(
                     (*iter)->getCell()->getGridX(),
                     (*iter)->getCell()->getGridY()
@@ -238,9 +258,14 @@ namespace MWWorld
 
         MWBase::Environment::get().getSoundManager()->stopSound (*iter);
         mActiveCells.erase(*iter);
+
+        // Added by tes3mp
+        //
+        // LocalPlayer has unloaded a cell, so store it
+        mwmp::Main::get().getLocalPlayer()->storeCellState(*(*iter)->getCell(), mwmp::CellState::UNLOAD);
     }
 
-    void Scene::loadCell (CellStore *cell, Loading::Listener* loadingListener)
+    void Scene::loadCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn)
     {
         std::pair<CellStoreCollection::iterator, bool> result = mActiveCells.insert(cell);
 
@@ -254,7 +279,7 @@ namespace MWWorld
             // Load terrain physics first...
             if (cell->getCell()->isExterior())
             {
-                ESM::Land* land =
+                const ESM::Land* land =
                     MWBase::Environment::get().getWorld()->getStore().get<ESM::Land>().search(
                         cell->getCell()->getGridX(),
                         cell->getCell()->getGridY()
@@ -268,17 +293,29 @@ namespace MWWorld
                     mPhysics->addHeightField (data->mHeights, cell->getCell()->getGridX(), cell->getCell()->getGridY(),
                         worldsize / (verts-1), verts);
                 }
+                else
+                {
+                    static std::vector<float> defaultHeight;
+                    defaultHeight.resize(verts*verts, ESM::Land::DEFAULT_HEIGHT);
+                    mPhysics->addHeightField (&defaultHeight[0], cell->getCell()->getGridX(), cell->getCell()->getGridY(),
+                            worldsize / (verts-1), verts);
+                }
             }
 
-            cell->respawn();
-
             // register local scripts
             // do this before insertCell, to make sure we don't add scripts from levelled creature spawning twice
             MWBase::Environment::get().getWorld()->getLocalScripts().addCell (cell);
 
+            if (respawn)
+                cell->respawn();
+
             // ... then references. This is important for adjustPosition to work correctly.
             /// \todo rescale depending on the state of a new GMST
-            insertCell (*cell, true, loadingListener);
+
+            // Minor change done by tes3mp:
+            // Instead of always rescaling objects as in the original code, never rescale them
+            insertCell(*cell, false, loadingListener);
+            
 
             mRendering.addCell(cell);
             bool waterEnabled = cell->getCell()->hasWater() || cell->isExterior();
@@ -294,18 +331,25 @@ namespace MWWorld
 
             if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
                 mRendering.configureAmbient(cell->getCell());
+
+            // Added by tes3mp
+            //
+            // LocalPlayer has loaded a cell, so store it
+            mwmp::Main::get().getLocalPlayer()->storeCellState(*cell->getCell(), mwmp::CellState::LOAD);
         }
 
         mPreloader->notifyLoaded(cell);
     }
 
-    void Scene::changeToVoid()
+    void Scene::clear()
     {
         CellStoreCollection::iterator active = mActiveCells.begin();
         while (active!=mActiveCells.end())
             unloadCell (active++);
         assert(mActiveCells.empty());
         mCurrentCell = NULL;
+
+        mPreloader->clear();
     }
 
     void Scene::playerMoved(const osg::Vec3f &pos)
@@ -329,7 +373,7 @@ namespace MWWorld
         }
     }
 
-    void Scene::changeCellGrid (int X, int Y)
+    void Scene::changeCellGrid (int X, int Y, bool changeEvent)
     {
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
@@ -403,17 +447,23 @@ namespace MWWorld
                 {
                     CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(x, y);
 
-                    loadCell (cell, loadingListener);
+                    loadCell (cell, loadingListener, changeEvent);
                 }
             }
         }
 
+        // Added by tes3mp
+        if (mwmp::Main::get().getLocalPlayer()->hasFinishedCharGen())
+        {
+            mwmp::Main::get().getLocalPlayer()->sendCellStates();
+            mwmp::Main::get().getLocalPlayer()->clearCellStates();
+        }
+
         CellStore* current = MWBase::Environment::get().getWorld()->getExterior(X,Y);
         MWBase::Environment::get().getWindowManager()->changeCell(current);
 
-        mCellChanged = true;
-
-        mPreloader->updateCache(mRendering.getReferenceTime());
+        if (changeEvent)
+            mCellChanged = true;
     }
 
     void Scene::changePlayerCell(CellStore *cell, const ESM::Position &pos, bool adjustPlayerPos)
@@ -435,7 +485,8 @@ namespace MWWorld
             float z = pos.rot[2];
             world->rotateObject(player, x, y, z);
 
-            player.getClass().adjustPosition(player, true);
+            if (adjustPlayerPos)
+                player.getClass().adjustPosition(player, true);
         }
 
         MWBase::MechanicsManager *mechMgr =
@@ -445,6 +496,8 @@ namespace MWWorld
         mechMgr->watchActor(player);
 
         MWBase::Environment::get().getWorld()->adjustSky();
+
+        mLastPlayerPos = pos.asVec3();
     }
 
     Scene::Scene (MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics)
@@ -461,11 +514,15 @@ namespace MWWorld
         mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager(), rendering.getTerrain()));
         mPreloader->setWorkQueue(mRendering.getWorkQueue());
 
+        mPreloader->setUnrefQueue(rendering.getUnrefQueue());
         mPhysics->setUnrefQueue(rendering.getUnrefQueue());
 
-        float cacheExpiryDelay = Settings::Manager::getFloat("cache expiry delay", "Cells");
-        rendering.getResourceSystem()->setExpiryDelay(cacheExpiryDelay);
-        mPreloader->setExpiryDelay(cacheExpiryDelay);
+        rendering.getResourceSystem()->setExpiryDelay(Settings::Manager::getFloat("cache expiry delay", "Cells"));
+
+        mPreloader->setExpiryDelay(Settings::Manager::getFloat("preload cell expiry delay", "Cells"));
+        mPreloader->setMinCacheSize(Settings::Manager::getInt("preload cell cache min", "Cells"));
+        mPreloader->setMaxCacheSize(Settings::Manager::getInt("preload cell cache max", "Cells"));
+        mPreloader->setPreloadInstances(Settings::Manager::getBool("preload instances", "Cells"));
     }
 
     Scene::~Scene()
@@ -482,7 +539,7 @@ namespace MWWorld
         return mActiveCells;
     }
 
-    void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position)
+    void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
         CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(cellName);
         bool loadcell = (mCurrentCell == NULL);
@@ -508,7 +565,8 @@ namespace MWWorld
             float z = position.rot[2];
             world->rotateObject(world->getPlayerPtr(), x, y, z);
 
-            world->getPlayerPtr().getClass().adjustPosition(world->getPlayerPtr(), true);
+            if (adjustPlayerPos)
+                world->getPlayerPtr().getClass().adjustPosition(world->getPlayerPtr(), true);
             MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.5);
             return;
         }
@@ -528,9 +586,16 @@ namespace MWWorld
         loadingListener->setProgressRange(refsToLoad);
 
         // Load cell.
-        loadCell (cell, loadingListener);
+        loadCell (cell, loadingListener, changeEvent);
 
-        changePlayerCell(cell, position, true);
+        // Added by tes3mp
+        if (mwmp::Main::get().getLocalPlayer()->hasFinishedCharGen())
+        {
+            mwmp::Main::get().getLocalPlayer()->sendCellStates();
+            mwmp::Main::get().getLocalPlayer()->clearCellStates();
+        }
+
+        changePlayerCell(cell, position, adjustPlayerPos);
 
         // adjust fog
         mRendering.configureFog(mCurrentCell->getCell());
@@ -538,21 +603,22 @@ namespace MWWorld
         // Sky system
         MWBase::Environment::get().getWorld()->adjustSky();
 
-        mCellChanged = true; MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.5);
+        if (changeEvent)
+            mCellChanged = true;
 
-        MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
+        MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.5);
 
-        mPreloader->updateCache(mRendering.getReferenceTime());
+        MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
     }
 
-    void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos)
+    void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
         int x = 0;
         int y = 0;
 
         MWBase::Environment::get().getWorld()->positionToIndex (position.pos[0], position.pos[1], x, y);
 
-        changeCellGrid(x, y);
+        changeCellGrid(x, y, changeEvent);
 
         CellStore* current = MWBase::Environment::get().getWorld()->getExterior(x, y);
         changePlayerCell(current, position, adjustPlayerPos);
@@ -586,7 +652,6 @@ namespace MWWorld
         try
         {
             addObject(ptr, *mPhysics, mRendering);
-            updateObjectRotation(ptr, false);
             MWBase::Environment::get().getWorld()->scaleObject(ptr, ptr.getCellRef().getScale());
         }
         catch (std::exception& e)
@@ -627,17 +692,57 @@ namespace MWWorld
         return Ptr();
     }
 
-    void Scene::preloadCells()
+    class PreloadMeshItem : public SceneUtil::WorkItem
+    {
+    public:
+        PreloadMeshItem(const std::string& mesh, Resource::SceneManager* sceneManager)
+            : mMesh(mesh), mSceneManager(sceneManager)
+        {
+        }
+
+        virtual void doWork()
+        {
+            try
+            {
+                mSceneManager->getTemplate(mMesh);
+            }
+            catch (std::exception& e)
+            {
+            }
+        }
+    private:
+        std::string mMesh;
+        Resource::SceneManager* mSceneManager;
+    };
+
+    void Scene::preload(const std::string &mesh, bool useAnim)
+    {
+        std::string mesh_ = mesh;
+        if (useAnim)
+            mesh_ = Misc::ResourceHelpers::correctActorModelPath(mesh_, mRendering.getResourceSystem()->getVFS());
+
+        if (!mRendering.getResourceSystem()->getSceneManager()->checkLoaded(mesh_, mRendering.getReferenceTime()))
+            mRendering.getWorkQueue()->addWorkItem(new PreloadMeshItem(mesh_, mRendering.getResourceSystem()->getSceneManager()));
+    }
+
+    void Scene::preloadCells(float dt)
     {
+        const MWWorld::ConstPtr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        osg::Vec3f playerPos = player.getRefData().getPosition().asVec3();
+        osg::Vec3f moved = playerPos - mLastPlayerPos;
+        osg::Vec3f predictedPos = playerPos + moved / dt;
+
+        mLastPlayerPos = playerPos;
+
         if (mPreloadDoors)
-            preloadTeleportDoorDestinations();
+            preloadTeleportDoorDestinations(playerPos, predictedPos);
         if (mPreloadExteriorGrid)
-            preloadExteriorGrid();
+            preloadExteriorGrid(playerPos, predictedPos);
         if (mPreloadFastTravel)
-            preloadFastTravelDestinations();
+            preloadFastTravelDestinations(playerPos, predictedPos);
     }
 
-    void Scene::preloadTeleportDoorDestinations()
+    void Scene::preloadTeleportDoorDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos)
     {
         std::vector<MWWorld::ConstPtr> teleportDoors;
         for (CellStoreCollection::const_iterator iter (mActiveCells.begin());
@@ -655,11 +760,11 @@ namespace MWWorld
             }
         }
 
-        const MWWorld::ConstPtr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
         for (std::vector<MWWorld::ConstPtr>::iterator it = teleportDoors.begin(); it != teleportDoors.end(); ++it)
         {
             const MWWorld::ConstPtr& door = *it;
-            float sqrDistToPlayer = (player.getRefData().getPosition().asVec3() - door.getRefData().getPosition().asVec3()).length2();
+            float sqrDistToPlayer = (playerPos - door.getRefData().getPosition().asVec3()).length2();
+            sqrDistToPlayer = std::min(sqrDistToPlayer, (predictedPos - door.getRefData().getPosition().asVec3()).length2());
 
             if (sqrDistToPlayer < mPreloadDistance*mPreloadDistance)
             {
@@ -682,15 +787,13 @@ namespace MWWorld
         }
     }
 
-    void Scene::preloadExteriorGrid()
+    void Scene::preloadExteriorGrid(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos)
     {
         if (!MWBase::Environment::get().getWorld()->isCellExterior())
             return;
 
         int halfGridSizePlusOne = mHalfGridSize + 1;
 
-        const MWWorld::ConstPtr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        osg::Vec3f playerPos = player.getRefData().getPosition().asVec3();
 
         int cellX,cellY;
         getGridCenter(cellX,cellY);
@@ -709,6 +812,7 @@ namespace MWWorld
                 MWBase::Environment::get().getWorld()->indexToPosition(cellX+dx, cellY+dy, thisCellCenterX, thisCellCenterY, true);
 
                 float dist = std::max(std::abs(thisCellCenterX - playerPos.x()), std::abs(thisCellCenterY - playerPos.y()));
+                dist = std::min(dist,std::max(std::abs(thisCellCenterX - predictedPos.x()), std::abs(thisCellCenterY - predictedPos.y())));
                 float loadDist = 8192/2 + 8192 - mCellLoadingThreshold + mPreloadDistance;
 
                 if (dist < loadDist)
@@ -723,11 +827,14 @@ namespace MWWorld
         {
             int x = cell->getCell()->getGridX();
             int y = cell->getCell()->getGridY();
+            unsigned int numpreloaded = 0;
             for (int dx = -mHalfGridSize; dx <= mHalfGridSize; ++dx)
             {
                 for (int dy = -mHalfGridSize; dy <= mHalfGridSize; ++dy)
                 {
                     mPreloader->preload(MWBase::Environment::get().getWorld()->getExterior(x+dx, y+dy), mRendering.getReferenceTime());
+                    if (++numpreloaded >= mPreloader->getMaxCacheSize())
+                        break;
                 }
             }
         }
@@ -765,7 +872,7 @@ namespace MWWorld
         std::vector<ESM::Transport::Dest> mList;
     };
 
-    void Scene::preloadFastTravelDestinations()
+    void Scene::preloadFastTravelDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& /*predictedPos*/) // ignore predictedPos here since opening dialogue with travel service takes extra time
     {
         const MWWorld::ConstPtr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
         ListFastTravelDestinationsVisitor listVisitor(mPreloadDistance, player.getRefData().getPosition().asVec3());
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 5c429f7c7..5f17f8d59 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -68,19 +68,19 @@ namespace MWWorld
             bool mPreloadDoors;
             bool mPreloadFastTravel;
 
+            osg::Vec3f mLastPlayerPos;
+
             void insertCell (CellStore &cell, bool rescale, Loading::Listener* loadingListener);
 
             // Load and unload cells as necessary to create a cell grid with "X" and "Y" in the center
-            void changeCellGrid (int X, int Y);
+            void changeCellGrid (int X, int Y, bool changeEvent = true);
 
             void getGridCenter(int& cellX, int& cellY);
 
-            void preloadCells();
-            void preloadTeleportDoorDestinations();
-            void preloadExteriorGrid();
-            void preloadFastTravelDestinations();
-
-            void preloadCell(MWWorld::CellStore* cell, bool preloadSurrounding=false);
+            void preloadCells(float dt);
+            void preloadTeleportDoorDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos);
+            void preloadExteriorGrid(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos);
+            void preloadFastTravelDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos);
 
         public:
 
@@ -88,9 +88,11 @@ namespace MWWorld
 
             ~Scene();
 
+            void preloadCell(MWWorld::CellStore* cell, bool preloadSurrounding=false);
+
             void unloadCell (CellStoreCollection::iterator iter);
 
-            void loadCell (CellStore *cell, Loading::Listener* loadingListener);
+            void loadCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn);
 
             void playerMoved (const osg::Vec3f& pos);
 
@@ -103,13 +105,15 @@ namespace MWWorld
             bool hasCellChanged() const;
             ///< Has the set of active cells changed, since the last frame?
 
-            void changeToInteriorCell (const std::string& cellName, const ESM::Position& position);
+            void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true);
             ///< Move to interior cell.
+            /// @param changeEvent Set cellChanged flag?
 
-            void changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos);
+            void changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true);
             ///< Move to exterior cell.
+            /// @param changeEvent Set cellChanged flag?
 
-            void changeToVoid();
+            void clear();
             ///< Change into a void
 
             void markCellAsUnchanged();
@@ -128,6 +132,8 @@ namespace MWWorld
             bool isCellActive(const CellStore &cell);
 
             Ptr searchPtrViaActorId (int actorId);
+
+            void preload(const std::string& mesh, bool useAnim=false);
     };
 }
 
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index d1ba0ef0b..cdf66f570 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -8,6 +8,7 @@
 
 #include <stdexcept>
 #include <sstream>
+#include <iostream>
 
 namespace
 {
@@ -37,6 +38,12 @@ namespace
             }
             return x->mX < y->mX;
         }
+        bool operator()(const ESM::Land *x, const std::pair<int, int>& y) {
+            if (x->mX == y.first) {
+                return x->mY < y.second;
+            }
+            return x->mX < y.first;
+        }
     };
 }
 
@@ -129,15 +136,14 @@ namespace MWWorld
     template<typename T>
     const T *Store<T>::search(const std::string &id) const
     {
-        T item;
-        item.mId = Misc::StringUtils::lowerCase(id);
+        std::string idLower = Misc::StringUtils::lowerCase(id);
 
-        typename Dynamic::const_iterator dit = mDynamic.find(item.mId);
+        typename Dynamic::const_iterator dit = mDynamic.find(idLower);
         if (dit != mDynamic.end()) {
             return &dit->second;
         }
 
-        typename std::map<std::string, T>::const_iterator it = mStatic.find(item.mId);
+        typename std::map<std::string, T>::const_iterator it = mStatic.find(idLower);
 
         if (it != mStatic.end() && Misc::StringUtils::ciEqual(it->second.mId, id)) {
             return &(it->second);
@@ -267,10 +273,9 @@ namespace MWWorld
     template<typename T>
     bool Store<T>::eraseStatic(const std::string &id)
     {
-        T item;
-        item.mId = Misc::StringUtils::lowerCase(id);
+        std::string idLower = Misc::StringUtils::lowerCase(id);
 
-        typename std::map<std::string, T>::iterator it = mStatic.find(item.mId);
+        typename std::map<std::string, T>::iterator it = mStatic.find(idLower);
 
         if (it != mStatic.end() && Misc::StringUtils::ciEqual(it->second.mId, id)) {
             // delete from the static part of mShared
@@ -278,7 +283,7 @@ namespace MWWorld
             typename std::vector<T *>::iterator end = sharedIter + mStatic.size();
 
             while (sharedIter != mShared.end() && sharedIter != end) {
-                if((*sharedIter)->mId == item.mId) {
+                if((*sharedIter)->mId == idLower) {
                     mShared.erase(sharedIter);
                     break;
                 }
@@ -435,22 +440,21 @@ namespace MWWorld
     {
         return iterator(mStatic.end());
     }
-    ESM::Land *Store<ESM::Land>::search(int x, int y) const
+    const ESM::Land *Store<ESM::Land>::search(int x, int y) const
     {
-        ESM::Land land;
-        land.mX = x, land.mY = y;
+        std::pair<int, int> comp(x,y);
 
         std::vector<ESM::Land *>::const_iterator it =
-            std::lower_bound(mStatic.begin(), mStatic.end(), &land, Compare());
+            std::lower_bound(mStatic.begin(), mStatic.end(), comp, Compare());
 
         if (it != mStatic.end() && (*it)->mX == x && (*it)->mY == y) {
-            return const_cast<ESM::Land *>(*it);
+            return *it;
         }
         return 0;
     }
-    ESM::Land *Store<ESM::Land>::find(int x, int y) const
+    const ESM::Land *Store<ESM::Land>::find(int x, int y) const
     {
-        ESM::Land *ptr = search(x, y);
+        const ESM::Land *ptr = search(x, y);
         if (ptr == 0) {
             std::ostringstream msg;
             msg << "Land at (" << x << ", " << y << ") not found";
@@ -515,15 +519,13 @@ namespace MWWorld
             // Add data required to make reference appear in the correct cell.
             // We should not need to test for duplicates, as this part of the code is pre-cell merge.
             cell->mMovedRefs.push_back(cMRef);
+
             // But there may be duplicates here!
-            if (!deleted)
-            {
-                ESM::CellRefTracker::iterator iter = std::find(cellAlt->mLeasedRefs.begin(), cellAlt->mLeasedRefs.end(), ref.mRefNum);
-                if (iter == cellAlt->mLeasedRefs.end())
-                  cellAlt->mLeasedRefs.push_back(ref);
-                else
-                  *iter = ref;
-            }
+            ESM::CellRefTracker::iterator iter = std::find_if(cellAlt->mLeasedRefs.begin(), cellAlt->mLeasedRefs.end(), ESM::CellRefTrackerPredicate(ref.mRefNum));
+            if (iter == cellAlt->mLeasedRefs.end())
+                cellAlt->mLeasedRefs.push_back(std::make_pair(ref, deleted));
+            else
+                *iter = std::make_pair(ref, deleted);
         }
     }
     const ESM::Cell *Store<ESM::Cell>::search(const std::string &id) const
@@ -676,11 +678,17 @@ namespace MWWorld
                 for (ESM::MovedCellRefTracker::const_iterator it = cell.mMovedRefs.begin(); it != cell.mMovedRefs.end(); ++it) {
                     // remove reference from current leased ref tracker and add it to new cell
                     ESM::MovedCellRefTracker::iterator itold = std::find(oldcell->mMovedRefs.begin(), oldcell->mMovedRefs.end(), it->mRefNum);
-                    if (itold != oldcell->mMovedRefs.end()) {
-                        ESM::MovedCellRef target0 = *itold;
-                        ESM::Cell *wipecell = const_cast<ESM::Cell*>(search(target0.mTarget[0], target0.mTarget[1]));
-                        ESM::CellRefTracker::iterator it_lease = std::find(wipecell->mLeasedRefs.begin(), wipecell->mLeasedRefs.end(), it->mRefNum);
-                        wipecell->mLeasedRefs.erase(it_lease);
+                    if (itold != oldcell->mMovedRefs.end())
+                    {
+                        if (it->mTarget[0] != itold->mTarget[0] || it->mTarget[1] != itold->mTarget[1])
+                        {
+                            ESM::Cell *wipecell = const_cast<ESM::Cell*>(search(itold->mTarget[0], itold->mTarget[1]));
+                            ESM::CellRefTracker::iterator it_lease = std::find_if(wipecell->mLeasedRefs.begin(), wipecell->mLeasedRefs.end(), ESM::CellRefTrackerPredicate(it->mRefNum));
+                            if (it_lease != wipecell->mLeasedRefs.end())
+                                wipecell->mLeasedRefs.erase(it_lease);
+                            else
+                                std::cerr << "can't find " << it->mRefNum.mIndex << " " << it->mRefNum.mContentFile  << " in leasedRefs " << std::endl;
+                        }
                         *itold = *it;
                     }
                     else
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 617c3552a..3babea86a 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -242,8 +242,8 @@ namespace MWWorld
 
         // Must be threadsafe! Called from terrain background loading threads.
         // Not a big deal here, since ESM::Land can never be modified or inserted/erased
-        ESM::Land *search(int x, int y) const;
-        ESM::Land *find(int x, int y) const;
+        const ESM::Land *search(int x, int y) const;
+        const ESM::Land *find(int x, int y) const;
 
         RecordId load(ESM::ESMReader &esm);
         void setUp();
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 03e7b581a..eaf88d45a 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -96,8 +96,8 @@ T TimeOfDayInterpolator<T>::getValue(const float gameHour, const TimeOfDaySettin
 
 
 
-template class TimeOfDayInterpolator<float>;
-template class TimeOfDayInterpolator<osg::Vec4f>;
+template class MWWorld::TimeOfDayInterpolator<float>;
+template class MWWorld::TimeOfDayInterpolator<osg::Vec4f>;
 
 Weather::Weather(const std::string& name,
                  const Fallback::Map& fallback,
@@ -695,9 +695,9 @@ void WeatherManager::update(float duration, bool paused)
 
         double theta;
         if ( !is_night ) {
-            theta = M_PI * (adjustedHour - mSunriseTime) / dayDuration;
+            theta = static_cast<float>(osg::PI) * (adjustedHour - mSunriseTime) / dayDuration;
         } else {
-            theta = M_PI * (1.f - (adjustedHour - adjustedNightStart) / nightDuration);
+            theta = static_cast<float>(osg::PI) * (1.f - (adjustedHour - adjustedNightStart) / nightDuration);
         }
 
         osg::Vec3f final(
@@ -722,7 +722,7 @@ void WeatherManager::update(float duration, bool paused)
 
     mRendering.configureFog(mResult.mFogDepth, underwaterFog, mResult.mFogColor);
     mRendering.setAmbientColour(mResult.mAmbientColor);
-    mRendering.setSunColour(mResult.mSunColor);
+    mRendering.setSunColour(mResult.mSunColor, mResult.mSunColor * mResult.mGlareView);
 
     mRendering.getSkyManager()->setWeather(mResult);
 
@@ -731,7 +731,7 @@ void WeatherManager::update(float duration, bool paused)
     {
         stopSounds();
         if (!mResult.mAmbientLoopSoundID.empty())
-            mAmbientSound = MWBase::Environment::get().getSoundManager()->playSound(mResult.mAmbientLoopSoundID, 1.0, 1.0, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Loop);
+            mAmbientSound = MWBase::Environment::get().getSoundManager()->playSound(mResult.mAmbientLoopSoundID, mResult.mAmbientSoundVolume, 1.0, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Loop);
 
         mPlayingSoundID = mResult.mAmbientLoopSoundID;
     }
@@ -832,17 +832,14 @@ bool WeatherManager::readRecord(ESM::ESMReader& reader, uint32_t type)
             mQueuedWeather = state.mQueuedWeather;
 
             mRegions.clear();
-            std::map<std::string, ESM::RegionWeatherState>::iterator it = state.mRegions.begin();
-            if(it == state.mRegions.end())
-            {
-                // When loading an imported save, the region modifiers aren't currently being set, so just reset them.
-                importRegions();
-            }
-            else
+            importRegions();
+
+            for(std::map<std::string, ESM::RegionWeatherState>::iterator it = state.mRegions.begin(); it != state.mRegions.end(); ++it)
             {
-                for(; it != state.mRegions.end(); ++it)
+                std::map<std::string, RegionWeather>::iterator found = mRegions.find(it->first);
+                if (found != mRegions.end())
                 {
-                    mRegions.insert(std::make_pair(it->first, RegionWeather(it->second)));
+                    found->second = RegionWeather(it->second);
                 }
             }
         }
@@ -892,8 +889,7 @@ inline void WeatherManager::regionalWeatherChanged(const std::string& regionID,
     MWWorld::ConstPtr player = MWMechanics::getPlayer();
     if(player.isInCell())
     {
-        std::string playerRegion = Misc::StringUtils::lowerCase(player.getCell()->getCell()->mRegion);
-        if(!playerRegion.empty() && (playerRegion == regionID))
+        if(Misc::StringUtils::ciEqual(regionID, mCurrentRegion))
         {
             addWeatherTransition(region.getWeather());
         }
@@ -1073,7 +1069,7 @@ inline void WeatherManager::calculateResult(const int weatherID, const float gam
         mResult.mSunDiscColor = lerp(osg::Vec4f(1,1,1,1), current.mSunDiscSunsetColor, factor);
         // The SunDiscSunsetColor in the INI isn't exactly the resulting color on screen, most likely because
         // MW applied the color to the ambient term as well. After the ambient and emissive terms are added together, the fixed pipeline
-        // would then clamp the total lighting to (1,1,1). A noticable change in color tone can be observed when only one of the color components gets clamped.
+        // would then clamp the total lighting to (1,1,1). A noticeable change in color tone can be observed when only one of the color components gets clamped.
         // Unfortunately that means we can't use the INI color as is, have to replicate the above nonsense.
         mResult.mSunDiscColor = mResult.mSunDiscColor + osg::componentMultiply(mResult.mSunDiscColor, mResult.mAmbientColor);
         for (int i=0; i<3; ++i)
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 137dac42e..f7ca2c893 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1,27 +1,27 @@
 #include "worldimp.hpp"
 
-#if defined(_WIN32) && !defined(__MINGW32__)
-#include <boost/tr1/tr1/unordered_map>
-#elif defined HAVE_UNORDERED_MAP
-#include <unordered_map>
-#else
-#include <tr1/unordered_map>
-#endif
+#include <stdio.h>
 
 #include <osg/Group>
 #include <osg/ComputeBoundsVisitor>
 
+#include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/WorldEvent.hpp"
+
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
 #include <components/esm/cellid.hpp>
 
+#include <components/misc/resourcehelpers.hpp>
 #include <components/misc/rng.hpp>
 
 #include <components/files/collections.hpp>
-#include <components/misc/resourcehelpers.hpp>
+
 #include <components/resource/resourcesystem.hpp>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/openmw-mp/Log.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -38,6 +38,7 @@
 #include "../mwmechanics/aiavoiddoor.hpp" //Used to tell actors to avoid doors
 
 #include "../mwrender/animation.hpp"
+#include "../mwrender/npcanimation.hpp"
 #include "../mwrender/renderingmanager.hpp"
 #include "../mwrender/camera.hpp"
 #include "../mwrender/vismask.hpp"
@@ -108,11 +109,7 @@ namespace MWWorld
         }
 
         private:
-#ifdef HAVE_UNORDERED_MAP
-          typedef std::unordered_map<std::string, ContentLoader*> LoadersContainer;
-#else
-          typedef std::tr1::unordered_map<std::string, ContentLoader*> LoadersContainer;
-#endif
+          typedef std::map<std::string, ContentLoader*> LoadersContainer;
           LoadersContainer mLoaders;
     };
 
@@ -152,23 +149,25 @@ namespace MWWorld
     World::World (
         osgViewer::Viewer* viewer,
         osg::ref_ptr<osg::Group> rootNode,
-        Resource::ResourceSystem* resourceSystem,
+        Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
         const Files::Collections& fileCollections,
         const std::vector<std::string>& contentFiles,
         ToUTF8::Utf8Encoder* encoder, const std::map<std::string,std::string>& fallbackMap,
         int activationDistanceOverride, const std::string& startCell, const std::string& startupScript,
-            const std::string& resourcePath)
+            const std::string& resourcePath, const std::string& userDataPath)
     : mResourceSystem(resourceSystem), mFallback(fallbackMap), mPlayer (0), mLocalScripts (mStore),
       mSky (true), mCells (mStore, mEsm),
-      mGodMode(false), mScriptsEnabled(true), mContentFiles (contentFiles),
+      mGodMode(false), mScriptsEnabled(true), mContentFiles (contentFiles), mUserDataPath(userDataPath),
       mActivationDistanceOverride (activationDistanceOverride), mStartupScript(startupScript),
-      mStartCell (startCell), mTeleportEnabled(true),
-      mLevitationEnabled(true), mGoToJail(false), mDaysInPrison(0)
+      mStartCell (startCell), mDistanceToFacedObject(-1), mTeleportEnabled(true),
+      mLevitationEnabled(true), mGoToJail(false), mDaysInPrison(0), mSpellPreloadTimer(0.f)
     {
         mPhysics = new MWPhysics::PhysicsSystem(resourceSystem, rootNode);
-        mRendering = new MWRender::RenderingManager(viewer, rootNode, resourceSystem, &mFallback, resourcePath);
+        mRendering = new MWRender::RenderingManager(viewer, rootNode, resourceSystem, workQueue, &mFallback, resourcePath);
         mProjectileManager.reset(new ProjectileManager(mRendering->getLightRoot(), resourceSystem, mRendering, mPhysics));
 
+        mRendering->preloadCommonAssets();
+
         mEsm.resize(contentFiles.size());
         Loading::Listener* listener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         listener->loadingOn();
@@ -251,13 +250,13 @@ namespace MWWorld
 
             if (findExteriorPosition (mStartCell, pos))
             {
-                changeToExteriorCell (pos);
+                changeToExteriorCell (pos, true);
                 fixPosition(getPlayerPtr());
             }
             else
             {
                 findInteriorPosition (mStartCell, pos);
-                changeToInteriorCell (mStartCell, pos);
+                changeToInteriorCell (mStartCell, pos, true);
             }
         }
         else
@@ -267,14 +266,27 @@ namespace MWWorld
             if (!getPlayerPtr().isInCell())
             {
                 ESM::Position pos;
-                const int cellSize = 8192;
-                pos.pos[0] = cellSize/2;
-                pos.pos[1] = cellSize/2;
-                pos.pos[2] = 0;
-                pos.rot[0] = 0;
-                pos.rot[1] = 0;
-                pos.rot[2] = 0;
-                mWorldScene->changeToExteriorCell(pos, true);
+
+                // Major change made by tes3mp
+                //
+                // If Pelagiad exists, spawn there; otherwise, spawn at 0,0
+
+                if (findExteriorPosition("Pelagiad", pos))
+                {
+                    changeToExteriorCell(pos, true);
+                    fixPosition(getPlayerPtr());
+                }
+                else
+                {
+                    const int cellSize = 8192;
+                    pos.pos[0] = cellSize / 2;
+                    pos.pos[1] = cellSize / 2;
+                    pos.pos[2] = 0;
+                    pos.rot[0] = 0;
+                    pos.rot[1] = 0;
+                    pos.rot[2] = 0;
+                    mWorldScene->changeToExteriorCell(pos, true);
+                }
             }
         }
 
@@ -300,7 +312,7 @@ namespace MWWorld
         mProjectileManager->clear();
         mLocalScripts.clear();
 
-        mWorldScene->changeToVoid();
+        mWorldScene->clear();
 
         mStore.clearDynamic();
         mStore.setUp();
@@ -356,9 +368,9 @@ namespace MWWorld
 
         mStore.write (writer, progress); // dynamic Store must be written (and read) before Cells, so that
                                          // references to custom made records will be recognized
+        mPlayer->write (writer, progress);
         mCells.write (writer, progress);
         mGlobalVariables.write (writer, progress);
-        mPlayer->write (writer, progress);
         mWeatherManager->write (writer, progress);
         mProjectileManager->write (writer, progress);
 
@@ -384,10 +396,13 @@ namespace MWWorld
                 reader.getHNT(mTeleportEnabled, "TELE");
                 reader.getHNT(mLevitationEnabled, "LEVT");
                 return;
+            case ESM::REC_PLAY:
+                mPlayer->readRecord(reader, type);
+                mWorldScene->preloadCell(getPlayerPtr().getCell(), true);
+                break;
             default:
                 if (!mStore.readRecord (reader, type) &&
                     !mGlobalVariables.readRecord (reader, type) &&
-                    !mPlayer->readRecord (reader, type) &&
                     !mWeatherManager->readRecord (reader, type) &&
                     !mCells.readRecord (reader, type, contentFileMap)
                      && !mProjectileManager->readRecord (reader, type)
@@ -433,11 +448,17 @@ namespace MWWorld
         gmst["sBribeFail"] = ESM::Variant("Bribe Fail");
         gmst["fNPCHealthBarTime"] = ESM::Variant(5.f);
         gmst["fNPCHealthBarFade"] = ESM::Variant(1.f);
+        gmst["fFleeDistance"] = ESM::Variant(3000.f);
+        gmst["sMaxSale"] = ESM::Variant("Max Sale");
 
         // Werewolf (BM)
-        gmst["fWereWolfRunMult"] = ESM::Variant(1.f);
-        gmst["fWereWolfSilverWeaponDamageMult"] = ESM::Variant(1.f);
-        gmst["iWerewolfFightMod"] = ESM::Variant(1);
+        gmst["fWereWolfRunMult"] = ESM::Variant(1.3f);
+        gmst["fWereWolfSilverWeaponDamageMult"] = ESM::Variant(2.f);
+        gmst["iWerewolfFightMod"] = ESM::Variant(100);
+        gmst["iWereWolfFleeMod"] = ESM::Variant(100);
+        gmst["iWereWolfLevelToAttack"] = ESM::Variant(20);
+        gmst["iWereWolfBounty"] = ESM::Variant(1000);
+        gmst["fCombatDistanceWerewolfMod"] = ESM::Variant(0.3f);
 
         std::map<std::string, ESM::Variant> globals;
         // vanilla Morrowind does not define dayspassed.
@@ -816,6 +837,9 @@ namespace MWWorld
 
         mWeatherManager->advanceTime (hours, incremental);
 
+        if (!incremental)
+            mProjectileManager->clear();
+
         hours += mGameHour->getFloat();
 
         setHour (hours);
@@ -962,11 +986,11 @@ namespace MWWorld
         return mTimeScale->getFloat();
     }
 
-    void World::changeToInteriorCell (const std::string& cellName, const ESM::Position& position)
+    void World::changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
         mPhysics->clearQueuedMovement();
 
-        if (mCurrentWorldSpace != cellName)
+        if (changeEvent && mCurrentWorldSpace != cellName)
         {
             // changed worldspace
             mProjectileManager->clear();
@@ -976,34 +1000,34 @@ namespace MWWorld
         }
 
         removeContainerScripts(getPlayerPtr());
-        mWorldScene->changeToInteriorCell(cellName, position);
+        mWorldScene->changeToInteriorCell(cellName, position, adjustPlayerPos, changeEvent);
         addContainerScripts(getPlayerPtr(), getPlayerPtr().getCell());
     }
 
-    void World::changeToExteriorCell (const ESM::Position& position)
+    void World::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
         mPhysics->clearQueuedMovement();
 
-        if (mCurrentWorldSpace != "sys::default") // FIXME
+        if (changeEvent && mCurrentWorldSpace != ESM::CellId::sDefaultWorldspace)
         {
             // changed worldspace
             mProjectileManager->clear();
             mRendering->notifyWorldSpaceChanged();
         }
         removeContainerScripts(getPlayerPtr());
-        mWorldScene->changeToExteriorCell(position, true);
+        mWorldScene->changeToExteriorCell(position, adjustPlayerPos, changeEvent);
         addContainerScripts(getPlayerPtr(), getPlayerPtr().getCell());
     }
 
-    void World::changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool detectWorldSpaceChange)
+    void World::changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
-        if (!detectWorldSpaceChange)
+        if (!changeEvent)
             mCurrentWorldSpace = cellId.mWorldspace;
 
         if (cellId.mPaged)
-            changeToExteriorCell (position);
+            changeToExteriorCell (position, adjustPlayerPos, changeEvent);
         else
-            changeToInteriorCell (cellId.mWorldspace, position);
+            changeToInteriorCell (cellId.mWorldspace, position, adjustPlayerPos, changeEvent);
     }
 
     void World::markCellAsUnchanged()
@@ -1017,7 +1041,7 @@ namespace MWWorld
             return static_cast<float>(mActivationDistanceOverride);
 
         static const int iMaxActivateDist = getStore().get<ESM::GameSetting>().find("iMaxActivateDist")->getInt();
-        return iMaxActivateDist * 5.f / 4.f;
+        return static_cast<float>(iMaxActivateDist);
     }
 
     MWWorld::Ptr World::getFacedObject()
@@ -1029,19 +1053,22 @@ namespace MWWorld
             facedObject = getFacedObject(getMaxActivationDistance() * 50, false);
         else
         {
-            float telekinesisRangeBonus =
-                    mPlayer->getPlayer().getClass().getCreatureStats(mPlayer->getPlayer()).getMagicEffects()
-                    .get(ESM::MagicEffect::Telekinesis).getMagnitude();
-            telekinesisRangeBonus = feetToGameUnits(telekinesisRangeBonus);
+            float activationDistance = getActivationDistancePlusTelekinesis();
 
-            float activationDistance = getMaxActivationDistance() + telekinesisRangeBonus;
+            facedObject = getFacedObject(activationDistance, true);
 
-            facedObject = getFacedObject(activationDistance);
+            if (!facedObject.isEmpty() && !facedObject.getClass().allowTelekinesis(facedObject)
+                && mDistanceToFacedObject > getMaxActivationDistance())
+                return 0;
         }
-
         return facedObject;
     }
 
+   float World::getDistanceToFacedObject()
+   {
+        return mDistanceToFacedObject;
+   }
+
     osg::Matrixf World::getActorHeadTransform(const MWWorld::ConstPtr& actor) const
     {
         const MWRender::Animation *anim = mRendering->getAnimation(actor);
@@ -1051,23 +1078,35 @@ namespace MWWorld
             if(!node) node = anim->getNode("Bip01 Head");
             if(node)
             {
-                osg::MatrixList mats = node->getWorldMatrices();
-                if(!mats.empty())
-                    return mats[0];
+                osg::NodePathList nodepaths = node->getParentalNodePaths();
+                if(!nodepaths.empty())
+                    return osg::computeLocalToWorld(nodepaths[0]);
             }
         }
         return osg::Matrixf::translate(actor.getRefData().getPosition().asVec3());
     }
 
-
-    std::pair<MWWorld::Ptr,osg::Vec3f> World::getHitContact(const MWWorld::ConstPtr &ptr, float distance)
+    std::pair<MWWorld::Ptr,osg::Vec3f> World::getHitContact(const MWWorld::ConstPtr &ptr, float distance, std::vector<MWWorld::Ptr> &targets)
     {
         const ESM::Position &posdata = ptr.getRefData().getPosition();
 
         osg::Quat rot = osg::Quat(posdata.rot[0], osg::Vec3f(-1,0,0)) * osg::Quat(posdata.rot[2], osg::Vec3f(0,0,-1));
-        osg::Vec3f pos = getActorHeadTransform(ptr).getTrans();
 
-        std::pair<MWWorld::Ptr,osg::Vec3f> result = mPhysics->getHitContact(ptr, pos, rot, distance);
+        osg::Vec3f pos = ptr.getRefData().getPosition().asVec3();
+
+        if (ptr == getPlayerPtr())
+            pos = getActorHeadTransform(ptr).getTrans(); // special cased for better aiming with the camera
+        else
+        {
+            // general case, compatible with all types of different creatures
+            // note: we intentionally do *not* use the collision box offset here, this is required to make
+            // some flying creatures work that have their collision box offset in the air
+            osg::Vec3f halfExtents = mPhysics->getHalfExtents(ptr);
+            pos.z() += halfExtents.z() * 2 * 0.75;
+            distance += halfExtents.y();
+        }
+
+        std::pair<MWWorld::Ptr,osg::Vec3f> result = mPhysics->getHitContact(ptr, pos, rot, distance, targets);
         if(result.first.isEmpty())
             return std::make_pair(MWWorld::Ptr(), osg::Vec3f());
 
@@ -1113,7 +1152,7 @@ namespace MWWorld
         }
     }
 
-    MWWorld::Ptr World::moveObject(const Ptr &ptr, CellStore* newCell, float x, float y, float z)
+    MWWorld::Ptr World::moveObject(const Ptr &ptr, CellStore* newCell, float x, float y, float z, bool movePhysics)
     {
         ESM::Position pos = ptr.getRefData().getPosition();
 
@@ -1129,15 +1168,26 @@ namespace MWWorld
         bool isPlayer = ptr == mPlayer->getPlayer();
         bool haveToMove = isPlayer || (currCell && mWorldScene->isCellActive(*currCell));
         MWWorld::Ptr newPtr = ptr;
+        
+        // tes3mp debug start
+        if (currCell != newCell) {
 
-        if (currCell != newCell)
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Tick: %s was %s move from %s to %s",
+                   ptr.getBase()->mRef.getRefId().c_str(),
+                   ptr.getBase()->canChangeCell ? "allowed" : "denied",
+                   currCell->getCell()->getDescription().c_str(),
+                   newCell->getCell()->getDescription().c_str());
+        }
+        // tes3mp debug end
+
+        if (currCell != newCell && ptr.getBase()->canChangeCell)
         {
             removeContainerScripts(ptr);
 
             if (isPlayer)
             {
                 if (!newCell->isExterior())
-                    changeToInteriorCell(Misc::StringUtils::lowerCase(newCell->getCell()->mName), pos);
+                    changeToInteriorCell(Misc::StringUtils::lowerCase(newCell->getCell()->mName), pos, false);
                 else
                 {
                     if (mWorldScene->isCellActive(*newCell))
@@ -1201,7 +1251,8 @@ namespace MWWorld
         if (haveToMove && newPtr.getRefData().getBaseNode())
         {
             mRendering->moveObject(newPtr, vec);
-            mPhysics->updatePosition(newPtr);
+            if (movePhysics)
+                mPhysics->updatePosition(newPtr);
         }
         if (isPlayer)
         {
@@ -1210,7 +1261,7 @@ namespace MWWorld
         return newPtr;
     }
 
-    MWWorld::Ptr World::moveObjectImp(const Ptr& ptr, float x, float y, float z)
+    MWWorld::Ptr World::moveObjectImp(const Ptr& ptr, float x, float y, float z, bool movePhysics)
     {
         CellStore *cell = ptr.getCell();
 
@@ -1221,7 +1272,7 @@ namespace MWWorld
             cell = getExterior(cellX, cellY);
         }
 
-        return moveObject(ptr, cell, x, y, z);
+        return moveObject(ptr, cell, x, y, z, movePhysics);
     }
 
     MWWorld::Ptr World::moveObject (const Ptr& ptr, float x, float y, float z)
@@ -1278,7 +1329,7 @@ namespace MWWorld
 
     void World::adjustPosition(const Ptr &ptr, bool force)
     {
-        ESM::Position pos (ptr.getRefData().getPosition());
+        osg::Vec3f pos (ptr.getRefData().getPosition().asVec3());
 
         if(!ptr.getRefData().getBaseNode())
         {
@@ -1288,34 +1339,31 @@ namespace MWWorld
 
         float terrainHeight = -std::numeric_limits<float>::max();
         if (ptr.getCell()->isExterior())
-            terrainHeight = mRendering->getTerrainHeightAt(pos.asVec3());
+            terrainHeight = getTerrainHeightAt(pos);
 
-        if (pos.pos[2] < terrainHeight)
-            pos.pos[2] = terrainHeight;
+        if (pos.z() < terrainHeight)
+            pos.z() = terrainHeight;
 
-        pos.pos[2] += 20; // place slightly above. will snap down to ground with code below
-
-        ptr.getRefData().setPosition(pos);
+        pos.z() += 20; // place slightly above. will snap down to ground with code below
 
         if (force || !isFlying(ptr))
         {
-            osg::Vec3f traced = mPhysics->traceDown(ptr, 500);
-            if (traced.z() < pos.pos[2])
-                pos.pos[2] = traced.z();
+            osg::Vec3f traced = mPhysics->traceDown(ptr, pos, 500);
+            if (traced.z() < pos.z())
+                pos.z() = traced.z();
         }
 
-        moveObject(ptr, ptr.getCell(), pos.pos[0], pos.pos[1], pos.pos[2]);
+        moveObject(ptr, ptr.getCell(), pos.x(), pos.y(), pos.z());
     }
 
     void World::fixPosition(const Ptr &actor)
     {
         const float dist = 8000;
-        ESM::Position pos (actor.getRefData().getPosition());
-        pos.pos[2] += dist;
-        actor.getRefData().setPosition(pos);
+        osg::Vec3f pos (actor.getRefData().getPosition().asVec3());
+        pos.z() += dist;
 
-        osg::Vec3f traced = mPhysics->traceDown(actor, dist*1.1f);
-        if (traced != pos.asVec3())
+        osg::Vec3f traced = mPhysics->traceDown(actor, pos, dist*1.1f);
+        if (traced != pos)
             moveObject(actor, actor.getCell(), traced.x(), traced.y(), traced.z());
     }
 
@@ -1324,11 +1372,63 @@ namespace MWWorld
         rotateObjectImp(ptr, osg::Vec3f(x, y, z), adjust);
     }
 
-    MWWorld::Ptr World::safePlaceObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos)
+    MWWorld::Ptr World::placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos)
     {
         return copyObjectToCell(ptr,cell,pos,ptr.getRefData().getCount(),false);
     }
 
+    MWWorld::Ptr World::safePlaceObject(const ConstPtr &ptr, const ConstPtr &referenceObject, MWWorld::CellStore* referenceCell, int direction, float distance)
+    {
+        ESM::Position ipos = referenceObject.getRefData().getPosition();
+        osg::Vec3f pos(ipos.asVec3());
+        osg::Quat orientation(ipos.rot[2], osg::Vec3f(0,0,-1));
+
+        int fallbackDirections[4] = {direction, (direction+3)%4, (direction+2)%4, (direction+1)%4};
+
+        osg::Vec3f spawnPoint = pos;
+
+        for (int i=0; i<4; ++i)
+        {
+            direction = fallbackDirections[i];
+            if (direction == 0) spawnPoint = pos + (orientation * osg::Vec3f(0,1,0)) * distance;
+            else if(direction == 1) spawnPoint = pos - (orientation * osg::Vec3f(0,1,0)) * distance;
+            else if(direction == 2) spawnPoint = pos - (orientation * osg::Vec3f(1,0,0)) * distance;
+            else if(direction == 3) spawnPoint = pos + (orientation * osg::Vec3f(1,0,0)) * distance;
+
+            if (!ptr.getClass().isActor())
+                break;
+
+            // check if spawn point is safe, fall back to another direction if not
+            spawnPoint.z() += 30; // move up a little to account for slopes, will snap down later
+
+            if (!castRay(spawnPoint.x(), spawnPoint.y(), spawnPoint.z(),
+                                                               pos.x(), pos.y(), pos.z() + 20))
+            {
+                // safe
+                break;
+            }
+        }
+        ipos.pos[0] = spawnPoint.x();
+        ipos.pos[1] = spawnPoint.y();
+        ipos.pos[2] = spawnPoint.z();
+
+        if (!referenceObject.getClass().isActor())
+        {
+            ipos.rot[0] = referenceObject.getRefData().getPosition().rot[0];
+            ipos.rot[1] = referenceObject.getRefData().getPosition().rot[1];
+        }
+        else
+        {
+            ipos.rot[0] = 0;
+            ipos.rot[1] = 0;
+        }
+        ipos.rot[2] = referenceObject.getRefData().getPosition().rot[2];
+
+        MWWorld::Ptr placed = copyObjectToCell(ptr, referenceCell, ipos, ptr.getRefData().getCount(), false);
+        placed.getClass().adjustPosition(placed, true); // snap to ground
+        return placed;
+    }
+
     void World::indexToPosition (int cellX, int cellY, float &x, float &y, bool centre) const
     {
         const int cellSize = 8192;
@@ -1373,19 +1473,17 @@ namespace MWWorld
                 player = iter;
                 continue;
             }
-            moveObjectImp(iter->first, iter->second.x(), iter->second.y(), iter->second.z());
+            moveObjectImp(iter->first, iter->second.x(), iter->second.y(), iter->second.z(), false);
         }
         if(player != results.end())
-            moveObjectImp(player->first, player->second.x(), player->second.y(), player->second.z());
-
-        mPhysics->debugDraw();
+            moveObjectImp(player->first, player->second.x(), player->second.y(), player->second.z(), false);
     }
 
     bool World::castRay (float x1, float y1, float z1, float x2, float y2, float z2)
     {
         osg::Vec3f a(x1,y1,z1);
         osg::Vec3f b(x2,y2,z2);
-        MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(a, b, MWWorld::Ptr(), MWPhysics::CollisionType_World|MWPhysics::CollisionType_Door);
+        MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(a, b, MWWorld::Ptr(), std::vector<MWWorld::Ptr>(), MWPhysics::CollisionType_World|MWPhysics::CollisionType_Door);
         return result.mHit;
     }
 
@@ -1412,8 +1510,6 @@ namespace MWWorld
                 float diff = duration * osg::DegreesToRadians(90.f);
                 float targetRot = std::min(std::max(minRot, oldRot + diff * (it->second == 1 ? 1 : -1)), maxRot);
                 rotateObject(it->first, objPos.rot[0], objPos.rot[1], targetRot);
-                // the rotation order we want to use
-                mWorldScene->updateObjectRotation(it->first, false);
 
                 bool reached = (targetRot == maxRot && it->second) || targetRot == minRot;
 
@@ -1437,6 +1533,9 @@ namespace MWWorld
                     }
                 }
 
+                // the rotation order we want to use
+                mWorldScene->updateObjectRotation(it->first, false);
+
                 if (reached)
                 {
                     // Mark as non-moving
@@ -1551,6 +1650,8 @@ namespace MWWorld
         if (!paused)
             doPhysics (duration);
 
+        mPhysics->debugDraw();
+
         mWorldScene->update (duration, paused);
 
         updateWindowManager ();
@@ -1558,6 +1659,13 @@ namespace MWWorld
         updateSoundListener();
 
         updatePlayer(paused);
+
+        mSpellPreloadTimer -= duration;
+        if (mSpellPreloadTimer <= 0.f)
+        {
+            mSpellPreloadTimer = 0.1f;
+            preloadSpells();
+        }
     }
 
     void World::updatePlayer(bool paused)
@@ -1614,7 +1722,39 @@ namespace MWWorld
             if (result.mHit)
                 mRendering->getCamera()->setCameraDistance((result.mHitPos - focal).length() - radius, false, false);
         }
+    }
 
+    void World::preloadSpells()
+    {
+        std::string selectedSpell = MWBase::Environment::get().getWindowManager()->getSelectedSpell();
+        if (!selectedSpell.empty())
+        {
+            const ESM::Spell* spell = mStore.get<ESM::Spell>().search(selectedSpell);
+            if (spell)
+                preloadEffects(&spell->mEffects);
+        }
+        const MWWorld::Ptr& selectedEnchantItem = MWBase::Environment::get().getWindowManager()->getSelectedEnchantItem();
+        if (!selectedEnchantItem.isEmpty())
+        {
+            std::string enchantId = selectedEnchantItem.getClass().getEnchantment(selectedEnchantItem);
+            if (!enchantId.empty())
+            {
+                const ESM::Enchantment* ench = mStore.get<ESM::Enchantment>().search(selectedEnchantItem.getClass().getEnchantment(selectedEnchantItem));
+                if (ench)
+                    preloadEffects(&ench->mEffects);
+            }
+        }
+        const MWWorld::Ptr& selectedWeapon = MWBase::Environment::get().getWindowManager()->getSelectedWeapon();
+        if (!selectedWeapon.isEmpty())
+        {
+            std::string enchantId = selectedWeapon.getClass().getEnchantment(selectedWeapon);
+            if (!enchantId.empty())
+            {
+                const ESM::Enchantment* ench = mStore.get<ESM::Enchantment>().search(enchantId);
+                if (ench && ench->mData.mType == ESM::Enchantment::WhenStrikes)
+                    preloadEffects(&ench->mEffects);
+            }
+        }
     }
 
     void World::updateSoundListener()
@@ -1658,18 +1798,26 @@ namespace MWWorld
 
     MWWorld::Ptr World::getFacedObject(float maxDistance, bool ignorePlayer)
     {
-        maxDistance += mRendering->getCameraDistance();
+        const float camDist = mRendering->getCameraDistance();
+        maxDistance += camDist;
+        MWWorld::Ptr facedObject;
+        MWRender::RenderingManager::RayResult rayToObject;
 
         if (MWBase::Environment::get().getWindowManager()->isGuiMode())
         {
             float x, y;
             MWBase::Environment::get().getWindowManager()->getMousePosition(x, y);
-            return mRendering->castCameraToViewportRay(x, y, maxDistance, ignorePlayer).mHitObject;
+            rayToObject = mRendering->castCameraToViewportRay(x, y, maxDistance, ignorePlayer);
         }
         else
-        {
-            return mRendering->castCameraToViewportRay(0.5f, 0.5f, maxDistance, ignorePlayer).mHitObject;
-        }
+            rayToObject = mRendering->castCameraToViewportRay(0.5f, 0.5f, maxDistance, ignorePlayer);
+
+        facedObject = rayToObject.mHitObject;
+        if (rayToObject.mHit)
+            mDistanceToFacedObject = (rayToObject.mRatio * maxDistance) - camDist;
+        else
+            mDistanceToFacedObject = -1;
+        return facedObject;
     }
 
     bool World::isCellExterior() const
@@ -1999,12 +2147,30 @@ namespace MWWorld
 
     bool World::isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f &pos) const
     {
-        if (!(cell->getCell()->mData.mFlags & ESM::Cell::HasWater)) {
+        if (!(cell->getCell()->hasWater())) {
             return false;
         }
         return pos.z() < cell->getWaterLevel();
     }
 
+    bool World::isWaterWalkingCastableOnTarget(const MWWorld::ConstPtr &target) const
+    {
+        const MWWorld::CellStore* cell = target.getCell();
+        if (!cell->getCell()->hasWater())
+            return true;
+
+        float waterlevel = cell->getWaterLevel();
+
+        // SwimHeightScale affects the upper z position an actor can swim to 
+        // while in water. Based on observation from the original engine,
+        // the upper z position you get with a +1 SwimHeightScale is the depth
+        // limit for being able to cast water walking on an underwater target.
+        if (isUnderwater(target, mSwimHeightScale + 1) || (isUnderwater(cell, target.getRefData().getPosition().asVec3()) && !mPhysics->canMoveToWaterSurface(target, waterlevel)))
+            return false; // not castable if too deep or if not enough room to move actor to surface
+        else
+            return true;
+    }
+
     bool World::isOnGround(const MWWorld::Ptr &ptr) const
     {
         return mPhysics->isOnGround(ptr);
@@ -2078,10 +2244,17 @@ namespace MWWorld
     {
         MWBase::Environment::get().getMechanicsManager()->remove(getPlayerPtr());
 
-        mRendering->renderPlayer(getPlayerPtr());
+        MWWorld::Ptr player = getPlayerPtr();
+
+        mRendering->renderPlayer(player);
+        MWRender::NpcAnimation* anim = static_cast<MWRender::NpcAnimation*>(mRendering->getAnimation(player));
+        player.getClass().getInventoryStore(player).setInvListener(anim, player);
+        player.getClass().getInventoryStore(player).setContListener(anim);
 
         scaleObject(getPlayerPtr(), 1.f); // apply race height
 
+        rotateObject(getPlayerPtr(), 0.f, 0.f, 0.f, true);
+
         MWBase::Environment::get().getMechanicsManager()->add(getPlayerPtr());
         MWBase::Environment::get().getMechanicsManager()->watchActor(getPlayerPtr());
 
@@ -2103,7 +2276,7 @@ namespace MWWorld
         if (!actor)
             throw std::runtime_error("can't find player");
 
-        if ((actor->getCollisionMode() && !mPhysics->isOnSolidGround(player)) || isUnderwater(currentCell, playerPos))
+        if ((actor->getCollisionMode() && !mPhysics->isOnSolidGround(player)) || isUnderwater(currentCell, playerPos) || isWalkingOnWater(player))
             return 2;
 
         if((currentCell->getCell()->mData.mFlags&ESM::Cell::NoSleep) || player.getClass().getNpcStats(player).isWerewolf())
@@ -2146,18 +2319,63 @@ namespace MWWorld
             state = 2; // if opening, then close
             break;
         }
+
+        // Added by tes3mp
+        mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+        worldEvent->cell = *door.getCell()->getCell();
+
+        mwmp::WorldObject worldObject;
+        worldObject.refId = door.getCellRef().getRefId();
+        worldObject.refNumIndex = door.getCellRef().getRefNum().mIndex;
+        worldObject.doorState = state;
+        worldEvent->addObject(worldObject);
+
+        mwmp::Main::get().getNetworking()->getWorldPacket(ID_DOOR_STATE)->Send(worldEvent);
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Door activation 1\n- cellRef: %s, %i\n- cell: %s\n- state: %s",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex,
+            worldEvent->cell.getDescription().c_str(),
+            worldObject.doorState ? "true" : "false");
+
         door.getClass().setDoorState(door, state);
         mDoorStates[door] = state;
     }
 
     void World::activateDoor(const Ptr &door, int state)
     {
+        // Added by tes3mp
+        mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->resetWorldEvent();
+        worldEvent->cell = *door.getCell()->getCell();
+
+        mwmp::WorldObject worldObject;
+        worldObject.refId = door.getCellRef().getRefId();
+        worldObject.refNumIndex = door.getCellRef().getRefNum().mIndex;
+        worldObject.doorState = state;
+        worldEvent->addObject(worldObject);
+
+        mwmp::Main::get().getNetworking()->getWorldPacket(ID_DOOR_STATE)->Send(worldEvent);
+
+        LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Door activation 2\n- cellRef: %s, %i\n- cell: %s\n- state: %s",
+            worldObject.refId.c_str(),
+            worldObject.refNumIndex,
+            worldEvent->cell.getDescription().c_str(),
+            worldObject.doorState ? "true" : "false");
+
         door.getClass().setDoorState(door, state);
         mDoorStates[door] = state;
         if (state == 0)
             mDoorStates.erase(door);
     }
 
+    // Added by tes3mp to allow saving a door state received from a packet
+    void World::saveDoorState(const Ptr &door, int state)
+    {
+        mDoorStates[door] = state;
+        if (state == 0)
+            mDoorStates.erase(door);
+    }
+
     bool World::getPlayerStandingOn (const MWWorld::ConstPtr& object)
     {
         MWWorld::Ptr player = getPlayerPtr();
@@ -2186,8 +2404,11 @@ namespace MWWorld
 
     void World::hurtStandingActors(const ConstPtr &object, float healthPerSecond)
     {
+        /* Disabled by tes3mp, because being in a menu should not pause the game in it
+
         if (MWBase::Environment::get().getWindowManager()->isGuiMode())
             return;
+        */
 
         std::vector<MWWorld::Ptr> actors;
         mPhysics->getActorsStandingOn(object, actors);
@@ -2216,8 +2437,11 @@ namespace MWWorld
 
     void World::hurtCollidingActors(const ConstPtr &object, float healthPerSecond)
     {
+        /* Disabled by tes3mp, because being in a menu should not pause the game in it
+
         if (MWBase::Environment::get().getWindowManager()->isGuiMode())
             return;
+        */
 
         std::vector<MWWorld::Ptr> actors;
         mPhysics->getActorsCollidingWith(object, actors);
@@ -2337,14 +2561,17 @@ namespace MWWorld
         return mPhysics->getLineOfSight(actor, targetActor);
     }
 
-    float World::getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist)
+    float World::getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist, bool includeWater)
     {
         osg::Vec3f to (dir);
         to.normalize();
         to = from + (to * maxDist);
 
-        MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(from, to, MWWorld::Ptr(),
-            MWPhysics::CollisionType_World|MWPhysics::CollisionType_HeightMap|MWPhysics::CollisionType_Door);
+        int collisionTypes = MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap | MWPhysics::CollisionType_Door;
+        if (includeWater) {
+            collisionTypes |= MWPhysics::CollisionType_Water;
+        }
+        MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(from, to, MWWorld::Ptr(), std::vector<MWWorld::Ptr>(), collisionTypes);
 
         if (!result.mHit)
             return maxDist;
@@ -2394,9 +2621,9 @@ namespace MWWorld
             }
             if (0 != source) {
                 // Find door leading to our current teleport door
-                // and use it destination to position inside cell.
-                const DoorList &doors = source->getReadOnlyDoors().mList;
-                for (DoorList::const_iterator jt = doors.begin(); jt != doors.end(); ++jt) {
+                // and use its destination to position inside cell.
+                const DoorList &destinationDoors = source->getReadOnlyDoors().mList;
+                for (DoorList::const_iterator jt = destinationDoors.begin(); jt != destinationDoors.end(); ++jt) {
                     if (it->mRef.getTeleport() &&
                         Misc::StringUtils::ciEqual(name, jt->mRef.getDestCell()))
                     {
@@ -2520,8 +2747,9 @@ namespace MWWorld
             const ESM::Spell* spell = getStore().get<ESM::Spell>().find(selectedSpell);
 
             // Check mana
+            bool godmode = (isPlayer && getGodModeState());
             MWMechanics::DynamicStat<float> magicka = stats.getMagicka();
-            if (magicka.getCurrent() < spell->mData.mCost && !(isPlayer && getGodModeState()))
+            if (magicka.getCurrent() < spell->mData.mCost && !godmode)
             {
                 message = "#{sMagicInsufficientSP}";
                 fail = true;
@@ -2535,7 +2763,7 @@ namespace MWWorld
             }
 
             // Reduce mana
-            if (!fail)
+            if (!fail && !godmode)
             {
                 magicka.setCurrent(magicka.getCurrent() - spell->mData.mCost);
                 stats.setMagicka(magicka);
@@ -2554,7 +2782,8 @@ namespace MWWorld
 
         // Get the target to use for "on touch" effects, using the facing direction from Head node
         MWWorld::Ptr target;
-        float distance = 192.f; // ??
+        float distance = getActivationDistancePlusTelekinesis();
+
         osg::Vec3f hitPosition = actor.getRefData().getPosition().asVec3();
         osg::Vec3f origin = getActorHeadTransform(actor).getTrans();
 
@@ -2564,12 +2793,17 @@ namespace MWWorld
         osg::Vec3f direction = orient * osg::Vec3f(0,1,0);
         osg::Vec3f dest = origin + direction * distance;
 
+        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
+        std::vector<MWWorld::Ptr> targetActors;
+        if (!actor.isEmpty() && actor != MWMechanics::getPlayer())
+            actor.getClass().getCreatureStats(actor).getAiSequence().getCombatTargets(targetActors);
+
         // For actor targets, we want to use bounding boxes (physics raycast).
         // This is to give a slight tolerance for errors, especially with creatures like the Skeleton that would be very hard to aim at otherwise.
         // For object targets, we want the detailed shapes (rendering raycast).
         // If we used the bounding boxes for static objects, then we would not be able to target e.g. objects lying on a shelf.
 
-        MWPhysics::PhysicsSystem::RayResult result1 = mPhysics->castRay(origin, dest, actor, MWPhysics::CollisionType_Actor);
+        MWPhysics::PhysicsSystem::RayResult result1 = mPhysics->castRay(origin, dest, actor, targetActors, MWPhysics::CollisionType_Actor);
 
         MWRender::RenderingManager::RayResult result2 = mRendering->castRay(origin, dest, true, true);
 
@@ -2581,15 +2815,29 @@ namespace MWWorld
         if (result2.mHit)
             dist2 = (origin - result2.mHitPointWorld).length();
 
-        if (dist1 <= dist2 && result1.mHit)
+        if (result1.mHit)
         {
             target = result1.mHitObject;
             hitPosition = result1.mHitPos;
+            if (dist1 > getMaxActivationDistance() && !target.isEmpty() && (target.getClass().isActor() || !target.getClass().canBeActivated(target)))
+                target = NULL;
         }
         else if (result2.mHit)
         {
             target = result2.mHitObject;
             hitPosition = result2.mHitPointWorld;
+            if (dist2 > getMaxActivationDistance() && !target.isEmpty() && !target.getClass().canBeActivated(target))
+                target = NULL;
+        }
+
+        // When targeting an actor that is in combat with an "on touch" spell, 
+        // compare against the minimum of activation distance and combat distance.
+
+        if (!target.isEmpty() && target.getClass().isActor() && target.getClass().getCreatureStats (target).getAiSequence().isInCombat()) 
+        {
+            distance = std::min (distance, getStore().get<ESM::GameSetting>().find("fCombatDistance")->getFloat());
+            if (distance < dist1)
+                target = NULL;
         }
 
         std::string selectedSpell = stats.getSpells().getSelectedSpell();
@@ -2600,7 +2848,6 @@ namespace MWWorld
         if (!selectedSpell.empty())
         {
             const ESM::Spell* spell = getStore().get<ESM::Spell>().find(selectedSpell);
-
             cast.cast(spell);
         }
         else if (actor.getClass().hasInventoryStore(actor))
@@ -2617,11 +2864,10 @@ namespace MWWorld
         mProjectileManager->launchProjectile(actor, projectile, worldPos, orient, bow, speed, attackStrength);
     }
 
-    void World::launchMagicBolt (const std::string& model, const std::string &sound, const std::string &spellId,
-                                 float speed, bool stack, const ESM::EffectList& effects,
-                                   const MWWorld::Ptr& caster, const std::string& sourceName, const osg::Vec3f& fallbackDirection)
+    void World::launchMagicBolt (const std::string &spellId, bool stack, const ESM::EffectList& effects,
+                                 const MWWorld::Ptr& caster, const std::string& sourceName, const osg::Vec3f& fallbackDirection)
     {
-        mProjectileManager->launchMagicBolt(model, sound, spellId, speed, stack, effects, caster, sourceName, fallbackDirection);
+        mProjectileManager->launchMagicBolt(spellId, stack, effects, caster, sourceName, fallbackDirection);
     }
 
     const std::vector<std::string>& World::getContentFiles() const
@@ -2631,6 +2877,7 @@ namespace MWWorld
 
     void World::breakInvisibility(const Ptr &actor)
     {
+        actor.getClass().getCreatureStats(actor).getSpells().purgeEffect(ESM::MagicEffect::Invisibility);
         actor.getClass().getCreatureStats(actor).getActiveSpells().purgeEffect(ESM::MagicEffect::Invisibility);
         if (actor.getClass().hasInventoryStore(actor))
             actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Invisibility);
@@ -2912,6 +3159,18 @@ namespace MWWorld
         return feet * 22;
     }
 
+    float World::getActivationDistancePlusTelekinesis()
+    {
+        float telekinesisRangeBonus =
+                    mPlayer->getPlayer().getClass().getCreatureStats(mPlayer->getPlayer()).getMagicEffects()
+                    .get(ESM::MagicEffect::Telekinesis).getMagnitude();
+        telekinesisRangeBonus = feetToGameUnits(telekinesisRangeBonus);
+
+        float activationDistance = getMaxActivationDistance() + telekinesisRangeBonus;
+
+        return activationDistance;
+    }
+
     MWWorld::Ptr World::getPlayerPtr()
     {
         return mPlayer->getPlayer();
@@ -3011,6 +3270,26 @@ namespace MWWorld
         return MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Jail);
     }
 
+    float World::getTerrainHeightAt(const osg::Vec3f& worldPos) const
+    {
+        return mRendering->getTerrainHeightAt(worldPos);
+    }
+
+    osg::Vec3f World::getHalfExtents(const ConstPtr& actor, bool rendering) const
+    {
+        if (rendering)
+            return mPhysics->getRenderingHalfExtents(actor);
+        else
+            return mPhysics->getHalfExtents(actor);
+    }
+
+    std::string World::exportSceneGraph(const Ptr &ptr)
+    {
+        std::string file = mUserDataPath + "/openmw.osgt";
+        mRendering->exportSceneGraph(ptr, file, "Ascii");
+        return file;
+    }
+
     void World::spawnRandomCreature(const std::string &creatureList)
     {
         const ESM::CreatureLevList* list = getStore().get<ESM::CreatureLevList>().find(creatureList);
@@ -3024,23 +3303,9 @@ namespace MWWorld
             if (selectedCreature.empty())
                 return;
 
-            ESM::Position ipos = mPlayer->getPlayer().getRefData().getPosition();
-            osg::Vec3f pos(ipos.asVec3());
-            osg::Quat rot(-ipos.rot[2], osg::Vec3f(0,0,1));
-            const float distance = 50;
-            pos = pos + (rot * osg::Vec3f(0,1,0)) * distance;
-            ipos.pos[0] = pos.x();
-            ipos.pos[1] = pos.y();
-            ipos.pos[2] = pos.z();
-            ipos.rot[0] = 0;
-            ipos.rot[1] = 0;
-            ipos.rot[2] = 0;
-
-            MWWorld::CellStore* cell = mPlayer->getPlayer().getCell();
             MWWorld::ManualRef ref(getStore(), selectedCreature, 1);
-            ref.getPtr().getCellRef().setPosition(ipos);
 
-            safePlaceObject(ref.getPtr(), cell, ipos);
+            safePlaceObject(ref.getPtr(), getPlayerPtr(), getPlayerPtr().getCell(), 0, 220.f);
         }
     }
 
@@ -3071,7 +3336,7 @@ namespace MWWorld
         modelName << roll;
         std::string model = "meshes\\" + getFallback()->getFallbackString(modelName.str());
 
-        mRendering->spawnEffect(model, texture, worldPosition);
+        mRendering->spawnEffect(model, texture, worldPosition, 1.0f, false);
     }
 
     void World::spawnEffect(const std::string &model, const std::string &textureOverride, const osg::Vec3f &worldPos)
@@ -3079,8 +3344,8 @@ namespace MWWorld
         mRendering->spawnEffect(model, textureOverride, worldPos);
     }
 
-    void World::explodeSpell(const osg::Vec3f &origin, const ESM::EffectList &effects, const Ptr &caster, const Ptr& ignore,
-                             ESM::RangeType rangeType, const std::string& id, const std::string& sourceName)
+    void World::explodeSpell(const osg::Vec3f& origin, const ESM::EffectList& effects, const Ptr& caster, const Ptr& ignore, ESM::RangeType rangeType,
+                             const std::string& id, const std::string& sourceName, const bool fromProjectile)
     {
         std::map<MWWorld::Ptr, std::vector<ESM::ENAMstruct> > toApply;
         for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = effects.mList.begin();
@@ -3088,8 +3353,11 @@ namespace MWWorld
         {
             const ESM::MagicEffect* effect = getStore().get<ESM::MagicEffect>().find(effectIt->mEffectID);
 
-            if (effectIt->mArea <= 0)
-                continue; // Not an area effect
+            if (effectIt->mRange != rangeType || (effectIt->mArea <= 0 && !ignore.isEmpty() && ignore.getClass().isActor()))
+                continue; // Not right range type, or not area effect and hit an actor
+
+            if (!fromProjectile && effectIt->mRange == ESM::RT_Touch && (!ignore.isEmpty()) && (!ignore.getClass().isActor() && !ignore.getClass().canBeActivated(ignore)))
+                continue; // Don't play explosion for touch spells on non-activatable objects except when spell is from the projectile enchantment
 
             // Spawn the explosion orb effect
             const ESM::Static* areaStatic;
@@ -3098,7 +3366,16 @@ namespace MWWorld
             else
                 areaStatic = getStore().get<ESM::Static>().find ("VFX_DefaultArea");
 
-            mRendering->spawnEffect("meshes\\" + areaStatic->mModel, "", origin, static_cast<float>(effectIt->mArea));
+            std::string texture = effect->mParticle;
+
+            if (effectIt->mArea <= 0)
+            {
+                if (effectIt->mRange == ESM::RT_Target)
+                    mRendering->spawnEffect("meshes\\" + areaStatic->mModel, texture, origin, 1.0f);
+                continue;
+            }
+            else
+                mRendering->spawnEffect("meshes\\" + areaStatic->mModel, texture, origin, static_cast<float>(effectIt->mArea * 2));              
 
             // Play explosion sound (make sure to use NoTrack, since we will delete the projectile now)
             static const std::string schools[] = {
@@ -3139,41 +3416,27 @@ namespace MWWorld
             cast.mId = id;
             cast.mSourceName = sourceName;
             cast.mStack = false;
-            ESM::EffectList effects;
-            effects.mList = apply->second;
-            cast.inflict(apply->first, caster, effects, rangeType, false, true);
+            ESM::EffectList effectsToApply;
+            effectsToApply.mList = apply->second;
+            cast.inflict(apply->first, caster, effectsToApply, rangeType, false, true);
         }
     }
 
     void World::activate(const Ptr &object, const Ptr &actor)
     {
-        MWScript::InterpreterContext interpreterContext (&object.getRefData().getLocals(), object);
-        interpreterContext.activate (object);
-
-        std::string script = object.getClass().getScript (object);
-
         breakInvisibility(actor);
 
-        if (mScriptsEnabled)
+        if (object.getRefData().activate())
         {
-            if (!script.empty())
-            {
-                getLocalScripts().setIgnore (object);
-                MWBase::Environment::get().getScriptManager()->run (script, interpreterContext);
-            }
-            if (!interpreterContext.hasActivationBeenHandled())
-                interpreterContext.executeActivation(object, actor);
+            boost::shared_ptr<MWWorld::Action> action = (object.getClass().activate(object, actor));
+            action->execute (actor);
         }
-        else
-            interpreterContext.executeActivation(object, actor);
     }
 
     struct ResetActorsVisitor
     {
         bool operator() (Ptr ptr)
         {
-            // Can't reset actors that were moved to a different cell, because we don't know what cell they came from.
-            // This could be fixed once we properly track actor cell changes, but may not be desirable behaviour anyhow.
             if (ptr.getClass().isActor() && ptr.getCellRef().hasContentFile())
             {
                 const ESM::Position& origPos = ptr.getCellRef().getPosition();
@@ -3195,7 +3458,7 @@ namespace MWWorld
         }
     }
 
-    bool World::isWalkingOnWater(const ConstPtr &actor)
+    bool World::isWalkingOnWater(const ConstPtr &actor) const
     {
         const MWPhysics::Actor* physicActor = mPhysics->getActor(actor);
         if (physicActor && physicActor->isWalkingOnWater())
@@ -3205,20 +3468,57 @@ namespace MWWorld
 
     osg::Vec3f World::aimToTarget(const ConstPtr &actor, const MWWorld::ConstPtr& target)
     {
-        osg::Vec3f weaponPos = getActorHeadTransform(actor).getTrans();
-        osg::Vec3f targetPos = mPhysics->getPosition(target);
+        osg::Vec3f weaponPos = actor.getRefData().getPosition().asVec3();
+        weaponPos.z() += mPhysics->getHalfExtents(actor).z() * 2 * 0.75;
+        osg::Vec3f targetPos = mPhysics->getCollisionObjectPosition(target);
         return (targetPos - weaponPos);
     }
 
     float World::getHitDistance(const ConstPtr &actor, const ConstPtr &target)
     {
-        osg::Vec3f weaponPos = getActorHeadTransform(actor).getTrans();
-        return mPhysics->getHitDistance(weaponPos, target);
+        osg::Vec3f weaponPos = actor.getRefData().getPosition().asVec3();
+        osg::Vec3f halfExtents = mPhysics->getHalfExtents(actor);
+        weaponPos.z() += halfExtents.z() * 2 * 0.75;
+
+        return mPhysics->getHitDistance(weaponPos, target) - halfExtents.y();
     }
 
-    void World::preloadCommonAssets()
+    void preload(MWWorld::Scene* scene, const ESMStore& store, const std::string& obj)
     {
-        mRendering->preloadCommonAssets();
+        if (obj.empty())
+            return;
+        try
+        {
+            MWWorld::ManualRef ref(store, obj);
+            std::string model = ref.getPtr().getClass().getModel(ref.getPtr());
+            if (!model.empty())
+                scene->preload(model, ref.getPtr().getClass().useAnim());
+        }
+        catch(std::exception& e)
+        {
+        }
+    }
+
+    void World::preloadEffects(const ESM::EffectList *effectList)
+    {
+        for (std::vector<ESM::ENAMstruct>::const_iterator it = effectList->mList.begin(); it != effectList->mList.end(); ++it)
+        {
+            const ESM::MagicEffect *effect = mStore.get<ESM::MagicEffect>().find(it->mEffectID);
+
+            if (MWMechanics::isSummoningEffect(it->mEffectID))
+            {
+                preload(mWorldScene, mStore, "VFX_Summon_Start");
+                preload(mWorldScene, mStore, MWMechanics::getSummonedCreature(it->mEffectID));
+            }
+
+            preload(mWorldScene, mStore, effect->mCasting);
+            preload(mWorldScene, mStore, effect->mHit);
+
+            if (it->mArea > 0)
+                preload(mWorldScene, mStore, effect->mArea);
+            if (it->mRange == ESM::RT_Target)
+                preload(mWorldScene, mStore, effect->mBolt);
+        }
     }
 
 }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index cf9321da5..0cd4c6746 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -34,6 +34,11 @@ namespace Resource
     class ResourceSystem;
 }
 
+namespace SceneUtil
+{
+    class WorkQueue;
+}
+
 namespace ESM
 {
     struct Position;
@@ -101,6 +106,8 @@ namespace MWWorld
             bool mScriptsEnabled;
             std::vector<std::string> mContentFiles;
 
+            std::string mUserDataPath;
+
             // not implemented
             World (const World&);
             World& operator= (const World&);
@@ -119,7 +126,7 @@ namespace MWWorld
 
             void rotateObjectImp (const Ptr& ptr, const osg::Vec3f& rot, bool adjust);
 
-            Ptr moveObjectImp (const Ptr& ptr, float x, float y, float z);
+            Ptr moveObjectImp (const Ptr& ptr, float x, float y, float z, bool movePhysics=true);
             ///< @return an updated Ptr in case the Ptr's cell changes
 
             Ptr copyObjectToCell(const ConstPtr &ptr, CellStore* cell, ESM::Position pos, int count, bool adjustPos);
@@ -127,7 +134,11 @@ namespace MWWorld
             void updateSoundListener();
             void updateWindowManager ();
             void updatePlayer(bool paused);
+
+            void preloadSpells();
+
             MWWorld::Ptr getFacedObject(float maxDistance, bool ignorePlayer=true);
+
     public: // FIXME
             void removeContainerScripts(const Ptr& reference);
     private:
@@ -154,6 +165,9 @@ namespace MWWorld
                 const std::vector<std::string>& content, ContentLoader& contentLoader);
 
             float mSwimHeightScale;
+
+            float mDistanceToFacedObject;
+
             bool isUnderwater(const MWWorld::ConstPtr &object, const float heightRatio) const;
             ///< helper function for implementing isSwimming(), isSubmerged(), isWading()
 
@@ -162,7 +176,10 @@ namespace MWWorld
             bool mGoToJail;
             int mDaysInPrison;
 
+            float mSpellPreloadTimer;
+
             float feetToGameUnits(float feet);
+            float getActivationDistancePlusTelekinesis();
 
             MWWorld::ConstPtr getClosestMarker( const MWWorld::Ptr &ptr, const std::string &id );
             MWWorld::ConstPtr getClosestMarkerFromExteriorPosition( const osg::Vec3f& worldPos, const std::string &id );
@@ -172,19 +189,17 @@ namespace MWWorld
             World (
                 osgViewer::Viewer* viewer,
                 osg::ref_ptr<osg::Group> rootNode,
-                Resource::ResourceSystem* resourceSystem,
+                Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
                 const Files::Collections& fileCollections,
                 const std::vector<std::string>& contentFiles,
                 ToUTF8::Utf8Encoder* encoder, const std::map<std::string,std::string>& fallbackMap,
-                int activationDistanceOverride, const std::string& startCell, const std::string& startupScript, const std::string& resourcePath);
+                int activationDistanceOverride, const std::string& startCell, const std::string& startupScript, const std::string& resourcePath, const std::string& userDataPath);
 
             virtual ~World();
 
             virtual void startNewGame (bool bypass);
             ///< \param bypass Bypass regular game start.
 
-            virtual void preloadCommonAssets();
-
             virtual void clear();
 
             virtual int countSavedGameRecords() const;
@@ -310,7 +325,7 @@ namespace MWWorld
             virtual bool toggleSky();
             ///< \return Resulting mode
 
-            virtual void changeWeather (const std::string& region, unsigned int id);
+            virtual void changeWeather (const std::string& region, const unsigned int id);
 
             virtual int getCurrentWeather() const;
 
@@ -324,15 +339,16 @@ namespace MWWorld
 
             virtual float getTimeScaleFactor() const;
 
-            virtual void changeToInteriorCell (const std::string& cellName,
-                const ESM::Position& position);
+            virtual void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true);
             ///< Move to interior cell.
+            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual void changeToExteriorCell (const ESM::Position& position);
+            virtual void changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true);
             ///< Move to exterior cell.
+            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool detectWorldSpaceChange=true);
-            ///< @param detectWorldSpaceChange if true, clean up worldspace-specific data when the world space changes
+            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true);
+            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
             virtual const ESM::Cell *getExterior (const std::string& cellName) const;
             ///< Return a cell matching the given name or a 0-pointer, if there is no such cell.
@@ -342,10 +358,12 @@ namespace MWWorld
             virtual MWWorld::Ptr getFacedObject();
             ///< Return pointer to the object the player is looking at, if it is within activation range
 
+            virtual float getDistanceToFacedObject();
+
             /// Returns a pointer to the object the provided object would hit (if within the
             /// specified distance), and the point where the hit occurs. This will attempt to
             /// use the "Head" node as a basis.
-            virtual std::pair<MWWorld::Ptr,osg::Vec3f> getHitContact(const MWWorld::ConstPtr &ptr, float distance);
+            virtual std::pair<MWWorld::Ptr,osg::Vec3f> getHitContact(const MWWorld::ConstPtr &ptr, float distance, std::vector<MWWorld::Ptr> &targets);
 
             /// @note No-op for items in containers. Use ContainerStore::removeItem instead.
             virtual void deleteObject (const Ptr& ptr);
@@ -355,7 +373,7 @@ namespace MWWorld
             virtual MWWorld::Ptr moveObject (const Ptr& ptr, float x, float y, float z);
             ///< @return an updated Ptr in case the Ptr's cell changes
 
-            virtual MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, float x, float y, float z);
+            virtual MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, float x, float y, float z, bool movePhysics=true);
             ///< @return an updated Ptr
 
             virtual void scaleObject (const Ptr& ptr, float scale);
@@ -366,8 +384,12 @@ namespace MWWorld
             /// \param adjust indicates rotation should be set or adjusted
             virtual void rotateObject (const Ptr& ptr,float x,float y,float z, bool adjust = false);
 
-            virtual MWWorld::Ptr safePlaceObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos);
-            ///< place an object in a "safe" location (ie not in the void, etc). Makes a copy of the Ptr.
+            virtual MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos);
+            ///< Place an object. Makes a copy of the Ptr.
+
+            virtual MWWorld::Ptr safePlaceObject (const MWWorld::ConstPtr& ptr, const MWWorld::ConstPtr& referenceObject, MWWorld::CellStore* referenceCell, int direction, float distance);
+            ///< Place an object in a safe place next to \a referenceObject. \a direction and \a distance specify the wanted placement
+            /// relative to \a referenceObject (but the object may be placed somewhere else if the wanted location is obstructed).
 
             virtual float getMaxActivationDistance();
 
@@ -469,6 +491,7 @@ namespace MWWorld
             virtual bool isSwimming(const MWWorld::ConstPtr &object) const;
             virtual bool isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f &pos) const;
             virtual bool isWading(const MWWorld::ConstPtr &object) const;
+            virtual bool isWaterWalkingCastableOnTarget(const MWWorld::ConstPtr &target) const;
             virtual bool isOnGround(const MWWorld::Ptr &ptr) const;
 
             virtual osg::Matrixf getActorHeadTransform(const MWWorld::ConstPtr& actor) const;
@@ -501,6 +524,9 @@ namespace MWWorld
             /// @note throws an exception when invoked on a teleport door
             virtual void activateDoor(const MWWorld::Ptr& door, int state);
 
+            // Added by tes3mp to allow saving a door state received from a packet
+            virtual void saveDoorState(const MWWorld::Ptr& door, int state);
+
             virtual bool getPlayerStandingOn (const MWWorld::ConstPtr& object); ///< @return true if the player is standing on \a object
             virtual bool getActorStandingOn (const MWWorld::ConstPtr& object); ///< @return true if any actor is standing on \a object
             virtual bool getPlayerCollidingWith(const MWWorld::ConstPtr& object); ///< @return true if the player is colliding with \a object
@@ -522,7 +548,7 @@ namespace MWWorld
             virtual bool getLOS(const MWWorld::ConstPtr& actor,const MWWorld::ConstPtr& targetActor);
             ///< get Line of Sight (morrowind stupid implementation)
 
-            virtual float getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist);
+            virtual float getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist, bool includeWater = false);
 
             virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable);
 
@@ -581,9 +607,8 @@ namespace MWWorld
              */
             virtual void castSpell (const MWWorld::Ptr& actor);
 
-            virtual void launchMagicBolt (const std::string& model, const std::string& sound, const std::string& spellId,
-                                          float speed, bool stack, const ESM::EffectList& effects,
-                                           const MWWorld::Ptr& caster, const std::string& sourceName, const osg::Vec3f& fallbackDirection);
+            virtual void launchMagicBolt (const std::string& spellId, bool stack, const ESM::EffectList& effects,
+                                          const MWWorld::Ptr& caster, const std::string& sourceName, const osg::Vec3f& fallbackDirection);
             virtual void launchProjectile (MWWorld::Ptr actor, MWWorld::ConstPtr projectile,
                                            const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr bow, float speed, float attackStrength);
 
@@ -624,8 +649,9 @@ namespace MWWorld
 
             virtual void spawnEffect (const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPos);
 
-            virtual void explodeSpell (const osg::Vec3f& origin, const ESM::EffectList& effects, const MWWorld::Ptr& caster,
-                                       const MWWorld::Ptr& ignore, ESM::RangeType rangeType, const std::string& id, const std::string& sourceName);
+            virtual void explodeSpell(const osg::Vec3f& origin, const ESM::EffectList& effects, const MWWorld::Ptr& caster, const MWWorld::Ptr& ignore,
+                                      ESM::RangeType rangeType, const std::string& id, const std::string& sourceName,
+                                      const bool fromProjectile=false);
 
             virtual void activate (const MWWorld::Ptr& object, const MWWorld::Ptr& actor);
 
@@ -638,7 +664,7 @@ namespace MWWorld
             /// Resets all actors in the current active cells to their original location within that cell.
             virtual void resetActors();
 
-            virtual bool isWalkingOnWater (const MWWorld::ConstPtr& actor);
+            virtual bool isWalkingOnWater (const MWWorld::ConstPtr& actor) const;
 
             /// Return a vector aiming the actor's weapon towards a target.
             /// @note The length of the vector is the distance between actor and target.
@@ -648,6 +674,19 @@ namespace MWWorld
             virtual float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target);
 
             virtual bool isPlayerInJail() const;
+
+            /// Return terrain height at \a worldPos position.
+            virtual float getTerrainHeightAt(const osg::Vec3f& worldPos) const;
+
+            /// Return physical or rendering half extents of the given actor.
+            virtual osg::Vec3f getHalfExtents(const MWWorld::ConstPtr& actor, bool rendering=false) const;
+
+            /// Export scene graph to a file and return the filename.
+            /// \param ptr object to export scene graph for (if empty, export entire scene graph)
+            virtual std::string exportSceneGraph(const MWWorld::Ptr& ptr);
+
+            /// Preload VFX associated with this effect list
+            virtual void preloadEffects(const ESM::EffectList* effectList);
     };
 }
 
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 2300f97a3..24ea1835a 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -9,6 +9,8 @@ if (GTEST_FOUND)
         mwworld/test_store.cpp
 
         mwdialogue/test_keywordsearch.cpp
+
+        esm/test_fixed_string.cpp
     )
 
     source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
diff --git a/apps/openmw_test_suite/esm/test_fixed_string.cpp b/apps/openmw_test_suite/esm/test_fixed_string.cpp
new file mode 100644
index 000000000..59dd7fe66
--- /dev/null
+++ b/apps/openmw_test_suite/esm/test_fixed_string.cpp
@@ -0,0 +1,75 @@
+#include <gtest/gtest.h>
+#include "components/esm/esmcommon.hpp"
+
+TEST(EsmFixedString, operator__eq_ne)
+{
+    {
+        SCOPED_TRACE("asdc == asdc");
+        ESM::NAME name;
+        name.assign("asdc");
+        char s[4] = {'a', 's', 'd', 'c'};
+        std::string ss(s, 4);
+
+        EXPECT_TRUE(name == s);
+        EXPECT_TRUE(name == ss.c_str());
+        EXPECT_TRUE(name == ss);
+    }
+    {
+        SCOPED_TRACE("asdc == asdcx");
+        ESM::NAME name;
+        name.assign("asdc");
+        char s[5] = {'a', 's', 'd', 'c', 'x'};
+        std::string ss(s, 5);
+
+        EXPECT_TRUE(name != s);
+        EXPECT_TRUE(name != ss.c_str());
+        EXPECT_TRUE(name != ss);
+    }
+    {
+        SCOPED_TRACE("asdc == asdc[NULL]");
+        ESM::NAME name;
+        name.assign("asdc");
+        char s[5] = {'a', 's', 'd', 'c', '\0'};
+        std::string ss(s, 5);
+
+        EXPECT_TRUE(name == s);
+        EXPECT_TRUE(name == ss.c_str());
+        EXPECT_TRUE(name == ss);
+    }
+}
+
+TEST(EsmFixedString, empty_strings)
+{
+    {
+        SCOPED_TRACE("4 bytes");
+        ESM::NAME empty = ESM::NAME();
+        EXPECT_TRUE(empty == "");
+        EXPECT_TRUE(empty == static_cast<uint32_t>(0));
+        EXPECT_TRUE(empty != "some string");
+        EXPECT_TRUE(empty != static_cast<uint32_t>(42));
+    }
+    {
+        SCOPED_TRACE("32 bytes");
+        ESM::NAME32 empty = ESM::NAME32();
+        EXPECT_TRUE(empty == "");
+        EXPECT_TRUE(empty != "some string");
+    }
+}
+
+TEST(EsmFixedString, struct_size)
+{
+    ASSERT_EQ(4, sizeof(ESM::NAME));
+    ASSERT_EQ(32, sizeof(ESM::NAME32));
+    ASSERT_EQ(64, sizeof(ESM::NAME64));
+    ASSERT_EQ(256, sizeof(ESM::NAME256));
+}
+
+TEST(EsmFixedString, DISABLED_is_pod)
+{
+    /* TODO: enable in C++11
+     * ASSERT_TRUE(std::is_pod<ESM::NAME>::value);
+     * ASSERT_TRUE(std::is_pod<ESM::NAME32>::value);
+     * ASSERT_TRUE(std::is_pod<ESM::NAME64>::value);
+     * ASSERT_TRUE(std::is_pod<ESM::NAME256>::value);
+     */
+}
diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
index 4be5fb2b7..d2b9ab0f6 100644
--- a/apps/wizard/CMakeLists.txt
+++ b/apps/wizard/CMakeLists.txt
@@ -1,13 +1,3 @@
-if (WIN32) # windows users can just run the morrowind installer
-    set(OPENMW_USE_UNSHIELD FALSE)
-else()
-    set(OPENMW_USE_UNSHIELD TRUE)
-
-    find_package(LIBUNSHIELD REQUIRED)
-    if(NOT LIBUNSHIELD_FOUND)
-        message(FATAL_ERROR "Failed to find Unshield library")
-    endif(NOT LIBUNSHIELD_FOUND)
-endif()
 
 set(WIZARD
     componentselectionpage.cpp
@@ -103,7 +93,7 @@ endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 if (OPENMW_USE_UNSHIELD)
-    include_directories(${LIBUNSHIELD_INCLUDE_DIR})
+    include_directories(${LIBUNSHIELD_INCLUDE_DIRS})
 endif()
 
 add_executable(openmw-wizard
@@ -132,7 +122,7 @@ else()
 endif()
 
 if (OPENMW_USE_UNSHIELD)
-    target_link_libraries(openmw-wizard ${LIBUNSHIELD_LIBRARY})
+    target_link_libraries(openmw-wizard ${LIBUNSHIELD_LIBRARIES})
 endif()
 
 
@@ -146,7 +136,10 @@ if (BUILD_WITH_CODE_COVERAGE)
 endif()
 
 # Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream
-if (UNIX AND NOT APPLE)
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
 target_link_libraries(openmw-wizard dl Xt)
 endif()
 
+if (WIN32)
+    INSTALL(TARGETS openmw-wizard RUNTIME DESTINATION ".")
+endif(WIN32)
diff --git a/apps/wizard/componentselectionpage.cpp b/apps/wizard/componentselectionpage.cpp
index 21a5c58d9..161e51515 100644
--- a/apps/wizard/componentselectionpage.cpp
+++ b/apps/wizard/componentselectionpage.cpp
@@ -24,7 +24,7 @@ Wizard::ComponentSelectionPage::ComponentSelectionPage(QWidget *parent) :
 
 }
 
-void Wizard::ComponentSelectionPage::updateButton(QListWidgetItem *item)
+void Wizard::ComponentSelectionPage::updateButton(QListWidgetItem*)
 {
     if (field(QLatin1String("installation.new")).toBool() == true)
         return; // Morrowind is always checked here
diff --git a/apps/wizard/existinginstallationpage.cpp b/apps/wizard/existinginstallationpage.cpp
index f821b38ba..a04e721d8 100644
--- a/apps/wizard/existinginstallationpage.cpp
+++ b/apps/wizard/existinginstallationpage.cpp
@@ -63,13 +63,13 @@ bool Wizard::ExistingInstallationPage::validatePage()
                                    The Wizard needs to update settings in this file.<br><br> \
                                    Press \"Browse...\" to specify the location manually.<br>"));
 
-        QAbstractButton *browseButton =
+        QAbstractButton *browseButton2 =
                 msgBox.addButton(QObject::tr("B&rowse..."), QMessageBox::ActionRole);
 
         msgBox.exec();
 
         QString iniFile;
-        if (msgBox.clickedButton() == browseButton) {
+        if (msgBox.clickedButton() == browseButton2) {
             iniFile = QFileDialog::getOpenFileName(
                         this,
                         QObject::tr("Select configuration file"),
diff --git a/apps/wizard/inisettings.cpp b/apps/wizard/inisettings.cpp
index 3711ba066..2367f5c4d 100644
--- a/apps/wizard/inisettings.cpp
+++ b/apps/wizard/inisettings.cpp
@@ -198,8 +198,8 @@ bool Wizard::IniSettings::parseInx(const QString &path)
             const QString section(array.left(index));
 
             // Figure how many characters to read for the key
-            int lenght = array.indexOf("\x06", section.length() + 3) - (section.length() + 3);
-            const QString key(array.mid(section.length() + 3, lenght));
+            int length = array.indexOf("\x06", section.length() + 3) - (section.length() + 3);
+            const QString key(array.mid(section.length() + 3, length));
 
             QString value(array.mid(section.length() + key.length() + 6));
 
diff --git a/apps/wizard/main.cpp b/apps/wizard/main.cpp
index c861a4ac8..e3624742a 100644
--- a/apps/wizard/main.cpp
+++ b/apps/wizard/main.cpp
@@ -20,12 +20,6 @@ int main(int argc, char *argv[])
     QDir dir(QCoreApplication::applicationDirPath());
 
     #ifdef Q_OS_MAC
-    if (dir.dirName() == "MacOS") {
-        dir.cdUp();
-        dir.cdUp();
-        dir.cdUp();
-    }
-
     // force Qt to load only LOCAL plugins, don't touch system Qt installation
     QDir pluginsPath(QCoreApplication::applicationDirPath());
     pluginsPath.cdUp();
diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp
index 19cdf9535..7ef8761dd 100644
--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@@ -162,10 +162,10 @@ void Wizard::MainWizard::setupGameSettings()
     paths.append(QLatin1String("openmw.cfg"));
     paths.append(globalPath + QLatin1String("openmw.cfg"));
 
-    foreach (const QString &path, paths) {
-        qDebug() << "Loading config file:" << path.toUtf8().constData();
+    foreach (const QString &path2, paths) {
+        qDebug() << "Loading config file:" << path2.toUtf8().constData();
 
-        QFile file(path);
+        file.setFileName(path2);
         if (file.exists()) {
             if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
                 QMessageBox msgBox;
diff --git a/apps/wizard/unshield/unshieldworker.cpp b/apps/wizard/unshield/unshieldworker.cpp
index c8f7ca677..d3ccfe03a 100644
--- a/apps/wizard/unshield/unshieldworker.cpp
+++ b/apps/wizard/unshield/unshieldworker.cpp
@@ -302,7 +302,7 @@ bool Wizard::UnshieldWorker::copyDirectory(const QString &source, const QString
 
 bool Wizard::UnshieldWorker::installFile(const QString &fileName, const QString &path, Qt::MatchFlags flags, bool keepSource)
 {
-    return installFiles(fileName, path, flags, true, keepSource);
+    return installFiles(fileName, path, flags, keepSource, true);
 }
 
 bool Wizard::UnshieldWorker::installFiles(const QString &fileName, const QString &path, Qt::MatchFlags flags, bool keepSource, bool single)
diff --git a/appveyor.yml b/appveyor.yml
index 1bc0d3ca6..e959792f5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,42 +6,54 @@ branches:
         - /openmw-.*$/
         - appveyor
 
+environment:
+    matrix:
+        - msvc: 2013
+        - msvc: 2015
+
 platform:
     - Win32
-#    - x64
-
-configuration: Debug
+#   - x64
 
-matrix:
-    fast_finish: true
+configuration:
+    - Debug
+#   - Release
 
 # For the Qt, Boost, CMake, etc installs
-os: unstable
+os: Visual Studio 2015
 
 # We want the git revision for versioning,
 # so shallow clones don't work.
 clone_depth: 1
 
 cache:
-    - C:\projects\openmw\deps\Bullet-2.83.5-win32.7z
-    - C:\projects\openmw\deps\Bullet-2.83.5-win64.7z
-    - C:\projects\openmw\deps\MyGUI-3.2.2-win32.7z
-    - C:\projects\openmw\deps\MyGUI-3.2.2-win64.7z
-    - C:\projects\openmw\deps\OSG-3.3.8-win32.7z
-    - C:\projects\openmw\deps\OSG-3.3.8-win64.7z
-    - C:\projects\openmw\deps\ffmpeg32-2.5.2.7z
-    - C:\projects\openmw\deps\ffmpeg32-2.5.2-dev.7z
-    - C:\projects\openmw\deps\ffmpeg64-2.5.2.7z
-    - C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z
+    - C:\projects\openmw\deps\Bullet-2.83.7-msvc2013-win32.7z
+    - C:\projects\openmw\deps\Bullet-2.83.7-msvc2013-win64.7z
+    - C:\projects\openmw\deps\Bullet-2.83.7-msvc2015-win32.7z
+    - C:\projects\openmw\deps\Bullet-2.83.7-msvc2015-win64.7z
+    - C:\projects\openmw\deps\MyGUI-3.2.3-git-msvc2013-win32.7z
+    - C:\projects\openmw\deps\MyGUI-3.2.3-git-msvc2013-win32.7z
+    - C:\projects\openmw\deps\MyGUI-3.2.3-git-msvc2015-win64.7z
+    - C:\projects\openmw\deps\MyGUI-3.2.3-git-msvc2015-win64.7z
+    - C:\projects\openmw\deps\OSG-3.4.0-scrawl-msvc2013-win32.7z
+    - C:\projects\openmw\deps\OSG-3.4.0-scrawl-msvc2013-win32.7z
+    - C:\projects\openmw\deps\OSG-3.4.0-scrawl-msvc2015-win64.7z
+    - C:\projects\openmw\deps\OSG-3.4.0-scrawl-msvc2015-win64.7z
+    - C:\projects\openmw\deps\ffmpeg-3.0.1-dev-win32.7z
+    - C:\projects\openmw\deps\ffmpeg-3.0.1-dev-win64.7z
+    - C:\projects\openmw\deps\ffmpeg-3.0.1-win32.7z
+    - C:\projects\openmw\deps\ffmpeg-3.0.1-win64.7z
+    - C:\projects\openmw\deps\OpenAL-Soft-1.17.2.zip
+    - C:\projects\openmw\deps\SDL2-2.0.4.zip
 
 clone_folder: C:\projects\openmw
 
 before_build:
-    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u -p %PLATFORM%
+    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u -p %PLATFORM% -v %msvc%
 
 build_script:
-    - cmd: if %PLATFORM%==Win32 set build=Build_32
-    - cmd: if %PLATFORM%==x64 set build=Build_64
+    - cmd: if %PLATFORM%==Win32 set build=MSVC%msvc%_32
+    - cmd: if %PLATFORM%==x64 set build=MSVC%msvc%_64
     - cmd: msbuild %build%\OpenMW.sln /t:Build /p:Configuration=%configuration% /m:2 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
 test: off
diff --git a/cmake/FindBullet.cmake b/cmake/FindBullet.cmake
index 6d5c517af..6d68bed70 100644
--- a/cmake/FindBullet.cmake
+++ b/cmake/FindBullet.cmake
@@ -1,78 +1,73 @@
 # - Try to find the Bullet physics engine
 #
-#  This module defines the following variables
-#
-#  BULLET_FOUND - Was bullet found
-#  BULLET_INCLUDE_DIRS - the Bullet include directories
-#  BULLET_LIBRARIES - Link to this, by default it includes
-#                     all bullet components (Dynamics,
-#                     Collision, LinearMath, & SoftBody)
+# This module accepts the following env variables
+#  BULLET_ROOT - Can be set to bullet install path or Windows build path
 #
-#  This module accepts the following variables
+# Once done this will define
+#  Bullet_FOUND         - System has the all required components.
+#  Bullet_INCLUDE_DIRS  - Include directory necessary for using the required components headers.
+#  Bullet_LIBRARIES     - Link these to use the required bullet components.
+#  Bullet_VERSION       - Version of libbullet
 #
-#  BULLET_ROOT - Can be set to bullet install path or Windows build path
+# For each of the components
+#   - LinearMath
+#   - BulletCollision
+#   - BulletSoftBody
+#   - BulletDynamics
 #
-
 # Copyright (c) 2009, Philip Lowman <philip at yhbt.com>
+# Modified for OpenMW to parse BT_BULLET_VERSION.
 #
 # Redistribution AND use is allowed according to the terms of the New
 # BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-set(BULLET_ROOT $ENV{BULLET_ROOT})
+include(LibFindMacros)
 
-macro(_FIND_BULLET_LIBRARY _var)
-  find_library(${_var}
-     NAMES
-        ${ARGN}
-     PATHS
-        ${BULLET_ROOT}
-		${BULLET_ROOT}/lib/Debug
-		${BULLET_ROOT}/lib/Release
-        ${BULLET_ROOT}/out/release8/libs
-        ${BULLET_ROOT}/out/debug8/libs
-     PATH_SUFFIXES lib
-  )
-  mark_as_advanced(${_var})
+# Macro: _internal_find_bullet_library
+# Checks for the given component by invoking pkgconfig etc.
+macro(_internal_find_bullet_library _lib)
+    libfind_pkg_detect(Bullet_${_lib} bullet
+        FIND_LIBRARY ${_lib}
+            HINTS $ENV{BULLET_ROOT}
+            PATH_SUFFIXES lib
+    )
+    libfind_process(Bullet_${_lib})
 endmacro()
 
-macro(_BULLET_APPEND_LIBRARIES _list _release)
-   set(_debug ${_release}_DEBUG)
-   if(${_debug})
-      set(${_list} ${${_list}} optimized ${${_release}} debug ${${_debug}})
-   else()
-      set(${_list} ${${_list}} ${${_release}})
-   endif()
-endmacro()
+set(_known_components LinearMath BulletCollision BulletSoftBody BulletDynamics)
 
-find_path(BULLET_INCLUDE_DIR NAMES btBulletCollisionCommon.h
-  PATHS
-    ${BULLET_ROOT}/include
-    ${BULLET_ROOT}/src
-  PATH_SUFFIXES bullet
-)
-
-# Find the libraries
+# Check if the required components were found and add their stuff to the Bullet_* vars.
+foreach (_component ${Bullet_FIND_COMPONENTS})
+    list(FIND _known_components ${_component} _known_component)
+    if (_known_component EQUAL -1)
+        message(FATAL_ERROR "Unknown component '${_component}'")
+    endif()
 
-#_FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY        BulletDynamics)
-#_FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY_DEBUG  BulletDynamics_Debug BulletDynamics_d)
-_FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY       BulletCollision)
-_FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY_DEBUG BulletCollision_Debug BulletCollision_d)
-_FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY            BulletMath LinearMath)
-_FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY_DEBUG      BulletMath_Debug BulletMath_d LinearMath_debug LinearMath_d)
+    set(Bullet_${_component}_Debug_FIND_QUIETLY TRUE) # don't spam messages with optional Debug component
+    _internal_find_bullet_library(${_component})
+    _internal_find_bullet_library(${_component}_Debug)
 
+    if (Bullet_${_component}_Debug_FOUND)
+        set(Bullet_LIBRARIES ${Bullet_LIBRARIES} optimized ${Bullet_${_component}_LIBRARIES} debug ${Bullet_${_component}_Debug_LIBRARIES})
+    else()
+        set(Bullet_LIBRARIES ${Bullet_LIBRARIES} ${Bullet_${_component}_LIBRARIES})
+    endif()
+endforeach()
 
-# handle the QUIETLY and REQUIRED arguments and set BULLET_FOUND to TRUE if
-# all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Bullet DEFAULT_MSG
-    #BULLET_DYNAMICS_LIBRARY
-    BULLET_COLLISION_LIBRARY BULLET_MATH_LIBRARY
-    BULLET_INCLUDE_DIR)
+libfind_pkg_detect(Bullet bullet
+    FIND_PATH btBulletCollisionCommon.h
+        HINTS $ENV{BULLET_ROOT}
+        PATH_SUFFIXES include/bullet
+)
+set(Bullet_INCLUDE_DIRS ${Bullet_INCLUDE_DIR})
+libfind_version_header(Bullet LinearMath/btScalar.h BT_BULLET_VERSION)
 
-set(BULLET_INCLUDE_DIRS ${BULLET_INCLUDE_DIR})
-if(BULLET_FOUND)
-   #_BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_DYNAMICS_LIBRARY)
-   _BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_COLLISION_LIBRARY)
-   _BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_MATH_LIBRARY)
-endif()
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Bullet
+    FOUND_VAR Bullet_FOUND
+    VERSION_VAR Bullet_VERSION
+    HANDLE_COMPONENTS
+    REQUIRED_VARS
+        Bullet_LIBRARIES
+        Bullet_INCLUDE_DIR
+)
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
index 74584bf31..830030e32 100644
--- a/cmake/FindFFmpeg.cmake
+++ b/cmake/FindFFmpeg.cmake
@@ -1,11 +1,14 @@
 # vim: ts=2 sw=2
-# - Try to find the required ffmpeg components(default: AVFORMAT, AVUTIL, AVCODEC)
+# - Try to find the required ffmpeg components
+#
+# This module accepts the following env variable
+#  FFMPEG_HOME - Can be set to custom install path
 #
 # Once done this will define
-#  FFMPEG_FOUND         - System has the all required components.
-#  FFMPEG_INCLUDE_DIRS  - Include directory necessary for using the required components headers.
-#  FFMPEG_LIBRARIES     - Link these to use the required ffmpeg components.
-#  FFMPEG_DEFINITIONS   - Compiler switches required for using the required ffmpeg components.
+#  FFmpeg_FOUND         - System has the all required components.
+#  FFmpeg_INCLUDE_DIRS  - Include directory necessary for using the required components headers.
+#  FFmpeg_LIBRARIES     - Link these to use the required ffmpeg components.
+#  FFmpeg_DEFINITIONS   - Compiler switches required for using the required ffmpeg components.
 #
 # For each of the components it will additionaly set.
 #   - AVCODEC
@@ -16,144 +19,96 @@
 #   - SWSCALE
 #   - SWRESAMPLE
 # the following variables will be defined
-#  <component>_FOUND        - System has <component>
-#  <component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers
-#  <component>_LIBRARIES    - Link these to use <component>
-#  <component>_DEFINITIONS  - Compiler switches required for using <component>
-#  <component>_VERSION      - The components version
+#  FFmpeg_<component>_FOUND        - System has <component>
+#  FFmpeg_<component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers
+#  FFmpeg_<component>_LIBRARIES    - Link these to use <component>
+#  FFmpeg_<component>_DEFINITIONS  - Compiler switches required for using <component>
+#  FFmpeg_<component>_VERSION      - The components version
 #
 # Copyright (c) 2006, Matthias Kretz, <kretz@kde.org>
 # Copyright (c) 2008, Alexander Neundorf, <neundorf@kde.org>
 # Copyright (c) 2011, Michael Jansen, <kde@michael-jansen.biz>
+# Copyright (c) 2016, Roman Proskuryakov, <humbug@deeptown.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
+include(LibFindMacros)
 include(FindPackageHandleStandardArgs)
 
-# The default components were taken from a survey over other FindFFMPEG.cmake files
-if (NOT FFmpeg_FIND_COMPONENTS)
-  set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE)
-endif ()
-
-#
-### Macro: set_component_found
-#
-# Marks the given component as found if both *_LIBRARIES AND *_INCLUDE_DIRS is present.
-#
-macro(set_component_found _component )
-  if (${_component}_LIBRARIES AND ${_component}_INCLUDE_DIRS)
-    # message(STATUS "  - ${_component} found.")
-    set(${_component}_FOUND TRUE)
-  else ()
-    # message(STATUS "  - ${_component} not found.")
-  endif ()
+# Macro: _internal_find_component
+# Checks for the given component by invoking pkgconfig etc.
+macro(_internal_find_component _component _pkgconfig _library _header)
+    set(_package_component FFmpeg_${_component})
+    libfind_pkg_detect(${_package_component} ${_pkgconfig}
+        FIND_PATH ${_header}
+            HINTS $ENV{FFMPEG_HOME}
+            PATH_SUFFIXES include ffmpeg
+        FIND_LIBRARY ${_library}
+            HINTS $ENV{FFMPEG_HOME}
+            PATH_SUFFIXES lib
+    )
+    set(${_package_component}_DEFINITIONS  ${${_package_component}_PKGCONF_CFLAGS_OTHER})
+    set(${_package_component}_VERSION      ${${_package_component}_PKGCONF_VERSION})
+    libfind_process(${_package_component})
 endmacro()
 
-#
-### Macro: find_component
-#
-# Checks for the given component by invoking pkgconfig and then looking up the libraries and
-# include directories.
-#
-macro(find_component _component _pkgconfig _library _header)
-
-  if (NOT WIN32)
-     # use pkg-config to get the directories and then use these values
-     # in the FIND_PATH() and FIND_LIBRARY() calls
-     find_package(PkgConfig)
-     if (PKG_CONFIG_FOUND)
-       pkg_check_modules(PC_${_component} ${_pkgconfig})
-     endif ()
-  endif (NOT WIN32)
-
-  find_path(${_component}_INCLUDE_DIRS ${_header}
-    HINTS
-      ${FFMPEGSDK_INC}
-      ${PC_LIB${_component}_INCLUDEDIR}
-      ${PC_LIB${_component}_INCLUDE_DIRS}
-    PATH_SUFFIXES
-      ffmpeg
-  )
-
-  find_library(${_component}_LIBRARIES NAMES ${_library}
-      HINTS
-      ${FFMPEGSDK_LIB}
-      ${PC_LIB${_component}_LIBDIR}
-      ${PC_LIB${_component}_LIBRARY_DIRS}
-  )
-
-  set(${_component}_DEFINITIONS  ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")
-  set(${_component}_VERSION      ${PC_${_component}_VERSION}      CACHE STRING "The ${_component} version number.")
-
-  set_component_found(${_component})
-
-  mark_as_advanced(
-    ${_component}_INCLUDE_DIRS
-    ${_component}_LIBRARIES
-    ${_component}_DEFINITIONS
-    ${_component}_VERSION)
 
+# setter for 'hashmap'
+macro(hashmap_set _table _key) # ARGN
+    set(${_table}_${_key} ${ARGN})
 endmacro()
 
+# check for key in 'hashmap'
+macro(hashmap_exists _table _key _out_var)
+    if (DEFINED ${_table}_${_key})
+        set(${_out_var} TRUE)
+    else()
+        set(${_out_var} FALSE)
+    endif()
+endmacro()
 
-# Check for cached results. If there are skip the costly part.
-if (NOT FFMPEG_LIBRARIES)
-
-  set (FFMPEGSDK $ENV{FFMPEG_HOME})
-  if (FFMPEGSDK)
-    set (FFMPEGSDK_INC "${FFMPEGSDK}/include")
-    set (FFMPEGSDK_LIB "${FFMPEGSDK}/lib")
-  endif ()
-
-  # Check for all possible component.
-  find_component(AVCODEC  libavcodec  avcodec  libavcodec/avcodec.h)
-  find_component(AVFORMAT libavformat avformat libavformat/avformat.h)
-  find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
-  find_component(AVUTIL   libavutil   avutil   libavutil/avutil.h)
-  find_component(SWSCALE  libswscale  swscale  libswscale/swscale.h)
-  find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h)
-  find_component(SWRESAMPLE  libswresample  swresample  libswresample/swresample.h)
-  find_component(AVRESAMPLE  libavresample  avresample  libavresample/avresample.h)
-
-  # Check if the required components were found and add their stuff to the FFMPEG_* vars.
-  foreach (_component ${FFmpeg_FIND_COMPONENTS})
-    if (${_component}_FOUND)
-      # message(STATUS "Required component ${_component} present.")
-      set(FFMPEG_LIBRARIES   ${FFMPEG_LIBRARIES}   ${${_component}_LIBRARIES})
-      set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${${_component}_DEFINITIONS})
-      list(APPEND FFMPEG_INCLUDE_DIRS ${${_component}_INCLUDE_DIRS})
-    else ()
-      # message(STATUS "Required component ${_component} missing.")
-    endif ()
-  endforeach ()
-
-  # Build the include path with duplicates removed.
-  if (FFMPEG_INCLUDE_DIRS)
-    list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
-  endif ()
-
-  # cache the vars.
-  set(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} CACHE STRING "The FFmpeg include directories." FORCE)
-  set(FFMPEG_LIBRARIES    ${FFMPEG_LIBRARIES}    CACHE STRING "The FFmpeg libraries." FORCE)
-  set(FFMPEG_DEFINITIONS  ${FFMPEG_DEFINITIONS}  CACHE STRING "The FFmpeg cflags." FORCE)
-
-  mark_as_advanced(FFMPEG_INCLUDE_DIRS
-                   FFMPEG_LIBRARIES
-                   FFMPEG_DEFINITIONS)
+# getter for 'hashmap'
+macro(hashmap_get _table _key _out_var)
+    set(${_out_var} ${${_table}_${_key}})
+endmacro()
 
-endif ()
 
-# Now set the noncached _FOUND vars for the components.
-foreach (_component AVCODEC AVDEVICE AVFORMAT AVUTIL POSTPROCESS SWSCALE SWRESAMPLE AVRESAMPLE)
-  set_component_found(${_component})
-endforeach ()
+# fill 'hashmap' named find_args
+hashmap_set(find_args AVCODEC  libavcodec  avcodec  libavcodec/avcodec.h)
+hashmap_set(find_args AVFORMAT libavformat avformat libavformat/avformat.h)
+hashmap_set(find_args AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
+hashmap_set(find_args AVUTIL   libavutil   avutil   libavutil/avutil.h)
+hashmap_set(find_args SWSCALE  libswscale  swscale  libswscale/swscale.h)
+hashmap_set(find_args POSTPROC libpostproc postproc libpostproc/postprocess.h)
+hashmap_set(find_args SWRESAMPLE  libswresample  swresample  libswresample/swresample.h)
+hashmap_set(find_args AVRESAMPLE  libavresample  avresample  libavresample/avresample.h)
 
-# Compile the list of required vars
-set(_FFmpeg_REQUIRED_VARS FFMPEG_LIBRARIES FFMPEG_INCLUDE_DIRS)
+# Check if the required components were found and add their stuff to the FFmpeg_* vars.
 foreach (_component ${FFmpeg_FIND_COMPONENTS})
-  list(APPEND _FFmpeg_REQUIRED_VARS ${_component}_LIBRARIES ${_component}_INCLUDE_DIRS)
+    hashmap_exists(find_args ${_component} _known_component)
+    if (NOT _known_component)
+        message(FATAL_ERROR "Unknown component '${_component}'")
+    endif()
+    hashmap_get(find_args ${_component} _component_find_args)
+    _internal_find_component(${_component} ${_component_find_args})
+    set(_package_component FFmpeg_${_component})
+    if (${_package_component}_FOUND)
+        list(APPEND FFmpeg_LIBRARIES ${${_package_component}_LIBRARIES})
+        list(APPEND FFmpeg_INCLUDE_DIRS ${${_package_component}_INCLUDE_DIRS})
+        list(APPEND FFmpeg_DEFINITIONS ${${_package_component}_DEFINITIONS})
+    endif ()
 endforeach ()
 
-# Give a nice error message if some of the required vars are missing.
-find_package_handle_standard_args(FFmpeg DEFAULT_MSG ${_FFmpeg_REQUIRED_VARS})
+# Build the include path with duplicates removed.
+if (FFmpeg_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES FFmpeg_INCLUDE_DIRS)
+endif()
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFmpeg
+    FOUND_VAR FFmpeg_FOUND
+    HANDLE_COMPONENTS
+    REQUIRED_VARS
+        FFmpeg_LIBRARIES
+        FFmpeg_INCLUDE_DIRS
+)
diff --git a/cmake/FindFreetype.cmake b/cmake/FindFreetype.cmake
index fc36d548e..3d28613ae 100644
--- a/cmake/FindFreetype.cmake
+++ b/cmake/FindFreetype.cmake
@@ -8,62 +8,84 @@
 #-------------------------------------------------------------------
 
 # - Try to find FreeType
+#
+# This module accepts the following env variable
+#  FREETYPE_DIR - Can be set to custom install path
+#
 # Once done, this will define
 #
-#  FREETYPE_FOUND - system has FreeType
-#  FREETYPE_INCLUDE_DIRS - the FreeType include directories 
-#  FREETYPE_LIBRARIES - link these to use FreeType
-
-include(FindPkgMacros)
-findpkg_begin(FREETYPE)
+#  Freetype_FOUND - system has FreeType
+#  Freetype_INCLUDE_DIRS - the FreeType include directories
+#  Freetype_LIBRARIES - link these to use FreeType
+#  Freetype_VERSION - version of FreeType
+#
+# libfreetype internals:
+#
+# ======================================
+# new versions (2.5.2)
+#
+# file structure:
+#     <prefix>/include/freetype2/ft2build.h
+#     <prefix>/include/freetype2/freetype.h
+# used as:
+#     #include <ft2build.h>
+#     #include <freetype.h>
+# requires:
+#     -I <prefix>/include/freetype2/
+#
+# ======================================
+# old versions (2.4.8, 2.3.5)
+#
+# file structure:
+#     <prefix>/include/ft2build.h
+#     <prefix>/include/freetype2/freetype/freetype.h
+# used as:
+#     #include <ft2build.h>
+#     #include <freetype/freetype.h>
+# requires:
+#     -I <prefix>/include/ -I <prefix>/include/freetype2/
+#
+# ======================================
 
-# Get path, convert backslashes as ${ENV_${var}}
-getenv_path(FREETYPE_HOME)
+include(LibFindMacros)
 
-# construct search paths
-set(FREETYPE_PREFIX_PATH ${FREETYPE_HOME} ${ENV_FREETYPE_HOME})
-create_search_paths(FREETYPE)
-# redo search if prefix path changed
-clear_if_changed(FREETYPE_PREFIX_PATH
-  FREETYPE_LIBRARY_FWK
-  FREETYPE_LIBRARY_REL
-  FREETYPE_LIBRARY_DBG
-  FREETYPE_INCLUDE_DIR
+set(_REGULAR_INSTALL_PATHS
+    /usr/X11R6
+    /usr/local/X11R6
+    /usr/local/X11
+    /usr/freeware
+    ENV GTKMM_BASEPATH
+    [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
 )
 
-set(FREETYPE_LIBRARY_NAMES freetype2311 freetype239 freetype238 freetype235 freetype219 freetype)
-get_debug_names(FREETYPE_LIBRARY_NAMES)
-
-use_pkgconfig(FREETYPE_PKGC freetype2)
-
-# prefer static library over framework 
-set(CMAKE_FIND_FRAMEWORK "LAST")
-
-message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
-findpkg_framework(FREETYPE)
-message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
-
-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
-find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
-
-if (SYMBIAN) 
-set(ORIGINAL_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})
-set(CMAKE_PREFIX_PATH ${CMAKE_SYSYEM_OUT_DIR})
-message(STATUS "Lib will be searched in Symbian out dir: ${CMAKE_SYSYEM_OUT_DIR}")
-endif (SYMBIAN)
-find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)
-find_library(FREETYPE_LIBRARY_DBG NAMES ${FREETYPE_LIBRARY_NAMES_DBG} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)
-if (SYMBIAN) 
-set(CMAKE_PREFIX_PATH ${ORIGINAL_CMAKE_PREFIX_PATH})
-endif (SYMBIAN)
-
-make_library_set(FREETYPE_LIBRARY)
+libfind_pkg_detect(Freetype freetype2
+    FIND_PATH ft2build.h
+        HINTS $ENV{FREETYPE_DIR}
+        PATHS ${_REGULAR_INSTALL_PATHS}
+        PATH_SUFFIXES include freetype2
+    FIND_LIBRARY freetype freetype2311 freetype239 freetype238 freetype235 freetype219
+        HINTS $ENV{FREETYPE_DIR}
+        PATHS ${_REGULAR_INSTALL_PATHS}
+        PATH_SUFFIXES lib
+)
+find_path(Freetype_OLD_INCLUDE_DIR
+    # in new versions of freetype old_include_dir equals to include_dir
+    # see explanation above
+    NAMES freetype/freetype.h freetype.h
+    PATHS ${Freetype_INCLUDE_DIR}
+    PATH_SUFFIXES freetype2
+    NO_DEFAULT_PATH
+)
+libfind_version_n_header(Freetype
+    NAMES freetype/freetype.h freetype.h
+    PATHS Freetype_OLD_INCLUDE_DIR
+    DEFINES FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH
+)
 
-findpkg_finish(FREETYPE)
-mark_as_advanced(FREETYPE_FT2BUILD_INCLUDE_DIR)
-if (NOT FREETYPE_FT2BUILD_INCLUDE_DIR STREQUAL FREETYPE_INCLUDE_DIR)
-  set(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} ${FREETYPE_FT2BUILD_INCLUDE_DIR})
-endif ()
+set(Freetype_PROCESS_INCLUDES Freetype_OLD_INCLUDE_DIR)
+libfind_process(Freetype)
 
-# Reset framework finding
-set(CMAKE_FIND_FRAMEWORK "FIRST")
+if (Freetype_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES Freetype_INCLUDE_DIRS)
+endif()
diff --git a/cmake/FindLIBUNSHIELD.cmake b/cmake/FindLIBUNSHIELD.cmake
index f0fa4cc82..285740b63 100644
--- a/cmake/FindLIBUNSHIELD.cmake
+++ b/cmake/FindLIBUNSHIELD.cmake
@@ -1,8 +1,8 @@
 # Locate LIBUNSHIELD
 # This module defines
-# LIBUNSHIELD_LIBRARY
+# LIBUNSHIELD_LIBRARIES
 # LIBUNSHIELD_FOUND, if false, do not try to link to LibUnshield
-# LIBUNSHIELD_INCLUDE_DIR, where to find the headers
+# LIBUNSHIELD_INCLUDE_DIRS, where to find the headers
 #
 # Created by Tom Mason (wheybags) for OpenMW (http://openmw.org), based on FindMPG123.cmake
 #
@@ -12,37 +12,24 @@
 # function. Do we really need to repeat this stuff for every single
 # library when they all work the same? </today's rant>
 
-FIND_PATH(LIBUNSHIELD_INCLUDE_DIR libunshield.h
-  HINTS
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local
-  /usr
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt
-  /usr/include
-)
+include(LibFindMacros)
 
-FIND_LIBRARY(LIBUNSHIELD_LIBRARY 
-  unshield
-  HINTS
-#  PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local
-  /usr
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-  /usr/lib
+set(POSSIBLE_LOCATIONS
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local
+    /usr
+    /sw # Fink
+    /opt/local # DarwinPorts
+    /opt/csw # Blastwave
+    /opt
+    /usr/include
 )
 
-IF(LIBUNSHIELD_LIBRARY AND LIBUNSHIELD_INCLUDE_DIR)
-  SET(LIBUNSHIELD_FOUND "YES")
-ENDIF(LIBUNSHIELD_LIBRARY AND LIBUNSHIELD_INCLUDE_DIR)
-
+libfind_pkg_detect(LIBUNSHIELD libunshield
+    FIND_PATH libunshield.h
+        HINTS ${POSSIBLE_LOCATIONS}
+    FIND_LIBRARY unshield
+        HINTS ${POSSIBLE_LOCATIONS}
+)
+libfind_process(LIBUNSHIELD)
diff --git a/cmake/FindLua.cmake b/cmake/FindLua.cmake
new file mode 100644
index 000000000..646aaaf6b
--- /dev/null
+++ b/cmake/FindLua.cmake
@@ -0,0 +1,70 @@
+# - Try to find Lua
+# Once done this will define
+#
+#  Lua_FOUND - system has Lua
+#  Lua_INCLUDES - the Lua include directory
+#  Lua_LIBRARY - Link these to use Lua
+
+FIND_LIBRARY (Lua_LIBRARY_RELEASE NAMES lua5.1
+    PATHS
+    ENV LD_LIBRARY_PATH
+    ENV LIBRARY_PATH
+    /usr/lib64
+    /usr/lib
+    /usr/local/lib64
+    /usr/local/lib
+    /opt/local/lib
+    $ENV{Lua_ROOT}/lib
+    )
+	
+FIND_LIBRARY (Lua_LIBRARY_DEBUG NAMES lua5.1
+    PATHS
+    ENV LD_LIBRARY_PATH
+    ENV LIBRARY_PATH
+    /usr/lib64
+    /usr/lib
+    /usr/local/lib64
+    /usr/local/lib
+    /opt/local/lib
+    $ENV{Lua_ROOT}/lib
+    )	
+	
+	
+
+FIND_PATH (Lua_INCLUDES lua5.1/lua.h
+    ENV CPATH
+    /usr/include
+    /usr/local/include
+    /opt/local/include
+    $ENV{Lua_ROOT}/include
+    )
+ 
+IF(Lua_INCLUDES AND Lua_LIBRARY_RELEASE)
+    SET(Lua_FOUND TRUE)
+ENDIF(Lua_INCLUDES AND Lua_LIBRARY_RELEASE)
+
+IF(NOT Lua_LIBRARY_DEBUG)
+    SET(Lua_LIBRARY_DEBUG ${Lua_LIBRARY_RELEASE})
+ENDIF()
+
+IF(Lua_FOUND)
+  SET(Lua_INCLUDES ${Lua_INCLUDES})
+
+  find_package(ZLIB REQUIRED)
+  
+   IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+        SET(Lua_LIBRARY optimized ${Lua_LIBRARY_RELEASE} debug ${Lua_LIBRARY_DEBUG} ${ZLIB_LIBRARIES})
+      ELSE()
+        # if there are no configuration types and CMAKE_BUILD_TYPE has no value
+        # then just use the release libraries
+        SET(Lua_LIBRARY ${Lua_LIBRARY_RELEASE} ${ZLIB_LIBRARIES})
+      ENDIF()
+  IF(NOT Lua_FIND_QUIETLY)
+    MESSAGE(STATUS "Found Lua: ${Lua_LIBRARIES}")
+  ENDIF(NOT Lua_FIND_QUIETLY)
+ELSE(Lua_FOUND)
+  IF(Lua_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find Lua")
+  ENDIF(Lua_FIND_REQUIRED)
+ENDIF(Lua_FOUND)
+
diff --git a/cmake/FindMyGUI.cmake b/cmake/FindMyGUI.cmake
index 85a1055f6..473f543ba 100644
--- a/cmake/FindMyGUI.cmake
+++ b/cmake/FindMyGUI.cmake
@@ -1,158 +1,53 @@
 # - Find MyGUI includes and library
 #
+# This module accepts the following env variables
+#  MYGUI_HOME - Can be set to MyGUI install path or Windows build path
+#
 # This module defines
-# MYGUI_INCLUDE_DIRS
-# MYGUI_LIBRARIES, the libraries to link against to use MYGUI.
-# MYGUI_LIB_DIR, the location of the libraries
-# MYGUI_FOUND, If false, do not try to use MYGUI
+# MyGUI_INCLUDE_DIRS
+# MyGUI_LIBRARIES, the libraries to link against to use MyGUI.
+# MyGUI_FOUND, If false, do not try to use MyGUI
 #
 # Copyright © 2007, Matt Williams
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-CMAKE_POLICY(PUSH)
-include(FindPkgMacros)
-include(PreprocessorUtils)
-
-# IF (MYGUI_LIBRARIES AND MYGUI_INCLUDE_DIRS)
-    # SET(MYGUI_FIND_QUIETLY TRUE)
-# ENDIF (MYGUI_LIBRARIES AND MYGUI_INCLUDE_DIRS)
-
-IF (WIN32) #Windows
-
-    MESSAGE(STATUS "Looking for MyGUI")
-
-    IF(MINGW)
-
-        FIND_PATH ( MYGUI_INCLUDE_DIRS MyGUI.h PATH_SUFFIXES MYGUI)
-        FIND_LIBRARY ( MYGUI_LIBRARIES_REL NAMES
-            libMyGUIEngine${CMAKE_SHARED_LIBRARY_SUFFIX}
-            HINTS
-            ${MYGUI_LIB_DIR}
-            PATH_SUFFIXES "" release relwithdebinfo minsizerel )
-
-        FIND_LIBRARY ( MYGUI_LIBRARIES_DBG NAMES
-            libMyGUIEngine_d${CMAKE_SHARED_LIBRARY_SUFFIX}
-            HINTS
-            ${MYGUI_LIB_DIR}
-            PATH_SUFFIXES "" debug )
-
-        make_library_set ( MYGUI_LIBRARIES )
-
-        MESSAGE ("${MYGUI_LIBRARIES}")
-    ENDIF(MINGW)
-
-    SET(MYGUISDK $ENV{MYGUI_HOME})
-    IF (MYGUISDK)
-        findpkg_begin ( "MYGUI" )
-        MESSAGE(STATUS "Using MyGUI in MyGUI SDK")
-        STRING(REGEX REPLACE "[\\]" "/" MYGUISDK "${MYGUISDK}" )
-
-        find_path ( MYGUI_INCLUDE_DIRS MyGUI.h "${MYGUISDK}/MyGUIEngine/include" NO_DEFAULT_PATH )
-
-        SET ( MYGUI_LIB_DIR ${MYGUISDK}/lib ${MYGUISDK}/*/lib )
-
-        if ( MYGUI_STATIC )
-           set(LIB_SUFFIX "Static")
-           find_package(freetype)
-        endif ( MYGUI_STATIC )
-
-        find_library ( MYGUI_LIBRARIES_REL NAMES MyGUIEngine${LIB_SUFFIX}.lib HINTS ${MYGUI_LIB_DIR} PATH_SUFFIXES "" release relwithdebinfo minsizerel )
-        find_library ( MYGUI_LIBRARIES_DBG NAMES MyGUIEngine${LIB_SUFFIX}_d.lib HINTS ${MYGUI_LIB_DIR} PATH_SUFFIXES "" debug )
-
-        make_library_set ( MYGUI_LIBRARIES )
-
-        MESSAGE ("${MYGUI_LIBRARIES}")
-
-        #findpkg_finish ( "MYGUI" )
-    ENDIF (MYGUISDK)
-ELSE (WIN32) #Unix
-    CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR)
-    FIND_PACKAGE(PkgConfig)
-    IF(MYGUI_STATIC)
-        # don't use pkgconfig on OS X, find freetype & append it's libs to resulting MYGUI_LIBRARIES
-        IF (NOT APPLE AND NOT ANDROID)
-            PKG_SEARCH_MODULE(MYGUI MYGUIStatic MyGUIStatic)
-            IF (MYGUI_INCLUDE_DIRS)
-                SET(MYGUI_INCLUDE_DIRS ${MYGUI_INCLUDE_DIRS})
-                SET(MYGUI_LIB_DIR ${MYGUI_LIBDIR})
-                SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} CACHE STRING "")
-            ELSE (MYGUI_INCLUDE_DIRS)
-                FIND_PATH(MYGUI_INCLUDE_DIRS MyGUI.h PATHS /usr/local/include /usr/include PATH_SUFFIXES MyGUI MYGUI)
-                FIND_LIBRARY(MYGUI_LIBRARIES myguistatic PATHS /usr/lib /usr/local/lib)
-                SET(MYGUI_LIB_DIR ${MYGUI_LIBRARIES})
-                STRING(REGEX REPLACE "(.*)/.*" "\\1" MYGUI_LIB_DIR "${MYGUI_LIB_DIR}")
-                STRING(REGEX REPLACE ".*/" "" MYGUI_LIBRARIES "${MYGUI_LIBRARIES}")
-            ENDIF (MYGUI_INCLUDE_DIRS)
-        ELSE (NOT APPLE AND NOT ANDROID)
-            SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${MYGUI_DEPENDENCIES_DIR})
-            FIND_PACKAGE(Freetype REQUIRED)
-            FIND_PATH(MYGUI_INCLUDE_DIRS MyGUI.h PATHS /usr/local/include /usr/include PATH_SUFFIXES MyGUI MYGUI)
-            FIND_LIBRARY(MYGUI_LIBRARIES MyGUIEngineStatic PATHS /usr/lib /usr/local/lib ${OPENMW_DEPENDENCIES_DIR})
-            SET(MYGUI_LIB_DIR ${MYGUI_LIBRARIES})
-            STRING(REGEX REPLACE "(.*)/.*" "\\1" MYGUI_LIB_DIR "${MYGUI_LIB_DIR}")
-            STRING(REGEX REPLACE ".*/" "" MYGUI_LIBRARIES "${MYGUI_LIBRARIES}")
-        ENDIF (NOT APPLE AND NOT ANDROID)
-    ELSE(MYGUI_STATIC)
-        PKG_SEARCH_MODULE(MYGUI MYGUI MyGUI)
-        IF (MYGUI_INCLUDE_DIRS)
-            SET(MYGUI_INCLUDE_DIRS ${MYGUI_INCLUDE_DIRS})
-            SET(MYGUI_LIB_DIR ${MYGUI_LIBDIR})
-            SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} CACHE STRING "")
-        ELSE (MYGUI_INCLUDE_DIRS)
-            FIND_PATH(MYGUI_INCLUDE_DIRS MyGUI.h PATHS /usr/local/include /usr/include PATH_SUFFIXES MyGUI MYGUI)
-            FIND_LIBRARY(MYGUI_LIBRARIES MyGUIEngine PATHS /usr/local/lib /usr/lib)
-            SET(MYGUI_LIB_DIR ${MYGUI_LIBRARIES})
-            STRING(REGEX REPLACE "(.*)/.*" "\\1" MYGUI_LIB_DIR "${MYGUI_LIB_DIR}")
-            STRING(REGEX REPLACE ".*/" "" MYGUI_LIBRARIES "${MYGUI_LIBRARIES}")
-        ENDIF (MYGUI_INCLUDE_DIRS)
-    ENDIF(MYGUI_STATIC)
-ENDIF (WIN32)
-
-
-#Do some preparation
-IF (NOT WIN32) # This does not work on Windows for paths with spaces in them
-	SEPARATE_ARGUMENTS(MYGUI_INCLUDE_DIRS)
-	SEPARATE_ARGUMENTS(MYGUI_LIBRARIES)
-ENDIF (NOT WIN32)
-
-SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} ${FREETYPE_LIBRARIES})
-
-SET(MYGUI_INCLUDE_DIRS ${MYGUI_INCLUDE_DIRS} CACHE PATH "")
-SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} CACHE STRING "")
-SET(MYGUI_LIB_DIR ${MYGUI_LIB_DIR} CACHE PATH "")
-
-IF (NOT APPLE OR NOT MYGUI_STATIC) # we need explicit freetype libs only on OS X for static build, for other cases just make it TRUE
-    SET(FREETYPE_LIBRARIES TRUE)
-ENDIF (NOT APPLE OR NOT MYGUI_STATIC)
-
-IF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES AND FREETYPE_LIBRARIES)
-    SET(MYGUI_FOUND TRUE)
-ENDIF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES AND FREETYPE_LIBRARIES)
-
-IF (MYGUI_FOUND)
-    MARK_AS_ADVANCED(MYGUI_LIB_DIR)
-    IF (NOT MYGUI_FIND_QUIETLY)
-        MESSAGE(STATUS " libraries : ${MYGUI_LIBRARIES} from ${MYGUI_LIB_DIR}")
-        MESSAGE(STATUS " includes : ${MYGUI_INCLUDE_DIRS}")
-    ENDIF (NOT MYGUI_FIND_QUIETLY)
-
-    find_file(MYGUI_PREQUEST_FILE NAMES MyGUI_Prerequest.h PATHS ${MYGUI_INCLUDE_DIRS})
-    file(READ ${MYGUI_PREQUEST_FILE} MYGUI_TEMP_VERSION_CONTENT)
-    get_preprocessor_entry(MYGUI_TEMP_VERSION_CONTENT MYGUI_VERSION_MAJOR MYGUI_VERSION_MAJOR)
-    get_preprocessor_entry(MYGUI_TEMP_VERSION_CONTENT MYGUI_VERSION_MINOR MYGUI_VERSION_MINOR)
-    get_preprocessor_entry(MYGUI_TEMP_VERSION_CONTENT MYGUI_VERSION_PATCH MYGUI_VERSION_PATCH)
-    set(MYGUI_VERSION "${MYGUI_VERSION_MAJOR}.${MYGUI_VERSION_MINOR}.${MYGUI_VERSION_PATCH}")
-
-    IF (NOT MYGUI_FIND_QUIETLY)
-        MESSAGE(STATUS "MyGUI version: ${MYGUI_VERSION}")
-    ENDIF (NOT MYGUI_FIND_QUIETLY)
-ENDIF (MYGUI_FOUND)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(MyGUI DEFAULT_MSG
-    MYGUI_INCLUDE_DIRS
-    FREETYPE_LIBRARIES
-    MYGUI_LIBRARIES)
 
-CMAKE_POLICY(POP)
+include(LibFindMacros)
+
+if (MYGUI_STATIC)
+    set(MYGUI_STATIC_SUFFIX "Static")
+else()
+    set(MYGUI_STATIC_SUFFIX "")
+endif()
+
+libfind_pkg_detect(MyGUI_Debug MyGUI${MYGUI_STATIC_SUFFIX} MYGUI${MYGUI_STATIC_SUFFIX}
+    FIND_LIBRARY MyGUIEngine_d${MYGUI_STATIC_SUFFIX}
+        HINTS $ENV{MYGUI_HOME}/lib
+        PATH_SUFFIXES "" debug
+)
+set(MyGUI_Debug_FIND_QUIETLY TRUE)
+libfind_process(MyGUI_Debug)
+
+libfind_pkg_detect(MyGUI MyGUI${MYGUI_STATIC_SUFFIX} MYGUI${MYGUI_STATIC_SUFFIX}
+    FIND_PATH MyGUI.h
+        HINTS $ENV{MYGUI_HOME}/include
+        PATH_SUFFIXES MYGUI MyGUI
+    FIND_LIBRARY MyGUIEngine${MYGUI_STATIC_SUFFIX}
+        HINTS $ENV{MYGUI_HOME}/lib
+        PATH_SUFFIXES "" release relwithdebinfo minsizerel
+)
+if (MYGUI_STATIC AND (APPLE OR ANDROID))
+    # we need explicit Freetype libs only on OS X and ANDROID for static build
+    libfind_package(MyGUI Freetype)
+endif()
+
+libfind_version_n_header(MyGUI
+    NAMES MyGUI_Prerequest.h
+    DEFINES MYGUI_VERSION_MAJOR MYGUI_VERSION_MINOR MYGUI_VERSION_PATCH
+)
+libfind_process(MyGUI)
+
+if (MyGUI_Debug_FOUND)
+    set(MyGUI_LIBRARIES optimized ${MyGUI_LIBRARIES} debug ${MyGUI_Debug_LIBRARIES})
+endif()
diff --git a/cmake/FindOSGPlugins.cmake b/cmake/FindOSGPlugins.cmake
new file mode 100644
index 000000000..8220f33d4
--- /dev/null
+++ b/cmake/FindOSGPlugins.cmake
@@ -0,0 +1,50 @@
+# This module accepts the following env variable
+#  OSGPlugins_LIB_DIR - <OpenSceneGraph>/lib/osgPlugins-<X.X.X> , path to search plugins
+#
+# Once done this will define
+#  OSGPlugins_FOUND         - System has the all required components.
+#  OSGPlugins_LIBRARIES     - Link these to use the required osg plugins components.
+#
+# Components:
+#   - osgdb_png
+#   - osgdb_tga
+#   - osgdb_dds
+#   - osgdb_jpeg
+
+include(LibFindMacros)
+include(Findosg_functions)
+
+if (NOT OSGPlugins_LIB_DIR)
+    set(_mode WARNING)
+    if (OSGPlugins_FIND_REQUIRED)
+        set(_mode FATAL_ERROR)
+    endif()
+    message(${_mode} "OSGPlugins_LIB_DIR variable must be set")
+endif()
+
+foreach(_library ${OSGPlugins_FIND_COMPONENTS})
+    string(TOUPPER ${_library} _library_uc)
+    set(_component OSGPlugins_${_library})
+
+    set(${_library_uc}_DIR ${OSGPlugins_LIB_DIR}) # to help function osg_find_library
+    set(_saved_lib_prefix ${CMAKE_FIND_LIBRARY_PREFIXES}) # save CMAKE_FIND_LIBRARY_PREFIXES
+    set(CMAKE_FIND_LIBRARY_PREFIXES "") # search libraries with no prefix
+    osg_find_library(${_library_uc} ${_library}) # find it into ${_library_uc}_LIBRARIES
+    set(CMAKE_FIND_LIBRARY_PREFIXES ${_saved_lib_prefix}) # restore prefix
+
+    if (${_library_uc}_LIBRARIES)
+        set(${_component}_LIBRARY ${${_library_uc}_LIBRARIES}) # fake as if we call find_library
+    else()
+        set(${_component}_LIBRARY ${_component}_LIBRARY-NOTFOUND)
+    endif()
+
+    list(APPEND OSGPlugins_PROCESS_LIBS ${_component}_LIBRARY)
+endforeach()
+
+foreach(_dependency PNG ZLIB JPEG) # needed by osgdb_png or osgdb_jpeg
+    libfind_package(OSGPlugins ${_dependency})
+    set(${_dependency}_LIBRARY_OPTS ${_dependency}_LIBRARY)
+    #list(APPEND OSGPlugins_PROCESS_LIBS ${_dependency}_LIBRARY)
+endforeach()
+
+libfind_process(OSGPlugins)
diff --git a/cmake/FindPkgMacros.cmake b/cmake/FindPkgMacros.cmake
deleted file mode 100644
index 473b27b2a..000000000
--- a/cmake/FindPkgMacros.cmake
+++ /dev/null
@@ -1,161 +0,0 @@
-#-------------------------------------------------------------------
-# This file is part of the CMake build system for OGRE
-#     (Object-oriented Graphics Rendering Engine)
-# For the latest info, see http://www.ogre3d.org/
-#
-# The contents of this file are placed in the public domain. Feel
-# free to make use of it in any way you like.
-#-------------------------------------------------------------------
-
-##################################################################
-# Provides some common functionality for the FindPackage modules
-##################################################################
-
-# Begin processing of package
-macro(findpkg_begin PREFIX)
-  if (NOT ${PREFIX}_FIND_QUIETLY)
-    message(STATUS "Looking for ${PREFIX}...")
-  endif ()
-endmacro(findpkg_begin)
-
-# Display a status message unless FIND_QUIETLY is set
-macro(pkg_message PREFIX)
-  if (NOT ${PREFIX}_FIND_QUIETLY)
-    message(STATUS ${ARGN})
-  endif ()
-endmacro(pkg_message)
-
-# Get environment variable, define it as ENV_$var and make sure backslashes are converted to forward slashes
-macro(getenv_path VAR)
-   set(ENV_${VAR} $ENV{${VAR}})
-   # replace won't work if var is blank
-   if (ENV_${VAR})
-     string( REGEX REPLACE "\\\\" "/" ENV_${VAR} ${ENV_${VAR}} )
-   endif ()
-endmacro(getenv_path)
-
-# Construct search paths for includes and libraries from a PREFIX_PATH
-macro(create_search_paths PREFIX)
-  foreach(dir ${${PREFIX}_PREFIX_PATH})
-    set(${PREFIX}_INC_SEARCH_PATH ${${PREFIX}_INC_SEARCH_PATH}
-      ${dir}/include ${dir}/Include ${dir}/include/${PREFIX} ${dir}/Headers)
-    set(${PREFIX}_LIB_SEARCH_PATH ${${PREFIX}_LIB_SEARCH_PATH}
-      ${dir}/lib ${dir}/Lib ${dir}/lib/${PREFIX} ${dir}/Libs)
-    set(${PREFIX}_BIN_SEARCH_PATH ${${PREFIX}_BIN_SEARCH_PATH}
-      ${dir}/bin)
-  endforeach(dir)
-  set(${PREFIX}_FRAMEWORK_SEARCH_PATH ${${PREFIX}_PREFIX_PATH})
-endmacro(create_search_paths)
-
-# clear cache variables if a certain variable changed
-macro(clear_if_changed TESTVAR)
-  # test against internal check variable
-  # HACK: Apparently, adding a variable to the cache cleans up the list
-  # a bit. We need to also remove any empty strings from the list, but
-  # at the same time ensure that we are actually dealing with a list.
-  list(APPEND ${TESTVAR} "")
-  list(REMOVE_ITEM ${TESTVAR} "")
-  if (NOT "${${TESTVAR}}" STREQUAL "${${TESTVAR}_INT_CHECK}")
-    message(STATUS "${TESTVAR} changed.")
-    foreach(var ${ARGN})
-      set(${var} "NOTFOUND" CACHE STRING "x" FORCE)
-    endforeach(var)
-  endif ()
-  set(${TESTVAR}_INT_CHECK ${${TESTVAR}} CACHE INTERNAL "x" FORCE)
-endmacro(clear_if_changed)
-
-# Try to get some hints from pkg-config, if available
-macro(use_pkgconfig PREFIX PKGNAME)
-  find_package(PkgConfig)
-  if (PKG_CONFIG_FOUND)
-    pkg_check_modules(${PREFIX} ${PKGNAME})
-  endif ()
-endmacro (use_pkgconfig)
-
-# Couple a set of release AND debug libraries (or frameworks)
-macro(make_library_set PREFIX)
-  if (${PREFIX}_FWK)
-    set(${PREFIX} ${${PREFIX}_FWK})
-  elseif (${PREFIX}_REL AND ${PREFIX}_DBG)
-    set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
-  elseif (${PREFIX}_REL)
-    set(${PREFIX} ${${PREFIX}_REL})
-  elseif (${PREFIX}_DBG)
-    set(${PREFIX} ${${PREFIX}_DBG})
-  endif ()
-endmacro(make_library_set)
-
-# Generate debug names from given release names
-macro(get_debug_names PREFIX)
-  foreach(i ${${PREFIX}})
-    set(${PREFIX}_DBG ${${PREFIX}_DBG} ${i}d ${i}D ${i}_d ${i}_D ${i}_debug ${i})
-  endforeach(i)
-endmacro(get_debug_names)
-
-# Add the parent dir from DIR to VAR 
-macro(add_parent_dir VAR DIR)
-  get_filename_component(${DIR}_TEMP "${${DIR}}/.." ABSOLUTE)
-  set(${VAR} ${${VAR}} ${${DIR}_TEMP})
-endmacro(add_parent_dir)
-
-# Do the final processing for the package find.
-macro(findpkg_finish PREFIX)
-  # skip if already processed during this run
-  if (NOT ${PREFIX}_FOUND)
-    if (${PREFIX}_INCLUDE_DIR AND ${PREFIX}_LIBRARY)
-      set(${PREFIX}_FOUND TRUE)
-      set(${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIR})
-      set(${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARY})
-      if (NOT ${PREFIX}_FIND_QUIETLY)
-        message(STATUS "Found ${PREFIX}: ${${PREFIX}_LIBRARIES}")
-      endif ()
-    else ()
-      if (NOT ${PREFIX}_FIND_QUIETLY)
-        message(STATUS "Could not locate ${PREFIX}")
-      endif ()
-      if (${PREFIX}_FIND_REQUIRED)
-        message(FATAL_ERROR "Required library ${PREFIX} not found! Install the library (including dev packages) and try again. If the library is already installed, set the missing variables manually in cmake.")
-      endif ()
-    endif ()
-
-    mark_as_advanced(${PREFIX}_INCLUDE_DIR ${PREFIX}_LIBRARY ${PREFIX}_LIBRARY_REL ${PREFIX}_LIBRARY_DBG ${PREFIX}_LIBRARY_FWK)
-  endif ()
-endmacro(findpkg_finish)
-
-
-# Slightly customised framework finder
-MACRO(findpkg_framework fwk)
-  IF(APPLE)
-    SET(${fwk}_FRAMEWORK_PATH
-      ${${fwk}_FRAMEWORK_SEARCH_PATH}
-      ${CMAKE_FRAMEWORK_PATH}
-      ~/Library/Frameworks
-      /Library/Frameworks
-      /System/Library/Frameworks
-      /Network/Library/Frameworks
-      /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.0.sdk/System/Library/Frameworks/
-      ${CMAKE_CURRENT_SOURCE_DIR}/lib/Release
-      ${CMAKE_CURRENT_SOURCE_DIR}/lib/Debug
-    )
-    # These could be arrays of paths, add each individually to the search paths
-    foreach(i ${OGRE_PREFIX_PATH})
-      set(${fwk}_FRAMEWORK_PATH ${${fwk}_FRAMEWORK_PATH} ${i}/lib/Release ${i}/lib/Debug)
-    endforeach(i)
-
-    foreach(i ${OGRE_PREFIX_BUILD})
-      set(${fwk}_FRAMEWORK_PATH ${${fwk}_FRAMEWORK_PATH} ${i}/lib/Release ${i}/lib/Debug)
-    endforeach(i)
-
-    FOREACH(dir ${${fwk}_FRAMEWORK_PATH})
-      SET(fwkpath ${dir}/${fwk}.framework)
-      IF(EXISTS ${fwkpath})
-        SET(${fwk}_FRAMEWORK_INCLUDES ${${fwk}_FRAMEWORK_INCLUDES}
-          ${fwkpath}/Headers ${fwkpath}/PrivateHeaders)
-        SET(${fwk}_FRAMEWORK_PATH ${dir})
-        if (NOT ${fwk}_LIBRARY_FWK)
-          SET(${fwk}_LIBRARY_FWK "-framework ${fwk}")
-        endif ()
-      ENDIF(EXISTS ${fwkpath})
-    ENDFOREACH(dir)
-  ENDIF(APPLE)
-ENDMACRO(findpkg_framework)
diff --git a/cmake/FindRakNet.cmake b/cmake/FindRakNet.cmake
new file mode 100644
index 000000000..9f83cc641
--- /dev/null
+++ b/cmake/FindRakNet.cmake
@@ -0,0 +1,77 @@
+# Comes form project edunetgames
+# - Try to find RakNet
+# Once done this will define
+#
+#  RakNet_FOUND - system has RakNet
+#  RakNet_INCLUDES - the RakNet include directory
+#  RakNet_LIBRARY - Link these to use RakNet
+
+FIND_LIBRARY (RakNet_LIBRARY_RELEASE NAMES RakNetLibStatic
+    PATHS
+    ENV LD_LIBRARY_PATH
+    ENV LIBRARY_PATH
+    /usr/lib64
+    /usr/lib
+    /usr/local/lib64
+    /usr/local/lib
+    /opt/local/lib
+    $ENV{RAKNET_ROOT}/Lib/*
+    )
+	
+FIND_LIBRARY (RakNet_LIBRARY_DEBUG NAMES RakNetLibStatic
+    PATHS
+    ENV LD_LIBRARY_PATH
+    ENV LIBRARY_PATH
+    /usr/lib64
+    /usr/lib
+    /usr/local/lib64
+    /usr/local/lib
+    /opt/local/lib
+    $ENV{RAKNET_ROOT}/Lib/*
+    )	
+	
+	
+
+FIND_PATH (RakNet_INCLUDES raknet/RakPeer.h
+    ENV CPATH
+    /usr/include
+    /usr/local/include
+    /opt/local/include
+	$ENV{RAKNET_ROOT}/include
+    )
+ 
+MESSAGE(STATUS ${RakNet_INCLUDES})
+MESSAGE(STATUS ${RakNet_LIBRARY_RELEASE})
+ 
+IF(RakNet_INCLUDES AND RakNet_LIBRARY_RELEASE)
+    SET(RakNet_FOUND TRUE)
+ENDIF(RakNet_INCLUDES AND RakNet_LIBRARY_RELEASE)
+
+IF(RakNet_FOUND)
+  SET(RakNet_INCLUDES ${RakNet_INCLUDES}/raknet)
+  
+  
+   IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+        SET(RakNet_LIBRARY optimized ${RakNet_LIBRARY_RELEASE} debug ${RakNet_LIBRARY_DEBUG})
+		IF(WIN32)
+			SET(RakNet_LIBRARY optimized ${RakNet_LIBRARY_RELEASE} debug ${RakNet_LIBRARY_DEBUG} ws2_32.lib)
+		ENDIF(WIN32)
+   ELSE()
+        # if there are no configuration types and CMAKE_BUILD_TYPE has no value
+        # then just use the release libraries
+        SET(RakNet_LIBRARY ${RakNet_LIBRARY_RELEASE} )
+		IF(WIN32)
+			SET(RakNet_LIBRARY ${RakNet_LIBRARY_RELEASE} ws2_32.lib)
+		ENDIF(WIN32)
+   ENDIF()
+   
+  IF(NOT RakNet_FIND_QUIETLY)
+    MESSAGE(STATUS "Found RakNet_LIBRARY_RELEASE: ${RakNet_LIBRARY_RELEASE}")
+    MESSAGE(STATUS "Found RakNet_INCLUDES: ${RakNet_INCLUDES}")
+  ENDIF(NOT RakNet_FIND_QUIETLY)
+ELSE(RakNet_FOUND)
+  IF(RakNet_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find RakNet")
+  ENDIF(RakNet_FIND_REQUIRED)
+ENDIF(RakNet_FOUND)
+
diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
index 163abf463..25105f1e2 100644
--- a/cmake/FindSDL2.cmake
+++ b/cmake/FindSDL2.cmake
@@ -1,16 +1,20 @@
 # Locate SDL2 library
 # This module defines
-# SDL2_LIBRARY, the name of the library to link against
+# SDL2_LIBRARY, the SDL2 library, with no other libraries
+# SDL2_LIBRARIES, the SDL library and required components with compiler flags
 # SDL2_FOUND, if false, do not try to link to SDL2
 # SDL2_INCLUDE_DIR, where to find SDL.h
+# SDL2_VERSION, the version of the found library
 #
+# This module accepts the following env variables
+#  SDL2DIR - Can be set to ./configure --prefix=$SDL2DIR used in building SDL2. l.e.galup 9-20-02
 # This module responds to the the flag:
 # SDL2_BUILDING_LIBRARY
 # If this is defined, then no SDL2_main will be linked in because
 # only applications need main().
 # Otherwise, it is assumed you are building an application and this
 # module will attempt to locate and set the the proper link flags
-# as part of the returned SDL2_LIBRARY variable.
+# as part of the returned SDL2_LIBRARIES variable.
 #
 # Don't forget to include SDL2main.h and SDL2main.m your project for the
 # OS X framework based version. (Other versions link to -lSDL2main which
@@ -18,20 +22,6 @@
 # module will automatically add the -framework Cocoa on your behalf.
 #
 #
-# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
-# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
-# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
-# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
-# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
-# as appropriate. These values are used to generate the final SDL2_LIBRARY
-# variable, but when these values are unset, SDL2_LIBRARY does not get created.
-#
-#
-# $SDL2DIR is an environment variable that would
-# correspond to the ./configure --prefix=$SDL2DIR
-# used in building SDL2.
-# l.e.galup  9-20-02
-#
 # Modified by Eric Wing.
 # Added code to assist with automated building by using environmental variables
 # and providing a more controlled/consistent search behavior.
@@ -71,126 +61,69 @@
 #  License text for the above reference.)
 
 
-FIND_PATH(SDL2_INCLUDE_DIR SDL.h
-  HINTS
-  $ENV{SDL2DIR}
-  PATH_SUFFIXES include/SDL2 include
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local/include/SDL2
-  /usr/include/SDL2
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt
-)
-#MESSAGE("SDL2_INCLUDE_DIR is ${SDL2_INCLUDE_DIR}")
+if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(_sdl_lib_suffix lib/x64)
+else()
+    set(_sdl_lib_suffix lib/x86)
+endif()
 
-FIND_LIBRARY(SDL2_LIBRARY_PATH
-  NAMES SDL2
-  HINTS
-  $ENV{SDL2DIR}
-  PATH_SUFFIXES lib64 lib
-  PATHS
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
+libfind_pkg_detect(SDL2 sdl2
+    FIND_PATH SDL.h
+        HINTS $ENV{SDL2DIR}
+        PATH_SUFFIXES include SDL2
+    FIND_LIBRARY SDL2
+        HINTS $ENV{SDL2DIR}
+        PATH_SUFFIXES ${_sdl_lib_suffix}
 )
+libfind_version_n_header(SDL2 NAMES SDL_version.h DEFINES SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_PATCHLEVEL)
 
-set(SDL2_LIBRARY_ONLY ${SDL2_LIBRARY_PATH} CACHE STRING "The SDL2 library, with no other libraries.")
-set(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_PATH})
-
-#MESSAGE("SDL2_LIBRARY_TEMP is ${SDL2_LIBRARY_TEMP}")
-
-IF(NOT SDL2_BUILDING_LIBRARY)
-  IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+IF(NOT SDL2_BUILDING_LIBRARY AND NOT APPLE)
     # Non-OS X framework versions expect you to also dynamically link to
     # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
     # seem to provide SDL2main for compatibility even though they don't
     # necessarily need it.
-    FIND_LIBRARY(SDL2MAIN_LIBRARY
-      NAMES SDL2main
-      HINTS
-      $ENV{SDL2DIR}
-      PATH_SUFFIXES lib64 lib
-      PATHS
-      /sw
-      /opt/local
-      /opt/csw
-      /opt
+    libfind_pkg_detect(SDL2MAIN sdl2
+        FIND_LIBRARY SDL2main
+            HINTS $ENV{SDL2DIR}
+            PATH_SUFFIXES ${_sdl_lib_suffix}
     )
-  ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
-ENDIF(NOT SDL2_BUILDING_LIBRARY)
-
-# SDL2 may require threads on your system.
-# The Apple build may not need an explicit flag because one of the
-# frameworks may already provide it.
-# But for non-OSX systems, I will use the CMake Threads package.
-IF(NOT APPLE)
-  FIND_PACKAGE(Threads)
-ENDIF(NOT APPLE)
+    set(SDL2MAIN_FIND_QUIETLY TRUE)
+    libfind_process(SDL2MAIN)
+    list(APPEND SDL2_PROCESS_LIBS SDL2MAIN_LIBRARY)
+ENDIF()
+
+
+set(SDL2_TARGET_SPECIFIC)
+
+if (APPLE)
+    # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
+    list(APPEND SDL2_TARGET_SPECIFIC "-framework Cocoa")
+else()
+    # SDL2 may require threads on your system.
+    # The Apple build may not need an explicit flag because one of the
+    # frameworks may already provide it.
+    # But for non-OSX systems, I will use the CMake Threads package.
+    libfind_package(SDL2 Threads)
+    list(APPEND SDL2_TARGET_SPECIFIC ${CMAKE_THREAD_LIBS_INIT})
+endif()
 
 # MinGW needs an additional library, mwindows
 # It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
 # (Actually on second look, I think it only needs one of the m* libraries.)
-IF(MINGW)
-  SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
-ENDIF(MINGW)
-
-SET(SDL2_FOUND "NO")
-IF(SDL2_LIBRARY_TEMP)
-  # For SDL2main
-  IF(NOT SDL2_BUILDING_LIBRARY)
-    IF(SDL2MAIN_LIBRARY)
-      SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
-    ENDIF(SDL2MAIN_LIBRARY)
-  ENDIF(NOT SDL2_BUILDING_LIBRARY)
-
-  # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
-  # CMake doesn't display the -framework Cocoa string in the UI even
-  # though it actually is there if I modify a pre-used variable.
-  # I think it has something to do with the CACHE STRING.
-  # So I use a temporary variable until the end so I can set the
-  # "real" variable in one-shot.
-  IF(APPLE)
-    SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
-  ENDIF(APPLE)
-
-  # For threads, as mentioned Apple doesn't need this.
-  # In fact, there seems to be a problem if I used the Threads package
-  # and try using this line, so I'm just skipping it entirely for OS X.
-  IF(NOT APPLE)
-    SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
-  ENDIF(NOT APPLE)
-
-  # For MinGW library
-  IF(MINGW)
-    SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
-  ENDIF(MINGW)
-  
-  IF(WIN32)
-    SET(SDL2_LIBRARY_TEMP winmm imm32 version msimg32 ${SDL2_LIBRARY_TEMP})
-  ENDIF(WIN32)
-
-  # Set the final string here so the GUI reflects the final state.
-  SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
-  # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
-  SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
+if(MINGW)
+    list(APPEND SDL2_TARGET_SPECIFIC mingw32)
+endif()
 
-  SET(SDL2_FOUND "YES")
-ENDIF(SDL2_LIBRARY_TEMP)
+if(WIN32)
+    list(APPEND SDL2_TARGET_SPECIFIC winmm imm32 version msimg32)
+endif()
 
-INCLUDE(FindPackageHandleStandardArgs)
+set(SDL2_PROCESS_LIBS SDL2_TARGET_SPECIFIC)
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
-                                  REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
+libfind_process(SDL2)
 
-IF(SDL2_STATIC)
-  if (UNIX AND NOT APPLE)
-    EXECUTE_PROCESS(COMMAND sdl2-config --static-libs OUTPUT_VARIABLE SDL2_LINK_FLAGS)
-    STRING(REGEX REPLACE "(\r?\n)+$" "" SDL2_LINK_FLAGS "${SDL2_LINK_FLAGS}")
-    SET(SDL2_LIBRARY ${SDL2_LINK_FLAGS})
-  ENDIF()
-ENDIF(SDL2_STATIC)
+if (SDL2_STATIC AND UNIX AND NOT APPLE)
+    execute_process(COMMAND sdl2-config --static-libs OUTPUT_VARIABLE SDL2_STATIC_FLAGS)
+    string(REGEX REPLACE "(\r?\n)+$" "" SDL2_STATIC_FLAGS "${SDL2_STATIC_FLAGS}")
+    set(SDL2_LIBRARIES ${SDL2_STATIC_FLAGS})
+endif()
diff --git a/cmake/FindSphinx.cmake b/cmake/FindSphinx.cmake
new file mode 100644
index 000000000..331598006
--- /dev/null
+++ b/cmake/FindSphinx.cmake
@@ -0,0 +1,84 @@
+# - This module looks for Sphinx
+# Find the Sphinx documentation generator
+#
+# This modules defines
+#  Sphinx_EXECUTABLE
+#  Sphinx_FOUND
+#  function Sphinx_add_target
+#  function Sphinx_add_targets
+#
+
+include(FindPackageHandleStandardArgs)
+include(CMakeParseArguments)
+
+set(_sphinx_names sphinx-build)
+foreach(_version 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+    list(APPEND _sphinx_names sphinx-build-${_version})
+endforeach()
+
+find_program(Sphinx_EXECUTABLE
+    NAMES ${_sphinx_names}
+    PATHS
+        /usr/bin
+        /usr/local/bin
+        /opt/local/bin
+    DOC "Sphinx documentation generator"
+)
+mark_as_advanced(Sphinx_EXECUTABLE)
+
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sphinx
+    FOUND_VAR Sphinx_FOUND
+    REQUIRED_VARS Sphinx_EXECUTABLE
+)
+
+option( SPHINX_HTML_OUTPUT "Build a single HTML with the whole content." ON )
+option( SPHINX_DIRHTML_OUTPUT "Build HTML pages, but with a single directory per document." OFF )
+option( SPHINX_HTMLHELP_OUTPUT "Build HTML pages with additional information for building a documentation collection in htmlhelp." OFF )
+option( SPHINX_QTHELP_OUTPUT "Build HTML pages with additional information for building a documentation collection in qthelp." OFF )
+option( SPHINX_DEVHELP_OUTPUT "Build HTML pages with additional information for building a documentation collection in devhelp." OFF )
+option( SPHINX_EPUB_OUTPUT "Build HTML pages with additional information for building a documentation collection in epub." OFF )
+option( SPHINX_LATEX_OUTPUT "Build LaTeX sources that can be compiled to a PDF document using pdflatex." OFF )
+option( SPHINX_MAN_OUTPUT "Build manual pages in groff format for UNIX systems." OFF )
+option( SPHINX_TEXT_OUTPUT "Build plain text files." OFF )
+
+function(Sphinx_add_target target_name builder conf source destination)
+    add_custom_target( ${target_name} ALL
+        COMMAND ${Sphinx_EXECUTABLE} -b ${builder} -c ${conf} ${source} ${destination}
+        DEPENDS ${conf}/conf.py
+        COMMENT "Generating sphinx documentation: ${builder}"
+    )
+
+    set_property(DIRECTORY APPEND PROPERTY
+        ADDITIONAL_MAKE_CLEAN_FILES ${destination}
+    )
+endfunction()
+
+# Usage:
+#
+# Sphinx_add_targets(NAME <base_targets_name>
+#   SRC_DIR <path_to_doc>/
+#   DST_DIR <path_to_output_result>/
+#   CONFIG_DIR <path_to_conf.py>/
+#   [DEPENDENCIES dep1 dep2 dep3 ...]
+# )
+function(Sphinx_add_targets)
+    set(options )
+    set(one_value_keywords NAME SRC_DIR DST_DIR CONFIG_DIR)
+    set(multi_value_keywords DEPENDENCIES)
+    CMAKE_PARSE_ARGUMENTS(OPT "${options}" "${one_value_keywords}" "${multi_value_keywords}" ${ARGN})
+
+    if (NOT OPT_NAME OR NOT OPT_SRC_DIR OR NOT OPT_DST_DIR OR NOT OPT_CONFIG_DIR)
+        message(FATAL_ERROR "Arguments NAME, SRC_DIR, DST_DIR, CONFIG_DIR are required!")
+    endif()
+
+    foreach(_generator html dirhtml qthelp devhelp epub latex man text linkcheck)
+        string(TOUPPER ${_generator} _generator_uc)
+        if (SPHINX_${_generator_uc}_OUTPUT)
+            Sphinx_add_target(${OPT_NAME}_${_generator} ${_generator} ${OPT_CONFIG_DIR} ${OPT_SRC_DIR} ${OPT_DST_DIR}/${_generator}/)
+            if (OPT_DEPENDENCIES)
+                add_dependencies(${OPT_NAME}_${_generator} ${OPT_DEPENDENCIES})
+            endif()
+        endif()
+    endforeach()
+endfunction()
diff --git a/cmake/FindTerra.cmake b/cmake/FindTerra.cmake
new file mode 100644
index 000000000..199e47d0d
--- /dev/null
+++ b/cmake/FindTerra.cmake
@@ -0,0 +1,69 @@
+# - Try to find Terra
+# Once done this will define
+#
+#  Terra_FOUND - system has Terra
+#  Terra_INCLUDES - the Terra include directory
+#  Terra_LIBRARY - Link these to use Terra
+
+FIND_LIBRARY (Terra_LIBRARY_RELEASE NAMES terra
+    PATHS
+    ENV LD_LIBRARY_PATH
+    ENV LIBRARY_PATH
+    /usr/lib64
+    /usr/lib
+    /usr/local/lib64
+    /usr/local/lib
+    /opt/local/lib
+    $ENV{Terra_ROOT}/lib
+    )
+
+FIND_LIBRARY (Terra_LIBRARY_DEBUG NAMES terra
+    PATHS
+    ENV LD_LIBRARY_PATH
+    ENV LIBRARY_PATH
+    /usr/lib64
+    /usr/lib
+    /usr/local/lib64
+    /usr/local/lib
+    /opt/local/lib
+    $ENV{Terra_ROOT}/lib
+    )
+
+FIND_PATH (Terra_INCLUDES terra/terra.h
+    ENV CPATH
+    /usr/include
+    /usr/local/include
+    /opt/local/include
+    $ENV{Terra_ROOT}/include
+    )
+ 
+IF(Terra_INCLUDES AND Terra_LIBRARY_RELEASE)
+    SET(Terra_FOUND TRUE)
+ENDIF(Terra_INCLUDES AND Terra_LIBRARY_RELEASE)
+
+IF(NOT Terra_LIBRARY_DEBUG)
+    SET(Terra_LIBRARY_DEBUG ${Terra_LIBRARY_RELEASE})
+ENDIF()
+
+IF(Terra_FOUND)
+  SET(Terra_INCLUDES ${Terra_INCLUDES})
+
+  find_package(ZLIB REQUIRED)
+  
+   IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+        SET(Terra_LIBRARY optimized ${Terra_LIBRARY_RELEASE} debug ${Terra_LIBRARY_DEBUG} ${ZLIB_LIBRARIES} dl tinfo)
+      ELSE()
+        # if there are no configuration types and CMAKE_BUILD_TYPE has no value
+        # then just use the release libraries
+        SET(Terra_LIBRARY ${Terra_LIBRARY_RELEASE} ${ZLIB_LIBRARIES} dl tinfo)
+      ENDIF()
+  IF(NOT Terra_FIND_QUIETLY)
+    MESSAGE(STATUS "Found Terra_LIBRARY_RELEASE: ${Terra_LIBRARY_RELEASE}")
+    MESSAGE(STATUS "Found Terra_INCLUDES: ${Terra_INCLUDES}")
+  ENDIF(NOT Terra_FIND_QUIETLY)
+ELSE(Terra_FOUND)
+  IF(Terra_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find Terra")
+  ENDIF(Terra_FIND_REQUIRED)
+ENDIF(Terra_FOUND)
+
diff --git a/cmake/FindTinyXML.cmake b/cmake/FindTinyXML.cmake
new file mode 100644
index 000000000..cfbacb881
--- /dev/null
+++ b/cmake/FindTinyXML.cmake
@@ -0,0 +1,19 @@
+# Try to find TinyXML library
+
+# Once done this will define
+#  TinyXML_FOUND         - System has the all required components.
+#  TinyXML_INCLUDE_DIRS  - Include directory necessary for using the required components headers.
+#  TinyXML_LIBRARIES     - Link these to use TinyXML.
+#
+
+include(LibFindMacros)
+
+libfind_pkg_detect(TinyXML tinyxml
+    FIND_PATH tinyxml.h
+    FIND_LIBRARY tinyxml
+)
+libfind_version_n_header(TinyXML
+    NAMES tinyxml.h
+    CONSTANTS TIXML_MAJOR_VERSION TIXML_MINOR_VERSION TIXML_PATCH_VERSION
+)
+libfind_process(TinyXML)
diff --git a/cmake/LibFindMacros.cmake b/cmake/LibFindMacros.cmake
new file mode 100644
index 000000000..2be27c5fc
--- /dev/null
+++ b/cmake/LibFindMacros.cmake
@@ -0,0 +1,363 @@
+# Version 2.2
+# Public Domain, originally written by Lasse Kärkkäinen <tronic>
+# Maintained at https://github.com/Tronic/cmake-modules
+# Please send your improvements as pull requests on Github.
+
+include(CMakeParseArguments)
+
+# Find another package and make it a dependency of the current package.
+# This also automatically forwards the "REQUIRED" argument.
+# Usage: libfind_package(<prefix> <another package> [extra args to find_package])
+macro (libfind_package PREFIX PKG)
+  set(${PREFIX}_args ${PKG} ${ARGN})
+  if (${PREFIX}_FIND_REQUIRED)
+    set(${PREFIX}_args ${${PREFIX}_args} REQUIRED)
+  endif()
+  find_package(${${PREFIX}_args})
+  set(${PREFIX}_DEPENDENCIES ${${PREFIX}_DEPENDENCIES};${PKG})
+  unset(${PREFIX}_args)
+endmacro()
+
+# A simple wrapper to make pkg-config searches a bit easier.
+# Works the same as CMake's internal pkg_check_modules but is always quiet.
+macro (libfind_pkg_check_modules)
+  find_package(PkgConfig QUIET)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules(${ARGN} QUIET)
+  endif()
+endmacro()
+
+# Avoid useless copy&pasta by doing what most simple libraries do anyway:
+# pkg-config, find headers, find library.
+# Usage: libfind_pkg_detect(<prefix> <pkg-config args> FIND_PATH <name> [other args] FIND_LIBRARY <name> [other args])
+# E.g. libfind_pkg_detect(SDL2 sdl2 FIND_PATH SDL.h PATH_SUFFIXES SDL2 FIND_LIBRARY SDL2)
+function (libfind_pkg_detect PREFIX)
+  # Parse arguments
+  set(argname pkgargs)
+  foreach (i ${ARGN})
+    if ("${i}" STREQUAL "FIND_PATH")
+      set(argname pathargs)
+    elseif ("${i}" STREQUAL "FIND_LIBRARY")
+      set(argname libraryargs)
+    else()
+      set(${argname} ${${argname}} ${i})
+    endif()
+  endforeach()
+  if (NOT pkgargs)
+    message(FATAL_ERROR "libfind_pkg_detect requires at least a pkg_config package name to be passed.")
+  endif()
+  # Find library
+  libfind_pkg_check_modules(${PREFIX}_PKGCONF ${pkgargs})
+  if (pathargs)
+    find_path(${PREFIX}_INCLUDE_DIR NAMES ${pathargs} HINTS ${${PREFIX}_PKGCONF_INCLUDE_DIRS})
+  endif()
+  if (libraryargs)
+    find_library(${PREFIX}_LIBRARY NAMES ${libraryargs} HINTS ${${PREFIX}_PKGCONF_LIBRARY_DIRS})
+  endif()
+endfunction()
+
+# libfind_header_path(<PREFIX> [PATHS <path> [<path> ...]] NAMES <name> [name ...] VAR <out_var> [QUIET])
+# Get fullpath of the first found header looking inside <PREFIX>_INCLUDE_DIR or in the given PATHS
+# Usage: libfind_header_path(Foobar NAMES foobar/version.h VAR filepath)
+function (libfind_header_path PREFIX)
+  set(options QUIET)
+  set(one_value_keywords VAR PATH)
+  set(multi_value_keywords NAMES PATHS)
+  CMAKE_PARSE_ARGUMENTS(OPT "${options}" "${one_value_keywords}" "${multi_value_keywords}" ${ARGN})
+  if (NOT OPT_VAR OR NOT OPT_NAMES)
+    message(FATAL_ERROR "Arguments VAR, NAMES are required!")
+  endif()
+  if (OPT_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "Calling function with unused arguments '${OPT_UNPARSED_ARGUMENTS}'!")
+  endif()
+  if (OPT_QUIET OR ${PREFIX}_FIND_QUIETLY)
+    set(quiet TRUE)
+  endif()
+  set(paths ${OPT_PATHS} ${PREFIX}_INCLUDE_DIR)
+
+  foreach(name ${OPT_NAMES})
+    foreach(path ${paths})
+      set(filepath "${${path}}/${name}")
+      # check for existance
+      if (EXISTS ${filepath})
+        set(${OPT_VAR} ${filepath} PARENT_SCOPE) # export path
+        return()
+      endif()
+    endforeach()
+  endforeach()
+
+  # report error if not found
+  set(${OPT_VAR} NOTFOUND PARENT_SCOPE)
+  if (NOT quiet)
+    message(AUTHOR_WARNING "Unable to find '${OPT_NAMES}'")
+  endif()
+endfunction()
+
+# libfind_version_n_header(<PREFIX>
+#  NAMES <name> [<name> ...]
+#  DEFINES <define> [<define> ...] | CONSTANTS <const> [<const> ...]
+#  [PATHS <path> [<path> ...]]
+#  [QUIET]
+# )
+# Collect all defines|constants from a header inside <PREFIX>_INCLUDE_DIR or in the given PATHS
+#  output stored to <PREFIX>_VERSION.
+# This function does nothing if the version variable is already defined.
+# Usage: libfind_version_n_header(Foobar NAMES foobar/version.h DEFINES FOOBAR_VERSION_MAJOR FOOBAR_VERSION_MINOR)
+function (libfind_version_n_header PREFIX)
+  # Skip processing if we already have a version
+  if (${PREFIX}_VERSION)
+    return()
+  endif()
+
+  set(options QUIET)
+  set(one_value_keywords )
+  set(multi_value_keywords NAMES PATHS DEFINES CONSTANTS)
+  CMAKE_PARSE_ARGUMENTS(OPT "${options}" "${one_value_keywords}" "${multi_value_keywords}" ${ARGN})
+  if (NOT OPT_NAMES OR (NOT OPT_DEFINES AND NOT OPT_CONSTANTS))
+    message(FATAL_ERROR "Arguments NAMES, DEFINES|CONSTANTS are required!")
+  endif()
+  if (OPT_DEFINES AND OPT_CONSTANTS)
+    message(FATAL_ERROR "Either DEFINES or CONSTANTS must be set!")
+  endif()
+  if (OPT_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "Calling function with unused arguments '${OPT_UNPARSED_ARGUMENTS}'!")
+  endif()
+  if (OPT_QUIET OR ${PREFIX}_FIND_QUIETLY)
+    set(quiet TRUE)
+    set(force_quiet "QUIET") # to propagate argument QUIET
+  endif()
+
+  # Read the header
+  libfind_header_path(${PREFIX} NAMES ${OPT_NAMES} PATHS ${OPT_PATHS} VAR filename ${force_quiet})
+  if (NOT filename)
+    return()
+  endif()
+  file(READ "${filename}" header)
+  # Parse for version number
+  unset(version_parts)
+  foreach(define_name ${OPT_DEFINES})
+    string(REGEX MATCH "# *define +${define_name} +((\"([^\n]*)\")|([^ \n]*))" match "${header}")
+    # No regex match?
+    if (NOT match OR match STREQUAL header)
+      if (NOT quiet)
+        message(AUTHOR_WARNING "Unable to find \#define ${define_name} \"<version>\" from ${filename}")
+      endif()
+      return()
+    else()
+      list(APPEND version_parts "${CMAKE_MATCH_3}${CMAKE_MATCH_4}")
+    endif()
+  endforeach()
+  foreach(constant_name ${OPT_CONSTANTS})
+    string(REGEX MATCH "${constant_name} *= *((\"([^\;]*)\")|([^ \;]*))" match "${header}")
+    # No regex match?
+    if (NOT match OR match STREQUAL header)
+      if (NOT quiet)
+        message(AUTHOR_WARNING "Unable to find ${constant_name} = \"<version>\" from ${filename}")
+      endif()
+      return()
+    else()
+      list(APPEND version_parts "${CMAKE_MATCH_3}${CMAKE_MATCH_4}")
+    endif()
+  endforeach()
+
+  # Export the version string
+  string(REPLACE ";" "." version "${version_parts}")
+  set(${PREFIX}_VERSION "${version}" PARENT_SCOPE)
+endfunction()
+
+# libfind_version_header(<PREFIX> <HEADER> <DEFINE_NAME> [PATHS <path> [<path> ...]] [QUIET])
+# Extracts a version #define from a version.h file, output stored to <PREFIX>_VERSION.
+# This function does nothing if the version variable is already defined.
+# Usage: libfind_version_header(Foobar foobar/version.h FOOBAR_VERSION_STR)
+function (libfind_version_header PREFIX VERSION_H DEFINE_NAME)
+  # Skip processing if we already have a version
+  if (${PREFIX}_VERSION)
+    return()
+  endif()
+
+  set(options QUIET)
+  set(one_value_keywords )
+  set(multi_value_keywords PATHS)
+  CMAKE_PARSE_ARGUMENTS(OPT "${options}" "${one_value_keywords}" "${multi_value_keywords}" ${ARGN})
+  if (OPT_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "Calling function with unused arguments '${OPT_UNPARSED_ARGUMENTS}'!")
+  endif()
+  if (OPT_QUIET OR ${PREFIX}_FIND_QUIETLY)
+    set(force_quiet "QUIET") # to propagate argument QUIET
+  endif()
+
+  libfind_version_n_header(${PREFIX} NAMES ${VERSION_H} PATHS ${OPT_PATHS} DEFINES ${DEFINE_NAME} ${force_quiet})
+  set(${PREFIX}_VERSION "${${PREFIX}_VERSION}" PARENT_SCOPE)
+endfunction()
+
+# Do the final processing once the paths have been detected.
+# If include dirs are needed, ${PREFIX}_PROCESS_INCLUDES should be set to contain
+# all the variables, each of which contain one include directory.
+# Ditto for ${PREFIX}_PROCESS_LIBS and library files.
+# Will set ${PREFIX}_FOUND, ${PREFIX}_INCLUDE_DIRS and ${PREFIX}_LIBRARIES.
+# Also handles errors in case library detection was required, etc.
+function (libfind_process PREFIX)
+  # Skip processing if already processed during this configuration run
+  if (${PREFIX}_FOUND)
+    return()
+  endif()
+
+  set(found TRUE)  # Start with the assumption that the package was found
+
+  # Did we find any files? Did we miss includes? These are for formatting better error messages.
+  set(some_files FALSE)
+  set(missing_headers FALSE)
+
+  # Shorthands for some variables that we need often
+  set(quiet ${${PREFIX}_FIND_QUIETLY})
+  set(required ${${PREFIX}_FIND_REQUIRED})
+  set(exactver ${${PREFIX}_FIND_VERSION_EXACT})
+  set(findver "${${PREFIX}_FIND_VERSION}")
+  set(version "${${PREFIX}_VERSION}")
+
+  # Lists of config option names (all, includes, libs)
+  unset(configopts)
+  set(includeopts ${${PREFIX}_PROCESS_INCLUDES})
+  set(libraryopts ${${PREFIX}_PROCESS_LIBS})
+
+  # Process deps to add to
+  foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
+    if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS)
+      # The package seems to export option lists that we can use, woohoo!
+      list(APPEND includeopts ${${i}_INCLUDE_OPTS})
+      list(APPEND libraryopts ${${i}_LIBRARY_OPTS})
+    else()
+      # If plural forms don't exist or they equal singular forms
+      if ((NOT DEFINED ${i}_INCLUDE_DIRS AND NOT DEFINED ${i}_LIBRARIES) OR
+          ({i}_INCLUDE_DIR STREQUAL ${i}_INCLUDE_DIRS AND ${i}_LIBRARY STREQUAL ${i}_LIBRARIES))
+        # Singular forms can be used
+        if (DEFINED ${i}_INCLUDE_DIR)
+          list(APPEND includeopts ${i}_INCLUDE_DIR)
+        endif()
+        if (DEFINED ${i}_LIBRARY)
+          list(APPEND libraryopts ${i}_LIBRARY)
+        endif()
+      else()
+        # Oh no, we don't know the option names
+        message(FATAL_ERROR "We couldn't determine config variable names for ${i} includes and libs. Aieeh!")
+      endif()
+    endif()
+  endforeach()
+
+  if (includeopts)
+    list(REMOVE_DUPLICATES includeopts)
+  endif()
+
+  if (libraryopts)
+    list(REMOVE_DUPLICATES libraryopts)
+  endif()
+
+  string(REGEX REPLACE ".*[ ;]([^ ;]*(_INCLUDE_DIRS|_LIBRARIES))" "\\1" tmp "${includeopts} ${libraryopts}")
+  if (NOT tmp STREQUAL "${includeopts} ${libraryopts}")
+    message(AUTHOR_WARNING "Plural form ${tmp} found in config options of ${PREFIX}. This works as before but is now deprecated. Please only use singular forms INCLUDE_DIR and LIBRARY, and update your find scripts for LibFindMacros > 2.0 automatic dependency system (most often you can simply remove the PROCESS variables entirely).")
+  endif()
+
+  # Include/library names separated by spaces (notice: not CMake lists)
+  unset(includes)
+  unset(libs)
+
+  # Process all includes and set found false if any are missing
+  foreach (i ${includeopts})
+    list(APPEND configopts ${i})
+    if (NOT "${${i}}" STREQUAL "${i}-NOTFOUND")
+      list(APPEND includes "${${i}}")
+    else()
+      set(found FALSE)
+      set(missing_headers TRUE)
+    endif()
+  endforeach()
+
+  # Process all libraries and set found false if any are missing
+  foreach (i ${libraryopts})
+    list(APPEND configopts ${i})
+    if (NOT "${${i}}" STREQUAL "${i}-NOTFOUND")
+      list(APPEND libs "${${i}}")
+    else()
+      set (found FALSE)
+    endif()
+  endforeach()
+
+  # Version checks
+  if (found AND findver)
+    if (NOT version)
+      message(WARNING "The find module for ${PREFIX} does not provide version information, so we'll just assume that it is OK. Please fix the module or remove package version requirements to get rid of this warning.")
+    elseif (version VERSION_LESS findver OR (exactver AND NOT version VERSION_EQUAL findver))
+      set(found FALSE)
+      set(version_unsuitable TRUE)
+    endif()
+  endif()
+
+  # If all-OK, hide all config options, export variables, print status and exit
+  if (found)
+    foreach (i ${configopts})
+      mark_as_advanced(${i})
+    endforeach()
+    set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE)
+    set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE)
+    set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE)
+    set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
+    set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
+    if (NOT quiet)
+      message(STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
+      if (LIBFIND_DEBUG)
+        message(STATUS "  ${PREFIX}_DEPENDENCIES=${${PREFIX}_DEPENDENCIES}")
+        message(STATUS "  ${PREFIX}_INCLUDE_OPTS=${includeopts}")
+        message(STATUS "  ${PREFIX}_INCLUDE_DIRS=${includes}")
+        message(STATUS "  ${PREFIX}_LIBRARY_OPTS=${libraryopts}")
+        message(STATUS "  ${PREFIX}_LIBRARIES=${libs}")
+      endif()
+    endif()
+    return()
+  endif()
+
+  # Format messages for debug info and the type of error
+  set(vars "Relevant CMake configuration variables:\n")
+  foreach (i ${configopts})
+    mark_as_advanced(CLEAR ${i})
+    set(val ${${i}})
+    if ("${val}" STREQUAL "${i}-NOTFOUND")
+      set (val "<not found>")
+    elseif (val AND NOT EXISTS "${val}")
+      set (val "${val}  (does not exist)")
+    else()
+      set(some_files TRUE)
+    endif()
+    set(vars "${vars}  ${i}=${val}\n")
+  endforeach()
+  set(vars "${vars}You may use CMake GUI, cmake -D or ccmake to modify the values. Delete CMakeCache.txt to discard all values and force full re-detection if necessary.\n")
+  if (version_unsuitable)
+    set(msg "${PREFIX} ${${PREFIX}_VERSION} was found but")
+    if (exactver)
+      set(msg "${msg} only version ${findver} is acceptable.")
+    else()
+      set(msg "${msg} version ${findver} is the minimum requirement.")
+    endif()
+  else()
+    if (missing_headers)
+      set(msg "We could not find development headers for ${PREFIX}. Do you have the necessary dev package installed?")
+    elseif (some_files)
+      set(msg "We only found some files of ${PREFIX}, not all of them. Perhaps your installation is incomplete or maybe we just didn't look in the right place?")
+      if(findver)
+        set(msg "${msg} This could also be caused by incompatible version (if it helps, at least ${PREFIX} ${findver} should work).")
+      endif()
+    else()
+      set(msg "We were unable to find package ${PREFIX}.")
+    endif()
+  endif()
+
+  # Fatal error out if REQUIRED
+  if (required)
+    set(msg "REQUIRED PACKAGE NOT FOUND\n${msg} This package is REQUIRED and you need to install it or adjust CMake configuration in order to continue building ${CMAKE_PROJECT_NAME}.")
+    message(FATAL_ERROR "${msg}\n${vars}")
+  endif()
+  # Otherwise just print a nasty warning
+  if (NOT quiet)
+    message(WARNING "WARNING: MISSING PACKAGE\n${msg} This package is NOT REQUIRED and you may ignore this warning but by doing so you may miss some functionality of ${CMAKE_PROJECT_NAME}. \n${vars}")
+  endif()
+endfunction()
+
diff --git a/cmake/PreprocessorUtils.cmake b/cmake/PreprocessorUtils.cmake
deleted file mode 100644
index 38462a98d..000000000
--- a/cmake/PreprocessorUtils.cmake
+++ /dev/null
@@ -1,60 +0,0 @@
-#-------------------------------------------------------------------
-# This file is part of the CMake build system for OGRE
-#     (Object-oriented Graphics Rendering Engine)
-# For the latest info, see http://www.ogre3d.org/
-#
-# The contents of this file are placed in the public domain. Feel
-# free to make use of it in any way you like.
-#-------------------------------------------------------------------
-
-macro(get_preprocessor_entry CONTENTS KEYWORD VARIABLE)
-  string(REGEX MATCH
-    "# *define +${KEYWORD} +((\"([^\n]*)\")|([^ \n]*))"
-    PREPROC_TEMP_VAR
-    ${${CONTENTS}}
-  )
-  if (CMAKE_MATCH_3)
-    set(${VARIABLE} ${CMAKE_MATCH_3})
-  else ()
-    set(${VARIABLE} ${CMAKE_MATCH_4})
-  endif ()
-endmacro()
-
-macro(has_preprocessor_entry CONTENTS KEYWORD VARIABLE)
-  string(REGEX MATCH
-    "\n *# *define +(${KEYWORD})"
-    PREPROC_TEMP_VAR
-    ${${CONTENTS}}
-  )
-  if (CMAKE_MATCH_1)
-    set(${VARIABLE} TRUE)
-  else ()
-    set(${VARIABLE} FALSE)
-  endif ()
-endmacro()
-
-macro(replace_preprocessor_entry VARIABLE KEYWORD NEW_VALUE)
-  string(REGEX REPLACE 
-    "(// *)?# *define +${KEYWORD} +[^ \n]*"
-	"#define ${KEYWORD} ${NEW_VALUE}"
-	${VARIABLE}_TEMP
-	${${VARIABLE}}
-  )
-  set(${VARIABLE} ${${VARIABLE}_TEMP})  
-endmacro()
-
-macro(set_preprocessor_entry VARIABLE KEYWORD ENABLE)
-  if (${ENABLE})
-    set(TMP_REPLACE_STR "#define ${KEYWORD}")
-  else ()
-    set(TMP_REPLACE_STR "// #define ${KEYWORD}")
-  endif ()
-  string(REGEX REPLACE 
-    "(// *)?# *define +${KEYWORD} *\n"
-	${TMP_REPLACE_STR}
-	${VARIABLE}_TEMP
-	${${VARIABLE}}
-  )
-  set(${VARIABLE} ${${VARIABLE}_TEMP})  
-endmacro()
-  
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 0ac32f65e..120902594 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -20,11 +20,13 @@ else (GIT_CHECKOUT)
     configure_file(${VERSION_IN_FILE} ${VERSION_FILE})
 endif (GIT_CHECKOUT)
 
-if (OPENGL_ES)
-    find_package(OpenGLES REQUIRED)
-else()    
-    find_package(OpenGL REQUIRED)
-endif()
+if(BUILD_OPENMW OR BUILD_OPENCS)
+    if (OPENGL_ES)
+        find_package(OpenGLES REQUIRED)
+    else()
+        find_package(OpenGL REQUIRED)
+    endif()
+endif(BUILD_OPENMW OR BUILD_OPENCS)
 
 # source files
 
@@ -39,14 +41,19 @@ add_component_dir (bsa
 add_component_dir (vfs
     manager archive bsaarchive filesystemarchive registerarchives
     )
-
+	
+IF(BUILD_OPENMW OR BUILD_OPENCS)
 add_component_dir (resource
-    scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache multiobjectcache resourcesystem resourcemanager
+    scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache multiobjectcache resourcesystem resourcemanager stats
+    )
+
+add_component_dir (shader
+    shadermanager shadervisitor
     )
 
 add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry lightcontroller
-    lightmanager lightutil positionattitudetransform workqueue unrefqueue
+    lightmanager lightutil positionattitudetransform workqueue unrefqueue pathgridutil waterutil writescene serialize optimizer
     )
 
 add_component_dir (nif
@@ -60,6 +67,7 @@ add_component_dir (nifosg
 add_component_dir (nifbullet
     bulletnifloader
     )
+ENDIF(BUILD_OPENMW OR BUILD_OPENCS)
 
 add_component_dir (to_utf8
     to_utf8
@@ -73,7 +81,7 @@ add_component_dir (esm
     loadweap records aipackage effectlist spelllist variant variantimp loadtes3 cellref filter
     savedgame journalentry queststate locals globalscript player objectstate cellid cellstate globalmap inventorystate containerstate npcstate creaturestate dialoguestate statstate
     npcstats creaturestats weatherstate quickkeys fogstate spellstate activespells creaturelevliststate doorstate projectilestate debugprofile
-    aisequence magiceffects util custommarkerstate stolenitems transport
+    aisequence magiceffects util custommarkerstate stolenitems transport animationstate controlsstate
     )
 
 add_component_dir (esmterrain
@@ -81,7 +89,7 @@ add_component_dir (esmterrain
     )
 
 add_component_dir (misc
-    utf8stream stringops resourcehelpers rng
+    utf8stream stringops resourcehelpers rng messageformatparser
     )
 
 IF(NOT WIN32 AND NOT APPLE)
@@ -89,7 +97,7 @@ IF(NOT WIN32 AND NOT APPLE)
     add_definitions(-DGLOBAL_CONFIG_PATH="${GLOBAL_CONFIG_PATH}")
 ENDIF()
 add_component_dir (files
-    linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager
+    linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager escape
     lowlevelfile constrainedfilestream memorystream
     )
 
@@ -116,7 +124,8 @@ add_component_dir (terrain
 add_component_dir (loadinglistener
     loadinglistener
     )
-
+	
+IF(BUILD_OPENMW OR BUILD_OPENCS)
 add_component_dir (myguiplatform
     myguirendermanager myguidatamanager myguiplatform myguitexture myguiloglistener additivelayer scalinglayer
     )
@@ -132,18 +141,47 @@ add_component_dir (fontloader
 add_component_dir (sdlutil
     sdlgraphicswindow imagetosurface sdlinputwrapper sdlvideowrapper OISCompat events sdlcursormanager
     )
+ENDIF(BUILD_OPENMW OR BUILD_OPENCS)
 
 add_component_dir (version
     version
     )
 
+add_component_dir (openmw-mp
+        Log
+        Controllers/PlayerPacketController Controllers/WorldPacketController
+        Packets/BasePacket Packets/Player/PlayerPacket Packets/World/WorldPacket
+
+        Packets/Player/PacketHandshake Packets/Player/PacketChatMessage
+
+        Packets/Player/PacketPlayerBaseInfo Packets/Player/PacketPlayerPosition Packets/Player/PacketPlayerEquipment
+        Packets/Player/PacketPlayerAttack Packets/Player/PacketPlayerDynamicStats Packets/Player/PacketPlayerDrawState
+        Packets/Player/PacketPlayerCharGen Packets/Player/PacketPlayerAttribute Packets/Player/PacketPlayerSkill
+        Packets/Player/PacketPlayerLevel Packets/Player/PacketPlayerClass Packets/Player/PacketPlayerInventory
+        Packets/Player/PacketPlayerSpellbook Packets/Player/PacketPlayerJournal Packets/Player/PacketPlayerActiveSkills
+        Packets/Player/PacketPlayerCellChange Packets/Player/PacketPlayerCellState
+
+        Packets/Player/PacketGUIBoxes Packets/Player/PacketTime
+
+        Packets/World/PacketObjectDelete Packets/World/PacketObjectPlace Packets/World/PacketObjectScale
+        Packets/World/PacketObjectLock Packets/World/PacketObjectUnlock Packets/World/PacketObjectMove
+        Packets/World/PacketObjectRotate Packets/World/PacketObjectAnimPlay
+
+        Packets/World/PacketContainer Packets/World/PacketDoorState Packets/World/PacketMusicPlay
+        Packets/World/PacketVideoPlay
+
+        Packets/World/PacketScriptLocalShort Packets/World/PacketScriptLocalFloat Packets/World/PacketScriptMemberShort
+        Packets/World/PacketScriptGlobalShort)
+
 add_component_dir (fallback
     fallback validate
     )
 
+
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
     )
 
+IF(BUILD_OPENMW OR BUILD_OPENCS)
 if (USE_QT)
     add_component_qt_dir (contentselector
         model/modelitem model/esmfile
@@ -170,6 +208,7 @@ if (USE_QT)
         QT5_WRAP_CPP(MOC_SRCS ${COMPONENT_MOC_FILES})
     endif()
 endif()
+ENDIF(BUILD_OPENMW OR BUILD_OPENCS)
 
 if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND NOT APPLE)
@@ -177,17 +216,19 @@ if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     endif()
 endif ()
 
-include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${Bullet_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
 
 add_library(components STATIC ${COMPONENT_FILES} ${MOC_SRCS} ${ESM_UI_HDR})
 
-if (OPENGL_ES)
-    set(GL_LIB ${OPENGLES_gl_LIBRARY})
-else()
-    set(GL_LIB ${OPENGL_gl_LIBRARY})
-endif()
+if(BUILD_OPENMW OR BUILD_OPENCS)
+    if (OPENGL_ES)
+        set(GL_LIB ${OPENGLES_gl_LIBRARY})
+    else()
+        set(GL_LIB ${OPENGL_gl_LIBRARY})
+    endif()
+endif(BUILD_OPENMW OR BUILD_OPENCS)
 
-target_link_libraries(components 
+target_link_libraries(components
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_THREAD_LIBRARY}
@@ -198,14 +239,15 @@ target_link_libraries(components
     ${OSGUTIL_LIBRARIES}
     ${OSGDB_LIBRARIES}
     ${OSGVIEWER_LIBRARIES}
+    ${OSGTEXT_LIBRARIES}
     ${OSGGA_LIBRARIES}
     ${OSGFX_LIBRARIES}
     ${OSGANIMATION_LIBRARIES}
-    ${BULLET_LIBRARIES}
-    ${SDL2_LIBRARY}
+    ${Bullet_LIBRARIES}
+    ${SDL2_LIBRARIES}
     # For MyGUI platform
     ${GL_LIB}
-    ${MYGUI_LIBRARIES}
+    ${MyGUI_LIBRARIES}
     )
 
 if (WIN32)
diff --git a/components/compiler/extensions0.cpp b/components/compiler/extensions0.cpp
index 6916945f9..eb3e1e4ee 100644
--- a/components/compiler/extensions0.cpp
+++ b/components/compiler/extensions0.cpp
@@ -48,7 +48,7 @@ namespace Compiler
             extensions.registerFunction ("getaipackagedone", 'l', "", opcodeGetAiPackageDone,
                 opcodeGetAiPackageDoneExplicit);
             extensions.registerFunction ("getcurrentaipackage", 'l', "", opcodeGetCurrentAiPackage,
-                opcodeGetAiPackageDoneExplicit);
+                opcodeGetCurrentAiPackageExplicit);
             extensions.registerFunction ("getdetected", 'l', "c", opcodeGetDetected,
                 opcodeGetDetectedExplicit);
             extensions.registerInstruction ("sethello", "l", opcodeSetHello, opcodeSetHelloExplicit);
@@ -59,8 +59,8 @@ namespace Compiler
             extensions.registerInstruction ("modfight", "l", opcodeModFight, opcodeModFightExplicit);
             extensions.registerInstruction ("modflee", "l", opcodeModFlee, opcodeModFleeExplicit);
             extensions.registerInstruction ("modalarm", "l", opcodeModAlarm, opcodeModAlarmExplicit);
-            extensions.registerInstruction ("toggleai", "", opcodeToggleAI, opcodeToggleAI);
-            extensions.registerInstruction ("tai", "", opcodeToggleAI, opcodeToggleAI);
+            extensions.registerInstruction ("toggleai", "", opcodeToggleAI);
+            extensions.registerInstruction ("tai", "", opcodeToggleAI);
             extensions.registerInstruction("startcombat", "c", opcodeStartCombat, opcodeStartCombatExplicit);
             extensions.registerInstruction("stopcombat", "x", opcodeStopCombat, opcodeStopCombatExplicit);
             extensions.registerFunction ("gethello", 'l', "", opcodeGetHello, opcodeGetHelloExplicit);
@@ -70,7 +70,7 @@ namespace Compiler
             extensions.registerFunction ("getlineofsight", 'l', "c", opcodeGetLineOfSight, opcodeGetLineOfSightExplicit);
             extensions.registerFunction ("getlos", 'l', "c", opcodeGetLineOfSight, opcodeGetLineOfSightExplicit);
             extensions.registerFunction("gettarget", 'l', "c", opcodeGetTarget, opcodeGetTargetExplicit);
-            extensions.registerInstruction("face", "llX", opcodeFace, opcodeFaceExplicit);
+            extensions.registerInstruction("face", "ffX", opcodeFace, opcodeFaceExplicit);
         }
     }
 
@@ -300,6 +300,7 @@ namespace Compiler
             extensions.registerInstruction ("disableteleporting", "", opcodeDisableTeleporting);
             extensions.registerInstruction ("enableteleporting", "", opcodeEnableTeleporting);
             extensions.registerInstruction ("showvars", "", opcodeShowVars, opcodeShowVarsExplicit);
+            extensions.registerInstruction ("show", "c", opcodeShow, opcodeShowExplicit);
             extensions.registerInstruction ("sv", "", opcodeShowVars, opcodeShowVarsExplicit);
             extensions.registerInstruction("tgm", "", opcodeToggleGodMode);
             extensions.registerInstruction("togglegodmode", "", opcodeToggleGodMode);
@@ -311,6 +312,8 @@ namespace Compiler
             extensions.registerInstruction ("betacomment", "/S", opcodeBetaComment, opcodeBetaCommentExplicit);
             extensions.registerInstruction ("bc", "/S", opcodeBetaComment, opcodeBetaCommentExplicit);
             extensions.registerInstruction ("ori", "/S", opcodeBetaComment, opcodeBetaCommentExplicit); // 'ori' stands for 'ObjectReferenceInfo'
+            extensions.registerInstruction ("showscenegraph", "/l", opcodeShowSceneGraph, opcodeShowSceneGraphExplicit);
+            extensions.registerInstruction ("ssg", "/l", opcodeShowSceneGraph, opcodeShowSceneGraphExplicit);
             extensions.registerInstruction ("addtolevcreature", "ccl", opcodeAddToLevCreature);
             extensions.registerInstruction ("removefromlevcreature", "ccl", opcodeRemoveFromLevCreature);
             extensions.registerInstruction ("addtolevitem", "ccl", opcodeAddToLevItem);
diff --git a/components/compiler/lineparser.cpp b/components/compiler/lineparser.cpp
index ce1e1e463..a5b67f58b 100644
--- a/components/compiler/lineparser.cpp
+++ b/components/compiler/lineparser.cpp
@@ -140,30 +140,9 @@ namespace Compiler
 
         if (mState==MessageState || mState==MessageCommaState)
         {
-            std::string arguments;
-
-            for (std::size_t i=0; i<name.size(); ++i)
-            {
-                if (name[i]=='%')
-                {
-                    ++i;
-                    if (i<name.size())
-                    {
-                        if (name[i]=='G' || name[i]=='g')
-                        {
-                            arguments += "l";
-                        }
-                        else if (name[i]=='S' || name[i]=='s')
-                        {
-                            arguments += 'S';
-                        }
-                        else if (name[i]=='.' || name[i]=='f')
-                        {
-                            arguments += 'f';
-                        }
-                    }
-                }
-            }
+            GetArgumentsFromMessageFormat processor;
+            processor.process(name);
+            std::string arguments = processor.getArguments();
 
             if (!arguments.empty())
             {
@@ -577,4 +556,23 @@ namespace Compiler
         mName.clear();
         mExplicit.clear();
     }
+
+    void GetArgumentsFromMessageFormat::visitedPlaceholder(Placeholder placeholder, char /*padding*/, int /*width*/, int /*precision*/)
+    {
+        switch (placeholder)
+        {
+            case StringPlaceholder:
+                mArguments += 'S';
+                break;
+            case IntegerPlaceholder:
+                mArguments += 'l';
+                break;
+            case FloatPlaceholder:
+                mArguments += 'f';
+                break;
+            default:
+                break;
+        }
+    }
+
 }
diff --git a/components/compiler/lineparser.hpp b/components/compiler/lineparser.hpp
index 4f2d33bde..d92c4895e 100644
--- a/components/compiler/lineparser.hpp
+++ b/components/compiler/lineparser.hpp
@@ -2,8 +2,10 @@
 #define COMPILER_LINEPARSER_H_INCLUDED
 
 #include <vector>
+#include <string>
 
 #include <components/interpreter/types.hpp>
+#include <components/misc/messageformatparser.hpp>
 
 #include "parser.hpp"
 #include "exprparser.hpp"
@@ -74,6 +76,24 @@ namespace Compiler
             void reset();
             ///< Reset parser to clean state.
     };
+
+    class GetArgumentsFromMessageFormat : public ::Misc::MessageFormatParser
+    {
+        private:
+            std::string mArguments;
+
+        protected:
+            virtual void visitedPlaceholder(Placeholder placeholder, char padding, int width, int precision);
+            virtual void visitedCharacter(char c) {}
+
+        public:
+            virtual void process(const std::string& message)
+            {
+                mArguments.clear();
+                ::Misc::MessageFormatParser::process(message);
+            }
+            std::string getArguments() const { return mArguments; }
+    };
 }
 
 #endif
diff --git a/components/compiler/opcodes.hpp b/components/compiler/opcodes.hpp
index feed5513e..b2333032b 100644
--- a/components/compiler/opcodes.hpp
+++ b/components/compiler/opcodes.hpp
@@ -52,7 +52,6 @@ namespace Compiler
         const int opcodeGetLineOfSight = 0x2000222;
         const int opcodeGetLineOfSightExplicit = 0x2000223;
         const int opcodeToggleAI = 0x2000224;
-        const int opcodeToggleAIExplicit = 0x2000225;
         const int opcodeGetTarget = 0x2000238;
         const int opcodeGetTargetExplicit = 0x2000239;
         const int opcodeStartCombat = 0x200023a;
@@ -277,6 +276,8 @@ namespace Compiler
         const int opcodeEnableTeleporting = 0x2000216;
         const int opcodeShowVars = 0x200021d;
         const int opcodeShowVarsExplicit = 0x200021e;
+        const int opcodeShow = 0x2000304;
+        const int opcodeShowExplicit = 0x2000305;
         const int opcodeToggleGodMode = 0x200021f;
         const int opcodeToggleScripts = 0x2000301;
         const int opcodeDisableLevitation = 0x2000220;
@@ -291,6 +292,8 @@ namespace Compiler
         const int opcodeRemoveFromLevCreature = 0x20002fc;
         const int opcodeAddToLevItem = 0x20002fd;
         const int opcodeRemoveFromLevItem = 0x20002fe;
+        const int opcodeShowSceneGraph = 0x2002f;
+        const int opcodeShowSceneGraphExplicit = 0x20030;
     }
 
     namespace Sky
diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index b370f74a1..720fde9f1 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -260,7 +260,7 @@ namespace Compiler
         return true;
     }
 
-    static const char *keywords[] =
+    static const char *sKeywords[] =
     {
         "begin", "end",
         "short", "long", "float",
@@ -306,11 +306,11 @@ namespace Compiler
 
         std::string lowerCase = Misc::StringUtils::lowerCase(name);
 
-        for (; keywords[i]; ++i)
-            if (lowerCase==keywords[i])
+        for (; sKeywords[i]; ++i)
+            if (lowerCase==sKeywords[i])
                 break;
 
-        if (keywords[i])
+        if (sKeywords[i])
         {
             cont = parser.parseKeyword (i, loc, *this);
             return true;
@@ -618,8 +618,8 @@ namespace Compiler
 
     void Scanner::listKeywords (std::vector<std::string>& keywords)
     {
-        for (int i=0; Compiler::keywords[i]; ++i)
-            keywords.push_back (Compiler::keywords[i]);
+        for (int i=0; Compiler::sKeywords[i]; ++i)
+            keywords.push_back (Compiler::sKeywords[i]);
 
         if (mExtensions)
             mExtensions->listKeywords (keywords);
diff --git a/components/compiler/streamerrorhandler.cpp b/components/compiler/streamerrorhandler.cpp
index 9ca8aa74b..04bee8adb 100644
--- a/components/compiler/streamerrorhandler.cpp
+++ b/components/compiler/streamerrorhandler.cpp
@@ -14,6 +14,9 @@ namespace Compiler
         else
             mStream << "warning ";
 
+        if (!mContext.empty())
+            mStream << mContext << " ";
+
         mStream
             << "line " << loc.mLine+1 << ", column " << loc.mColumn+1
             << " (" << loc.mLiteral << ")" << std::endl
@@ -34,5 +37,10 @@ namespace Compiler
             << "    " << message << std::endl;
     }
 
+    void StreamErrorHandler::setContext(const std::string &context)
+    {
+        mContext = context;
+    }
+
     StreamErrorHandler::StreamErrorHandler (std::ostream& ErrorStream) : mStream (ErrorStream) {}
 }
diff --git a/components/compiler/streamerrorhandler.hpp b/components/compiler/streamerrorhandler.hpp
index 85de1833a..d287833ee 100644
--- a/components/compiler/streamerrorhandler.hpp
+++ b/components/compiler/streamerrorhandler.hpp
@@ -13,6 +13,8 @@ namespace Compiler
     {
             std::ostream& mStream;
 
+            std::string mContext;
+
         // not implemented
 
             StreamErrorHandler (const StreamErrorHandler&);
@@ -26,6 +28,8 @@ namespace Compiler
 
         public:
 
+            void setContext(const std::string& context);
+
         // constructors
 
             StreamErrorHandler (std::ostream& ErrorStream);
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 26f0a4806..a7ac29b46 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -110,26 +110,26 @@ Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex &index
     bool gamefileChecked = (file->gameFiles().count() == 0);
     foreach (const QString &fileName, file->gameFiles())
     {
-        foreach (EsmFile *dependency, mFiles)
+        for (QListIterator<EsmFile *> dependencyIter(mFiles); dependencyIter.hasNext(); dependencyIter.next())
         {
             //compare filenames only.  Multiple instances
             //of the filename (with different paths) is not relevant here.
-            bool depFound = (dependency->fileName().compare(fileName, Qt::CaseInsensitive) == 0);
+            bool depFound = (dependencyIter.peekNext()->fileName().compare(fileName, Qt::CaseInsensitive) == 0);
 
             if (!depFound)
                 continue;
 
             if (!gamefileChecked)
             {
-                if (isChecked (dependency->filePath()))
-                    gamefileChecked = (dependency->isGameFile());
+                if (isChecked (dependencyIter.peekNext()->filePath()))
+                    gamefileChecked = (dependencyIter.peekNext()->isGameFile());
             }
 
             // force it to iterate all files in cases where the current
             // dependency is a game file to ensure that a later duplicate
             // game file is / is not checked.
             // (i.e., break only if it's not a gamefile or the game file has been checked previously)
-            if (gamefileChecked || !(dependency->isGameFile()))
+            if (gamefileChecked || !(dependencyIter.peekNext()->isGameFile()))
                 break;
         }
     }
@@ -283,12 +283,11 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex &index, const
             else
                 return success;
 
-
-            foreach (EsmFile *file, mFiles)
+            foreach (EsmFile *file2, mFiles)
             {
-                if (file->gameFiles().contains(fileName, Qt::CaseInsensitive))
+                if (file2->gameFiles().contains(fileName, Qt::CaseInsensitive))
                 {
-                    QModelIndex idx = indexFromItem(file);
+                    QModelIndex idx = indexFromItem(file2);
                     emit dataChanged(idx, idx);
                 }
             }
@@ -425,9 +424,9 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
     filters << "*.esp" << "*.esm" << "*.omwgame" << "*.omwaddon";
     dir.setNameFilters(filters);
 
-    foreach (const QString &path, dir.entryList())
+    foreach (const QString &path2, dir.entryList())
     {
-        QFileInfo info(dir.absoluteFilePath(path));
+        QFileInfo info(dir.absoluteFilePath(path2));
 
         if (item(info.absoluteFilePath()) != 0)
             continue;
@@ -437,12 +436,13 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
             ToUTF8::Utf8Encoder encoder =
             ToUTF8::calculateEncoding(mEncoding.toStdString());
             fileReader.setEncoder(&encoder);
-            fileReader.open(std::string(dir.absoluteFilePath(path).toUtf8().constData()));
-
-            EsmFile *file = new EsmFile(path);
+            fileReader.open(std::string(dir.absoluteFilePath(path2).toUtf8().constData()));
 
-            foreach (const ESM::Header::MasterData &item, fileReader.getGameFiles())
-                file->addGameFile(QString::fromUtf8(item.name.c_str()));
+            EsmFile *file = new EsmFile(path2);
+         
+            for (std::vector<ESM::Header::MasterData>::const_iterator itemIter = fileReader.getGameFiles().begin();
+                itemIter != fileReader.getGameFiles().end(); ++itemIter)
+                file->addGameFile(QString::fromUtf8(itemIter->name.c_str()));
 
             file->setAuthor     (QString::fromUtf8(fileReader.getAuthor().c_str()));
             file->setDate       (info.lastModified());
diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index 87c9cea08..514a0444a 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -192,8 +192,8 @@ void ContentSelectorView::ContentSelector::setGameFileSelected(int index, bool s
     const ContentSelectorModel::EsmFile* file = mContentModel->item(fileName);
     if (file != NULL)
     {
-        QModelIndex index(mContentModel->indexFromItem(file));
-        mContentModel->setData(index, selected, Qt::UserRole + 1);
+        QModelIndex index2(mContentModel->indexFromItem(file));
+        mContentModel->setData(index2, selected, Qt::UserRole + 1);
     }
 }
 
diff --git a/components/esm/aisequence.cpp b/components/esm/aisequence.cpp
index 5b36f9a4c..71f87b170 100644
--- a/components/esm/aisequence.cpp
+++ b/components/esm/aisequence.cpp
@@ -15,7 +15,7 @@ namespace AiSequence
     void AiWander::load(ESMReader &esm)
     {
         esm.getHNT (mData, "DATA");
-        esm.getHNT(mStartTime, "STAR");
+        esm.getHNT(mDurationData, "STAR"); // was mStartTime
         mStoredInitialActorPosition = false;
         if (esm.isNextSub("POS_"))
         {
@@ -27,7 +27,7 @@ namespace AiSequence
     void AiWander::save(ESMWriter &esm) const
     {
         esm.writeHNT ("DATA", mData);
-        esm.writeHNT ("STAR", mStartTime);
+        esm.writeHNT ("STAR", mDurationData);
         if (mStoredInitialActorPosition)
             esm.writeHNT ("POS_", mInitialActorPosition);
     }
diff --git a/components/esm/aisequence.hpp b/components/esm/aisequence.hpp
index 2560fbe7d..52446d38f 100644
--- a/components/esm/aisequence.hpp
+++ b/components/esm/aisequence.hpp
@@ -46,6 +46,11 @@ namespace ESM
         unsigned char mIdle[8];
         unsigned char mShouldRepeat;
     };
+    struct AiWanderDuration
+    {
+        float mRemainingDuration;
+        int unused;
+    };
     struct AiTravelData
     {
         float   mX, mY, mZ;
@@ -61,7 +66,7 @@ namespace ESM
     struct AiWander : AiPackage
     {
         AiWanderData mData;
-        ESM::TimeStamp mStartTime;
+        AiWanderDuration mDurationData; // was ESM::TimeStamp mStartTime
 
         bool mStoredInitialActorPosition;
         ESM::Vector3 mInitialActorPosition;
diff --git a/components/esm/animationstate.cpp b/components/esm/animationstate.cpp
new file mode 100644
index 000000000..37ea0b186
--- /dev/null
+++ b/components/esm/animationstate.cpp
@@ -0,0 +1,53 @@
+#include "animationstate.hpp"
+
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
+
+namespace ESM
+{
+    bool AnimationState::empty() const
+    {
+        return mScriptedAnims.empty();
+    }
+
+    void AnimationState::load(ESMReader& esm)
+    {
+        mScriptedAnims.clear();
+
+        while (esm.isNextSub("ANIS"))
+        {
+            ScriptedAnimation anim;
+
+            anim.mGroup = esm.getHString();
+            esm.getHNOT(anim.mTime, "TIME");
+            esm.getHNOT(anim.mAbsolute, "ABST");
+
+            esm.getSubNameIs("COUN");
+            // workaround bug in earlier version where size_t was used
+            esm.getSubHeader();
+            if (esm.getSubSize() == 8)
+                esm.getT(anim.mLoopCount);
+            else
+            {
+                uint32_t loopcount;
+                esm.getT(loopcount);
+                anim.mLoopCount = (uint64_t) loopcount;
+            }
+
+            mScriptedAnims.push_back(anim);
+        }
+    }
+
+    void AnimationState::save(ESMWriter& esm) const
+    {
+        for (ScriptedAnimations::const_iterator iter = mScriptedAnims.begin(); iter != mScriptedAnims.end(); ++iter)
+        {
+            esm.writeHNString("ANIS", iter->mGroup);
+            if (iter->mTime > 0)
+                esm.writeHNT("TIME", iter->mTime);
+            if (iter->mAbsolute)
+                esm.writeHNT("ABST", iter->mAbsolute);
+            esm.writeHNT("COUN", iter->mLoopCount);
+        }
+    }
+}
diff --git a/components/esm/animationstate.hpp b/components/esm/animationstate.hpp
new file mode 100644
index 000000000..2a19eff63
--- /dev/null
+++ b/components/esm/animationstate.hpp
@@ -0,0 +1,37 @@
+#ifndef OPENMW_ESM_ANIMATIONSTATE_H
+#define OPENMW_ESM_ANIMATIONSTATE_H
+
+#include <string>
+#include <vector>
+#include <stdint.h>
+
+namespace ESM
+{
+    class ESMReader;
+    class ESMWriter;
+
+    // format 0, saved games only
+    struct AnimationState
+    {
+        struct ScriptedAnimation
+        {
+            ScriptedAnimation()
+                : mTime(0.f), mAbsolute(false), mLoopCount(0) {}
+
+            std::string mGroup;
+            float mTime;
+            bool mAbsolute;
+            uint64_t mLoopCount;
+        };
+
+        typedef std::vector<ScriptedAnimation> ScriptedAnimations;
+        ScriptedAnimations mScriptedAnims;
+
+        bool empty() const;
+
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
+    };
+}
+
+#endif
diff --git a/components/esm/cellid.cpp b/components/esm/cellid.cpp
index f77e2eb55..ad91d30e0 100644
--- a/components/esm/cellid.cpp
+++ b/components/esm/cellid.cpp
@@ -3,6 +3,8 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+const std::string ESM::CellId::sDefaultWorldspace = "sys::default";
+
 void ESM::CellId::load (ESMReader &esm)
 {
     mWorldspace = esm.getHNString ("SPAC");
diff --git a/components/esm/cellid.hpp b/components/esm/cellid.hpp
index 56d5a674e..a28b71794 100644
--- a/components/esm/cellid.hpp
+++ b/components/esm/cellid.hpp
@@ -20,6 +20,8 @@ namespace ESM
         CellIndex mIndex;
         bool mPaged;
 
+        static const std::string sDefaultWorldspace;
+
         void load (ESMReader &esm);
         void save (ESMWriter &esm) const;
     };
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index 7acaed86d..e41201d6e 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -1,5 +1,7 @@
 #include "cellref.hpp"
 
+#include <iostream>
+
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
@@ -43,7 +45,13 @@ void ESM::CellRef::loadId (ESMReader& esm, bool wideRefNum)
 
     mRefNum.load (esm, wideRefNum);
 
-    mRefID = esm.getHNString ("NAME");
+    mRefID = esm.getHNOString ("NAME");
+    if (mRefID.empty())
+    {
+        std::ios::fmtflags f(std::cerr.flags());
+        std::cerr << "Warning: got CellRef with empty RefId in " << esm.getName() << " 0x" << std::hex << esm.getFileOffset() << std::endl;
+        std::cerr.flags(f);
+    }
 }
 
 void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted)
@@ -54,7 +62,7 @@ void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted)
     while (!isLoaded && esm.hasMoreSubs())
     {
         esm.getSubName();
-        switch (esm.retSubName().val)
+        switch (esm.retSubName().intval)
         {
             case ESM::FourCC<'U','N','A','M'>::value:
                 esm.getHT(mReferenceBlocked);
@@ -188,6 +196,7 @@ void ESM::CellRef::blank()
     mFaction.clear();
     mFactionRank = -2;
     mChargeInt = -1;
+    mChargeIntRemainder = 0.0f;
     mEnchantmentCharge = -1;
     mGoldValue = 0;
     mDestCell.clear();
diff --git a/components/esm/cellref.hpp b/components/esm/cellref.hpp
index 3c646cc61..f14617531 100644
--- a/components/esm/cellref.hpp
+++ b/components/esm/cellref.hpp
@@ -69,6 +69,7 @@ namespace ESM
                 int mChargeInt;     // Used by everything except lights
                 float mChargeFloat; // Used only by lights
             };
+            float mChargeIntRemainder; // Stores amount of charge not subtracted from mChargeInt
 
             // Remaining enchantment charge. This could be -1 if the charge was not touched yet (i.e. full).
             float mEnchantmentCharge;
diff --git a/components/esm/controlsstate.cpp b/components/esm/controlsstate.cpp
new file mode 100644
index 000000000..ae4e1dff1
--- /dev/null
+++ b/components/esm/controlsstate.cpp
@@ -0,0 +1,43 @@
+#include "controlsstate.hpp"
+
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
+
+ESM::ControlsState::ControlsState()
+    : mViewSwitchDisabled(false),
+      mControlsDisabled(false),
+      mJumpingDisabled(false),
+      mLookingDisabled(false),
+      mVanityModeDisabled(false),
+      mWeaponDrawingDisabled(false),
+      mSpellDrawingDisabled(false)
+{
+}
+
+void ESM::ControlsState::load(ESM::ESMReader& esm)
+{
+    int flags;
+    esm.getHNT(flags, "CFLG");
+
+    mViewSwitchDisabled = flags & ViewSwitchDisabled;
+    mControlsDisabled = flags & ControlsDisabled;
+    mJumpingDisabled = flags & JumpingDisabled;
+    mLookingDisabled = flags & LookingDisabled;
+    mVanityModeDisabled = flags & VanityModeDisabled;
+    mWeaponDrawingDisabled = flags & WeaponDrawingDisabled;
+    mSpellDrawingDisabled = flags & SpellDrawingDisabled;
+}
+
+void ESM::ControlsState::save(ESM::ESMWriter& esm) const
+{
+    int flags = 0;
+    if (mViewSwitchDisabled) flags |= ViewSwitchDisabled;
+    if (mControlsDisabled) flags |= ControlsDisabled;
+    if (mJumpingDisabled) flags |= JumpingDisabled;
+    if (mLookingDisabled) flags |= LookingDisabled;
+    if (mVanityModeDisabled) flags |= VanityModeDisabled;
+    if (mWeaponDrawingDisabled) flags |= WeaponDrawingDisabled;
+    if (mSpellDrawingDisabled) flags |= SpellDrawingDisabled;
+
+    esm.writeHNT("CFLG", flags);
+}
diff --git a/components/esm/controlsstate.hpp b/components/esm/controlsstate.hpp
new file mode 100644
index 000000000..b9654ea1a
--- /dev/null
+++ b/components/esm/controlsstate.hpp
@@ -0,0 +1,39 @@
+#ifndef OPENMW_ESM_CONTROLSSTATE_H
+#define OPENMW_ESM_CONTROLSSTATE_H
+
+namespace ESM
+{
+    class ESMReader;
+    class ESMWriter;
+
+    // format 0, saved games only
+
+    struct ControlsState
+    {
+        ControlsState();
+
+        enum Flags
+        {
+            ViewSwitchDisabled = 0x1,
+            ControlsDisabled = 0x4,
+            JumpingDisabled = 0x1000,
+            LookingDisabled = 0x2000,
+            VanityModeDisabled = 0x4000,
+            WeaponDrawingDisabled = 0x8000,
+            SpellDrawingDisabled = 0x10000
+        };
+
+        bool mViewSwitchDisabled;
+        bool mControlsDisabled;
+        bool mJumpingDisabled;
+        bool mLookingDisabled;
+        bool mVanityModeDisabled;
+        bool mWeaponDrawingDisabled;
+        bool mSpellDrawingDisabled;
+
+        void load (ESMReader &esm);
+        void save (ESMWriter &esm) const;
+    };
+}
+
+#endif
diff --git a/components/esm/creaturestats.cpp b/components/esm/creaturestats.cpp
index 9bdbf9668..beb2c4c64 100644
--- a/components/esm/creaturestats.cpp
+++ b/components/esm/creaturestats.cpp
@@ -20,6 +20,12 @@ void ESM::CreatureStats::load (ESMReader &esm)
     mDead = false;
     esm.getHNOT (mDead, "DEAD");
 
+    mDeathAnimationFinished = false;
+    esm.getHNOT (mDeathAnimationFinished, "DFNT");
+
+    if (esm.getFormat() < 3 && mDead)
+        mDeathAnimationFinished = true;
+
     mDied = false;
     esm.getHNOT (mDied, "DIED");
 
@@ -84,9 +90,16 @@ void ESM::CreatureStats::load (ESMReader &esm)
     mActorId = -1;
     esm.getHNOT (mActorId, "ACID");
 
-    mDeathAnimation = 0;
+    //mHitAttemptActorId = -1;
+    //esm.getHNOT(mHitAttemptActorId, "HAID");
+
+    mDeathAnimation = -1;
     esm.getHNOT (mDeathAnimation, "DANM");
 
+    mTimeOfDeath.mDay = 0;
+    mTimeOfDeath.mHour = 0;
+    esm.getHNOT (mTimeOfDeath, "DTIM");
+
     mSpells.load(esm);
     mActiveSpells.load(esm);
     mAiSequence.load(esm);
@@ -136,6 +149,9 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
     if (mDead)
         esm.writeHNT ("DEAD", mDead);
 
+    if (mDeathAnimationFinished)
+        esm.writeHNT ("DFNT", mDeathAnimationFinished);
+
     if (mDied)
         esm.writeHNT ("DIED", mDied);
 
@@ -190,9 +206,15 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
     if (mActorId != -1)
         esm.writeHNT ("ACID", mActorId);
 
-    if (mDeathAnimation)
+    //if (mHitAttemptActorId != -1)
+    //    esm.writeHNT("HAID", mHitAttemptActorId);
+
+    if (mDeathAnimation != -1)
         esm.writeHNT ("DANM", mDeathAnimation);
 
+    if (mTimeOfDeath.mHour != 0 && mTimeOfDeath.mDay != 0)
+        esm.writeHNT ("DTIM", mTimeOfDeath);
+
     mSpells.save(esm);
     mActiveSpells.save(esm);
     mAiSequence.save(esm);
@@ -224,8 +246,10 @@ void ESM::CreatureStats::blank()
     mTradeTime.mDay = 0;
     mGoldPool = 0;
     mActorId = -1;
+    //mHitAttemptActorId = -1;
     mHasAiSettings = false;
     mDead = false;
+    mDeathAnimationFinished = false;
     mDied = false;
     mMurdered = false;
     mTalkedTo = false;
@@ -240,6 +264,6 @@ void ESM::CreatureStats::blank()
     mFallHeight = 0.f;
     mRecalcDynamicStats = false;
     mDrawState = 0;
-    mDeathAnimation = 0;
+    mDeathAnimation = -1;
     mLevel = 1;
 }
diff --git a/components/esm/creaturestats.hpp b/components/esm/creaturestats.hpp
index 426e89055..7e7e5dac3 100644
--- a/components/esm/creaturestats.hpp
+++ b/components/esm/creaturestats.hpp
@@ -38,8 +38,10 @@ namespace ESM
         ESM::TimeStamp mTradeTime;
         int mGoldPool;
         int mActorId;
+        //int mHitAttemptActorId;
 
         bool mDead;
+        bool mDeathAnimationFinished;
         bool mDied;
         bool mMurdered;
         bool mTalkedTo;
@@ -56,7 +58,8 @@ namespace ESM
         std::string mLastHitAttemptObject;
         bool mRecalcDynamicStats;
         int mDrawState;
-        unsigned char mDeathAnimation;
+        signed char mDeathAnimation;
+        ESM::TimeStamp mTimeOfDeath;
 
         int mLevel;
 
diff --git a/components/esm/debugprofile.cpp b/components/esm/debugprofile.cpp
index 66e338d0c..17249d8a3 100644
--- a/components/esm/debugprofile.cpp
+++ b/components/esm/debugprofile.cpp
@@ -13,7 +13,7 @@ void ESM::DebugProfile::load (ESMReader& esm, bool &isDeleted)
     while (esm.hasMoreSubs())
     {
         esm.getSubName();
-        switch (esm.retSubName().val)
+        switch (esm.retSubName().intval)
         {
             case ESM::SREC_NAME:
                 mId = esm.getHString();
diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index 8066b622a..0f0478faa 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -127,6 +127,7 @@ enum RecNameInts
     REC_ENAB = FourCC<'E','N','A','B'>::value,
     REC_CAM_ = FourCC<'C','A','M','_'>::value,
     REC_STLN = FourCC<'S','T','L','N'>::value,
+    REC_INPU = FourCC<'I','N','P','U'>::value,
 
     // format 1
     REC_FILT = FourCC<'F','I','L','T'>::value,
diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index d90a3444d..d635ba6df 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -15,43 +15,98 @@ enum Version
     VER_13 = 0x3fa66666
   };
 
-/* A structure used for holding fixed-length strings. In the case of
-   LEN=4, it can be more efficient to match the string as a 32 bit
-   number, therefore the struct is implemented as a union with an int.
- */
-template <int LEN>
-union NAME_T
+
+// CRTP for FIXED_STRING class, a structure used for holding fixed-length strings
+template< template<size_t> class DERIVED, size_t SIZE>
+class FIXED_STRING_BASE
 {
-    char name[LEN];
-    uint32_t val;
+    /* The following methods must be implemented in derived classes:
+     *   char const* ro_data() const; // return pointer to ro buffer
+     *   char*       rw_data();       // return pointer to rw buffer
+     */
+public:
+    enum { size = SIZE };
 
-  bool operator==(const char *str) const
-  {
-    for(int i=0; i<LEN; i++)
-      if(name[i] != str[i]) return false;
-      else if(name[i] == 0) return true;
-    return str[LEN] == 0;
-  }
-  bool operator!=(const char *str) const { return !((*this)==str); }
-
-  bool operator==(const std::string &str) const
-  {
-    return (*this) == str.c_str();
-  }
-  bool operator!=(const std::string &str) const { return !((*this)==str); }
+    template<size_t OTHER_SIZE>
+    bool operator==(char const (&str)[OTHER_SIZE]) const
+    {
+        size_t other_len = strnlen(str, OTHER_SIZE);
+        if (other_len != this->length())
+            return false;
+        return std::strncmp(self()->ro_data(), str, size) == 0;
+    }
+    bool operator==(const char* const str) const
+    {
+        char const* const data = self()->ro_data();
+        for(size_t i = 0; i < size; ++i)
+        {
+            if(data[i] != str[i]) return false;
+            else if(data[i] == '\0') return true;
+        }
+        return str[size] == '\0';
+    }
+    bool operator!=(const char* const str) const { return !( (*this) == str ); }
+
+    bool operator==(const std::string& str) const
+    {
+        return (*this) == str.c_str();
+    }
+    bool operator!=(const std::string& str) const { return !( (*this) == str ); }
+
+    size_t data_size() const { return size; }
+    size_t length() const { return strnlen(self()->ro_data(), size); }
+    std::string toString() const { return std::string(self()->ro_data(), this->length()); }
+
+    void assign(const std::string& value) { std::strncpy(self()->rw_data(), value.c_str(), size); }
+    void clear() { this->assign(""); }
+private:
+    DERIVED<size> const* self() const
+    {
+        return static_cast<DERIVED<size> const*>(this);
+    }
+
+    // write the non-const version in terms of the const version
+    // Effective C++ 3rd ed., Item 3 (p. 24-25)
+    DERIVED<size>* self()
+    {
+        return const_cast<DERIVED<size>*>(static_cast<FIXED_STRING_BASE const*>(this)->self());
+    }
+};
+
+// Generic implementation
+template <size_t SIZE>
+struct FIXED_STRING : public FIXED_STRING_BASE<FIXED_STRING, SIZE>
+{
+    char data[SIZE];
+
+    char const* ro_data() const { return data; }
+    char*       rw_data() { return data; }
+};
+
+// In the case of SIZE=4, it can be more efficient to match the string
+// as a 32 bit number, therefore the struct is implemented as a union with an int.
+template <>
+struct FIXED_STRING<4> : public FIXED_STRING_BASE<FIXED_STRING, 4>
+{
+    union {
+        char data[4];
+        uint32_t intval;
+    };
 
-  bool operator==(uint32_t v) const { return v == val; }
-  bool operator!=(uint32_t v) const { return v != val; }
+    using FIXED_STRING_BASE::operator==;
+    using FIXED_STRING_BASE::operator!=;
 
-  std::string toString() const { return std::string(name, strnlen(name, LEN)); }
+    bool operator==(uint32_t v) const { return v == intval; }
+    bool operator!=(uint32_t v) const { return v != intval; }
 
-  void assign (const std::string& value) { std::strncpy (name, value.c_str(), LEN); }
+    char const* ro_data() const { return data; }
+    char*       rw_data() { return data; }
 };
 
-typedef NAME_T<4> NAME;
-typedef NAME_T<32> NAME32;
-typedef NAME_T<64> NAME64;
-typedef NAME_T<256> NAME256;
+typedef FIXED_STRING<4> NAME;
+typedef FIXED_STRING<32> NAME32;
+typedef FIXED_STRING<64> NAME64;
+typedef FIXED_STRING<256> NAME256;
 
 /* This struct defines a file 'context' which can be saved and later
    restored by an ESMReader instance. It will save the position within
diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 6ef14a70e..2a716427e 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -55,8 +55,8 @@ void ESMReader::close()
     mCtx.leftRec = 0;
     mCtx.leftSub = 0;
     mCtx.subCached = false;
-    mCtx.recName.val = 0;
-    mCtx.subName.val = 0;
+    mCtx.recName.clear();
+    mCtx.subName.clear();
 }
 
 void ESMReader::openRaw(Files::IStreamPtr _esm, const std::string& name)
@@ -204,16 +204,18 @@ void ESMReader::getSubName()
     }
 
     // reading the subrecord data anyway.
-    getExact(mCtx.subName.name, 4);
-    mCtx.leftRec -= 4;
+    const size_t subNameSize = mCtx.subName.data_size();
+    getExact(mCtx.subName.rw_data(), subNameSize);
+    mCtx.leftRec -= subNameSize;
 }
 
 bool ESMReader::isEmptyOrGetName()
 {
     if (mCtx.leftRec)
     {
-        getExact(mCtx.subName.name, 4);
-        mCtx.leftRec -= 4;
+        const size_t subNameSize = mCtx.subName.data_size();
+        getExact(mCtx.subName.rw_data(), subNameSize);
+        mCtx.leftRec -= subNameSize;
         return false;
     }
     return true;
@@ -267,7 +269,7 @@ NAME ESMReader::getRecName()
     if (!hasMoreRecs())
         fail("No more records, getRecName() failed");
     getName(mCtx.recName);
-    mCtx.leftFile -= 4;
+    mCtx.leftFile -= mCtx.recName.data_size();
 
     // Make sure we don't carry over any old cached subrecord
     // names. This can happen in some cases when we skip parts of a
diff --git a/components/esm/esmwriter.cpp b/components/esm/esmwriter.cpp
index 4d9999143..b8c78a2b9 100644
--- a/components/esm/esmwriter.cpp
+++ b/components/esm/esmwriter.cpp
@@ -9,10 +9,13 @@
 namespace ESM
 {
     ESMWriter::ESMWriter()
-        : mStream(NULL)
-        , mEncoder (0)
-        , mRecordCount (0)
-        , mCounting (true)
+        : mRecords()
+        , mStream(NULL)
+        , mHeaderPos()
+        , mEncoder(NULL)
+        , mRecordCount(0)
+        , mCounting(true)
+        , mHeader()
     {}
 
     unsigned int ESMWriter::getVersion() const
diff --git a/components/esm/filter.cpp b/components/esm/filter.cpp
index c3658f152..4f0519f80 100644
--- a/components/esm/filter.cpp
+++ b/components/esm/filter.cpp
@@ -13,7 +13,7 @@ void ESM::Filter::load (ESMReader& esm, bool &isDeleted)
     while (esm.hasMoreSubs())
     {
         esm.getSubName();
-        uint32_t name = esm.retSubName().val;
+        uint32_t name = esm.retSubName().intval;
         switch (name)
         {
             case ESM::SREC_NAME:
diff --git a/components/esm/inventorystate.cpp b/components/esm/inventorystate.cpp
index b24128ec3..73db72b00 100644
--- a/components/esm/inventorystate.cpp
+++ b/components/esm/inventorystate.cpp
@@ -65,11 +65,11 @@ void ESM::InventoryState::load (ESMReader &esm)
     while (esm.isNextSub("EQUI"))
     {
         esm.getSubHeader();
-        int index;
-        esm.getT(index);
+        int equipIndex;
+        esm.getT(equipIndex);
         int slot;
         esm.getT(slot);
-        mEquipmentSlots[index] = slot;
+        mEquipmentSlots[equipIndex] = slot;
     }
 
     mSelectedEnchantItem = -1;
diff --git a/components/esm/loadacti.cpp b/components/esm/loadacti.cpp
index b9934d3d3..ba35535b8 100644
--- a/components/esm/loadacti.cpp
+++ b/components/esm/loadacti.cpp
@@ -16,7 +16,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadalch.cpp b/components/esm/loadalch.cpp
index 204904502..85c24dc2d 100644
--- a/components/esm/loadalch.cpp
+++ b/components/esm/loadalch.cpp
@@ -19,7 +19,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadappa.cpp b/components/esm/loadappa.cpp
index 490881fae..1bd1f9379 100644
--- a/components/esm/loadappa.cpp
+++ b/components/esm/loadappa.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadappa.hpp b/components/esm/loadappa.hpp
index 0590d33ed..74f8dd6ae 100644
--- a/components/esm/loadappa.hpp
+++ b/components/esm/loadappa.hpp
@@ -22,7 +22,7 @@ struct Apparatus
     enum AppaType
     {
         MortarPestle = 0,
-        Albemic = 1,
+        Alembic = 1,
         Calcinator = 2,
         Retort = 3
     };
diff --git a/components/esm/loadarmo.cpp b/components/esm/loadarmo.cpp
index f2526554a..929c111a9 100644
--- a/components/esm/loadarmo.cpp
+++ b/components/esm/loadarmo.cpp
@@ -49,7 +49,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadbody.cpp b/components/esm/loadbody.cpp
index 09113e8d1..3e5895c2c 100644
--- a/components/esm/loadbody.cpp
+++ b/components/esm/loadbody.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadbook.cpp b/components/esm/loadbook.cpp
index 617040be4..ee3c0c4af 100644
--- a/components/esm/loadbook.cpp
+++ b/components/esm/loadbook.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
@@ -84,7 +84,7 @@ namespace ESM
         mData.mWeight = 0;
         mData.mValue = 0;
         mData.mIsScroll = 0;
-        mData.mSkillID = 0;
+        mData.mSkillId = 0;
         mData.mEnchant = 0;
         mName.clear();
         mModel.clear();
diff --git a/components/esm/loadbook.hpp b/components/esm/loadbook.hpp
index 3d50356ae..bb2d7912f 100644
--- a/components/esm/loadbook.hpp
+++ b/components/esm/loadbook.hpp
@@ -21,7 +21,7 @@ struct Book
     struct BKDTstruct
     {
         float mWeight;
-        int mValue, mIsScroll, mSkillID, mEnchant;
+        int mValue, mIsScroll, mSkillId, mEnchant;
     };
 
     BKDTstruct mData;
diff --git a/components/esm/loadbsgn.cpp b/components/esm/loadbsgn.cpp
index 9a4d98bb7..e3b2f76a3 100644
--- a/components/esm/loadbsgn.cpp
+++ b/components/esm/loadbsgn.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index eb9d6b8d8..7c4349d31 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -69,7 +69,7 @@ namespace ESM
         while (!isLoaded && esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mName = esm.getHString();
@@ -96,7 +96,7 @@ namespace ESM
 
         if (mCellId.mPaged)
         {
-            mCellId.mWorldspace = "sys::default";
+            mCellId.mWorldspace = ESM::CellId::sDefaultWorldspace;
             mCellId.mIndex.mX = mData.mX;
             mCellId.mIndex.mY = mData.mY;
         }
@@ -114,7 +114,7 @@ namespace ESM
         while (!isLoaded && esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'I','N','T','V'>::value:
                     int waterl;
diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp
index f92e0b5b7..249d812b1 100644
--- a/components/esm/loadcell.hpp
+++ b/components/esm/loadcell.hpp
@@ -30,12 +30,12 @@ class MovedCellRef
 public:
     RefNum mRefNum;
 
-    // Target cell (if exterior)
+    // Coordinates of target exterior cell
     int mTarget[2];
 
-    // TODO: Support moving references between exterior and interior cells!
-    //  This may happen in saves, when an NPC follows the player. Tribunal
-    //  introduces a henchman (which no one uses), so we may need this as well.
+    // The content file format does not support moving objects to an interior cell.
+    // The save game format does support moving to interior cells, but uses a different mechanism
+    // (see the MovedRefTracker implementation in MWWorld::CellStore for more details).
 };
 
 /// Overloaded compare operator used to search inside a list of cell refs.
@@ -43,7 +43,15 @@ bool operator==(const MovedCellRef& ref, const RefNum& refNum);
 bool operator==(const CellRef& ref, const RefNum& refNum);
 
 typedef std::list<MovedCellRef> MovedCellRefTracker;
-typedef std::list<CellRef> CellRefTracker;
+typedef std::list<std::pair<CellRef, bool> > CellRefTracker;
+
+struct CellRefTrackerPredicate
+{
+    RefNum mRefNum;
+
+    CellRefTrackerPredicate(const RefNum& refNum) : mRefNum(refNum) {}
+    bool operator() (const std::pair<CellRef, bool>& refdelPair) { return refdelPair.first == mRefNum; }
+};
 
 /* Cells hold data about objects, creatures, statics (rocks, walls,
    buildings) and landscape (for exterior cells). Cells frequently
@@ -141,7 +149,7 @@ struct Cell
 
   bool hasWater() const
   {
-      return (mData.mFlags&HasWater) != 0;
+      return ((mData.mFlags&HasWater) != 0) || isExterior();
   }
 
   // Restore the given reader to the stored position. Will try to open
diff --git a/components/esm/loadclas.cpp b/components/esm/loadclas.cpp
index 61960b87d..1e18bc054 100644
--- a/components/esm/loadclas.cpp
+++ b/components/esm/loadclas.cpp
@@ -47,7 +47,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadclot.cpp b/components/esm/loadclot.cpp
index 2ef69e5e9..12f0d495d 100644
--- a/components/esm/loadclot.cpp
+++ b/components/esm/loadclot.cpp
@@ -19,7 +19,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadcont.cpp b/components/esm/loadcont.cpp
index 739b0d7db..5ee785fb8 100644
--- a/components/esm/loadcont.cpp
+++ b/components/esm/loadcont.cpp
@@ -36,7 +36,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadcrea.cpp b/components/esm/loadcrea.cpp
index b51782089..ddd49f8df 100644
--- a/components/esm/loadcrea.cpp
+++ b/components/esm/loadcrea.cpp
@@ -30,7 +30,7 @@ namespace ESM {
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loaddial.cpp b/components/esm/loaddial.cpp
index bc87c4f57..f06b42250 100644
--- a/components/esm/loaddial.cpp
+++ b/components/esm/loaddial.cpp
@@ -28,7 +28,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'D','A','T','A'>::value:
                 {
@@ -77,14 +77,12 @@ namespace ESM
     void Dialogue::readInfo(ESMReader &esm, bool merge)
     {
         ESM::DialInfo info;
-        info.loadId(esm);
-
         bool isDeleted = false;
+        info.load(esm, isDeleted);
+
         if (!merge || mInfo.empty())
         {
-            info.loadData(esm, isDeleted);
             mLookup[info.mId] = std::make_pair(mInfo.insert(mInfo.end(), info), isDeleted);
-
             return;
         }
 
@@ -96,20 +94,10 @@ namespace ESM
         if (lookup != mLookup.end())
         {
             it = lookup->second.first;
-
-            // Merge with existing record. Only the subrecords that are present in
-            // the new record will be overwritten.
-            it->loadData(esm, isDeleted);
-            info = *it;
-
-            // Since the record merging may have changed the next/prev linked list connection, we need to re-insert the record
+            // Since the new version of this record may have changed the next/prev linked list connection, we need to re-insert the record
             mInfo.erase(it);
             mLookup.erase(lookup);
         }
-        else
-        {
-            info.loadData(esm, isDeleted);
-        }
 
         if (info.mNext.empty())
         {
diff --git a/components/esm/loaddoor.cpp b/components/esm/loaddoor.cpp
index 6d8c0978c..523d8a1ef 100644
--- a/components/esm/loaddoor.cpp
+++ b/components/esm/loaddoor.cpp
@@ -16,7 +16,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadench.cpp b/components/esm/loadench.cpp
index ae83c63f7..78e2fb5aa 100644
--- a/components/esm/loadench.cpp
+++ b/components/esm/loadench.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadfact.cpp b/components/esm/loadfact.cpp
index 75c482d20..07611c32f 100644
--- a/components/esm/loadfact.cpp
+++ b/components/esm/loadfact.cpp
@@ -40,7 +40,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadinfo.cpp b/components/esm/loadinfo.cpp
index 246baf026..38bb163e6 100644
--- a/components/esm/loadinfo.cpp
+++ b/components/esm/loadinfo.cpp
@@ -9,18 +9,9 @@ namespace ESM
     unsigned int DialInfo::sRecordId = REC_INFO;
 
     void DialInfo::load(ESMReader &esm, bool &isDeleted)
-    {
-        loadId(esm);
-        loadData(esm, isDeleted);
-    }
-
-    void DialInfo::loadId(ESMReader &esm)
     {
         mId = esm.getHNString("INAM");
-    }
 
-    void DialInfo::loadData(ESMReader &esm, bool &isDeleted)
-    {
         isDeleted = false;
 
         mQuestStatus = QS_None;
@@ -29,13 +20,10 @@ namespace ESM
         mPrev = esm.getHNString("PNAM");
         mNext = esm.getHNString("NNAM");
 
-        // Since there's no way to mark selects as "deleted", we have to clear the SelectStructs from all previous loadings
-        mSelects.clear();
-
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'D','A','T','A'>::value:
                     esm.getHT(mData, 12);
diff --git a/components/esm/loadinfo.hpp b/components/esm/loadinfo.hpp
index 8123a9ace..2fbc782ec 100644
--- a/components/esm/loadinfo.hpp
+++ b/components/esm/loadinfo.hpp
@@ -106,11 +106,7 @@ struct DialInfo
     };
 
     void load(ESMReader &esm, bool &isDeleted);
-    ///< Loads all sub-records of Info record
-    void loadId(ESMReader &esm);
-    ///< Loads only Id of Info record (INAM sub-record)
-    void loadData(ESMReader &esm, bool &isDeleted);
-    ///< Loads all sub-records of Info record, except INAM sub-record
+    ///< Loads Info record
 
     void save(ESMWriter &esm, bool isDeleted = false) const;
 
diff --git a/components/esm/loadingr.cpp b/components/esm/loadingr.cpp
index e00e73ab0..a18e321ff 100644
--- a/components/esm/loadingr.cpp
+++ b/components/esm/loadingr.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadland.cpp b/components/esm/loadland.cpp
index b0b072232..5e33e6082 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@@ -12,51 +12,6 @@ namespace ESM
 {
     unsigned int Land::sRecordId = REC_LAND;
 
-    void Land::LandData::save(ESMWriter &esm) const
-    {
-        if (mDataTypes & Land::DATA_VNML) {
-            esm.writeHNT("VNML", mNormals, sizeof(mNormals));
-        }
-        if (mDataTypes & Land::DATA_VHGT) {
-            VHGT offsets;
-            offsets.mHeightOffset = mHeights[0] / HEIGHT_SCALE;
-            offsets.mUnk1 = mUnk1;
-            offsets.mUnk2 = mUnk2;
-
-            float prevY = mHeights[0];
-            int number = 0; // avoid multiplication
-            for (int i = 0; i < LAND_SIZE; ++i) {
-                float diff = (mHeights[number] - prevY) / HEIGHT_SCALE;
-                offsets.mHeightData[number] =
-                    (diff >= 0) ? (int8_t) (diff + 0.5) : (int8_t) (diff - 0.5);
-
-                float prevX = prevY = mHeights[number];
-                ++number;
-
-                for (int j = 1; j < LAND_SIZE; ++j) {
-                    diff = (mHeights[number] - prevX) / HEIGHT_SCALE;
-                    offsets.mHeightData[number] =
-                        (diff >= 0) ? (int8_t) (diff + 0.5) : (int8_t) (diff - 0.5);
-
-                    prevX = mHeights[number];
-                    ++number;
-                }
-            }
-            esm.writeHNT("VHGT", offsets, sizeof(VHGT));
-        }
-        if (mDataTypes & Land::DATA_WNAM) {
-            esm.writeHNT("WNAM", mWnam, 81);
-        }
-        if (mDataTypes & Land::DATA_VCLR) {
-            esm.writeHNT("VCLR", mColours, 3*LAND_NUM_VERTS);
-        }
-        if (mDataTypes & Land::DATA_VTEX) {
-            static uint16_t vtex[LAND_NUM_TEXTURES];
-            transposeTextureData(mTextures, vtex);
-            esm.writeHNT("VTEX", vtex, sizeof(vtex));
-        }
-    }
-
     Land::Land()
         : mFlags(0)
         , mX(0)
@@ -68,7 +23,7 @@ namespace ESM
     {
     }
 
-    void Land::LandData::transposeTextureData(const uint16_t *in, uint16_t *out)
+    void transposeTextureData(const uint16_t *in, uint16_t *out)
     {
         int readPos = 0; //bit ugly, but it works
         for ( int y1 = 0; y1 < 4; y1++ )
@@ -94,7 +49,7 @@ namespace ESM
         while (!isLoaded && esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'I','N','T','V'>::value:
                     esm.getSubHeaderIs(8);
@@ -121,11 +76,14 @@ namespace ESM
 
         mContext = esm.getContext();
 
+        mDataLoaded = 0;
+        mLandData = NULL;
+
         // Skip the land data here. Load it when the cell is loaded.
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'V','N','M','L'>::value:
                     esm.skipHSub();
@@ -136,7 +94,7 @@ namespace ESM
                     mDataTypes |= DATA_VHGT;
                     break;
                 case ESM::FourCC<'W','N','A','M'>::value:
-                    esm.skipHSub();
+                    esm.getHExact(mWnam, sizeof(mWnam));
                     mDataTypes |= DATA_WNAM;
                     break;
                 case ESM::FourCC<'V','C','L','R'>::value:
@@ -152,9 +110,6 @@ namespace ESM
                     break;
             }
         }
-
-        mDataLoaded = 0;
-        mLandData = NULL;
     }
 
     void Land::save(ESMWriter &esm, bool isDeleted) const
@@ -174,8 +129,54 @@ namespace ESM
 
         if (mLandData)
         {
-            mLandData->save(esm);
+            if (mDataTypes & Land::DATA_VNML) {
+                esm.writeHNT("VNML", mLandData->mNormals, sizeof(mLandData->mNormals));
+            }
+            if (mDataTypes & Land::DATA_VHGT) {
+                VHGT offsets;
+                offsets.mHeightOffset = mLandData->mHeights[0] / HEIGHT_SCALE;
+                offsets.mUnk1 = mLandData->mUnk1;
+                offsets.mUnk2 = mLandData->mUnk2;
+
+                float prevY = mLandData->mHeights[0];
+                int number = 0; // avoid multiplication
+                for (int i = 0; i < LAND_SIZE; ++i) {
+                    float diff = (mLandData->mHeights[number] - prevY) / HEIGHT_SCALE;
+                    offsets.mHeightData[number] =
+                        (diff >= 0) ? (int8_t) (diff + 0.5) : (int8_t) (diff - 0.5);
+
+                    float prevX = prevY = mLandData->mHeights[number];
+                    ++number;
+
+                    for (int j = 1; j < LAND_SIZE; ++j) {
+                        diff = (mLandData->mHeights[number] - prevX) / HEIGHT_SCALE;
+                        offsets.mHeightData[number] =
+                            (diff >= 0) ? (int8_t) (diff + 0.5) : (int8_t) (diff - 0.5);
+
+                        prevX = mLandData->mHeights[number];
+                        ++number;
+                    }
+                }
+                esm.writeHNT("VHGT", offsets, sizeof(VHGT));
+            }
         }
+
+        if (mDataTypes & Land::DATA_WNAM) {
+            esm.writeHNT("WNAM", mWnam, 81);
+        }
+
+        if (mLandData)
+        {
+            if (mDataTypes & Land::DATA_VCLR) {
+                esm.writeHNT("VCLR", mLandData->mColours, 3*LAND_NUM_VERTS);
+            }
+            if (mDataTypes & Land::DATA_VTEX) {
+                uint16_t vtex[LAND_NUM_TEXTURES];
+                transposeTextureData(mLandData->mTextures, vtex);
+                esm.writeHNT("VTEX", vtex, sizeof(vtex));
+            }
+        }
+
     }
 
     void Land::loadData(int flags) const
@@ -191,7 +192,6 @@ namespace ESM
         // Create storage if nothing is loaded
         if (mLandData == NULL) {
             mLandData = new LandData;
-            mLandData->mDataTypes = mDataTypes;
         }
 
         ESM::ESMReader reader;
@@ -202,7 +202,7 @@ namespace ESM
         }
 
         if (reader.isNextSub("VHGT")) {
-            static VHGT vhgt;
+            VHGT vhgt;
             if (condLoad(reader, flags, DATA_VHGT, &vhgt, sizeof(vhgt))) {
                 float rowOffset = vhgt.mHeightOffset;
                 for (int y = 0; y < LAND_SIZE; y++) {
@@ -221,20 +221,20 @@ namespace ESM
             }
         }
 
-        if (reader.isNextSub("WNAM")) {
-            condLoad(reader, flags, DATA_WNAM, mLandData->mWnam, 81);
-        }
+        if (reader.isNextSub("WNAM"))
+            reader.skipHSub();
+
         if (reader.isNextSub("VCLR"))
             condLoad(reader, flags, DATA_VCLR, mLandData->mColours, 3 * LAND_NUM_VERTS);
         if (reader.isNextSub("VTEX")) {
-            static uint16_t vtex[LAND_NUM_TEXTURES];
+            uint16_t vtex[LAND_NUM_TEXTURES];
             if (condLoad(reader, flags, DATA_VTEX, vtex, sizeof(vtex))) {
-                LandData::transposeTextureData(vtex, mLandData->mTextures);
+                transposeTextureData(vtex, mLandData->mTextures);
             }
         }
     }
 
-    void Land::unloadData()
+    void Land::unloadData() const
     {
         if (mDataLoaded)
         {
diff --git a/components/esm/loadland.hpp b/components/esm/loadland.hpp
index 8a8d6fdd2..bdaf6cce8 100644
--- a/components/esm/loadland.hpp
+++ b/components/esm/loadland.hpp
@@ -46,6 +46,9 @@ struct Land
         DATA_VTEX = 16
     };
 
+    // default height to use in case there is no Land record
+    static const int DEFAULT_HEIGHT = -2048;
+
     // number of vertices per side
     static const int LAND_SIZE = 65;
 
@@ -93,20 +96,14 @@ struct Land
         // 24-bit RGB color for each vertex
         unsigned char mColours[3 * LAND_NUM_VERTS];
 
-        // DataTypes available in this LandData, accessing data that is not available is an undefined operation
-        int mDataTypes;
-
-        // low-LOD heightmap (used for rendering the global map)
-        signed char mWnam[81];
-
         // ???
         short mUnk1;
         uint8_t mUnk2;
-
-        void save(ESMWriter &esm) const;
-        static void transposeTextureData(const uint16_t *in, uint16_t *out);
     };
 
+    // low-LOD heightmap (used for rendering the global map)
+    signed char mWnam[81];
+
     void load(ESMReader &esm, bool &isDeleted);
     void save(ESMWriter &esm, bool isDeleted = false) const;
 
@@ -120,7 +117,7 @@ struct Land
     /**
      * Frees memory allocated for land data
      */
-    void unloadData();
+    void unloadData() const;
 
     /// Check if given data type is loaded
     /// @note We only check data types that *can* be loaded (present in mDataTypes)
diff --git a/components/esm/loadlevlist.cpp b/components/esm/loadlevlist.cpp
index 8c0d50324..0aed15aa9 100644
--- a/components/esm/loadlevlist.cpp
+++ b/components/esm/loadlevlist.cpp
@@ -15,7 +15,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadligh.cpp b/components/esm/loadligh.cpp
index 20c700b23..2a6dac14b 100644
--- a/components/esm/loadligh.cpp
+++ b/components/esm/loadligh.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadlock.cpp b/components/esm/loadlock.cpp
index fc6af8699..b14353ec5 100644
--- a/components/esm/loadlock.cpp
+++ b/components/esm/loadlock.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadltex.cpp b/components/esm/loadltex.cpp
index a42ae7c5b..613b706e3 100644
--- a/components/esm/loadltex.cpp
+++ b/components/esm/loadltex.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadmgef.cpp b/components/esm/loadmgef.cpp
index eef58aa2f..dc8266132 100644
--- a/components/esm/loadmgef.cpp
+++ b/components/esm/loadmgef.cpp
@@ -211,7 +211,7 @@ void MagicEffect::load(ESMReader &esm, bool &isDeleted)
     while (esm.hasMoreSubs())
     {
         esm.getSubName();
-        switch (esm.retSubName().val)
+        switch (esm.retSubName().intval)
         {
             case ESM::FourCC<'I','T','E','X'>::value:
                 mIcon = esm.getHString();
@@ -298,10 +298,10 @@ short MagicEffect::getResistanceEffect(short effect)
 
     for (int i=0; i<2; ++i)
     {
-        effects[CalmHumanoid] = ResistMagicka;
-        effects[FrenzyHumanoid] = ResistMagicka;
-        effects[DemoralizeHumanoid] = ResistMagicka;
-        effects[RallyHumanoid] = ResistMagicka;
+        effects[CalmHumanoid+i] = ResistMagicka;
+        effects[FrenzyHumanoid+i] = ResistMagicka;
+        effects[DemoralizeHumanoid+i] = ResistMagicka;
+        effects[RallyHumanoid+i] = ResistMagicka;
     }
 
     effects[TurnUndead] = ResistMagicka;
@@ -341,10 +341,10 @@ short MagicEffect::getWeaknessEffect(short effect)
 
     for (int i=0; i<2; ++i)
     {
-        effects[CalmHumanoid] = WeaknessToMagicka;
-        effects[FrenzyHumanoid] = WeaknessToMagicka;
-        effects[DemoralizeHumanoid] = WeaknessToMagicka;
-        effects[RallyHumanoid] = WeaknessToMagicka;
+        effects[CalmHumanoid+i] = WeaknessToMagicka;
+        effects[FrenzyHumanoid+i] = WeaknessToMagicka;
+        effects[DemoralizeHumanoid+i] = WeaknessToMagicka;
+        effects[RallyHumanoid+i] = WeaknessToMagicka;
     }
 
     effects[TurnUndead] = WeaknessToMagicka;
@@ -356,8 +356,7 @@ short MagicEffect::getWeaknessEffect(short effect)
     effects[Corprus] = WeaknessToCorprusDisease;
     effects[Poison] = WeaknessToPoison;
 
-    // Weakness to magicka or -1 ?
-    effects[Paralyze] = WeaknessToMagicka;
+    effects[Paralyze] = -1;
 
     if (effects.find(effect) != effects.end())
         return effects[effect];
diff --git a/components/esm/loadmisc.cpp b/components/esm/loadmisc.cpp
index 199b4e3b2..3ba662650 100644
--- a/components/esm/loadmisc.cpp
+++ b/components/esm/loadmisc.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadnpc.cpp b/components/esm/loadnpc.cpp
index e524e6a7c..a68c97a6a 100644
--- a/components/esm/loadnpc.cpp
+++ b/components/esm/loadnpc.cpp
@@ -26,7 +26,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp
index 69ee60eeb..708685e72 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@@ -46,7 +46,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mCell = esm.getHString();
@@ -127,6 +127,28 @@ namespace ESM
 
     void Pathgrid::save(ESMWriter &esm, bool isDeleted) const
     {
+        // Correct connection count and sort edges by point
+        // Can probably be optimized
+        PointList correctedPoints = mPoints;
+        std::vector<int> sortedEdges;
+
+        sortedEdges.reserve(mEdges.size());
+
+        for (size_t point = 0; point < correctedPoints.size(); ++point)
+        {
+            correctedPoints[point].mConnectionNum = 0;
+
+            for (EdgeList::const_iterator it = mEdges.begin(); it != mEdges.end(); ++it)
+            {
+                if (static_cast<size_t>(it->mV0) == point)
+                {
+                    sortedEdges.push_back(it->mV1);
+                    ++correctedPoints[point].mConnectionNum;
+                }
+            }
+        }
+
+        // Save
         esm.writeHNCString("NAME", mCell);
         esm.writeHNT("DATA", mData, 12);
 
@@ -136,22 +158,22 @@ namespace ESM
             return;
         }
 
-        if (!mPoints.empty())
+        if (!correctedPoints.empty())
         {
             esm.startSubRecord("PGRP");
-            for (PointList::const_iterator it = mPoints.begin(); it != mPoints.end(); ++it)
+            for (PointList::const_iterator it = correctedPoints.begin(); it != correctedPoints.end(); ++it)
             {
                 esm.writeT(*it);
             }
             esm.endRecord("PGRP");
         }
 
-        if (!mEdges.empty())
+        if (!sortedEdges.empty())
         {
             esm.startSubRecord("PGRC");
-            for (std::vector<Edge>::const_iterator it = mEdges.begin(); it != mEdges.end(); ++it)
+            for (std::vector<int>::const_iterator it = sortedEdges.begin(); it != sortedEdges.end(); ++it)
             {
-                esm.writeT(it->mV1);
+                esm.writeT(*it);
             }
             esm.endRecord("PGRC");
         }
diff --git a/components/esm/loadprob.cpp b/components/esm/loadprob.cpp
index baf466490..6307df329 100644
--- a/components/esm/loadprob.cpp
+++ b/components/esm/loadprob.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadrace.cpp b/components/esm/loadrace.cpp
index a37175144..88ce08c91 100644
--- a/components/esm/loadrace.cpp
+++ b/components/esm/loadrace.cpp
@@ -29,7 +29,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadregn.cpp b/components/esm/loadregn.cpp
index e5382f50b..6e0e6db9d 100644
--- a/components/esm/loadregn.cpp
+++ b/components/esm/loadregn.cpp
@@ -16,7 +16,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
@@ -61,10 +61,12 @@ namespace ESM
                     esm.getHT(mMapColor);
                     break;
                 case ESM::FourCC<'S','N','A','M'>::value:
+                {
                     SoundRef sr;
                     esm.getHT(sr, 33);
                     mSoundList.push_back(sr);
                     break;
+                }
                 case ESM::SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
diff --git a/components/esm/loadrepa.cpp b/components/esm/loadrepa.cpp
index e4af3d937..c04691c12 100644
--- a/components/esm/loadrepa.cpp
+++ b/components/esm/loadrepa.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
index b46d5b658..1adebe45f 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@@ -67,15 +67,17 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'S','C','H','D'>::value:
+                {
                     SCHD data;
                     esm.getHT(data, 52);
                     mData = data.mData;
                     mId = data.mName.toString();
                     hasHeader = true;
                     break;
+                }
                 case ESM::FourCC<'S','C','V','R'>::value:
                     // list of local variables
                     loadSCVR(esm);
@@ -113,7 +115,7 @@ namespace ESM
         memset(&data, 0, sizeof(data));
 
         data.mData = mData;
-        memcpy(data.mName.name, mId.c_str(), mId.size());
+        data.mName.assign(mId);
 
         esm.writeHNT("SCHD", data, 52);
 
diff --git a/components/esm/loadskil.cpp b/components/esm/loadskil.cpp
index c52089791..36204c940 100644
--- a/components/esm/loadskil.cpp
+++ b/components/esm/loadskil.cpp
@@ -138,7 +138,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'I','N','D','X'>::value:
                     esm.getHT(mIndex);
diff --git a/components/esm/loadsndg.cpp b/components/esm/loadsndg.cpp
index d84fe624d..9bd806641 100644
--- a/components/esm/loadsndg.cpp
+++ b/components/esm/loadsndg.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadsoun.cpp b/components/esm/loadsoun.cpp
index 82f169e54..3b3dc1eac 100644
--- a/components/esm/loadsoun.cpp
+++ b/components/esm/loadsoun.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadspel.cpp b/components/esm/loadspel.cpp
index 728b7bc2a..947e6c9ec 100644
--- a/components/esm/loadspel.cpp
+++ b/components/esm/loadspel.cpp
@@ -19,7 +19,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadsscr.cpp b/components/esm/loadsscr.cpp
index ab4c09750..f8854493b 100644
--- a/components/esm/loadsscr.cpp
+++ b/components/esm/loadsscr.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadstat.cpp b/components/esm/loadstat.cpp
index 62d495ee3..6c9de22bd 100644
--- a/components/esm/loadstat.cpp
+++ b/components/esm/loadstat.cpp
@@ -16,7 +16,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadtes3.cpp b/components/esm/loadtes3.cpp
index df35a2579..b16145467 100644
--- a/components/esm/loadtes3.cpp
+++ b/components/esm/loadtes3.cpp
@@ -9,8 +9,8 @@ void ESM::Header::blank()
 {
     mData.version = ESM::VER_13;
     mData.type = 0;
-    mData.author.assign ("");
-    mData.desc.assign ("");
+    mData.author.clear();
+    mData.desc.clear();
     mData.records = 0;
     mFormat = CurrentFormat;
     mMaster.clear();
@@ -32,8 +32,8 @@ void ESM::Header::load (ESMReader &esm)
       esm.getSubHeader();
       esm.getT(mData.version);
       esm.getT(mData.type);
-      mData.author.assign(esm.getString(sizeof(mData.author.name)));
-      mData.desc.assign(esm.getString(sizeof(mData.desc.name)));
+      mData.author.assign( esm.getString(mData.author.data_size()) );
+      mData.desc.assign( esm.getString(mData.desc.data_size()) );
       esm.getT(mData.records);
     }
 
@@ -53,14 +53,14 @@ void ESM::Header::load (ESMReader &esm)
     {
         esm.getSubHeader();
         mSCRD.resize(esm.getSubSize());
-        if (mSCRD.size())
+        if (!mSCRD.empty())
             esm.getExact(&mSCRD[0], mSCRD.size());
     }
     if (esm.isNextSub("SCRS"))
     {
         esm.getSubHeader();
         mSCRS.resize(esm.getSubSize());
-        if (mSCRS.size())
+        if (!mSCRS.empty())
             esm.getExact(&mSCRS[0], mSCRS.size());
     }
 }
@@ -73,8 +73,8 @@ void ESM::Header::save (ESMWriter &esm)
     esm.startSubRecord("HEDR");
     esm.writeT(mData.version);
     esm.writeT(mData.type);
-    esm.writeFixedSizeString(mData.author.toString(), 32);
-    esm.writeFixedSizeString(mData.desc.toString(), 256);
+    esm.writeFixedSizeString(mData.author.toString(), mData.author.data_size());
+    esm.writeFixedSizeString(mData.desc.toString(), mData.desc.data_size());
     esm.writeT(mData.records);
     esm.endRecord("HEDR");
 
diff --git a/components/esm/loadweap.cpp b/components/esm/loadweap.cpp
index 880a26bcb..4a77ff6a0 100644
--- a/components/esm/loadweap.cpp
+++ b/components/esm/loadweap.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/npcstats.cpp b/components/esm/npcstats.cpp
index 10c0b6f16..4c1095b6e 100644
--- a/components/esm/npcstats.cpp
+++ b/components/esm/npcstats.cpp
@@ -95,6 +95,10 @@ void ESM::NpcStats::load (ESMReader &esm)
 
     esm.getHNT (mSkillIncrease, "INCR");
 
+    for (int i=0; i<3; ++i)
+        mSpecIncreases[i] = 0;
+    esm.getHNOT (mSpecIncreases, "SPEC");
+
     while (esm.isNextSub ("USED"))
         mUsedIds.push_back (esm.getHString());
 
@@ -156,6 +160,8 @@ void ESM::NpcStats::save (ESMWriter &esm) const
 
     esm.writeHNT ("INCR", mSkillIncrease);
 
+    esm.writeHNT ("SPEC", mSpecIncreases);
+
     for (std::vector<std::string>::const_iterator iter (mUsedIds.begin()); iter!=mUsedIds.end();
         ++iter)
         esm.writeHNString ("USED", *iter);
@@ -178,6 +184,8 @@ void ESM::NpcStats::blank()
     mLevelProgress = 0;
     for (int i=0; i<8; ++i)
         mSkillIncrease[i] = 0;
+    for (int i=0; i<3; ++i)
+        mSpecIncreases[i] = 0;
     mTimeToStartDrowning = 20;
     mCrimeId = -1;
 }
diff --git a/components/esm/npcstats.hpp b/components/esm/npcstats.hpp
index 9b27f587c..467a099ce 100644
--- a/components/esm/npcstats.hpp
+++ b/components/esm/npcstats.hpp
@@ -37,6 +37,7 @@ namespace ESM
         int mWerewolfKills;
         int mLevelProgress;
         int mSkillIncrease[8];
+        int mSpecIncreases[3];
         std::vector<std::string> mUsedIds; // lower case IDs
         float mTimeToStartDrowning;
         int mCrimeId;
diff --git a/components/esm/objectstate.cpp b/components/esm/objectstate.cpp
index d736bab66..18c030256 100644
--- a/components/esm/objectstate.cpp
+++ b/components/esm/objectstate.cpp
@@ -27,10 +27,15 @@ void ESM::ObjectState::load (ESMReader &esm)
     if (esm.isNextSub("LROT"))
         esm.skipHSub(); // local rotation, no longer used
 
+    mFlags = 0;
+    esm.getHNOT (mFlags, "FLAG");
+
     // obsolete
     int unused;
     esm.getHNOT(unused, "LTIM");
 
+    mAnimationState.load(esm);
+
     // FIXME: assuming "false" as default would make more sense, but also break compatibility with older save files
     mHasCustomState = true;
     esm.getHNOT (mHasCustomState, "HCUS");
@@ -55,6 +60,11 @@ void ESM::ObjectState::save (ESMWriter &esm, bool inInventory) const
     if (!inInventory)
         esm.writeHNT ("POS_", mPosition, 24);
 
+    if (mFlags != 0)
+        esm.writeHNT ("FLAG", mFlags);
+
+    mAnimationState.save(esm);
+
     if (!mHasCustomState)
         esm.writeHNT ("HCUS", false);
 }
@@ -70,6 +80,7 @@ void ESM::ObjectState::blank()
         mPosition.pos[i] = 0;
         mPosition.rot[i] = 0;
     }
+    mFlags = 0;
     mHasCustomState = true;
 }
 
diff --git a/components/esm/objectstate.hpp b/components/esm/objectstate.hpp
index 215cb74ba..b8eb138eb 100644
--- a/components/esm/objectstate.hpp
+++ b/components/esm/objectstate.hpp
@@ -6,6 +6,7 @@
 
 #include "cellref.hpp"
 #include "locals.hpp"
+#include "animationstate.hpp"
 
 namespace ESM
 {
@@ -24,12 +25,15 @@ namespace ESM
         unsigned char mEnabled;
         int mCount;
         ESM::Position mPosition;
+        unsigned int mFlags;
 
         // Is there any class-specific state following the ObjectState
         bool mHasCustomState;
 
         unsigned int mVersion;
 
+        ESM::AnimationState mAnimationState;
+
         ObjectState() : mHasCustomState(true), mVersion(0)
         {}
 
diff --git a/components/esm/savedgame.cpp b/components/esm/savedgame.cpp
index cf9f68c9a..3220f496e 100644
--- a/components/esm/savedgame.cpp
+++ b/components/esm/savedgame.cpp
@@ -5,7 +5,7 @@
 #include "defs.hpp"
 
 unsigned int ESM::SavedGame::sRecordId = ESM::REC_SAVE;
-int ESM::SavedGame::sCurrentFormat = 2;
+int ESM::SavedGame::sCurrentFormat = 3;
 
 void ESM::SavedGame::load (ESMReader &esm)
 {
diff --git a/components/esm/spellstate.cpp b/components/esm/spellstate.cpp
index 8845842e9..a21078e10 100644
--- a/components/esm/spellstate.cpp
+++ b/components/esm/spellstate.cpp
@@ -12,7 +12,7 @@ namespace ESM
         {
             std::string id = esm.getHString();
 
-            std::map<int, float> random;
+            SpellParams state;
             while (esm.isNextSub("INDX"))
             {
                 int index;
@@ -21,10 +21,16 @@ namespace ESM
                 float magnitude;
                 esm.getHNT(magnitude, "RAND");
 
-                random[index] = magnitude;
+                state.mEffectRands[index] = magnitude;
             }
 
-            mSpells[id] = random;
+            while (esm.isNextSub("PURG")) {
+                int index;
+                esm.getHT(index);
+                state.mPurgedEffects.insert(index);
+            }
+
+            mSpells[id] = state;
         }
 
         while (esm.isNextSub("PERM"))
@@ -73,12 +79,16 @@ namespace ESM
         {
             esm.writeHNString("SPEL", it->first);
 
-            const std::map<int, float>& random = it->second;
+            const std::map<int, float>& random = it->second.mEffectRands;
             for (std::map<int, float>::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt)
             {
                 esm.writeHNT("INDX", rIt->first);
                 esm.writeHNT("RAND", rIt->second);
             }
+
+            const std::set<int>& purges = it->second.mPurgedEffects;
+            for (std::set<int>::const_iterator pIt = purges.begin(); pIt != purges.end(); ++pIt)
+                esm.writeHNT("PURG", *pIt);
         }
 
         for (std::map<std::string, std::vector<PermanentSpellEffectInfo> >::const_iterator it = mPermanentSpellEffects.begin(); it != mPermanentSpellEffects.end(); ++it)
diff --git a/components/esm/spellstate.hpp b/components/esm/spellstate.hpp
index 503c3aea9..ec613afab 100644
--- a/components/esm/spellstate.hpp
+++ b/components/esm/spellstate.hpp
@@ -4,6 +4,7 @@
 #include <map>
 #include <vector>
 #include <string>
+#include <set>
 
 #include "defs.hpp"
 
@@ -28,7 +29,11 @@ namespace ESM
             float mMagnitude;
         };
 
-        typedef std::map<std::string, std::map<int, float> > TContainer;
+        struct SpellParams {
+            std::map<int, float> mEffectRands;
+            std::set<int> mPurgedEffects;
+        };
+        typedef std::map<std::string, SpellParams> TContainer;
         TContainer mSpells;
 
         std::map<std::string, std::vector<PermanentSpellEffectInfo> > mPermanentSpellEffects;
diff --git a/components/esm/transport.cpp b/components/esm/transport.cpp
index da0a5f767..063c03329 100644
--- a/components/esm/transport.cpp
+++ b/components/esm/transport.cpp
@@ -8,13 +8,13 @@ namespace ESM
 
     void Transport::add(ESMReader &esm)
     {
-        if (esm.retSubName().val == ESM::FourCC<'D','O','D','T'>::value)
+        if (esm.retSubName().intval == ESM::FourCC<'D','O','D','T'>::value)
         {
             Dest dodt;
             esm.getHExact(&dodt.mPos, 24);
             mList.push_back(dodt);
         }
-        else if (esm.retSubName().val == ESM::FourCC<'D','N','A','M'>::value)
+        else if (esm.retSubName().intval == ESM::FourCC<'D','N','A','M'>::value)
         {
             mList.back().mCellName = esm.getHString();
         }
diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index cead73070..70ad0a50b 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -16,10 +16,15 @@
 namespace ESMTerrain
 {
 
-    const float defaultHeight = -2048;
+    const float defaultHeight = ESM::Land::DEFAULT_HEIGHT;
 
-    Storage::Storage(const VFS::Manager *vfs)
+    Storage::Storage(const VFS::Manager *vfs, const std::string& normalMapPattern, const std::string& normalHeightMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern, bool autoUseSpecularMaps)
         : mVFS(vfs)
+        , mNormalMapPattern(normalMapPattern)
+        , mNormalHeightMapPattern(normalHeightMapPattern)
+        , mAutoUseNormalMaps(autoUseNormalMaps)
+        , mSpecularMapPattern(specularMapPattern)
+        , mAutoUseSpecularMaps(autoUseSpecularMaps)
     {
     }
 
@@ -150,7 +155,7 @@ namespace ESMTerrain
                                             osg::ref_ptr<osg::Vec4Array> colours)
     {
         // LOD level n means every 2^n-th vertex is kept
-        size_t increment = 1 << lodLevel;
+        size_t increment = static_cast<size_t>(1) << lodLevel;
 
         osg::Vec2f origin = center - osg::Vec2f(size/2.f, size/2.f);
 
@@ -511,28 +516,34 @@ namespace ESMTerrain
         info.mParallax = false;
         info.mSpecular = false;
         info.mDiffuseMap = texture;
-        std::string texture_ = texture;
-        boost::replace_last(texture_, ".", "_nh.");
 
-        if (mVFS->exists(texture_))
+        if (mAutoUseNormalMaps)
         {
-            info.mNormalMap = texture_;
-            info.mParallax = true;
-        }
-        else
-        {
-            texture_ = texture;
-            boost::replace_last(texture_, ".", "_n.");
+            std::string texture_ = texture;
+            boost::replace_last(texture_, ".", mNormalHeightMapPattern + ".");
             if (mVFS->exists(texture_))
+            {
                 info.mNormalMap = texture_;
+                info.mParallax = true;
+            }
+            else
+            {
+                texture_ = texture;
+                boost::replace_last(texture_, ".", mNormalMapPattern + ".");
+                if (mVFS->exists(texture_))
+                    info.mNormalMap = texture_;
+            }
         }
 
-        texture_ = texture;
-        boost::replace_last(texture_, ".", "_diffusespec.");
-        if (mVFS->exists(texture_))
+        if (mAutoUseSpecularMaps)
         {
-            info.mDiffuseMap = texture_;
-            info.mSpecular = true;
+            std::string texture_ = texture;
+            boost::replace_last(texture_, ".", mSpecularMapPattern + ".");
+            if (mVFS->exists(texture_))
+            {
+                info.mDiffuseMap = texture_;
+                info.mSpecular = true;
+            }
         }
 
         mLayerInfoMap[texture] = info;
diff --git a/components/esmterrain/storage.hpp b/components/esmterrain/storage.hpp
index 9ca39e6f3..092998b2e 100644
--- a/components/esmterrain/storage.hpp
+++ b/components/esmterrain/storage.hpp
@@ -27,7 +27,7 @@ namespace ESMTerrain
         virtual const ESM::LandTexture* getLandTexture(int index, short plugin) = 0;
 
     public:
-        Storage(const VFS::Manager* vfs);
+        Storage(const VFS::Manager* vfs, const std::string& normalMapPattern = "", const std::string& normalHeightMapPattern = "", bool autoUseNormalMaps = false, const std::string& specularMapPattern = "", bool autoUseSpecularMaps = false);
 
         /// Data is loaded first, if necessary. Will return a 0-pointer if there is no data for
         /// any of the data types specified via \a flags. Will also return a 0-pointer if there
@@ -109,6 +109,13 @@ namespace ESMTerrain
         std::map<std::string, Terrain::LayerInfo> mLayerInfoMap;
         OpenThreads::Mutex mLayerInfoMutex;
 
+        std::string mNormalMapPattern;
+        std::string mNormalHeightMapPattern;
+        bool mAutoUseNormalMaps;
+
+        std::string mSpecularMapPattern;
+        bool mAutoUseSpecularMaps;
+
         Terrain::LayerInfo getLayerInfo(const std::string& texture);
     };
 
diff --git a/components/fallback/validate.hpp b/components/fallback/validate.hpp
index 3b6398d6a..a1d3f9601 100644
--- a/components/fallback/validate.hpp
+++ b/components/fallback/validate.hpp
@@ -3,6 +3,8 @@
 
 #include <boost/program_options.hpp>
 
+#include <components/files/escape.hpp>
+
 // Parses and validates a fallback map from boost program_options.
 // Note: for boost to pick up the validate function, you need to pull in the namespace e.g.
 // by using namespace Fallback;
@@ -11,38 +13,38 @@ namespace Fallback
 {
 
     struct FallbackMap {
-        std::map<std::string,std::string> mMap;
+        std::map<std::string, std::string> mMap;
     };
 
     void validate(boost::any &v, std::vector<std::string> const &tokens, FallbackMap*, int)
     {
-        if(v.empty())
+        if (v.empty())
         {
             v = boost::any(FallbackMap());
         }
 
         FallbackMap *map = boost::any_cast<FallbackMap>(&v);
 
-        for(std::vector<std::string>::const_iterator it=tokens.begin(); it != tokens.end(); ++it)
+        for (std::vector<std::string>::const_iterator it = tokens.begin(); it != tokens.end(); ++it)
         {
-            int sep = it->find(",");
-            if(sep < 1 || sep == (int)it->length()-1)
-    #if (BOOST_VERSION < 104200)
+            std::string temp = Files::EscapeHashString::processString(*it);
+            int sep = temp.find(",");
+            if (sep < 1 || sep == (int)temp.length() - 1)
+#if (BOOST_VERSION < 104200)
                 throw boost::program_options::validation_error("invalid value");
-    #else
+#else
                 throw boost::program_options::validation_error(boost::program_options::validation_error::invalid_option_value);
-    #endif
+#endif
 
-            std::string key(it->substr(0,sep));
-            std::string value(it->substr(sep+1));
+            std::string key(temp.substr(0, sep));
+            std::string value(temp.substr(sep + 1));
 
-            if(map->mMap.find(key) == map->mMap.end())
+            if (map->mMap.find(key) == map->mMap.end())
             {
-                map->mMap.insert(std::make_pair (key,value));
+                map->mMap.insert(std::make_pair(key, value));
             }
         }
     }
-
 }
 
 #endif
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 9c9cebe96..b53e3834a 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -3,10 +3,15 @@
 #include <string>
 #include <iostream>
 #include <algorithm>
+#include <ctype.h>
+
+#include <components/files/escape.hpp>
 
 #include <boost/bind.hpp>
 #include <boost/algorithm/string/erase.hpp>
+#include <boost/algorithm/string/replace.hpp>
 #include <boost/filesystem/fstream.hpp>
+#include <boost/iostreams/filtering_stream.hpp>
 
 /**
  * \namespace Files
@@ -22,7 +27,6 @@ static const char* const applicationName = "OpenMW";
 static const char* const applicationName = "openmw";
 #endif
 
-const char* const mwToken = "?mw?";
 const char* const localToken = "?local?";
 const char* const userDataToken = "?userdata?";
 const char* const globalToken = "?global?";
@@ -45,7 +49,6 @@ ConfigurationManager::~ConfigurationManager()
 
 void ConfigurationManager::setupTokensMapping()
 {
-    mTokensMapping.insert(std::make_pair(mwToken, &FixedPath<>::getInstallPath));
     mTokensMapping.insert(std::make_pair(localToken, &FixedPath<>::getLocalPath));
     mTokensMapping.insert(std::make_pair(userDataToken, &FixedPath<>::getUserDataPath));
     mTokensMapping.insert(std::make_pair(globalToken, &FixedPath<>::getGlobalDataPath));
@@ -141,8 +144,11 @@ bool ConfigurationManager::loadConfig(const boost::filesystem::path& path,
         if (!mSilent)
             std::cout << "Loading config file: " << cfgFile.string() << "... ";
 
-        boost::filesystem::ifstream configFileStream(cfgFile);
-        if (configFileStream.is_open())
+        boost::filesystem::ifstream configFileStreamUnfiltered(cfgFile);
+        boost::iostreams::filtering_istream configFileStream;
+        configFileStream.push(escape_hash_filter());
+        configFileStream.push(configFileStreamUnfiltered);
+        if (configFileStreamUnfiltered.is_open())
         {
             boost::program_options::store(boost::program_options::parse_config_file(
                 configFileStream, description, true), variables);
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index 58ee5c1ae..df131e671 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -1,13 +1,7 @@
 #ifndef COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
 #define COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
 
-#if defined(_WIN32) && !defined(__MINGW32__)
-#include <boost/tr1/tr1/unordered_map>
-#elif defined HAVE_UNORDERED_MAP
-#include <unordered_map>
-#else
-#include <tr1/unordered_map>
-#endif
+#include <map>
 
 #include <boost/program_options.hpp>
 
@@ -52,11 +46,7 @@ struct ConfigurationManager
         typedef Files::FixedPath<> FixedPathType;
 
         typedef const boost::filesystem::path& (FixedPathType::*path_type_f)() const;
-    #if defined HAVE_UNORDERED_MAP
-        typedef std::unordered_map<std::string, path_type_f> TokensMappingContainer;
-    #else
-        typedef std::tr1::unordered_map<std::string, path_type_f> TokensMappingContainer;
-    #endif
+        typedef std::map<std::string, path_type_f> TokensMappingContainer;
 
         bool loadConfig(const boost::filesystem::path& path,
             boost::program_options::variables_map& variables,
@@ -72,7 +62,6 @@ struct ConfigurationManager
 
         bool mSilent;
 };
-
 } /* namespace Cfg */
 
 #endif /* COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP */
diff --git a/components/files/escape.cpp b/components/files/escape.cpp
new file mode 100644
index 000000000..c5d2c041e
--- /dev/null
+++ b/components/files/escape.cpp
@@ -0,0 +1,140 @@
+#include "escape.hpp"
+
+#include <boost/algorithm/string/replace.hpp>
+#include <boost/program_options.hpp>
+
+namespace Files
+{
+    const int escape_hash_filter::sEscape = '@';
+    const int escape_hash_filter::sEscapeIdentifier = 'a';
+    const int escape_hash_filter::sHashIdentifier = 'h';
+
+    escape_hash_filter::escape_hash_filter() : mNext(), mPrevious(), mSeenNonWhitespace(false), mFinishLine(false)
+    {
+    }
+
+    escape_hash_filter::~escape_hash_filter()
+    {
+    }
+
+    unescape_hash_filter::unescape_hash_filter() : expectingIdentifier(false)
+    {
+    }
+
+    unescape_hash_filter::~unescape_hash_filter()
+    {
+    }
+
+    std::string EscapeHashString::processString(const std::string & str)
+    {
+        std::string temp = boost::replace_all_copy<std::string>(str, std::string() + (char)escape_hash_filter::sEscape + (char)escape_hash_filter::sHashIdentifier, "#");
+        boost::replace_all(temp, std::string() + (char)escape_hash_filter::sEscape + (char)escape_hash_filter::sEscapeIdentifier, std::string((char)escape_hash_filter::sEscape, 1));
+        return temp;
+    }
+
+    EscapeHashString::EscapeHashString() : mData()
+    {
+    }
+
+    EscapeHashString::EscapeHashString(const std::string & str) : mData(EscapeHashString::processString(str))
+    {
+    }
+
+    EscapeHashString::EscapeHashString(const std::string & str, size_t pos, size_t len) : mData(EscapeHashString::processString(str), pos, len)
+    {
+    }
+
+    EscapeHashString::EscapeHashString(const char * s) : mData(EscapeHashString::processString(std::string(s)))
+    {
+    }
+
+    EscapeHashString::EscapeHashString(const char * s, size_t n) : mData(EscapeHashString::processString(std::string(s)), 0, n)
+    {
+    }
+
+    EscapeHashString::EscapeHashString(size_t n, char c) : mData(n, c)
+    {
+    }
+
+    template <class InputIterator>
+    EscapeHashString::EscapeHashString(InputIterator first, InputIterator last) : mData(EscapeHashString::processString(std::string(first, last)))
+    {
+    }
+
+    std::string EscapeHashString::toStdString() const
+    {
+        return std::string(mData);
+    }
+
+    std::istream & operator>> (std::istream & is, EscapeHashString & eHS)
+    {
+        std::string temp;
+        is >> temp;
+        eHS = EscapeHashString(temp);
+        return is;
+    }
+
+    std::ostream & operator<< (std::ostream & os, const EscapeHashString & eHS)
+    {
+        os << eHS.mData;
+        return os;
+    }
+
+    EscapeStringVector::EscapeStringVector() : mVector()
+    {
+    }
+
+    EscapeStringVector::~EscapeStringVector()
+    {
+    }
+
+    std::vector<std::string> EscapeStringVector::toStdStringVector() const
+    {
+        std::vector<std::string> temp = std::vector<std::string>();
+        for (std::vector<EscapeHashString>::const_iterator it = mVector.begin(); it != mVector.end(); ++it)
+        {
+            temp.push_back(it->toStdString());
+        }
+        return temp;
+    }
+
+    // boost program options validation
+
+    void validate(boost::any &v, const std::vector<std::string> &tokens, Files::EscapeHashString * eHS, int a)
+    {
+        boost::program_options::validators::check_first_occurrence(v);
+
+        if (v.empty())
+            v = boost::any(EscapeHashString(boost::program_options::validators::get_single_string(tokens)));
+    }
+
+    void validate(boost::any &v, const std::vector<std::string> &tokens, EscapeStringVector *, int)
+    {
+        if (v.empty())
+            v = boost::any(EscapeStringVector());
+
+        EscapeStringVector * eSV = boost::any_cast<EscapeStringVector>(&v);
+
+        for (std::vector<std::string>::const_iterator it = tokens.begin(); it != tokens.end(); ++it)
+            eSV->mVector.push_back(EscapeHashString(*it));
+    }
+
+    PathContainer EscapePath::toPathContainer(const EscapePathContainer & escapePathContainer)
+    {
+        PathContainer temp;
+        for (EscapePathContainer::const_iterator it = escapePathContainer.begin(); it != escapePathContainer.end(); ++it)
+            temp.push_back(it->mPath);
+        return temp;
+    }
+
+    std::istream & operator>> (std::istream & istream, EscapePath & escapePath)
+    {
+        boost::iostreams::filtering_istream filteredStream;
+        filteredStream.push(unescape_hash_filter());
+        filteredStream.push(istream);
+
+        filteredStream >> escapePath.mPath;
+
+        return istream;
+    }
+}
diff --git a/components/files/escape.hpp b/components/files/escape.hpp
new file mode 100644
index 000000000..2017c2ed2
--- /dev/null
+++ b/components/files/escape.hpp
@@ -0,0 +1,196 @@
+#ifndef COMPONENTS_FILES_ESCAPE_HPP
+#define COMPONENTS_FILES_ESCAPE_HPP
+
+#include <queue>
+
+#include <components/files/multidircollection.hpp>
+
+#include <boost/iostreams/filtering_stream.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/program_options.hpp>
+
+/**
+ * \namespace Files
+ */
+namespace Files
+{
+    /**
+    * \struct escape_hash_filter
+    */
+    struct escape_hash_filter : public boost::iostreams::input_filter
+    {
+        static const int sEscape;
+        static const int sHashIdentifier;
+        static const int sEscapeIdentifier;
+
+        escape_hash_filter();
+        virtual ~escape_hash_filter();
+
+        template <typename Source> int get(Source & src);
+
+    private:
+        std::queue<int> mNext;
+        int mPrevious;
+
+        bool mSeenNonWhitespace;
+        bool mFinishLine;
+    };
+
+    template <typename Source>
+    int escape_hash_filter::get(Source & src)
+    {
+        if (mNext.empty())
+        {
+            int character = boost::iostreams::get(src);
+            bool record = true;
+            if (character == boost::iostreams::WOULD_BLOCK)
+            {
+                mNext.push(character);
+                record = false;
+            }
+            else if (character == EOF)
+            {
+                mSeenNonWhitespace = false;
+                mFinishLine = false;
+                mNext.push(character);
+            }
+            else if (character == '\n')
+            {
+                mSeenNonWhitespace = false;
+                mFinishLine = false;
+                mNext.push(character);
+            }
+            else if (mFinishLine)
+            {
+                mNext.push(character);
+            }
+            else if (character == '#')
+            {
+                if (mSeenNonWhitespace)
+                {
+                    mNext.push(sEscape);
+                    mNext.push(sHashIdentifier);
+                }
+                else
+                {
+                    //it's fine being interpreted by Boost as a comment, and so is anything afterwards
+                    mNext.push(character);
+                    mFinishLine = true;
+                }
+            }
+            else if (mPrevious == sEscape)
+            {
+                mNext.push(sEscape);
+                mNext.push(sEscapeIdentifier);
+            }
+            else
+            {
+                mNext.push(character);
+            }
+            if (!mSeenNonWhitespace && !isspace(character))
+                mSeenNonWhitespace = true;
+            if (record)
+                mPrevious = character;
+        }
+        int retval = mNext.front();
+        mNext.pop();
+        return retval;
+    }
+
+    struct unescape_hash_filter : public boost::iostreams::input_filter
+    {
+        unescape_hash_filter();
+        virtual ~unescape_hash_filter();
+
+        template <typename Source> int get(Source & src);
+
+    private:
+        bool expectingIdentifier;
+    };
+
+    template <typename Source>
+    int unescape_hash_filter::get(Source & src)
+    {
+        int character;
+        if (!expectingIdentifier)
+            character = boost::iostreams::get(src);
+        else
+        {
+            character = escape_hash_filter::sEscape;
+            expectingIdentifier = false;
+        }
+        if (character == escape_hash_filter::sEscape)
+        {
+            int nextChar = boost::iostreams::get(src);
+            int intended;
+            if (nextChar == escape_hash_filter::sEscapeIdentifier)
+                intended = escape_hash_filter::sEscape;
+            else if (nextChar == escape_hash_filter::sHashIdentifier)
+                intended = '#';
+            else if (nextChar == boost::iostreams::WOULD_BLOCK)
+            {
+                expectingIdentifier = true;
+                intended = nextChar;
+            }
+            else
+                intended = '?';
+            return intended;
+        }
+        else
+            return character;
+    }
+
+    /**
+    * \class EscapeHashString
+    */
+    class EscapeHashString
+    {
+    private:
+        std::string mData;
+    public:
+        static std::string processString(const std::string & str);
+
+        EscapeHashString();
+        EscapeHashString(const std::string & str);
+        EscapeHashString(const std::string & str, size_t pos, size_t len = std::string::npos);
+        EscapeHashString(const char * s);
+        EscapeHashString(const char * s, size_t n);
+        EscapeHashString(size_t n, char c);
+        template <class InputIterator>
+        EscapeHashString(InputIterator first, InputIterator last);
+
+        std::string toStdString() const;
+
+        friend std::ostream & operator<< (std::ostream & os, const EscapeHashString & eHS);
+    };
+
+    std::istream & operator>> (std::istream & is, EscapeHashString & eHS);
+
+    struct EscapeStringVector
+    {
+        std::vector<Files::EscapeHashString> mVector;
+
+        EscapeStringVector();
+        virtual ~EscapeStringVector();
+
+        std::vector<std::string> toStdStringVector() const;
+    };
+
+    //boost program options validation
+
+    void validate(boost::any &v, const std::vector<std::string> &tokens, Files::EscapeHashString * eHS, int a);
+
+    void validate(boost::any &v, const std::vector<std::string> &tokens, EscapeStringVector *, int);
+
+    struct EscapePath
+    {
+        boost::filesystem::path mPath;
+
+        static PathContainer toPathContainer(const std::vector<EscapePath> & escapePathContainer);
+    };
+
+    typedef std::vector<EscapePath> EscapePathContainer;
+
+    std::istream & operator>> (std::istream & istream, EscapePath & escapePath);
+} /* namespace Files */
+#endif /* COMPONENTS_FILES_ESCAPE_HPP */
diff --git a/components/files/fixedpath.hpp b/components/files/fixedpath.hpp
index 5e0ea6c86..2e72b8154 100644
--- a/components/files/fixedpath.hpp
+++ b/components/files/fixedpath.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <boost/filesystem.hpp>
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
 #ifndef ANDROID
     #include <components/files/linuxpath.hpp>
     namespace Files { typedef LinuxPath TargetPathType; }
diff --git a/components/files/linuxpath.cpp b/components/files/linuxpath.cpp
index 212db562c..89b4bf45a 100644
--- a/components/files/linuxpath.cpp
+++ b/components/files/linuxpath.cpp
@@ -1,6 +1,6 @@
 #include "linuxpath.hpp"
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
 
 #include <cstdlib>
 #include <cstring>
@@ -159,4 +159,4 @@ boost::filesystem::path LinuxPath::getInstallPath() const
 
 } /* namespace Files */
 
-#endif /* defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) */
+#endif /* defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) */
diff --git a/components/files/linuxpath.hpp b/components/files/linuxpath.hpp
index ba9756fc0..7950157bb 100644
--- a/components/files/linuxpath.hpp
+++ b/components/files/linuxpath.hpp
@@ -1,7 +1,7 @@
 #ifndef COMPONENTS_FILES_LINUXPATH_H
 #define COMPONENTS_FILES_LINUXPATH_H
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
 
 #include <boost/filesystem.hpp>
 
@@ -56,6 +56,6 @@ struct LinuxPath
 
 } /* namespace Files */
 
-#endif /* defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) */
+#endif /* defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) */
 
 #endif /* COMPONENTS_FILES_LINUXPATH_H */
diff --git a/components/files/macospath.cpp b/components/files/macospath.cpp
index 237141960..b49b72e46 100644
--- a/components/files/macospath.cpp
+++ b/components/files/macospath.cpp
@@ -68,7 +68,7 @@ boost::filesystem::path MacOsPath::getCachePath() const
 
 boost::filesystem::path MacOsPath::getLocalPath() const
 {
-    return boost::filesystem::path("./");
+    return boost::filesystem::path("../Resources/");
 }
 
 boost::filesystem::path MacOsPath::getGlobalDataPath() const
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index b66fbbb20..aa92a01c6 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -58,7 +58,7 @@ namespace
         }
         for (size_t j = 0; j < numbytes; ++j)
         {
-            unsigned char ch = utf8[i++];
+            ch = utf8[i++];
             if (ch < 0x80 || ch > 0xBF)
                 throw std::logic_error("not a UTF-8 string");
             unicode <<= 6;
@@ -374,7 +374,7 @@ namespace Gui
                     if (it->first != i)
                         continue;
 
-                    MyGUI::xml::ElementPtr code = codes->createChild("Code");
+                    code = codes->createChild("Code");
                     code->addAttribute("index", it->second);
                     code->addAttribute("coord", MyGUI::utility::toString(x1) + " "
                                                 + MyGUI::utility::toString(y1) + " "
diff --git a/components/interpreter/defines.cpp b/components/interpreter/defines.cpp
index 2ceb857c4..912a5e1d9 100644
--- a/components/interpreter/defines.cpp
+++ b/components/interpreter/defines.cpp
@@ -26,13 +26,14 @@ namespace Interpreter{
         return a.length() > b.length();
     }
 
-    std::string fixDefinesReal(std::string text, char eschar, bool isBook, Context& context)
+    std::string fixDefinesReal(std::string text, bool dialogue, Context& context)
     {
         unsigned int start = 0;
         std::ostringstream retval;
         for(unsigned int i = 0; i < text.length(); i++)
         {
-            if(text[i] == eschar)
+            char eschar = text[i];
+            if(eschar == '%' || eschar == '^')
             {
                 retval << text.substr(start, i - start);
                 std::string temp = Misc::StringUtils::lowerCase(text.substr(i+1, 100));
@@ -113,7 +114,7 @@ namespace Interpreter{
                         retval << context.getCurrentCellName();
                     }
 
-                    else if(eschar == '%' && !isBook) { // In Dialogue, not messagebox
+                    else if(dialogue) { // In Dialogue, not messagebox
                         if(     (found = check(temp, "faction", &i, &start))){
                             retval << context.getNPCFaction();
                         }
@@ -171,7 +172,7 @@ namespace Interpreter{
 
                         for(unsigned int j = 0; j < globals.size(); j++){
                             if(globals[j].length() > temp.length()){ // Just in case there's a global with a huuuge name
-                                std::string temp = text.substr(i+1, globals[j].length());
+                                temp = text.substr(i+1, globals[j].length());
                                 transform(temp.begin(), temp.end(), temp.begin(), ::tolower);
                             }
 
@@ -207,15 +208,15 @@ namespace Interpreter{
         return retval.str ();
     }
 
-    std::string fixDefinesDialog(std::string text, Context& context){
-        return fixDefinesReal(text, '%', false, context);
+    std::string fixDefinesDialog(const std::string& text, Context& context){
+        return fixDefinesReal(text, true, context);
     }
 
-    std::string fixDefinesMsgBox(std::string text, Context& context){
-        return fixDefinesReal(text, '^', false, context);
+    std::string fixDefinesMsgBox(const std::string& text, Context& context){
+        return fixDefinesReal(text, false, context);
     }
 
-    std::string fixDefinesBook(std::string text, Context& context){
-        return fixDefinesReal(text, '%', true, context);
+    std::string fixDefinesBook(const std::string& text, Context& context){
+        return fixDefinesReal(text, false, context);
     }
 }
diff --git a/components/interpreter/defines.hpp b/components/interpreter/defines.hpp
index 00c4386b8..3471b2030 100644
--- a/components/interpreter/defines.hpp
+++ b/components/interpreter/defines.hpp
@@ -5,9 +5,9 @@
 #include "context.hpp"
 
 namespace Interpreter{
-    std::string fixDefinesDialog(std::string text, Context& context);
-    std::string fixDefinesMsgBox(std::string text, Context& context);
-    std::string fixDefinesBook(std::string text, Context& context);
+    std::string fixDefinesDialog(const std::string& text, Context& context);
+    std::string fixDefinesMsgBox(const std::string& text, Context& context);
+    std::string fixDefinesBook(const std::string& text, Context& context);
 }
 
 #endif
diff --git a/components/interpreter/interpreter.cpp b/components/interpreter/interpreter.cpp
index 1892e4a6f..e77a0bb72 100644
--- a/components/interpreter/interpreter.cpp
+++ b/components/interpreter/interpreter.cpp
@@ -241,9 +241,9 @@ namespace Interpreter
 
             while (mRuntime.getPC()>=0 && mRuntime.getPC()<opcodes)
             {
-                Type_Code code = codeBlock[mRuntime.getPC()];
+                Type_Code runCode = codeBlock[mRuntime.getPC()];
                 mRuntime.setPC (mRuntime.getPC()+1);
-                execute (code);
+                execute (runCode);
             }
         }
         catch (...)
diff --git a/components/interpreter/miscopcodes.hpp b/components/interpreter/miscopcodes.hpp
index c49bbeb01..20a1b52be 100644
--- a/components/interpreter/miscopcodes.hpp
+++ b/components/interpreter/miscopcodes.hpp
@@ -13,67 +13,89 @@
 #include "defines.hpp"
 
 #include <components/misc/rng.hpp>
+#include <components/misc/messageformatparser.hpp>
 
 namespace Interpreter
 {
-    inline std::string formatMessage (const std::string& message, Runtime& runtime)
+    class RuntimeMessageFormatter : public Misc::MessageFormatParser
     {
-        std::string formattedMessage;
-
-        for (std::size_t i=0; i<message.size(); ++i)
-        {
-            char c = message[i];
+        private:
+            std::string mFormattedMessage;
+            Runtime& mRuntime;
 
-            if (c!='%')
-                formattedMessage += c;
-            else
+        protected:
+            virtual void visitedPlaceholder(Placeholder placeholder, char padding, int width, int precision)
             {
-                ++i;
-                if (i<message.size())
+                std::ostringstream out;
+                out.fill(padding);
+                if (width != -1)
+                    out.width(width);
+                if (precision != -1)
+                    out.precision(precision);
+
+                switch (placeholder)
                 {
-                    c = message[i];
-
-                    if (c=='S' || c=='s')
-                    {
-                        int index = runtime[0].mInteger;
-                        runtime.pop();
-                        formattedMessage += runtime.getStringLiteral (index);
-                    }
-                    else if (c=='g' || c=='G')
-                    {
-                        Type_Integer value = runtime[0].mInteger;
-                        runtime.pop();
-
-                        std::ostringstream out;
-                        out << value;
-                        formattedMessage += out.str();
-                    }
-                    else if (c=='f' || c=='F' || c=='.')
-                    {
-                        while (c!='f' && i+1<message.size())
+                    case StringPlaceholder:
                         {
-                            ++i;
-                            c = message[i];
+                            int index = mRuntime[0].mInteger;
+                            mRuntime.pop();
+
+                            out << mRuntime.getStringLiteral(index);
+                            mFormattedMessage += out.str();
                         }
+                        break;
+                    case IntegerPlaceholder:
+                        {
+                            Type_Integer value = mRuntime[0].mInteger;
+                            mRuntime.pop();
+
+                            out << value;
+                            mFormattedMessage += out.str();
+                        }
+                        break;
+                    case FloatPlaceholder:
+                        {
+                            float value = mRuntime[0].mFloat;
+                            mRuntime.pop();
 
-                        float value = runtime[0].mFloat;
-                        runtime.pop();
-
-                        std::ostringstream out;
-                        out << value;
-                        formattedMessage += out.str();
-                    }
-                    else if (c=='%')
-                        formattedMessage += "%";
-                    else
-                    {
-                        formattedMessage += "%";
-                        formattedMessage += c;
-                    }
+                            out << std::fixed << value;
+                            mFormattedMessage += out.str();
+                        }
+                        break;
+                    default:
+                        break;
                 }
             }
-        }
-        
+
+            virtual void visitedCharacter(char c)
+            {
+                mFormattedMessage += c;
+            }
+
+        public:
+            RuntimeMessageFormatter(Runtime& runtime)
+                : mRuntime(runtime)
+            {
+            }
+
+            virtual void process(const std::string& message)
+            {
+                mFormattedMessage.clear();
+                MessageFormatParser::process(message);
+            }
+
+            std::string getFormattedMessage() const
+            {
+                return mFormattedMessage;
+            }
+    };
+
+    inline std::string formatMessage (const std::string& message, Runtime& runtime)
+    {
+        RuntimeMessageFormatter formatter(runtime);
+        formatter.process(message);
+
+        std::string formattedMessage = formatter.getFormattedMessage();
         formattedMessage = fixDefinesMsgBox(formattedMessage, runtime.getContext());
         return formattedMessage;
     }
@@ -94,7 +116,7 @@ namespace Interpreter
 
                 for (std::size_t i=0; i<arg0; ++i)
                 {
-                    int index = runtime[0].mInteger;
+                    index = runtime[0].mInteger;
                     runtime.pop();
                     buttons.push_back (runtime.getStringLiteral (index));
                 }
diff --git a/components/misc/messageformatparser.cpp b/components/misc/messageformatparser.cpp
new file mode 100644
index 000000000..bfd8dd562
--- /dev/null
+++ b/components/misc/messageformatparser.cpp
@@ -0,0 +1,70 @@
+#include "messageformatparser.hpp"
+
+namespace Misc
+{
+    MessageFormatParser::~MessageFormatParser() {}
+
+    void MessageFormatParser::process(const std::string& m)
+    {
+        for (unsigned int i = 0; i < m.size(); ++i)
+        {
+            if (m[i] == '%')
+            {
+                if (++i < m.size())
+                {
+                    if (m[i] == '%')
+                        visitedCharacter('%');
+                    else
+                    {
+                        char pad = ' ';
+                        if (m[i] == '0' || m[i] == ' ')
+                        {
+                            pad = m[i];
+                            ++i;
+                        }
+
+                        int width = 0;
+                        bool widthSet = false;
+                        while (i < m.size() && m[i] >= '0' && m[i] <= '9')
+                        {
+                            width = width * 10 + (m[i] - '0');
+                            widthSet = true;
+                            ++i;
+                        }
+
+                        if (i < m.size())
+                        {
+                            int precision = 0;
+                            bool precisionSet = false;
+                            if (m[i] == '.')
+                            {
+                                while (++i < m.size() && m[i] >= '0' && m[i] <= '9')
+                                {
+                                    precision = precision * 10 + (m[i] - '0');
+                                    precisionSet = true;
+                                }
+                            }
+
+                            if (i < m.size())
+                            {
+                                width = (widthSet) ? width : -1;
+                                precision = (precisionSet) ? precision : -1;
+
+                                if (m[i] == 'S' || m[i] == 's')
+                                    visitedPlaceholder(StringPlaceholder, pad, width, precision);
+                                else if (m[i] == 'g' || m[i] == 'G')
+                                    visitedPlaceholder(IntegerPlaceholder, pad, width, precision);
+                                else if (m[i] == 'f' || m[i] == 'F')
+                                    visitedPlaceholder(FloatPlaceholder, pad, width, precision);
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                visitedCharacter(m[i]);
+            }
+        }
+    }
+}
diff --git a/components/misc/messageformatparser.hpp b/components/misc/messageformatparser.hpp
new file mode 100644
index 000000000..c12b9352a
--- /dev/null
+++ b/components/misc/messageformatparser.hpp
@@ -0,0 +1,28 @@
+#ifndef OPENMW_COMPONENTS_MISC_MESSAGEFORMATPARSER_H
+#define OPENMW_COMPONENTS_MISC_MESSAGEFORMATPARSER_H
+
+#include <string>
+
+namespace Misc
+{
+    class MessageFormatParser
+    {
+        protected:
+            enum Placeholder
+            {
+                StringPlaceholder,
+                IntegerPlaceholder,
+                FloatPlaceholder
+            };
+
+            virtual void visitedPlaceholder(Placeholder placeholder, char padding, int width, int precision) = 0;
+            virtual void visitedCharacter(char c) = 0;
+
+        public:
+            virtual ~MessageFormatParser();
+
+            virtual void process(const std::string& message);
+    };
+}
+
+#endif
diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index 2723527f1..b14051a81 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -106,6 +106,14 @@ public:
         lowerCaseInPlace(out);
         return out;
     }
+
+    struct CiComp
+    {
+        bool operator()(const std::string& left, const std::string& right) const
+        {
+            return ciLess(left, right);
+        }
+    };
 };
 
 }
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index 5d2e3a9ae..5ab7ab736 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -6,7 +6,6 @@
 #include <MyGUI_Timer.h>
 
 #include <osg/Drawable>
-#include <osg/Geode>
 #include <osg/BlendFunc>
 #include <osg/Texture2D>
 #include <osg/TexMat>
@@ -24,7 +23,6 @@
 
 #define MYGUI_PLATFORM_EXCEPT(dest) do { \
     MYGUI_PLATFORM_LOG(Critical, dest); \
-    MYGUI_DBG_BREAK;\
     std::ostringstream stream; \
     stream << dest << "\n"; \
     MYGUI_BASE_EXCEPT(stream.str().c_str(), "MyGUI"); \
@@ -34,7 +32,6 @@
     if ( ! (exp) ) \
     { \
         MYGUI_PLATFORM_LOG(Critical, dest); \
-        MYGUI_DBG_BREAK;\
         std::ostringstream stream; \
         stream << dest << "\n"; \
         MYGUI_BASE_EXCEPT(stream.str().c_str(), "MyGUI"); \
@@ -132,9 +129,8 @@ public:
             if(texture)
                 state->applyTextureAttribute(0, texture);
 
-            // VBOs disabled due to crash in OSG: http://forum.openscenegraph.org/viewtopic.php?t=14909
-            osg::GLBufferObject* bufferobject = 0;//state->isVertexBufferObjectSupported() ? vbo->getOrCreateGLBufferObject(state->getContextID()) : 0;
-            if (0)//bufferobject)
+            osg::GLBufferObject* bufferobject = state->isVertexBufferObjectSupported() ? vbo->getOrCreateGLBufferObject(state->getContextID()) : 0;
+            if (bufferobject)
             {
                 state->bindVertexBufferObject(bufferobject);
 
@@ -214,7 +210,7 @@ public:
 
         osg::ref_ptr<osg::VertexBufferObject> mVertexBuffer;
         // need to hold on to this too as the mVertexBuffer does not hold a ref to its own array
-        osg::ref_ptr<osg::UByteArray> mArray;
+        osg::ref_ptr<osg::Array> mArray;
 
         // optional
         osg::ref_ptr<osg::StateSet> mStateSet;
@@ -248,21 +244,25 @@ private:
 
 class OSGVertexBuffer : public MyGUI::IVertexBuffer
 {
-    osg::ref_ptr<osg::VertexBufferObject> mBuffer;
-    osg::ref_ptr<osg::UByteArray> mVertexArray;
+    osg::ref_ptr<osg::VertexBufferObject> mBuffer[2];
+    osg::ref_ptr<osg::UByteArray> mVertexArray[2];
 
     size_t mNeedVertexCount;
 
-    bool mQueuedForDrawing;
+    unsigned int mCurrentBuffer;
+    bool mUsed; // has the mCurrentBuffer been submitted to the rendering thread
 
     void destroy();
-    void create();
+    osg::UByteArray* create();
 
 public:
     OSGVertexBuffer();
-    virtual ~OSGVertexBuffer();
+    virtual ~OSGVertexBuffer() {}
 
-    void markAsQueuedForDrawing();
+    void markUsed();
+
+    osg::Array* getVertexArray();
+    osg::VertexBufferObject* getVertexBuffer();
 
     virtual void setVertexCount(size_t count);
     virtual size_t getVertexCount();
@@ -270,26 +270,18 @@ public:
     virtual MyGUI::Vertex *lock();
     virtual void unlock();
 
-/*internal:*/
-
-    osg::VertexBufferObject *getBuffer() const { return mBuffer.get(); }
-    osg::UByteArray *getArray() const { return mVertexArray.get(); }
 };
 
 OSGVertexBuffer::OSGVertexBuffer()
   : mNeedVertexCount(0)
-  , mQueuedForDrawing(false)
-{
-}
-
-OSGVertexBuffer::~OSGVertexBuffer()
+  , mCurrentBuffer(0)
+  , mUsed(false)
 {
-    destroy();
 }
 
-void OSGVertexBuffer::markAsQueuedForDrawing()
+void OSGVertexBuffer::markUsed()
 {
-    mQueuedForDrawing = true;
+    mUsed = true;
 }
 
 void OSGVertexBuffer::setVertexCount(size_t count)
@@ -307,48 +299,51 @@ size_t OSGVertexBuffer::getVertexCount()
 
 MyGUI::Vertex *OSGVertexBuffer::lock()
 {
-    if (mQueuedForDrawing || !mVertexArray)
+    if (mUsed)
     {
-        // Force recreating the buffer, to make sure we are not modifying a buffer currently
-        // queued for rendering in the last frame's draw thread.
-        // a more efficient solution might be double buffering
-        destroy();
-        create();
-        mQueuedForDrawing = false;
+        mCurrentBuffer = (mCurrentBuffer+1)%2;
+        mUsed = false;
     }
-    else
+    osg::UByteArray* array = mVertexArray[mCurrentBuffer];
+    if (!array)
     {
-        mVertexArray->resize(mNeedVertexCount * sizeof(MyGUI::Vertex));
+        array = create();
+    }
+    else if (array->size() != mNeedVertexCount * sizeof(MyGUI::Vertex))
+    {
+        array->resize(mNeedVertexCount * sizeof(MyGUI::Vertex));
     }
 
-    MYGUI_PLATFORM_ASSERT(mBuffer.valid(), "Vertex buffer is not created");
-
-    return (MyGUI::Vertex*)&(*mVertexArray)[0];
+    return (MyGUI::Vertex*)&(*array)[0];
 }
 
 void OSGVertexBuffer::unlock()
 {
-    mVertexArray->dirty();
-    mBuffer->dirty();
+    mVertexArray[mCurrentBuffer]->dirty();
+    mBuffer[mCurrentBuffer]->dirty();
 }
 
-void OSGVertexBuffer::destroy()
+osg::UByteArray* OSGVertexBuffer::create()
 {
-    mBuffer = nullptr;
-    mVertexArray = nullptr;
+    mVertexArray[mCurrentBuffer] = new osg::UByteArray(mNeedVertexCount*sizeof(MyGUI::Vertex));
+
+    mBuffer[mCurrentBuffer] = new osg::VertexBufferObject;
+    mBuffer[mCurrentBuffer]->setDataVariance(osg::Object::DYNAMIC);
+    mBuffer[mCurrentBuffer]->setUsage(GL_DYNAMIC_DRAW);
+    // NB mBuffer does not own the array
+    mBuffer[mCurrentBuffer]->setArray(0, mVertexArray[mCurrentBuffer].get());
+
+    return mVertexArray[mCurrentBuffer];
 }
 
-void OSGVertexBuffer::create()
+osg::Array* OSGVertexBuffer::getVertexArray()
 {
-    MYGUI_PLATFORM_ASSERT(!mBuffer.valid(), "Vertex buffer already exist");
-
-    mVertexArray = new osg::UByteArray(mNeedVertexCount*sizeof(MyGUI::Vertex));
+    return mVertexArray[mCurrentBuffer];
+}
 
-    mBuffer = new osg::VertexBufferObject;
-    mBuffer->setDataVariance(osg::Object::DYNAMIC);
-    mBuffer->setUsage(GL_DYNAMIC_DRAW);
-    // NB mBuffer does not own the array
-    mBuffer->setArray(0, mVertexArray.get());
+osg::VertexBufferObject* OSGVertexBuffer::getVertexBuffer()
+{
+    return mBuffer[mCurrentBuffer];
 }
 
 // ---------------------------------------------------------------------------
@@ -394,9 +389,6 @@ void RenderManager::initialise()
 
     mDrawable = new Drawable(this);
 
-    osg::ref_ptr<osg::Geode> geode = new osg::Geode;
-    geode->addDrawable(mDrawable.get());
-
     osg::ref_ptr<osg::Camera> camera = new osg::Camera();
     camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
     camera->setProjectionResizePolicy(osg::Camera::FIXED);
@@ -404,8 +396,8 @@ void RenderManager::initialise()
     camera->setViewMatrix(osg::Matrix::identity());
     camera->setRenderOrder(osg::Camera::POST_RENDER);
     camera->setClearMask(GL_NONE);
-    geode->setCullingActive(false);
-    camera->addChild(geode.get());
+    mDrawable->setCullingActive(false);
+    camera->addChild(mDrawable.get());
 
     mGuiRoot = camera;
     mSceneRoot->addChild(mGuiRoot.get());
@@ -419,6 +411,8 @@ void RenderManager::initialise()
 
 void RenderManager::shutdown()
 {
+    mGuiRoot->removeChildren(0, mGuiRoot->getNumChildren());
+    mSceneRoot->removeChild(mGuiRoot);
 }
 
 MyGUI::IVertexBuffer* RenderManager::createVertexBuffer()
@@ -443,9 +437,9 @@ void RenderManager::doRender(MyGUI::IVertexBuffer *buffer, MyGUI::ITexture *text
 {
     Drawable::Batch batch;
     batch.mVertexCount = count;
-    batch.mVertexBuffer = static_cast<OSGVertexBuffer*>(buffer)->getBuffer();
-    static_cast<OSGVertexBuffer*>(buffer)->markAsQueuedForDrawing();
-    batch.mArray = static_cast<OSGVertexBuffer*>(buffer)->getArray();
+    batch.mVertexBuffer = static_cast<OSGVertexBuffer*>(buffer)->getVertexBuffer();
+    batch.mArray = static_cast<OSGVertexBuffer*>(buffer)->getVertexArray();
+    static_cast<OSGVertexBuffer*>(buffer)->markUsed();
     if (texture)
     {
         batch.mTexture = static_cast<OSGTexture*>(texture)->getTexture();
diff --git a/components/myguiplatform/myguitexture.cpp b/components/myguiplatform/myguitexture.cpp
index 2ba78c26b..85ff3e3b5 100644
--- a/components/myguiplatform/myguitexture.cpp
+++ b/components/myguiplatform/myguitexture.cpp
@@ -86,9 +86,12 @@ namespace osgMyGUI
         if (!mImageManager)
             throw std::runtime_error("No imagemanager set");
 
-        mTexture = new osg::Texture2D(mImageManager->getImage(fname));
+        osg::ref_ptr<osg::Image> image (mImageManager->getImage(fname));
+        mTexture = new osg::Texture2D(image);
         mTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         mTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        mTexture->setTextureWidth(image->s());
+        mTexture->setTextureHeight(image->t());
         // disable mip-maps
         mTexture->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::LINEAR);
 
@@ -107,8 +110,6 @@ namespace osgMyGUI
     {
         if(!mTexture.valid())
             return 0;
-        osg::Image *image = mTexture->getImage();
-        if(image) return image->s();
         return mTexture->getTextureWidth();
     }
 
@@ -116,8 +117,6 @@ namespace osgMyGUI
     {
         if(!mTexture.valid())
             return 0;
-        osg::Image *image = mTexture->getImage();
-        if(image) return image->t();
         return mTexture->getTextureHeight();
     }
 
@@ -128,15 +127,12 @@ namespace osgMyGUI
         if (mLockedImage.valid())
             throw std::runtime_error("Texture already locked");
 
-        mLockedImage = mTexture->getImage();
-        if(!mLockedImage.valid())
-        {
-            mLockedImage = new osg::Image();
-            mLockedImage->allocateImage(
-                mTexture->getTextureWidth(), mTexture->getTextureHeight(), mTexture->getTextureDepth(),
-                mTexture->getSourceFormat(), mTexture->getSourceType()
-            );
-        }
+        mLockedImage = new osg::Image();
+        mLockedImage->allocateImage(
+            mTexture->getTextureWidth(), mTexture->getTextureHeight(), mTexture->getTextureDepth(),
+            mTexture->getSourceFormat(), mTexture->getSourceType()
+        );
+
         return mLockedImage->data();
     }
 
diff --git a/components/nif/controlled.cpp b/components/nif/controlled.cpp
index 5c63094ce..52e7a7302 100644
--- a/components/nif/controlled.cpp
+++ b/components/nif/controlled.cpp
@@ -87,6 +87,15 @@ namespace Nif
         nif->skip(17);
     }
 
+    void NiSphericalCollider::read(NIFStream* nif)
+    {
+        Controlled::read(nif);
+
+        mBounceFactor = nif->getFloat();
+        mRadius = nif->getFloat();
+        mCenter = nif->getVector3();
+    }
+
 
 
 
diff --git a/components/nif/controlled.hpp b/components/nif/controlled.hpp
index 4bd7ce1f9..5601474ac 100644
--- a/components/nif/controlled.hpp
+++ b/components/nif/controlled.hpp
@@ -111,6 +111,16 @@ public:
     float mPlaneDistance;
 };
 
+class NiSphericalCollider : public Controlled
+{
+public:
+    float mBounceFactor;
+    float mRadius;
+    osg::Vec3f mCenter;
+
+    void read(NIFStream *nif);
+};
+
 class NiParticleRotation : public Controlled
 {
 public:
diff --git a/components/nif/data.cpp b/components/nif/data.cpp
index 08c268dde..0813ab36b 100644
--- a/components/nif/data.cpp
+++ b/components/nif/data.cpp
@@ -1,9 +1,6 @@
 #include "data.hpp"
 #include "node.hpp"
 
-#include <osg/Array>
-#include <osg/PrimitiveSet>
-
 namespace Nif
 {
 void NiSkinInstance::read(NIFStream *nif)
@@ -40,18 +37,15 @@ void ShapeData::read(NIFStream *nif)
 {
     int verts = nif->getUShort();
 
-    vertices = new osg::Vec3Array;
     if(nif->getInt())
         nif->getVector3s(vertices, verts);
 
-    normals = new osg::Vec3Array(osg::Array::BIND_PER_VERTEX);
     if(nif->getInt())
         nif->getVector3s(normals, verts);
 
     center = nif->getVector3();
     radius = nif->getFloat();
 
-    colors = new osg::Vec4Array(osg::Array::BIND_PER_VERTEX);
     if(nif->getInt())
         nif->getVector4s(colors, verts);
 
@@ -65,13 +59,11 @@ void ShapeData::read(NIFStream *nif)
         uvlist.resize(uvs);
         for(int i = 0;i < uvs;i++)
         {
-            osg::Vec2Array* list = uvlist[i] = new osg::Vec2Array(osg::Array::BIND_PER_VERTEX);
-            nif->getVector2s(list, verts);
-
+            nif->getVector2s(uvlist[i], verts);
             // flip the texture coordinates to convert them to the OpenGL convention of bottom-left image origin
-            for (unsigned int uv=0; uv<list->size(); ++uv)
+            for (unsigned int uv=0; uv<uvlist[i].size(); ++uv)
             {
-                (*list)[uv] = osg::Vec2((*list)[uv].x(), 1.f - (*list)[uv].y());
+                uvlist[i][uv] = osg::Vec2f(uvlist[i][uv].x(), 1.f - uvlist[i][uv].y());
             }
         }
     }
@@ -86,7 +78,6 @@ void NiTriShapeData::read(NIFStream *nif)
     // We have three times as many vertices as triangles, so this
     // is always equal to tris*3.
     int cnt = nif->getInt();
-    triangles = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES);
     nif->getUShorts(triangles, cnt);
 
     // Read the match list, which lists the vertices that are equal to
@@ -113,9 +104,8 @@ void NiAutoNormalParticlesData::read(NIFStream *nif)
 
     if(nif->getInt())
     {
-        int numVerts = vertices->size();
         // Particle sizes
-        nif->getFloats(sizes, numVerts);
+        nif->getFloats(sizes, vertices.size());
     }
 }
 
@@ -125,9 +115,8 @@ void NiRotatingParticlesData::read(NIFStream *nif)
 
     if(nif->getInt())
     {
-        int numVerts = vertices->size();
         // Rotation quaternions.
-        nif->getQuaternions(rotations, numVerts);
+        nif->getQuaternions(rotations, vertices.size());
     }
 }
 
@@ -154,7 +143,7 @@ void NiFloatData::read(NIFStream *nif)
 
 void NiPixelData::read(NIFStream *nif)
 {
-    nif->getInt(); // always 0 or 1
+    fmt = (Format)nif->getUInt();
 
     rmask = nif->getInt(); // usually 0xff
     gmask = nif->getInt(); // usually 0xff00
@@ -169,19 +158,23 @@ void NiPixelData::read(NIFStream *nif)
     mips = nif->getInt();
 
     // Bytes per pixel, should be bpp * 8
-    /*int bytes =*/ nif->getInt();
+    /* int bytes = */ nif->getInt();
 
     for(int i=0; i<mips; i++)
     {
         // Image size and offset in the following data field
-        /*int x =*/ nif->getInt();
-        /*int y =*/ nif->getInt();
-        /*int offset =*/ nif->getInt();
+        Mipmap m;
+        m.width = nif->getUInt();
+        m.height = nif->getUInt();
+        m.dataOffset = nif->getUInt();
+        mipmaps.push_back(m);
     }
 
-    // Skip the data
+    // Read the data
     unsigned int dataSize = nif->getInt();
-    nif->skip(dataSize);
+    data.reserve(dataSize);
+    for (unsigned i=0; i<dataSize; ++i)
+        data.push_back((unsigned char)nif->getChar());
 }
 
 void NiColorData::read(NIFStream *nif)
@@ -242,7 +235,6 @@ void NiMorphData::read(NIFStream *nif)
     {
         mMorphs[i].mKeyFrames.reset(new FloatKeyMap);
         mMorphs[i].mKeyFrames->read(nif, true);
-        mMorphs[i].mVertices = new osg::Vec3Array;
         nif->getVector3s(mMorphs[i].mVertices, vertCount);
     }
 }
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index 95f244129..e6227b52a 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -28,8 +28,6 @@
 
 #include "niftypes.hpp" // Transformation
 
-#include <osg/Array>
-
 namespace Nif
 {
 
@@ -37,10 +35,9 @@ namespace Nif
 class ShapeData : public Record
 {
 public:
-    osg::ref_ptr<osg::Vec3Array> vertices, normals;
-    osg::ref_ptr<osg::Vec4Array> colors;
-
-    std::vector< osg::ref_ptr<osg::Vec2Array> > uvlist;
+    std::vector<osg::Vec3f> vertices, normals;
+    std::vector<osg::Vec4f> colors;
+    std::vector< std::vector<osg::Vec2f> > uvlist;
     osg::Vec3f center;
     float radius;
 
@@ -51,7 +48,7 @@ class NiTriShapeData : public ShapeData
 {
 public:
     // Triangles, three vertex indices per triangle
-    osg::ref_ptr<osg::DrawElementsUShort> triangles;
+    std::vector<unsigned short> triangles;
 
     void read(NIFStream *nif);
 };
@@ -105,9 +102,30 @@ public:
 class NiPixelData : public Record
 {
 public:
+    enum Format
+    {
+        NIPXFMT_RGB8,
+        NIPXFMT_RGBA8,
+        NIPXFMT_PAL8,
+        NIPXFMT_DXT1,
+        NIPXFMT_DXT3,
+        NIPXFMT_DXT5,
+        NIPXFMT_DXT5_ALT
+    };
+    Format fmt;
+
     unsigned int rmask, gmask, bmask, amask;
     int bpp, mips;
 
+    struct Mipmap
+    {
+        int width, height;
+        int dataOffset;
+    };
+    std::vector<Mipmap> mipmaps;
+
+    std::vector<unsigned char> data;
+
     void read(NIFStream *nif);
 };
 
@@ -169,7 +187,7 @@ struct NiMorphData : public Record
 {
     struct MorphData {
         FloatKeyMapPtr mKeyFrames;
-        osg::ref_ptr<osg::Vec3Array> mVertices;
+        std::vector<osg::Vec3f> mVertices;
     };
     std::vector<MorphData> mMorphs;
 
diff --git a/components/nif/effect.cpp b/components/nif/effect.cpp
index 79cd10431..7947e301d 100644
--- a/components/nif/effect.cpp
+++ b/components/nif/effect.cpp
@@ -19,14 +19,20 @@ void NiTextureEffect::read(NIFStream *nif)
 {
     NiDynamicEffect::read(nif);
 
-    /*
-           3 x Vector4 = [1,0,0,0]
-           int = 2
-           int = 0 or 3
-           int = 2
-           int = 2
-        */
-    nif->skip(16*4);
+    // Model Projection Matrix
+    nif->skip(3 * 3 * sizeof(float));
+
+    // Model Projection Transform
+    nif->skip(3 * sizeof(float));
+
+    // Texture Filtering
+    nif->skip(4);
+
+    clamp = nif->getUInt();
+
+    textureType = (TextureType)nif->getUInt();
+
+    coordGenType = (CoordGenType)nif->getUInt();
 
     texture.read(nif);
 
diff --git a/components/nif/effect.hpp b/components/nif/effect.hpp
index 02647e444..015809a68 100644
--- a/components/nif/effect.hpp
+++ b/components/nif/effect.hpp
@@ -70,6 +70,26 @@ struct NiSpotLight : public NiPointLight
 struct NiTextureEffect : NiDynamicEffect
 {
     NiSourceTexturePtr texture;
+    unsigned int clamp;
+
+    enum TextureType
+    {
+        Projected_Light = 0,
+        Projected_Shadow = 1,
+        Environment_Map = 2,
+        Fog_Map = 3
+    };
+    TextureType textureType;
+
+    enum CoordGenType
+    {
+        World_Parallel = 0,
+        World_Perspective,
+        Sphere_Map,
+        Specular_Cube_Map,
+        Diffuse_Cube_Map
+    };
+    CoordGenType coordGenType;
 
     void read(NIFStream *nif);
     void post(NIFFile *nif);
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index f6e489527..b4b1caefc 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -89,6 +89,7 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     newFactory.insert(makeEntry("NiStringExtraData",          &construct <NiStringExtraData>           , RC_NiStringExtraData             ));
     newFactory.insert(makeEntry("NiGravity",                  &construct <NiGravity>                   , RC_NiGravity                     ));
     newFactory.insert(makeEntry("NiPlanarCollider",           &construct <NiPlanarCollider>            , RC_NiPlanarCollider              ));
+    newFactory.insert(makeEntry("NiSphericalCollider",        &construct <NiSphericalCollider>         , RC_NiSphericalCollider           ));
     newFactory.insert(makeEntry("NiParticleGrowFade",         &construct <NiParticleGrowFade>          , RC_NiParticleGrowFade            ));
     newFactory.insert(makeEntry("NiParticleColorModifier",    &construct <NiParticleColorModifier>     , RC_NiParticleColorModifier       ));
     newFactory.insert(makeEntry("NiParticleRotation",         &construct <NiParticleRotation>          , RC_NiParticleRotation            ));
diff --git a/components/nif/niffile.hpp b/components/nif/niffile.hpp
index 900c360bb..9a2acbb9f 100644
--- a/components/nif/niffile.hpp
+++ b/components/nif/niffile.hpp
@@ -48,14 +48,14 @@ class NIFFile
 
 public:
     /// Used if file parsing fails
-    void fail(const std::string &msg)
+    void fail(const std::string &msg) const
     {
         std::string err = " NIFFile Error: " + msg;
         err += "\nFile: " + filename;
         throw std::runtime_error(err);
     }
     /// Used when something goes wrong, but not catastrophically so
-    void warn(const std::string &msg)
+    void warn(const std::string &msg) const
     {
         std::cerr << " NIFFile Warning: " << msg <<std::endl
                   << "File: " << filename <<std::endl;
@@ -90,9 +90,9 @@ public:
     bool getUseSkinning() const;
 
     /// Get the name of the file
-    std::string getFilename(){ return filename; }
+    std::string getFilename() const { return filename; }
 };
-typedef boost::shared_ptr<Nif::NIFFile> NIFFilePtr;
+typedef boost::shared_ptr<const Nif::NIFFile> NIFFilePtr;
 
 
 
diff --git a/components/nif/nifstream.cpp b/components/nif/nifstream.cpp
index 5f49c2d21..d0fc9bab0 100644
--- a/components/nif/nifstream.cpp
+++ b/components/nif/nifstream.cpp
@@ -103,11 +103,11 @@ std::string NIFStream::getVersionString()
     return result;
 }
 
-void NIFStream::getUShorts(osg::VectorGLushort* vec, size_t size)
+void NIFStream::getUShorts(std::vector<unsigned short> &vec, size_t size)
 {
-    vec->reserve(size);
-    for(size_t i = 0;i < size;i++)
-        vec->push_back(getUShort());
+    vec.resize(size);
+    for(size_t i = 0;i < vec.size();i++)
+        vec[i] = getUShort();
 }
 void NIFStream::getFloats(std::vector<float> &vec, size_t size)
 {
@@ -115,23 +115,23 @@ void NIFStream::getFloats(std::vector<float> &vec, size_t size)
     for(size_t i = 0;i < vec.size();i++)
         vec[i] = getFloat();
 }
-void NIFStream::getVector2s(osg::Vec2Array* vec, size_t size)
+void NIFStream::getVector2s(std::vector<osg::Vec2f> &vec, size_t size)
 {
-    vec->reserve(size);
-    for(size_t i = 0;i < size;i++)
-        vec->push_back(getVector2());
+    vec.resize(size);
+    for(size_t i = 0;i < vec.size();i++)
+        vec[i] = getVector2();
 }
-void NIFStream::getVector3s(osg::Vec3Array* vec, size_t size)
+void NIFStream::getVector3s(std::vector<osg::Vec3f> &vec, size_t size)
 {
-    vec->reserve(size);
-    for(size_t i = 0;i < size;i++)
-        vec->push_back(getVector3());
+    vec.resize(size);
+    for(size_t i = 0;i < vec.size();i++)
+        vec[i] = getVector3();
 }
-void NIFStream::getVector4s(osg::Vec4Array* vec, size_t size)
+void NIFStream::getVector4s(std::vector<osg::Vec4f> &vec, size_t size)
 {
-    vec->reserve(size);
-    for(size_t i = 0;i < size;i++)
-        vec->push_back(getVector4());
+    vec.resize(size);
+    for(size_t i = 0;i < vec.size();i++)
+        vec[i] = getVector4();
 }
 void NIFStream::getQuaternions(std::vector<osg::Quat> &quat, size_t size)
 {
diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index f5d777bdf..f4163ce47 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -12,12 +12,9 @@
 #include <osg/Vec3f>
 #include <osg/Vec4f>
 #include <osg/Quat>
-#include <osg/Array>
-#include <osg/PrimitiveSet>
 
 #include "niftypes.hpp"
 
-
 namespace Nif
 {
 
@@ -62,11 +59,11 @@ public:
     ///This is special since the version string doesn't start with a number, and ends with "\n"
     std::string getVersionString();
 
-    void getUShorts(osg::VectorGLushort* vec, size_t size);
+    void getUShorts(std::vector<unsigned short> &vec, size_t size);
     void getFloats(std::vector<float> &vec, size_t size);
-    void getVector2s(osg::Vec2Array* vec, size_t size);
-    void getVector3s(osg::Vec3Array* vec, size_t size);
-    void getVector4s(osg::Vec4Array* vec, size_t size);
+    void getVector2s(std::vector<osg::Vec2f> &vec, size_t size);
+    void getVector3s(std::vector<osg::Vec3f> &vec, size_t size);
+    void getVector4s(std::vector<osg::Vec4f> &vec, size_t size);
     void getQuaternions(std::vector<osg::Quat> &quat, size_t size);
 };
 
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index bcbdba115..605c4d76e 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -92,7 +92,8 @@ enum RecordType
   RC_NiSequenceStreamHelper,
   RC_NiSourceTexture,
   RC_NiSkinInstance,
-  RC_RootCollisionNode
+  RC_RootCollisionNode,
+  RC_NiSphericalCollider
 };
 
 /// Base class for all records
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 19afe49d6..1cfac15eb 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -266,6 +266,11 @@ void BulletNifLoader::handleNiTriShape(const Nif::NiTriShape *shape, int flags,
     if (!shape->skin.empty())
         isAnimated = false;
 
+    if (shape->data.empty())
+        return;
+    if (shape->data->triangles.empty())
+        return;
+
     if (isAnimated)
     {
         if (!mCompoundShape)
@@ -275,14 +280,13 @@ void BulletNifLoader::handleNiTriShape(const Nif::NiTriShape *shape, int flags,
 
         const Nif::NiTriShapeData *data = shape->data.getPtr();
 
-        childMesh->preallocateVertices(data->vertices->size());
-        childMesh->preallocateIndices(data->triangles->size());
+        childMesh->preallocateVertices(data->vertices.size());
+        childMesh->preallocateIndices(data->triangles.size());
 
-        const osg::Vec3Array& vertices = *data->vertices;
-        const osg::DrawElementsUShort& triangles = *data->triangles;
+        const std::vector<osg::Vec3f> &vertices = data->vertices;
+        const std::vector<unsigned short> &triangles = data->triangles;
 
-        size_t numtris = data->triangles->size();
-        for(size_t i = 0;i < numtris;i+=3)
+        for(size_t i = 0;i < data->triangles.size();i+=3)
         {
             osg::Vec3f b1 = vertices[triangles[i+0]];
             osg::Vec3f b2 = vertices[triangles[i+1]];
@@ -316,13 +320,13 @@ void BulletNifLoader::handleNiTriShape(const Nif::NiTriShape *shape, int flags,
 
         // Static shape, just transform all vertices into position
         const Nif::NiTriShapeData *data = shape->data.getPtr();
-        const osg::Vec3Array& vertices = *data->vertices;
-        const osg::DrawElementsUShort& triangles = *data->triangles;
+        const std::vector<osg::Vec3f> &vertices = data->vertices;
+        const std::vector<unsigned short> &triangles = data->triangles;
 
-        mStaticMesh->preallocateVertices(data->vertices->size());
-        mStaticMesh->preallocateIndices(data->triangles->size());
+        mStaticMesh->preallocateVertices(data->vertices.size());
+        mStaticMesh->preallocateIndices(data->triangles.size());
 
-        size_t numtris = data->triangles->size();
+        size_t numtris = data->triangles.size();
         for(size_t i = 0;i < numtris;i+=3)
         {
             osg::Vec3f b1 = vertices[triangles[i+0]]*transform;
diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index d0abc9ead..8d0c73bff 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -239,7 +239,7 @@ UVController::UVController(const UVController& copy, const osg::CopyOp& copyop)
 
 void UVController::setDefaults(osg::StateSet *stateset)
 {
-    osg::TexMat* texMat = new osg::TexMat;
+    osg::ref_ptr<osg::TexMat> texMat (new osg::TexMat);
     for (std::set<int>::const_iterator it = mTextureUnits.begin(); it != mTextureUnits.end(); ++it)
         stateset->setTextureAttributeAndModes(*it, texMat, osg::StateAttribute::ON);
 }
@@ -254,9 +254,15 @@ void UVController::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
         float uScale = mUScale.interpKey(value);
         float vScale = mVScale.interpKey(value);
 
+        osg::Matrix flipMat;
+        flipMat.preMultTranslate(osg::Vec3f(0,1,0));
+        flipMat.preMultScale(osg::Vec3f(1,-1,1));
+
         osg::Matrixf mat = osg::Matrixf::scale(uScale, vScale, 1);
         mat.setTrans(uTrans, vTrans, 0);
 
+        mat = flipMat * mat * flipMat;
+
         // setting once is enough because all other texture units share the same TexMat (see setDefaults).
         if (!mTextureUnits.empty())
         {
@@ -433,12 +439,15 @@ ParticleSystemController::ParticleSystemController(const ParticleSystemControlle
 
 void ParticleSystemController::operator() (osg::Node* node, osg::NodeVisitor* nv)
 {
+    osgParticle::ParticleProcessor* emitter = static_cast<osgParticle::ParticleProcessor*>(node);
     if (hasInput())
     {
-        osgParticle::ParticleProcessor* emitter = static_cast<osgParticle::ParticleProcessor*>(node);
         float time = getInputValue(nv);
+        emitter->getParticleSystem()->setFrozen(false);
         emitter->setEnabled(time >= mEmitStart && time < mEmitStop);
     }
+    else
+        emitter->getParticleSystem()->setFrozen(true);
     traverse(node, nv);
 }
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 6c6061063..bdd104b3d 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -2,11 +2,11 @@
 
 #include <osg/Matrixf>
 #include <osg/MatrixTransform>
-#include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/Array>
-#include <osg/Version>
 #include <osg/LOD>
+#include <osg/TexGen>
+#include <osg/ValueObject>
 
 // resource
 #include <components/misc/stringops.hpp>
@@ -20,7 +20,6 @@
 #include <osgParticle/ParticleSystem>
 #include <osgParticle/ParticleSystemUpdater>
 #include <osgParticle/ConstantRateCounter>
-#include <osgParticle/ModularEmitter>
 #include <osgParticle/Shooter>
 #include <osgParticle/BoxPlacer>
 #include <osgParticle/ModularProgram>
@@ -37,7 +36,7 @@
 #include <osg/TexEnvCombine>
 
 #include <components/nif/node.hpp>
-#include <components/sceneutil/util.hpp>
+#include <components/nif/effect.hpp>
 #include <components/sceneutil/skeleton.hpp>
 #include <components/sceneutil/riggeometry.hpp>
 
@@ -131,31 +130,27 @@ namespace
 
         virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
         {
-            osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(nv);
-            if (node && cv)
-            {
-                osg::Matrix modelView = *cv->getModelViewMatrix();
+            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
 
-                // attempt to preserve scale
-                float mag[3];
-                for (int i=0;i<3;++i)
-                {
-                    mag[i] = std::sqrt(modelView(0,i) * modelView(0,i) + modelView(1,i) * modelView(1,i) + modelView(2,i) * modelView(2,i));
-                }
+            osg::Matrix modelView = *cv->getModelViewMatrix();
+
+            // attempt to preserve scale
+            float mag[3];
+            for (int i=0;i<3;++i)
+            {
+                mag[i] = std::sqrt(modelView(0,i) * modelView(0,i) + modelView(1,i) * modelView(1,i) + modelView(2,i) * modelView(2,i));
+            }
 
-                modelView.setRotate(osg::Quat());
-                modelView(0,0) = mag[0];
-                modelView(1,1) = mag[1];
-                modelView(2,2) = mag[2];
+            modelView.setRotate(osg::Quat());
+            modelView(0,0) = mag[0];
+            modelView(1,1) = mag[1];
+            modelView(2,2) = mag[2];
 
-                cv->pushModelViewMatrix(new osg::RefMatrix(modelView), osg::Transform::RELATIVE_RF);
+            cv->pushModelViewMatrix(new osg::RefMatrix(modelView), osg::Transform::RELATIVE_RF);
 
-                traverse(node, nv);
+            traverse(node, nv);
 
-                cv->popModelViewMatrix();
-            }
-            else
-                traverse(node, nv);
+            cv->popModelViewMatrix();
         }
     };
 
@@ -282,11 +277,13 @@ namespace NifOsg
     public:
         /// @param filename used for warning messages.
         LoaderImpl(const std::string& filename)
-            : mFilename(filename)
+            : mFilename(filename), mFirstRootTextureIndex(-1), mFoundFirstRootTexturingProperty(false)
         {
 
         }
         std::string mFilename;
+        size_t mFirstRootTextureIndex;
+        bool mFoundFirstRootTexturingProperty;
 
         static void loadKf(Nif::NIFFilePtr nif, KeyframeHolder& target)
         {
@@ -327,8 +324,8 @@ namespace NifOsg
                     continue;
                 }
 
-                if (!(ctrl->flags & Nif::NiNode::ControllerFlag_Active))
-                    continue;
+                // Vanilla seems to ignore the "active" flag for NiKeyframeController,
+                // so we don't want to skip inactive controllers here.
 
                 const Nif::NiStringExtraData *strdata = static_cast<const Nif::NiStringExtraData*>(extra.getPtr());
                 const Nif::NiKeyframeController *key = static_cast<const Nif::NiKeyframeController*>(ctrl.getPtr());
@@ -339,7 +336,10 @@ namespace NifOsg
                 osg::ref_ptr<NifOsg::KeyframeController> callback(new NifOsg::KeyframeController(key->data.getPtr()));
                 callback->setFunction(boost::shared_ptr<NifOsg::ControllerFunction>(new NifOsg::ControllerFunction(key)));
 
-                target.mKeyframeControllers[strdata->string] = callback;
+                if (target.mKeyframeControllers.find(strdata->string) != target.mKeyframeControllers.end())
+                    std::cerr << "Warning: controller " << strdata->string << " present more than once in " << nif->getFilename() << ", ignoring later version" << std::endl;
+                else
+                    target.mKeyframeControllers[strdata->string] = callback;
             }
         }
 
@@ -356,15 +356,29 @@ namespace NifOsg
 
             osg::ref_ptr<TextKeyMapHolder> textkeys (new TextKeyMapHolder);
 
-            osg::ref_ptr<osg::Node> created = handleNode(nifNode, NULL, imageManager, std::vector<int>(), 0, 0, false, &textkeys->mTextKeys);
+            osg::ref_ptr<osg::Node> created = handleNode(nifNode, NULL, imageManager, std::vector<int>(), 0, false, false, &textkeys->mTextKeys);
 
             if (nif->getUseSkinning())
             {
                 osg::ref_ptr<SceneUtil::Skeleton> skel = new SceneUtil::Skeleton;
-                skel->addChild(created);
+
+                osg::Group* root = created->asGroup();
+                if (root && root->getDataVariance() == osg::Object::STATIC)
+                {
+                    skel->setStateSet(root->getStateSet());
+                    skel->setName(root->getName());
+                    for (unsigned int i=0; i<root->getNumChildren(); ++i)
+                        skel->addChild(root->getChild(i));
+                    root->removeChildren(0, root->getNumChildren());
+                    created = skel;
+                }
+                else
+                    skel->addChild(created);
                 created = skel;
             }
-            created->getOrCreateUserDataContainer()->addUserObject(textkeys);
+
+            if (!textkeys->mTextKeys.empty())
+                created->getOrCreateUserDataContainer()->addUserObject(textkeys);
 
             return created;
         }
@@ -372,10 +386,24 @@ namespace NifOsg
         void applyNodeProperties(const Nif::Node *nifNode, osg::Node *applyTo, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<int>& boundTextures, int animflags)
         {
             const Nif::PropertyList& props = nifNode->props;
-            for (size_t i = 0; i <props.length();++i)
+            for (size_t i = 0; i <props.length(); ++i)
             {
                 if (!props[i].empty())
+                {
+                    // Get the lowest numbered recIndex of the NiTexturingProperty root node.
+                    // This is what is overridden when a spell effect "particle texture" is used.
+                    if (nifNode->parent == NULL && !mFoundFirstRootTexturingProperty && props[i].getPtr()->recType == Nif::RC_NiTexturingProperty)
+                    {
+                        mFirstRootTextureIndex = props[i].getPtr()->recIndex;
+                        mFoundFirstRootTexturingProperty = true;
+                    }
+                    else if (props[i].getPtr()->recType == Nif::RC_NiTexturingProperty)
+                    {
+                        if (props[i].getPtr()->recIndex == mFirstRootTextureIndex)
+                            applyTo->setUserValue("overrideFx", 1);                
+                    }
                     handleProperty(props[i].getPtr(), applyTo, composite, imageManager, boundTextures, animflags);
+                }              
             }
         }
 
@@ -388,44 +416,6 @@ namespace NifOsg
             toSetup->setFunction(boost::shared_ptr<ControllerFunction>(new ControllerFunction(ctrl)));
         }
 
-        void optimize (const Nif::Node* nifNode, osg::Group* node, bool skipMeshes)
-        {
-            // For nodes with an identity transform, remove the redundant Transform node
-            if (node->getDataVariance() == osg::Object::STATIC
-                    // For TriShapes, we can only collapse the node, but not completely remove it,
-                    // if the link to animated collision shapes is supposed to stay intact.
-                    && (nifNode->recType != Nif::RC_NiTriShape || !skipMeshes)
-                    // Don't optimize drawables with controllers, that creates issues when we want to deep copy controllers without deep copying the drawable that holds the controller.
-                    // A deep copy of controllers may be needed to independently animate multiple copies of the same mesh.
-                    && !node->getUpdateCallback())
-            {
-                if (node->getNumParents() && nifNode->trafo.isIdentity())
-                {
-                    osg::Group* parent = node->getParent(0);
-
-                     // can be multiple children in case of ParticleSystems, with the extra ParticleSystemUpdater node
-                    for (unsigned int i=0; i<node->getNumChildren(); ++i)
-                    {
-                        osg::Node* child = node->getChild(i);
-                        if (i == node->getNumChildren()-1) // FIXME: some nicer way to determine where our actual Drawable resides...
-                        {
-                            child->addUpdateCallback(node->getUpdateCallback());
-                            child->setStateSet(node->getStateSet());
-                            child->setName(node->getName());
-                            // make sure to copy the UserDataContainer with the record index, so that connections to an animated collision shape don't break
-                            child->setUserDataContainer(node->getUserDataContainer());
-                        }
-                        parent->addChild(child);
-                    }
-
-                    node->removeChildren(0, node->getNumChildren());
-                    parent->removeChild(node);
-                }
-            }
-            // For NiTriShapes *with* a valid transform, perhaps we could apply the transform to the vertices.
-            // Need to make sure that won't break transparency sorting. Check what the original engine is doing?
-        }
-
         osg::ref_ptr<osg::LOD> handleLodNode(const Nif::NiLODNode* niLodNode)
         {
             osg::ref_ptr<osg::LOD> lod (new osg::LOD);
@@ -440,12 +430,93 @@ namespace NifOsg
             return lod;
         }
 
-        osg::ref_ptr<osg::Node> handleNode(const Nif::Node* nifNode, osg::Group* parentNode, Resource::ImageManager* imageManager,
-                                std::vector<int> boundTextures, int animflags, int particleflags, bool skipMeshes, TextKeyMap* textKeys, osg::Node* rootNode=NULL)
+        osg::ref_ptr<osg::Image> handleSourceTexture(const Nif::NiSourceTexture* st, Resource::ImageManager* imageManager)
+        {
+            if (!st)
+                return NULL;
+
+            osg::ref_ptr<osg::Image> image;
+            if (!st->external && !st->data.empty())
+            {
+                image = handleInternalTexture(st->data.getPtr());
+            }
+            else
+            {
+                std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, imageManager->getVFS());
+                image = imageManager->getImage(filename);
+            }
+            return image;
+        }
+
+        void handleEffect(const Nif::Node* nifNode, osg::Node* node, Resource::ImageManager* imageManager)
         {
-            osg::ref_ptr<osg::Group> node = new osg::MatrixTransform(nifNode->trafo.toMatrix());
+            if (nifNode->recType != Nif::RC_NiTextureEffect)
+            {
+                std::cerr << "Unhandled effect " << nifNode->recName << " in " << mFilename << std::endl;
+                return;
+            }
+
+            const Nif::NiTextureEffect* textureEffect = static_cast<const Nif::NiTextureEffect*>(nifNode);
+            if (textureEffect->textureType != Nif::NiTextureEffect::Environment_Map)
+            {
+                std::cerr << "Unhandled NiTextureEffect type " << textureEffect->textureType << " in " << mFilename << std::endl;
+                return;
+            }
+
+            if (textureEffect->texture.empty())
+            {
+                std::cerr << "NiTextureEffect missing source texture in " << mFilename << std::endl;
+                return;
+            }
+
+            osg::ref_ptr<osg::TexGen> texGen (new osg::TexGen);
+            switch (textureEffect->coordGenType)
+            {
+            case Nif::NiTextureEffect::World_Parallel:
+                texGen->setMode(osg::TexGen::OBJECT_LINEAR);
+                break;
+            case Nif::NiTextureEffect::World_Perspective:
+                texGen->setMode(osg::TexGen::EYE_LINEAR);
+                break;
+            case Nif::NiTextureEffect::Sphere_Map:
+                texGen->setMode(osg::TexGen::SPHERE_MAP);
+                break;
+            default:
+                std::cerr << "Unhandled NiTextureEffect coordGenType " << textureEffect->coordGenType << " in " << mFilename << std::endl;
+                return;
+            }
+
+            osg::ref_ptr<osg::Texture2D> texture2d (new osg::Texture2D(handleSourceTexture(textureEffect->texture.getPtr(), imageManager)));
+            texture2d->setName("envMap");
+            unsigned int clamp = static_cast<unsigned int>(textureEffect->clamp);
+            int wrapT = (clamp) & 0x1;
+            int wrapS = (clamp >> 1) & 0x1;
+            texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP);
+            texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP);
+
+            osg::ref_ptr<osg::TexEnvCombine> texEnv = new osg::TexEnvCombine;
+            texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
+            texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+            texEnv->setCombine_RGB(osg::TexEnvCombine::ADD);
+            texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+            texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
+
+            int texUnit = 3; // FIXME
+
+            osg::StateSet* stateset = node->getOrCreateStateSet();
+            stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
+            stateset->setTextureAttributeAndModes(texUnit, texGen, osg::StateAttribute::ON);
+            stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
+
+            stateset->addUniform(new osg::Uniform("envMapColor", osg::Vec4f(1,1,1,1)));
+        }
+
+        // Get a default dataVariance for this node to be used as a hint by optimization (post)routines
+        osg::Object::DataVariance getDataVariance(const Nif::Node* nifNode)
+        {
+            if (nifNode->boneTrafo || nifNode->boneIndex != -1)
+                return osg::Object::DYNAMIC;
 
-            // Set a default DataVariance (used as hint by optimization routines).
             switch (nifNode->recType)
             {
             case Nif::RC_NiTriShape:
@@ -453,13 +524,29 @@ namespace NifOsg
             case Nif::RC_NiRotatingParticles:
                 // Leaf nodes in the NIF hierarchy, so won't be able to dynamically attach children.
                 // No support for keyframe controllers (just crashes in the original engine).
-                node->setDataVariance(osg::Object::STATIC);
-                break;
+                return osg::Object::STATIC;
             default:
-                // could have new children attached at any time, or added external keyframe controllers from .kf files
-                node->setDataVariance(osg::Object::DYNAMIC);
-                break;
+                return osg::Object::DYNAMIC;
             }
+        }
+
+        osg::ref_ptr<osg::Node> handleNode(const Nif::Node* nifNode, osg::Group* parentNode, Resource::ImageManager* imageManager,
+                                std::vector<int> boundTextures, int animflags, bool skipMeshes, bool isAnimated, TextKeyMap* textKeys, osg::Node* rootNode=NULL)
+        {
+            if (rootNode != NULL && Misc::StringUtils::ciEqual(nifNode->name, "Bounding Box"))
+                return NULL;
+
+            osg::Object::DataVariance dataVariance = getDataVariance(nifNode);
+
+            osg::ref_ptr<osg::Group> node;
+            if (dataVariance == osg::Object::STATIC && nifNode->trafo.isIdentity())
+                node = new osg::Group;
+            else
+                node = new osg::MatrixTransform(nifNode->trafo.toMatrix());
+            node->setDataVariance(dataVariance);
+
+            if (nifNode->controller.empty())
+                node->setDataVariance(osg::Object::STATIC);
 
             if (nifNode->recType == Nif::RC_NiBillboardNode)
             {
@@ -474,6 +561,9 @@ namespace NifOsg
                 node->setDataVariance(osg::Object::STATIC);
             }
 
+            if (!nifNode->controller.empty() && nifNode->controller->recType == Nif::RC_NiKeyframeController)
+                isAnimated = true;
+
             node->setName(nifNode->name);
 
             if (parentNode)
@@ -511,10 +601,8 @@ namespace NifOsg
                 }
             }
 
-            if (nifNode->recType == Nif::RC_NiBSAnimationNode)
-                animflags |= nifNode->flags;
-            if (nifNode->recType == Nif::RC_NiBSParticleNode)
-                particleflags |= nifNode->flags;
+            if (nifNode->recType == Nif::RC_NiBSAnimationNode || nifNode->recType == Nif::RC_NiBSParticleNode)
+                animflags = nifNode->flags;
 
             // Hide collision shapes, but don't skip the subgraph
             // We still need to animate the hidden bones so the physics system can access them
@@ -525,6 +613,11 @@ namespace NifOsg
                 node->setNodeMask(0x1);
             }
 
+            if (skipMeshes && isAnimated) // make sure the empty node is not optimized away so the physicssystem can find it.
+            {
+                node->setDataVariance(osg::Object::DYNAMIC);
+            }
+
             // We can skip creating meshes for hidden nodes if they don't have a VisController that
             // might make them visible later
             if (nifNode->flags & Nif::NiNode::Flag_Hidden)
@@ -557,7 +650,7 @@ namespace NifOsg
             }
 
             if(nifNode->recType == Nif::RC_NiAutoNormalParticles || nifNode->recType == Nif::RC_NiRotatingParticles)
-                handleParticleSystem(nifNode, node, composite, animflags, particleflags, rootNode);
+                handleParticleSystem(nifNode, node, composite, animflags, rootNode);
 
             if (composite->getNumControllers() > 0)
                 node->addUpdateCallback(composite);
@@ -568,9 +661,6 @@ namespace NifOsg
             if (!nifNode->controller.empty() && node->getDataVariance() == osg::Object::DYNAMIC)
                 handleNodeControllers(nifNode, static_cast<osg::MatrixTransform*>(node.get()), animflags);
 
-            // Optimization pass
-            optimize(nifNode, node, skipMeshes);
-
 
             if (nifNode->recType == Nif::RC_NiLODNode)
             {
@@ -583,13 +673,18 @@ namespace NifOsg
             const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(nifNode);
             if(ninode)
             {
+                const Nif::NodeList &effects = ninode->effects;
+                for (size_t i = 0; i < effects.length(); ++i)
+                {
+                    if (!effects[i].empty())
+                        handleEffect(effects[i].getPtr(), node, imageManager);
+                }
+
                 const Nif::NodeList &children = ninode->children;
                 for(size_t i = 0;i < children.length();++i)
                 {
                     if(!children[i].empty())
-                    {
-                        handleNode(children[i].getPtr(), node, imageManager, boundTextures, animflags, particleflags, skipMeshes, textKeys, rootNode);
-                    }
+                        handleNode(children[i].getPtr(), node, imageManager, boundTextures, animflags, skipMeshes, isAnimated, textKeys, rootNode);
                 }
             }
 
@@ -604,14 +699,14 @@ namespace NifOsg
                     continue;
                 if (ctrl->recType == Nif::RC_NiUVController)
                 {
-                    const Nif::NiUVController *uvctrl = static_cast<const Nif::NiUVController*>(ctrl.getPtr());
+                    const Nif::NiUVController *niuvctrl = static_cast<const Nif::NiUVController*>(ctrl.getPtr());
                     std::set<int> texUnits;
                     for (unsigned int i=0; i<boundTextures.size(); ++i)
                         texUnits.insert(i);
 
-                    osg::ref_ptr<UVController> ctrl = new UVController(uvctrl->data.getPtr(), texUnits);
-                    setupController(uvctrl, ctrl, animflags);
-                    composite->addController(ctrl);
+                    osg::ref_ptr<UVController> uvctrl = new UVController(niuvctrl->data.getPtr(), texUnits);
+                    setupController(niuvctrl, uvctrl, animflags);
+                    composite->addController(uvctrl);
                 }
                 else if (ctrl->recType == Nif::RC_NiVisController)
                 {
@@ -666,16 +761,16 @@ namespace NifOsg
                 if (ctrl->recType == Nif::RC_NiAlphaController)
                 {
                     const Nif::NiAlphaController* alphactrl = static_cast<const Nif::NiAlphaController*>(ctrl.getPtr());
-                    osg::ref_ptr<AlphaController> ctrl(new AlphaController(alphactrl->data.getPtr()));
-                    setupController(alphactrl, ctrl, animflags);
-                    composite->addController(ctrl);
+                    osg::ref_ptr<AlphaController> osgctrl(new AlphaController(alphactrl->data.getPtr()));
+                    setupController(alphactrl, osgctrl, animflags);
+                    composite->addController(osgctrl);
                 }
                 else if (ctrl->recType == Nif::RC_NiMaterialColorController)
                 {
                     const Nif::NiMaterialColorController* matctrl = static_cast<const Nif::NiMaterialColorController*>(ctrl.getPtr());
-                    osg::ref_ptr<MaterialColorController> ctrl(new MaterialColorController(matctrl->data.getPtr()));
-                    setupController(matctrl, ctrl, animflags);
-                    composite->addController(ctrl);
+                    osg::ref_ptr<MaterialColorController> osgctrl(new MaterialColorController(matctrl->data.getPtr()));
+                    setupController(matctrl, osgctrl, animflags);
+                    composite->addController(osgctrl);
                 }
                 else
                     std::cerr << "Unexpected material controller " << ctrl->recType << " in " << mFilename << std::endl;
@@ -708,8 +803,7 @@ namespace NifOsg
                             wrapT = inherit->getWrap(osg::Texture2D::WRAP_T);
                         }
 
-                        std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, imageManager->getVFS());
-                        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D(imageManager->getImage(filename)));
+                        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D(handleSourceTexture(st.getPtr(), imageManager)));
                         texture->setWrap(osg::Texture::WRAP_S, wrapS);
                         texture->setWrap(osg::Texture::WRAP_T, wrapT);
                         textures.push_back(texture);
@@ -761,6 +855,13 @@ namespace NifOsg
                     const Nif::NiPlanarCollider* planarcollider = static_cast<const Nif::NiPlanarCollider*>(colliders.getPtr());
                     program->addOperator(new PlanarCollider(planarcollider));
                 }
+                else if (colliders->recType == Nif::RC_NiSphericalCollider)
+                {
+                    const Nif::NiSphericalCollider* sphericalcollider = static_cast<const Nif::NiSphericalCollider*>(colliders.getPtr());
+                    program->addOperator(new SphericalCollider(sphericalcollider));
+                }
+                else
+                    std::cerr << "Unhandled particle collider " << colliders->recName << " in " << mFilename << std::endl;
             }
         }
 
@@ -775,6 +876,8 @@ namespace NifOsg
             else
                 return;
 
+            osg::BoundingBox box;
+
             int i=0;
             for (std::vector<Nif::NiParticleSystemController::Particle>::const_iterator it = partctrl->particles.begin();
                  i<particledata->activeCount && it != partctrl->particles.end(); ++it, ++i)
@@ -789,19 +892,22 @@ namespace NifOsg
                 // Note this position and velocity is not correct for a particle system with absolute reference frame,
                 // which can not be done in this loader since we are not attached to the scene yet. Will be fixed up post-load in the SceneManager.
                 created->setVelocity(particle.velocity);
-                created->setPosition(particledata->vertices->at(particle.vertex));
+                const osg::Vec3f& position = particledata->vertices.at(particle.vertex);
+                created->setPosition(position);
 
                 osg::Vec4f partcolor (1.f,1.f,1.f,1.f);
-                if (particle.vertex < int(particledata->colors->size()))
-                    partcolor = particledata->colors->at(particle.vertex);
+                if (particle.vertex < int(particledata->colors.size()))
+                    partcolor = particledata->colors.at(particle.vertex);
 
                 float size = particledata->sizes.at(particle.vertex) * partctrl->size;
 
                 created->setSizeRange(osgParticle::rangef(size, size));
+                box.expandBy(osg::BoundingSphere(position, size));
             }
 
-            osg::BoundingBox box;
+            // radius may be used to force a larger bounding box
             box.expandBy(osg::BoundingSphere(osg::Vec3(0,0,0), particledata->radius));
+
             partsys->setInitialBound(box);
         }
 
@@ -831,15 +937,15 @@ namespace NifOsg
             emitter->setShooter(shooter);
 
             osgParticle::BoxPlacer* placer = new osgParticle::BoxPlacer;
-            placer->setXRange(-partctrl->offsetRandom.x(), partctrl->offsetRandom.x());
-            placer->setYRange(-partctrl->offsetRandom.y(), partctrl->offsetRandom.y());
-            placer->setZRange(-partctrl->offsetRandom.z(), partctrl->offsetRandom.z());
+            placer->setXRange(-partctrl->offsetRandom.x() / 2.f, partctrl->offsetRandom.x() / 2.f);
+            placer->setYRange(-partctrl->offsetRandom.y() / 2.f, partctrl->offsetRandom.y() / 2.f);
+            placer->setZRange(-partctrl->offsetRandom.z() / 2.f, partctrl->offsetRandom.z() / 2.f);
 
             emitter->setPlacer(placer);
             return emitter;
         }
 
-        void handleParticleSystem(const Nif::Node *nifNode, osg::Group *parentNode, SceneUtil::CompositeStateSetUpdater* composite, int animflags, int particleflags, osg::Node* rootNode)
+        void handleParticleSystem(const Nif::Node *nifNode, osg::Group *parentNode, SceneUtil::CompositeStateSetUpdater* composite, int animflags, osg::Node* rootNode)
         {
             osg::ref_ptr<ParticleSystem> partsys (new ParticleSystem);
             partsys->setSortMode(osgParticle::ParticleSystem::SORT_BACK_TO_FRONT);
@@ -860,7 +966,7 @@ namespace NifOsg
                 return;
             }
 
-            osgParticle::ParticleProcessor::ReferenceFrame rf = (particleflags & Nif::NiNode::ParticleFlag_LocalSpace)
+            osgParticle::ParticleProcessor::ReferenceFrame rf = (animflags & Nif::NiNode::ParticleFlag_LocalSpace)
                     ? osgParticle::ParticleProcessor::RELATIVE_RF
                     : osgParticle::ParticleProcessor::ABSOLUTE_RF;
 
@@ -908,6 +1014,16 @@ namespace NifOsg
                 osg::ref_ptr<ParticleSystemController> callback(new ParticleSystemController(partctrl));
                 setupController(partctrl, callback, animflags);
                 emitter->setUpdateCallback(callback);
+
+                if (!(animflags & Nif::NiNode::ParticleFlag_AutoPlay))
+                {
+                    partsys->setFrozen(true);
+                }
+
+                // Due to odd code in the ParticleSystemUpdater, particle systems will not be updated in the first frame
+                // So do that update manually
+                osg::NodeVisitor nv;
+                partsys->update(0.0, nv);
             }
 
             // affectors must be attached *after* the emitter in the scene graph for correct update order
@@ -917,16 +1033,7 @@ namespace NifOsg
 
             std::vector<const Nif::Property*> drawableProps;
             collectDrawableProperties(nifNode, drawableProps);
-            applyDrawableProperties(parentNode, drawableProps, composite, true, animflags);
-
-            // Particles don't have normals, so can't be diffuse lit.
-            osg::Material* mat = static_cast<osg::Material*>(parentNode->getStateSet()->getAttribute(osg::StateAttribute::MATERIAL));
-            if (mat)
-            {
-                // NB ignoring diffuse.a()
-                mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,1));
-                mat->setColorMode(osg::Material::AMBIENT);
-            }
+            applyDrawableProperties(parentNode, drawableProps, composite, true, animflags, true);
 
             // particle system updater (after the emitters and affectors in the scene graph)
             // I think for correct culling needs to be *before* the ParticleSystem, though osg examples do it the other way
@@ -934,13 +1041,7 @@ namespace NifOsg
             updater->addParticleSystem(partsys);
             parentNode->addChild(updater);
 
-#if OSG_VERSION_LESS_THAN(3,3,3)
-            osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-            geode->addDrawable(partsys);
-            osg::Node* toAttach = geode.get();
-#else
             osg::Node* toAttach = partsys.get();
-#endif
 
             if (rf == osgParticle::ParticleProcessor::RELATIVE_RF)
                 parentNode->addChild(toAttach);
@@ -957,10 +1058,11 @@ namespace NifOsg
         {
             const Nif::NiTriShapeData* data = triShape->data.getPtr();
 
-            geometry->setVertexArray(data->vertices);
-
-            if (!data->normals->empty())
-                geometry->setNormalArray(data->normals);
+            {
+                geometry->setVertexArray(new osg::Vec3Array(data->vertices.size(), &data->vertices[0]));
+                if (!data->normals.empty())
+                    geometry->setNormalArray(new osg::Vec3Array(data->normals.size(), &data->normals[0]), osg::Array::BIND_PER_VERTEX);
+            }
 
             int textureStage = 0;
             for (std::vector<int>::const_iterator it = boundTextures.begin(); it != boundTextures.end(); ++it,++textureStage)
@@ -969,19 +1071,20 @@ namespace NifOsg
                 if (uvSet >= (int)data->uvlist.size())
                 {
                     std::cerr << "Warning: out of bounds UV set " << uvSet << " on TriShape \"" << triShape->name << "\" in " << mFilename << std::endl;
-                    if (data->uvlist.size())
-                        geometry->setTexCoordArray(textureStage, data->uvlist[0]);
+                    if (!data->uvlist.empty())
+                        geometry->setTexCoordArray(textureStage, new osg::Vec2Array(data->uvlist[0].size(), &data->uvlist[0][0]), osg::Array::BIND_PER_VERTEX);
                     continue;
                 }
 
-                geometry->setTexCoordArray(textureStage, data->uvlist[uvSet]);
+                geometry->setTexCoordArray(textureStage, new osg::Vec2Array(data->uvlist[uvSet].size(), &data->uvlist[uvSet][0]), osg::Array::BIND_PER_VERTEX);
             }
 
-            if (!data->colors->empty())
-                geometry->setColorArray(data->colors);
+            if (!data->colors.empty())
+                geometry->setColorArray(new osg::Vec4Array(data->colors.size(), &data->colors[0]), osg::Array::BIND_PER_VERTEX);
 
-            if (!data->triangles->empty())
-                geometry->addPrimitiveSet(data->triangles);
+            geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES,
+                                                                  data->triangles.size(),
+                                                                  (unsigned short*)&data->triangles[0]));
 
             // osg::Material properties are handled here for two reasons:
             // - if there are no vertex colors, we need to disable colorMode.
@@ -989,7 +1092,7 @@ namespace NifOsg
             //   above the actual renderable would be tedious.
             std::vector<const Nif::Property*> drawableProps;
             collectDrawableProperties(triShape, drawableProps);
-            applyDrawableProperties(parentNode, drawableProps, composite, !data->colors->empty(), animflags);
+            applyDrawableProperties(parentNode, drawableProps, composite, !data->colors.empty(), animflags, false);
         }
 
         void handleTriShape(const Nif::NiTriShape* triShape, osg::Group* parentNode, SceneUtil::CompositeStateSetUpdater* composite, const std::vector<int>& boundTextures, int animflags)
@@ -1017,11 +1120,6 @@ namespace NifOsg
                 triShapeToGeometry(triShape, geometry, parentNode, composite, boundTextures, animflags);
             }
 
-#if OSG_VERSION_LESS_THAN(3,3,3)
-            osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-            geode->addDrawable(geometry);
-#endif
-
             if (geometry->getDataVariance() == osg::Object::DYNAMIC)
             {
                 // Add a copy, we will alternate between the two copies every other frame using the FrameSwitch
@@ -1029,24 +1127,14 @@ namespace NifOsg
                 geometry->setDataVariance(osg::Object::STATIC);
                 osg::ref_ptr<FrameSwitch> frameswitch = new FrameSwitch;
 
-#if OSG_VERSION_LESS_THAN(3,3,3)
-                osg::ref_ptr<osg::Geode> geode2 = static_cast<osg::Geode*>(osg::clone(geode.get(), osg::CopyOp::DEEP_COPY_NODES|osg::CopyOp::DEEP_COPY_DRAWABLES));
-                frameswitch->addChild(geode);
-                frameswitch->addChild(geode2);
-#else
-                osg::ref_ptr<osg::Geometry> geom2 = static_cast<osg::Geometry*>(osg::clone(geometry.get(), osg::CopyOp::DEEP_COPY_NODES|osg::CopyOp::DEEP_COPY_DRAWABLES));
+                osg::ref_ptr<osg::Geometry> geom2 = osg::clone(geometry.get(), osg::CopyOp::DEEP_COPY_NODES|osg::CopyOp::DEEP_COPY_DRAWABLES);
                 frameswitch->addChild(geometry);
                 frameswitch->addChild(geom2);
-#endif
 
                 parentNode->addChild(frameswitch);
             }
             else
-#if OSG_VERSION_LESS_THAN(3,3,3)
-                parentNode->addChild(geode);
-#else
                 parentNode->addChild(geometry);
-#endif
         }
 
         osg::ref_ptr<osg::Geometry> handleMorphGeometry(const Nif::NiGeomMorpherController* morpher, const Nif::NiTriShape *triShape, osg::Node* parentNode, SceneUtil::CompositeStateSetUpdater* composite, const std::vector<int>& boundTextures, int animflags)
@@ -1058,23 +1146,26 @@ namespace NifOsg
 
             morphGeom->setUpdateCallback(NULL);
             morphGeom->setCullCallback(new UpdateMorphGeometry);
+            morphGeom->setUseVertexBufferObjects(true);
 
             triShapeToGeometry(triShape, morphGeom, parentNode, composite, boundTextures, animflags);
 
+            morphGeom->getOrCreateVertexBufferObject()->setUsage(GL_DYNAMIC_DRAW_ARB);
+
             const std::vector<Nif::NiMorphData::MorphData>& morphs = morpher->data.getPtr()->mMorphs;
-            if (!morphs.size())
+            if (morphs.empty())
                 return morphGeom;
             // Note we are not interested in morph 0, which just contains the original vertices
             for (unsigned int i = 1; i < morphs.size(); ++i)
             {
                 osg::ref_ptr<osg::Geometry> morphTarget = new osg::Geometry;
-                morphTarget->setVertexArray(morphs[i].mVertices);
+                morphTarget->setVertexArray(new osg::Vec3Array(morphs[i].mVertices.size(), &morphs[i].mVertices[0]));
                 morphGeom->addMorphTarget(morphTarget, 0.f);
             }
 
             // build the bounding box containing all possible morph combinations
 
-            std::vector<osg::BoundingBox> vertBounds(morphs[0].mVertices->size());
+            std::vector<osg::BoundingBox> vertBounds(morphs[0].mVertices.size());
 
             // Since we don't know what combinations of morphs are being applied we need to keep track of a bounding box for each vertex.
             // The minimum/maximum of the box is the minimum/maximum offset the vertex can have from its starting position.
@@ -1085,19 +1176,19 @@ namespace NifOsg
 
             for (unsigned int i = 1; i < morphs.size(); ++i)
             {
-                for (unsigned int j=0; j<morphs[i].mVertices->size() && vertBounds.size(); ++j)
+                for (unsigned int j=0; j<morphs[i].mVertices.size() && vertBounds.size(); ++j)
                 {
                     osg::BoundingBox& bounds = vertBounds[j];
-                    bounds.expandBy(bounds._max + (*morphs[i].mVertices)[j]);
-                    bounds.expandBy(bounds._min + (*morphs[i].mVertices)[j]);
+                    bounds.expandBy(bounds._max + morphs[i].mVertices[j]);
+                    bounds.expandBy(bounds._min + morphs[i].mVertices[j]);
                 }
             }
 
             osg::BoundingBox box;
             for (unsigned int i=0; i<vertBounds.size(); ++i)
             {
-                vertBounds[i]._max += (*morphs[0].mVertices)[i];
-                vertBounds[i]._min += (*morphs[0].mVertices)[i];
+                vertBounds[i]._max += morphs[0].mVertices[i];
+                vertBounds[i]._min += morphs[0].mVertices[i];
                 box.expandBy(vertBounds[i]);
             }
 
@@ -1151,21 +1242,9 @@ namespace NifOsg
 
             osg::ref_ptr<FrameSwitch> frameswitch = new FrameSwitch;
 
-#if OSG_VERSION_LESS_THAN(3,3,3)
-            osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-            geode->addDrawable(rig);
-
-            osg::Geode* geode2 = static_cast<osg::Geode*>(osg::clone(geode.get(), osg::CopyOp::DEEP_COPY_NODES|
-                                                                     osg::CopyOp::DEEP_COPY_DRAWABLES));
-
-            frameswitch->addChild(geode);
-            frameswitch->addChild(geode2);
-#else
-            SceneUtil::RigGeometry* rig2 = static_cast<SceneUtil::RigGeometry*>(osg::clone(rig.get(), osg::CopyOp::DEEP_COPY_NODES|
-                                                                                           osg::CopyOp::DEEP_COPY_DRAWABLES));
+            SceneUtil::RigGeometry* rig2 = osg::clone(rig.get(), osg::CopyOp::DEEP_COPY_NODES|osg::CopyOp::DEEP_COPY_DRAWABLES);
             frameswitch->addChild(rig);
             frameswitch->addChild(rig2);
-#endif
 
             parentNode->addChild(frameswitch);
         }
@@ -1243,6 +1322,218 @@ namespace NifOsg
             }
         }
 
+        osg::ref_ptr<osg::Image> handleInternalTexture(const Nif::NiPixelData* pixelData)
+        {
+            osg::ref_ptr<osg::Image> image (new osg::Image);
+
+            GLenum pixelformat = 0;
+            switch (pixelData->fmt)
+            {
+            case Nif::NiPixelData::NIPXFMT_RGB8:
+                pixelformat = GL_RGB;
+                break;
+            case Nif::NiPixelData::NIPXFMT_RGBA8:
+                pixelformat = GL_RGBA;
+                break;
+            default:
+                std::cerr << "Unhandled internal pixel format " << pixelData->fmt << " in " << mFilename << std::endl;
+                return NULL;
+            }
+
+            if (pixelData->mipmaps.empty())
+                return NULL;
+
+            unsigned int width = 0;
+            unsigned int height = 0;
+
+            std::vector<unsigned int> mipmapVector;
+            for (unsigned int i=0; i<pixelData->mipmaps.size()-3; ++i)
+            {
+                const Nif::NiPixelData::Mipmap& mip = pixelData->mipmaps[i];
+
+                size_t mipSize = mip.height * mip.width * pixelData->bpp / 8;
+                if (mipSize + mip.dataOffset > pixelData->data.size())
+                {
+                    std::cerr << "Internal texture's mipmap data out of bounds" << std::endl;
+                    return NULL;
+                }
+
+                if (i != 0)
+                    mipmapVector.push_back(mip.dataOffset);
+                else
+                {
+                    width = mip.width;
+                    height = mip.height;
+                }
+            }
+
+            if (width <= 0 || height <= 0)
+            {
+                std::cerr << "Width and height must be non zero " << std::endl;
+                return NULL;
+            }
+
+            unsigned char* data = new unsigned char[pixelData->data.size()];
+            memcpy(data, &pixelData->data[0], pixelData->data.size());
+
+            image->setImage(width, height, 1, pixelformat, pixelformat, GL_UNSIGNED_BYTE, data, osg::Image::USE_NEW_DELETE);
+            image->setMipmapLevels(mipmapVector);
+            image->flipVertical();
+
+            return image;
+        }
+
+        void handleTextureProperty(const Nif::NiTexturingProperty* texprop, osg::StateSet* stateset, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<int>& boundTextures, int animflags)
+        {
+            if (!boundTextures.empty())
+            {
+                // overriding a parent NiTexturingProperty, so remove what was previously bound
+                for (unsigned int i=0; i<boundTextures.size(); ++i)
+                    stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
+                boundTextures.clear();
+            }
+
+            for (int i=0; i<Nif::NiTexturingProperty::NumTextures; ++i)
+            {
+                if (texprop->textures[i].inUse)
+                {
+                    switch(i)
+                    {
+                        //These are handled later on
+                        case Nif::NiTexturingProperty::BaseTexture:
+                        case Nif::NiTexturingProperty::GlowTexture:
+                        case Nif::NiTexturingProperty::DarkTexture:
+                        case Nif::NiTexturingProperty::BumpTexture:
+                        case Nif::NiTexturingProperty::DetailTexture:
+                        case Nif::NiTexturingProperty::DecalTexture:
+                            break;
+                        case Nif::NiTexturingProperty::GlossTexture:
+                        {
+                            // Not used by the vanilla engine. MCP (Morrowind Code Patch) adds an option to use Gloss maps:
+                            // "- Gloss map fix. Morrowind removed gloss map entries from model files after loading them. This stops Morrowind from removing them."
+                            std::cerr << "NiTexturingProperty::GlossTexture in " << mFilename << " not currently used." << std::endl;
+                            continue;
+                        }
+                        default:
+                        {
+                            std::cerr << "Warning: unhandled texture stage " << i << " in " << mFilename << std::endl;
+                            continue;
+                        }
+                    }
+
+                    const Nif::NiTexturingProperty::Texture& tex = texprop->textures[i];
+                    if(tex.texture.empty() && texprop->controller.empty())
+                    {
+                        std::cerr << "Warning: texture layer " << i << " is in use but empty in " << mFilename << std::endl;
+                        continue;
+                    }
+
+                    // create a new texture, will later attempt to share using the SharedStateManager
+                    osg::ref_ptr<osg::Texture2D> texture2d;
+                    if (!tex.texture.empty())
+                    {
+                        const Nif::NiSourceTexture *st = tex.texture.getPtr();
+                        osg::ref_ptr<osg::Image> image = handleSourceTexture(st, imageManager);
+                        texture2d = new osg::Texture2D(image);
+                    }
+                    else
+                        texture2d = new osg::Texture2D;
+
+                    unsigned int clamp = static_cast<unsigned int>(tex.clamp);
+                    int wrapT = (clamp) & 0x1;
+                    int wrapS = (clamp >> 1) & 0x1;
+
+                    texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP);
+                    texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP);
+
+                    int texUnit = boundTextures.size();
+
+                    stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
+
+                    if (i == Nif::NiTexturingProperty::GlowTexture)
+                    {
+                        osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
+                        texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
+                        texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+                        texEnv->setCombine_RGB(osg::TexEnvCombine::ADD);
+                        texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+                        texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
+
+                        stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
+                    }
+                    else if (i == Nif::NiTexturingProperty::DarkTexture)
+                    {
+                        osg::TexEnv* texEnv = new osg::TexEnv;
+                        texEnv->setMode(osg::TexEnv::MODULATE);
+                        stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
+                    }
+                    else if (i == Nif::NiTexturingProperty::DetailTexture)
+                    {
+                        osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
+                        texEnv->setScale_RGB(2.f);
+                        texEnv->setCombine_Alpha(osg::TexEnvCombine::MODULATE);
+                        texEnv->setOperand0_Alpha(osg::TexEnvCombine::SRC_ALPHA);
+                        texEnv->setOperand1_Alpha(osg::TexEnvCombine::SRC_ALPHA);
+                        texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+                        texEnv->setSource1_Alpha(osg::TexEnvCombine::TEXTURE);
+                        texEnv->setCombine_RGB(osg::TexEnvCombine::MODULATE);
+                        texEnv->setOperand0_RGB(osg::TexEnvCombine::SRC_COLOR);
+                        texEnv->setOperand1_RGB(osg::TexEnvCombine::SRC_COLOR);
+                        texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+                        texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
+                        stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
+                    }
+                    else if (i == Nif::NiTexturingProperty::BumpTexture)
+                    {
+                        // Set this texture to Off by default since we can't render it with the fixed-function pipeline
+                        stateset->setTextureMode(texUnit, GL_TEXTURE_2D, osg::StateAttribute::OFF);
+                    }
+                    else if (i == Nif::NiTexturingProperty::DecalTexture)
+                    {
+                         osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
+                         texEnv->setCombine_RGB(osg::TexEnvCombine::INTERPOLATE);
+                         texEnv->setSource0_RGB(osg::TexEnvCombine::TEXTURE);
+                         texEnv->setOperand0_RGB(osg::TexEnvCombine::SRC_COLOR);
+                         texEnv->setSource1_RGB(osg::TexEnvCombine::PREVIOUS);
+                         texEnv->setOperand1_RGB(osg::TexEnvCombine::SRC_COLOR);
+                         texEnv->setSource2_RGB(osg::TexEnvCombine::TEXTURE);
+                         texEnv->setOperand2_RGB(osg::TexEnvCombine::SRC_ALPHA);
+                         texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
+                         texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+                         texEnv->setOperand0_Alpha(osg::TexEnvCombine::SRC_ALPHA);
+                         stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
+                    }
+
+                    switch (i)
+                    {
+                    case Nif::NiTexturingProperty::BaseTexture:
+                        texture2d->setName("diffuseMap");
+                        break;
+                    case Nif::NiTexturingProperty::BumpTexture:
+                        texture2d->setName("normalMap");
+                        break;
+                    case Nif::NiTexturingProperty::GlowTexture:
+                        texture2d->setName("emissiveMap");
+                        break;
+                    case Nif::NiTexturingProperty::DarkTexture:
+                        texture2d->setName("darkMap");
+                        break;
+                    case Nif::NiTexturingProperty::DetailTexture:
+                        texture2d->setName("detailMap");
+                        break;
+                    case Nif::NiTexturingProperty::DecalTexture:
+                        texture2d->setName("decalMap");
+                        break;
+                    default:
+                        break;
+                    }
+
+                    boundTextures.push_back(tex.uvSet);
+                }
+            }
+            handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+        }
+
         void handleProperty(const Nif::Property *property,
                             osg::Node *node, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<int>& boundTextures, int animflags)
         {
@@ -1251,7 +1542,7 @@ namespace NifOsg
             case Nif::RC_NiStencilProperty:
             {
                 const Nif::NiStencilProperty* stencilprop = static_cast<const Nif::NiStencilProperty*>(property);
-                osg::FrontFace* frontFace = new osg::FrontFace;
+                osg::ref_ptr<osg::FrontFace> frontFace = new osg::FrontFace;
                 switch (stencilprop->data.drawMode)
                 {
                 case 2:
@@ -1263,6 +1554,7 @@ namespace NifOsg
                     frontFace->setMode(osg::FrontFace::COUNTER_CLOCKWISE);
                     break;
                 }
+                frontFace = shareAttribute(frontFace);
 
                 osg::StateSet* stateset = node->getOrCreateStateSet();
                 stateset->setAttribute(frontFace, osg::StateAttribute::ON);
@@ -1271,11 +1563,12 @@ namespace NifOsg
 
                 if (stencilprop->data.enabled != 0)
                 {
-                    osg::Stencil* stencil = new osg::Stencil;
+                    osg::ref_ptr<osg::Stencil> stencil = new osg::Stencil;
                     stencil->setFunction(getStencilFunction(stencilprop->data.compareFunc), stencilprop->data.stencilRef, stencilprop->data.stencilMask);
                     stencil->setStencilFailOperation(getStencilOperation(stencilprop->data.failAction));
                     stencil->setStencilPassAndDepthFailOperation(getStencilOperation(stencilprop->data.zFailAction));
                     stencil->setStencilPassAndDepthPassOperation(getStencilOperation(stencilprop->data.zPassAction));
+                    stencil = shareAttribute(stencil);
 
                     stateset->setAttributeAndModes(stencil, osg::StateAttribute::ON);
                 }
@@ -1284,9 +1577,10 @@ namespace NifOsg
             case Nif::RC_NiWireframeProperty:
             {
                 const Nif::NiWireframeProperty* wireprop = static_cast<const Nif::NiWireframeProperty*>(property);
-                osg::PolygonMode* mode = new osg::PolygonMode;
+                osg::ref_ptr<osg::PolygonMode> mode = new osg::PolygonMode;
                 mode->setMode(osg::PolygonMode::FRONT_AND_BACK, wireprop->flags == 0 ? osg::PolygonMode::FILL
                                                                                      : osg::PolygonMode::LINE);
+                mode = shareAttribute(mode);
                 node->getOrCreateStateSet()->setAttributeAndModes(mode, osg::StateAttribute::ON);
                 break;
             }
@@ -1294,8 +1588,9 @@ namespace NifOsg
             {
                 const Nif::NiZBufferProperty* zprop = static_cast<const Nif::NiZBufferProperty*>(property);
                 // VER_MW doesn't support a DepthFunction according to NifSkope
-                osg::Depth* depth = new osg::Depth;
+                osg::ref_ptr<osg::Depth> depth = new osg::Depth;
                 depth->setWriteMask((zprop->flags>>1)&1);
+                depth = shareAttribute(depth);
                 node->getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
                 break;
             }
@@ -1316,115 +1611,7 @@ namespace NifOsg
             {
                 const Nif::NiTexturingProperty* texprop = static_cast<const Nif::NiTexturingProperty*>(property);
                 osg::StateSet* stateset = node->getOrCreateStateSet();
-
-                if (boundTextures.size())
-                {
-                    // overriding a parent NiTexturingProperty, so remove what was previously bound
-                    for (unsigned int i=0; i<boundTextures.size(); ++i)
-                        stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
-                    boundTextures.clear();
-                }
-
-                for (int i=0; i<Nif::NiTexturingProperty::NumTextures; ++i)
-                {
-                    if (texprop->textures[i].inUse)
-                    {
-                        switch(i)
-                        {
-                            //These are handled later on
-                            case Nif::NiTexturingProperty::BaseTexture:
-                            case Nif::NiTexturingProperty::GlowTexture:
-                            case Nif::NiTexturingProperty::DarkTexture:
-                            case Nif::NiTexturingProperty::DetailTexture:
-                                break;
-                            case Nif::NiTexturingProperty::GlossTexture:
-                            {
-                                std::cerr << "NiTexturingProperty::GlossTexture in " << mFilename << " not currently used." << std::endl;
-                                continue;
-                            }
-                            case Nif::NiTexturingProperty::BumpTexture:
-                            {
-                                std::cerr << "NiTexturingProperty::BumpTexture in " << mFilename << " not currently used." << std::endl;
-                                continue;
-                            }
-                            case Nif::NiTexturingProperty::DecalTexture:
-                            {
-                                std::cerr << "NiTexturingProperty::DecalTexture in " << mFilename << " not currently used." << std::endl;
-                                continue;
-                            }
-                            default:
-                            {
-                                std::cerr << "Warning: unhandled texture stage " << i << " in " << mFilename << std::endl;
-                                continue;
-                            }
-                        }
-
-                        const Nif::NiTexturingProperty::Texture& tex = texprop->textures[i];
-                        if(tex.texture.empty())
-                        {
-                            std::cerr << "Warning: texture layer " << i << " is in use but empty in " << mFilename << std::endl;
-                            continue;
-                        }
-                        const Nif::NiSourceTexture *st = tex.texture.getPtr();
-                        if (!st->external)
-                        {
-                            std::cerr << "Warning: unhandled internal texture in " << mFilename << std::endl;
-                            continue;
-                        }
-
-                        std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, imageManager->getVFS());
-
-                        unsigned int clamp = static_cast<unsigned int>(tex.clamp);
-                        int wrapT = (clamp) & 0x1;
-                        int wrapS = (clamp >> 1) & 0x1;
-
-                        // create a new texture, will later attempt to share using the SharedStateManager
-                        osg::ref_ptr<osg::Texture2D> texture2d (new osg::Texture2D(imageManager->getImage(filename)));
-                        texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP);
-                        texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP);
-
-                        int texUnit = boundTextures.size();
-
-                        stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
-
-                        if (i == Nif::NiTexturingProperty::GlowTexture)
-                        {
-                            osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
-                            texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
-                            texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
-                            texEnv->setCombine_RGB(osg::TexEnvCombine::ADD);
-                            texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
-                            texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
-
-                            stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
-                        }
-                        else if (i == Nif::NiTexturingProperty::DarkTexture)
-                        {
-                            osg::TexEnv* texEnv = new osg::TexEnv;
-                            texEnv->setMode(osg::TexEnv::MODULATE);
-                            stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
-                        }
-                        else if (i == Nif::NiTexturingProperty::DetailTexture)
-                        {
-                            osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
-                            texEnv->setScale_RGB(2.f);
-                            texEnv->setCombine_Alpha(GL_MODULATE);
-                            texEnv->setOperand0_Alpha(GL_SRC_ALPHA);
-                            texEnv->setOperand1_Alpha(GL_SRC_ALPHA);
-                            texEnv->setSource0_Alpha(GL_PREVIOUS_ARB);
-                            texEnv->setSource1_Alpha(GL_TEXTURE);
-                            texEnv->setCombine_RGB(GL_MODULATE);
-                            texEnv->setOperand0_RGB(GL_SRC_COLOR);
-                            texEnv->setOperand1_RGB(GL_SRC_COLOR);
-                            texEnv->setSource0_RGB(GL_PREVIOUS_ARB);
-                            texEnv->setSource1_RGB(GL_TEXTURE);
-                            stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
-                        }
-
-                        boundTextures.push_back(tex.uvSet);
-                    }
-                    handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
-                }
+                handleTextureProperty(texprop, stateset, composite, imageManager, boundTextures, animflags);
                 break;
             }
             // unused by mw
@@ -1440,8 +1627,30 @@ namespace NifOsg
             }
         }
 
+        struct CompareStateAttribute
+        {
+            bool operator() (const osg::ref_ptr<osg::StateAttribute>& left, const osg::ref_ptr<osg::StateAttribute>& right) const
+            {
+                return left->compare(*right) < 0;
+            }
+        };
+
+        // global sharing of State Attributes will reduce the number of GL calls as the osg::State will check by pointer to see if state is the same
+        template <class Attribute>
+        Attribute* shareAttribute(const osg::ref_ptr<Attribute>& attr)
+        {
+            typedef std::set<osg::ref_ptr<Attribute>, CompareStateAttribute> Cache;
+            static Cache sCache;
+            static OpenThreads::Mutex sMutex;
+            OpenThreads::ScopedLock<OpenThreads::Mutex> lock(sMutex);
+            typename Cache::iterator found = sCache.find(attr);
+            if (found == sCache.end())
+                found = sCache.insert(attr).first;
+            return *found;
+        }
+
         void applyDrawableProperties(osg::Node* node, const std::vector<const Nif::Property*>& properties, SceneUtil::CompositeStateSetUpdater* composite,
-                                             bool hasVertexColors, int animflags)
+                                             bool hasVertexColors, int animflags, bool particleMaterial)
         {
             osg::StateSet* stateset = node->getOrCreateStateSet();
 
@@ -1453,6 +1662,8 @@ namespace NifOsg
             mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
             mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
 
+            bool hasMatCtrl = false;
+
             for (std::vector<const Nif::Property*>::const_reverse_iterator it = properties.rbegin(); it != properties.rend(); ++it)
             {
                 const Nif::Property* property = *it;
@@ -1475,7 +1686,10 @@ namespace NifOsg
                     mat->setShininess(osg::Material::FRONT_AND_BACK, matprop->data.glossiness);
 
                     if (!matprop->controller.empty())
+                    {
+                        hasMatCtrl = true;
                         handleMaterialControllers(matprop, composite, animflags);
+                    }
 
                     break;
                 }
@@ -1503,9 +1717,10 @@ namespace NifOsg
                     const Nif::NiAlphaProperty* alphaprop = static_cast<const Nif::NiAlphaProperty*>(property);
                     if (alphaprop->flags&1)
                     {
-                        stateset->setAttributeAndModes(new osg::BlendFunc(getBlendMode((alphaprop->flags>>1)&0xf),
-                                                                          getBlendMode((alphaprop->flags>>5)&0xf)),
-                                                       osg::StateAttribute::ON);
+                        osg::ref_ptr<osg::BlendFunc> blendFunc (new osg::BlendFunc(getBlendMode((alphaprop->flags>>1)&0xf),
+                                                                                   getBlendMode((alphaprop->flags>>5)&0xf)));
+                        blendFunc = shareAttribute(blendFunc);
+                        stateset->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
 
                         bool noSort = (alphaprop->flags>>13)&1;
                         if (!noSort)
@@ -1522,8 +1737,9 @@ namespace NifOsg
 
                     if((alphaprop->flags>>9)&1)
                     {
-                        stateset->setAttributeAndModes(new osg::AlphaFunc(getTestMode((alphaprop->flags>>10)&0x7),
-                                                                          alphaprop->data.threshold/255.f), osg::StateAttribute::ON);
+                        osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(getTestMode((alphaprop->flags>>10)&0x7), alphaprop->data.threshold/255.f));
+                        alphaFunc = shareAttribute(alphaFunc);
+                        stateset->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
                     }
                     else
                     {
@@ -1538,6 +1754,25 @@ namespace NifOsg
             if (specFlags == 0)
                 mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f,0.f,0.f,0.f));
 
+            // Particles don't have normals, so can't be diffuse lit.
+            if (particleMaterial)
+            {
+                // NB ignoring diffuse.a()
+                mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,1));
+                mat->setColorMode(osg::Material::AMBIENT);
+            }
+
+            if (!hasMatCtrl && mat->getColorMode() == osg::Material::OFF
+                    && mat->getDiffuse(osg::Material::FRONT_AND_BACK) == osg::Vec4f(1,1,1,1)
+                    && mat->getAmbient(osg::Material::FRONT_AND_BACK) == osg::Vec4f(1,1,1,1)
+                    && mat->getSpecular(osg::Material::FRONT_AND_BACK) == osg::Vec4f(0.f, 0.f, 0.f, 0.f))
+            {
+                // default state, skip
+                return;
+            }
+
+            mat = shareAttribute(mat);
+
             stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
         }
 
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 500339722..fa0fe0be3 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -3,8 +3,11 @@
 #include <limits>
 
 #include <osg/MatrixTransform>
+#include <osg/Geometry>
 
 #include <components/nif/controlled.hpp>
+#include <components/nif/nifkey.hpp>
+#include <components/nif/data.hpp>
 
 #include "userdata.hpp"
 
@@ -261,10 +264,10 @@ void Emitter::emitParticles(double dt)
     osg::Matrix worldToPs;
 
     // maybe this could be optimized by halting at the lowest common ancestor of the particle and emitter nodes
-    osg::MatrixList worldMats = getParticleSystem()->getWorldMatrices();
-    if (!worldMats.empty())
+    osg::NodePathList partsysNodePaths = getParticleSystem()->getParentalNodePaths();
+    if (!partsysNodePaths.empty())
     {
-        const osg::Matrix psToWorld = worldMats[0];
+        osg::Matrix psToWorld = osg::computeLocalToWorld(partsysNodePaths[0]);
         worldToPs = osg::Matrix::inverse(psToWorld);
     }
 
@@ -313,7 +316,22 @@ FindGroupByRecIndex::FindGroupByRecIndex(int recIndex)
 {
 }
 
-void FindGroupByRecIndex::apply(osg::Node &searchNode)
+void FindGroupByRecIndex::apply(osg::Node &node)
+{
+    applyNode(node);
+}
+
+void FindGroupByRecIndex::apply(osg::MatrixTransform &node)
+{
+    applyNode(node);
+}
+
+void FindGroupByRecIndex::apply(osg::Geometry &node)
+{
+    applyNode(node);
+}
+
+void FindGroupByRecIndex::applyNode(osg::Node &searchNode)
 {
     if (searchNode.getUserDataContainer() && searchNode.getUserDataContainer()->getNumUserObjects())
     {
@@ -374,4 +392,73 @@ void PlanarCollider::operate(osgParticle::Particle *particle, double dt)
     }
 }
 
+SphericalCollider::SphericalCollider(const Nif::NiSphericalCollider* collider)
+    : mBounceFactor(collider->mBounceFactor),
+      mSphere(collider->mCenter, collider->mRadius)
+{
+}
+
+SphericalCollider::SphericalCollider()
+    : mBounceFactor(1.0f)
+{
+
+}
+
+SphericalCollider::SphericalCollider(const SphericalCollider& copy, const osg::CopyOp& copyop)
+    : osgParticle::Operator(copy, copyop)
+    , mBounceFactor(copy.mBounceFactor)
+    , mSphere(copy.mSphere)
+    , mSphereInParticleSpace(copy.mSphereInParticleSpace)
+{
+
+}
+
+void SphericalCollider::beginOperate(osgParticle::Program* program)
+{
+    mSphereInParticleSpace = mSphere;
+    if (program->getReferenceFrame() == osgParticle::ParticleProcessor::ABSOLUTE_RF)
+        mSphereInParticleSpace.center() = program->transformLocalToWorld(mSphereInParticleSpace.center());
+}
+
+void SphericalCollider::operate(osgParticle::Particle* particle, double dt)
+{
+    osg::Vec3f cent = (particle->getPosition() - mSphereInParticleSpace.center()); // vector from sphere center to particle
+
+    bool insideSphere = cent.length2() <= mSphereInParticleSpace.radius2();
+
+    if (insideSphere
+            || (cent * particle->getVelocity() < 0.0f)) // if outside, make sure the particle is flying towards the sphere
+    {
+        // Collision test (finding point of contact) is performed by solving a quadratic equation:
+        // ||vec(cent) + vec(vel)*k|| = R      /^2
+        // k^2 + 2*k*(vec(cent)*vec(vel))/||vec(vel)||^2 + (||vec(cent)||^2 - R^2)/||vec(vel)||^2 = 0
+
+        float b = -(cent * particle->getVelocity()) / particle->getVelocity().length2();
+
+        osg::Vec3f u = cent + particle->getVelocity() * b;
+
+        if (insideSphere
+                || (u.length2() < mSphereInParticleSpace.radius2()))
+        {
+            float d = (mSphereInParticleSpace.radius2() - u.length2()) / particle->getVelocity().length2();
+            float k = insideSphere ? (std::sqrt(d) + b) : (b - std::sqrt(d));
+
+            if (k < dt)
+            {
+                // collision detected; reflect off the tangent plane
+                osg::Vec3f contact = particle->getPosition() + particle->getVelocity() * k;
+
+                osg::Vec3 normal = (contact - mSphereInParticleSpace.center());
+                normal.normalize();
+
+                float dotproduct = particle->getVelocity() * normal;
+
+                osg::Vec3 reflectedVelocity = particle->getVelocity() - normal * (2 * dotproduct);
+                reflectedVelocity *= mBounceFactor;
+                particle->setVelocity(reflectedVelocity);
+            }
+        }
+    }
+}
+
 }
diff --git a/components/nifosg/particle.hpp b/components/nifosg/particle.hpp
index a1ed3f3d0..7a2377f9d 100644
--- a/components/nifosg/particle.hpp
+++ b/components/nifosg/particle.hpp
@@ -4,13 +4,11 @@
 #include <osgParticle/Particle>
 #include <osgParticle/Shooter>
 #include <osgParticle/Operator>
-#include <osgParticle/ModularEmitter>
+#include <osgParticle/Emitter>
+#include <osgParticle/Placer>
+#include <osgParticle/Counter>
 
 #include <osg/NodeCallback>
-#include <osg/UserDataContainer>
-
-#include <components/nif/nifkey.hpp>
-#include <components/nif/data.hpp>
 
 #include "controller.hpp" // ValueInterpolator
 
@@ -18,6 +16,8 @@ namespace Nif
 {
     class NiGravity;
     class NiPlanarCollider;
+    class NiSphericalCollider;
+    class NiColorData;
 }
 
 namespace NifOsg
@@ -111,6 +111,23 @@ namespace NifOsg
         osg::Plane mPlaneInParticleSpace;
     };
 
+    class SphericalCollider : public osgParticle::Operator
+    {
+    public:
+        SphericalCollider(const Nif::NiSphericalCollider* collider);
+        SphericalCollider();
+        SphericalCollider(const SphericalCollider& copy, const osg::CopyOp& copyop);
+
+        META_Object(NifOsg, SphericalCollider)
+
+        virtual void beginOperate(osgParticle::Program* program);
+        virtual void operate(osgParticle::Particle* particle, double dt);
+    private:
+        float mBounceFactor;
+        osg::BoundingSphere mSphere;
+        osg::BoundingSphere mSphereInParticleSpace;
+    };
+
     class GrowFadeAffector : public osgParticle::Operator
     {
     public:
@@ -179,7 +196,14 @@ namespace NifOsg
     public:
         FindGroupByRecIndex(int recIndex);
 
-        virtual void apply(osg::Node &searchNode);
+        virtual void apply(osg::Node &node);
+
+        // Technically not required as the default implementation would trickle down to apply(Node&) anyway,
+        // but we'll shortcut instead to avoid the chain of virtual function calls
+        virtual void apply(osg::MatrixTransform& node);
+        virtual void apply(osg::Geometry& node);
+
+        void applyNode(osg::Node& searchNode);
 
         osg::Group* mFound;
         osg::NodePath mFoundPath;
diff --git a/components/nifosg/userdata.hpp b/components/nifosg/userdata.hpp
index 9770890b0..42fcaff47 100644
--- a/components/nifosg/userdata.hpp
+++ b/components/nifosg/userdata.hpp
@@ -38,8 +38,7 @@ namespace NifOsg
         // Decomposing the original components from the 4x4 matrix isn't possible, which causes
         // problems when a KeyframeController wants to change only one of these components. So
         // we store the scale and rotation components separately here.
-        // Note for a cleaner solution it would be possible to write a custom Transform node,
-        // but then we have to fork osgAnimation :/
+        // Note for a cleaner solution it would be possible to write a custom Transform node
         float mScale;
         Nif::Matrix3 mRotationScale;
     };
diff --git a/components/openmw-mp/Base/BaseEvent.hpp b/components/openmw-mp/Base/BaseEvent.hpp
new file mode 100644
index 000000000..54d6484fc
--- /dev/null
+++ b/components/openmw-mp/Base/BaseEvent.hpp
@@ -0,0 +1,94 @@
+#ifndef OPENMW_BASEEVENT_HPP
+#define OPENMW_BASEEVENT_HPP
+
+#include <components/esm/loadcell.hpp>
+#include <components/esm/cellref.hpp>
+#include <RakNetTypes.h>
+
+namespace mwmp
+{
+    struct ContainerItem
+    {
+        std::string refId;
+        int count;
+        int charge;
+
+        int actionCount;
+
+        inline bool operator==(const ContainerItem& rhs)
+        {
+            return refId == rhs.refId && count == rhs.count && charge == rhs.charge;
+        }
+    };
+
+    struct ContainerChanges
+    {
+        std::vector<ContainerItem> items;
+        unsigned int count;
+    };
+
+    struct WorldObject
+    {
+        std::string refId;
+        int refNumIndex;
+        int count;
+        int charge;
+        int goldValue;
+        ESM::Position pos;
+
+        int doorState;
+        int lockLevel;
+        float scale;
+
+        std::string filename;
+        bool allowSkipping;
+
+        std::string animGroup;
+        int animMode;
+
+        int index;
+        int shortVal;
+        float floatVal;
+        std::string varName;
+
+        ContainerChanges containerChanges;
+    };
+
+    struct ObjectChanges
+    {
+        std::vector<WorldObject> objects;
+        unsigned int count;
+    };
+
+    class BaseEvent
+    {
+    public:
+
+        BaseEvent(RakNet::RakNetGUID guid) : guid(guid)
+        {
+
+        }
+
+        BaseEvent()
+        {
+
+        }
+
+        enum WORLD_ACTION
+        {
+            SET = 0,
+            ADD = 1,
+            REMOVE = 2,
+            REQUEST = 3
+        };
+
+        RakNet::RakNetGUID guid;
+        ObjectChanges objectChanges;
+
+        ESM::Cell cell;
+
+        unsigned char action; // 0 - Clear and set in entirety, 1 - Add item, 2 - Remove item, 3 - Request items
+    };
+}
+
+#endif //OPENMW_BASEEVENT_HPP
diff --git a/components/openmw-mp/Base/BasePlayer.hpp b/components/openmw-mp/Base/BasePlayer.hpp
new file mode 100644
index 000000000..e30cb09ed
--- /dev/null
+++ b/components/openmw-mp/Base/BasePlayer.hpp
@@ -0,0 +1,199 @@
+//
+// Created by koncord on 07.01.16.
+//
+
+#ifndef OPENMW_BASEPLAYER_HPP
+#define OPENMW_BASEPLAYER_HPP
+
+#include <components/esm/npcstats.hpp>
+#include <components/esm/loadcell.hpp>
+#include <components/esm/loadnpc.hpp>
+#include <components/esm/creaturestats.hpp>
+#include <components/esm/loadclas.hpp>
+#include <components/esm/loadspel.hpp>
+#include <RakNetTypes.h>
+
+namespace mwmp
+{
+    class Attack
+    {
+    public:
+        RakNet::RakNetGUID target;
+        RakNet::RakNetGUID attacker;
+        char type; // 0 - melee, 1 - magic, 2 - throwable
+        enum TYPE
+        {
+            MELEE = 0,
+            MAGIC,
+            THROWABLE
+        };
+        std::string refid; // id of spell (e.g. "fireball")
+        char success;
+        char block;
+        float damage;
+        char pressed;
+        char knockdown;
+    };
+
+    struct CurrentContainer
+    {
+        std::string refId;
+        int refNumIndex;
+        bool loot;
+    };
+
+    struct Item
+    {
+        std::string refId;
+        int count;
+        int charge;
+
+        inline bool operator==(const Item& rhs)
+        {
+            return refId == rhs.refId && count == rhs.count && charge == rhs.charge;
+        }
+    };
+
+    struct JournalItem
+    {
+        std::string quest;
+        int index;
+        enum JOURNAL_ITEM_TYPE
+        {
+            ENTRY = 0,
+            INDEX = 1
+        };
+
+        ESM::Cell actorCell;
+        ESM::CellRef actorCellRef;
+
+        int type; // 0 - An entire entry, 1 - An index
+    };
+
+    struct CellState
+    {
+        ESM::Cell cell;
+
+        enum CELL_STATE_ACTION
+        {
+            LOAD = 0,
+            UNLOAD = 1
+        };
+
+        int type; // 0 - Cell load, 1 - Cell unload
+    };
+
+    struct JournalChanges
+    {
+        std::vector<JournalItem> journalItems;
+        unsigned int count;
+    };
+
+    struct InventoryChanges
+    {
+        std::vector<Item> items;
+        unsigned int count;
+        enum ACTION_TYPE
+        {
+            SET = 0,
+            ADD,
+            REMOVE
+        };
+        int action; // 0 - Clear and set in entirety, 1 - Add item, 2 - Remove item
+    };
+
+    struct SpellbookChanges
+    {
+        std::vector<ESM::Spell> spells;
+        unsigned int count;
+        enum ACTION_TYPE
+        {
+            SET = 0,
+            ADD,
+            REMOVE
+        };
+        int action; // 0 - Clear and set in entirety, 1 - Add spell, 2 - Remove spell
+    };
+
+    struct CellStateChanges
+    {
+        std::vector<CellState> cellStates;
+        unsigned int count;
+    };
+
+    class BasePlayer
+    {
+    public:
+
+        struct CGStage
+        {
+            int current, end;
+        };
+
+        struct GUIMessageBox
+        {
+            int id;
+            int type;
+            enum GUI_TYPE
+            {
+                MessageBox = 0,
+                CustomMessageBox,
+                InputDialog,
+                PasswordDialog,
+                ListBox
+            };
+            std::string label;
+            std::string buttons;
+
+            std::string data;
+        };
+
+        BasePlayer(RakNet::RakNetGUID guid) : guid(guid)
+        {
+            inventoryChanges.action = 0;
+            inventoryChanges.count = 0;
+            spellbookChanges.action = 0;
+            spellbookChanges.count = 0;
+        }
+
+        BasePlayer()
+        {
+
+        }
+
+        RakNet::RakNetGUID guid;
+        GUIMessageBox guiMessageBox;
+        ESM::Class charClass;
+        int month;
+        int day;
+        double hour;
+
+        InventoryChanges inventoryChanges;
+        SpellbookChanges spellbookChanges;
+        JournalChanges journalChanges;
+        CellStateChanges cellStateChanges;
+        ESM::ActiveSpells activeSpells;
+        CurrentContainer currentContainer;
+
+        bool consoleAllowed;
+        bool ignorePosPacket;
+
+        ESM::Position position;
+        ESM::Position direction;
+        ESM::Cell cell;
+        ESM::NPC npc;
+        ESM::NpcStats npcStats;
+        ESM::CreatureStats creatureStats;
+        Item equipedItems[19];
+        unsigned int movementFlags;
+        char movementAnim;
+        char drawState;
+        Attack attack;
+        std::string birthsign;
+        std::string chatMessage;
+        CGStage charGenStage;
+        std::string passw;
+    };
+}
+
+#endif //OPENMW_BASEPLAYER_HPP
diff --git a/components/openmw-mp/Controllers/PlayerPacketController.cpp b/components/openmw-mp/Controllers/PlayerPacketController.cpp
new file mode 100644
index 000000000..6ad7a907a
--- /dev/null
+++ b/components/openmw-mp/Controllers/PlayerPacketController.cpp
@@ -0,0 +1,100 @@
+#include <boost/shared_ptr.hpp>
+#include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
+
+#include "../Packets/Player/PacketPlayerClass.hpp"
+#include "../Packets/Player/PacketPlayerPosition.hpp"
+#include "../Packets/Player/PacketPlayerCellChange.hpp"
+#include "../Packets/Player/PacketPlayerCellState.hpp"
+#include "../Packets/Player/PacketPlayerBaseInfo.hpp"
+#include "../Packets/Player/PacketPlayerEquipment.hpp"
+#include "../Packets/Player/PacketPlayerAttack.hpp"
+#include "../Packets/Player/PacketPlayerDynamicStats.hpp"
+#include "../Packets/Player/PacketResurrect.hpp"
+#include "../Packets/Player/PacketDie.hpp"
+#include "../Packets/Player/PacketSendMyID.hpp"
+#include "../Packets/Player/PacketDisconnect.hpp"
+#include "../Packets/Player/PacketPlayerDrawState.hpp"
+#include "../Packets/Player/PacketChatMessage.hpp"
+#include "../Packets/Player/PacketPlayerCharGen.hpp"
+#include "../Packets/Player/PacketPlayerAttribute.hpp"
+#include "../Packets/Player/PacketPlayerSkill.hpp"
+#include "../Packets/Player/PacketPlayerLevel.hpp"
+#include "../Packets/Player/PacketHandshake.hpp"
+#include "../Packets/Player/PacketGUIBoxes.hpp"
+#include "../Packets/Player/PacketTime.hpp"
+#include "../Packets/Player/PacketLoaded.hpp"
+#include "../Packets/Player/PacketPlayerInventory.hpp"
+#include "../Packets/Player/PacketPlayerSpellbook.hpp"
+#include "../Packets/Player/PacketPlayerJournal.hpp"
+#include "../Packets/Player/PacketConsole.hpp"
+#include "../Packets/Player/PacketPlayerActiveSkills.hpp"
+
+#include "PlayerPacketController.hpp"
+
+template <typename T>
+inline void AddPacket(mwmp::PlayerPacketController::packets_t *packets, RakNet::RakPeerInterface *peer)
+{
+    T *packet = new T(peer);
+    typedef mwmp::PlayerPacketController::packets_t::value_type value_t;
+    packets->insert(value_t(packet->GetPacketID(), value_t::second_type(packet)));
+}
+
+mwmp::PlayerPacketController::PlayerPacketController(RakNet::RakPeerInterface *peer)
+{
+    AddPacket<PacketPlayerPosition>(&packets, peer);
+    AddPacket<PacketPlayerCellChange>(&packets, peer);
+    AddPacket<PacketPlayerCellState>(&packets, peer);
+
+    AddPacket<PacketPlayerBaseInfo>(&packets, peer);
+    AddPacket<PacketPlayerEquipment>(&packets, peer);
+
+    AddPacket<PacketPlayerAttack>(&packets, peer);
+    AddPacket<PacketPlayerDynamicStats>(&packets, peer);
+    AddPacket<PacketResurrect>(&packets, peer);
+
+    AddPacket<PacketDie>(&packets, peer);
+    AddPacket<PacketPlayerDrawState>(&packets, peer);
+    AddPacket<PacketSendMyID>(&packets, peer);
+    AddPacket<PacketDisconnect>(&packets, peer);
+
+    AddPacket<PacketChatMessage>(&packets, peer);
+    AddPacket<PacketPlayerCharGen>(&packets, peer);
+    AddPacket<PacketPlayerAttribute>(&packets, peer);
+    AddPacket<PacketPlayerSkill>(&packets, peer);
+    AddPacket<PacketPlayerLevel>(&packets, peer);
+
+    AddPacket<PacketHandshake>(&packets, peer);
+    AddPacket<PacketGUIBoxes>(&packets, peer);
+    AddPacket<PacketPlayerClass>(&packets, peer);
+    AddPacket<PacketTime>(&packets, peer);
+    AddPacket<PacketLoaded>(&packets, peer);
+    AddPacket<PacketPlayerInventory>(&packets, peer);
+    AddPacket<PacketPlayerSpellbook>(&packets, peer);
+    AddPacket<PacketPlayerJournal>(&packets, peer);
+
+    AddPacket<PacketPlayerActiveSkills>(&packets, peer);
+
+    AddPacket<PacketConsole>(&packets, peer);
+}
+
+
+mwmp::PlayerPacket *mwmp::PlayerPacketController::GetPacket(RakNet::MessageID id)
+{
+    return packets[(unsigned char)id].get();
+}
+
+void mwmp::PlayerPacketController::SetStream(RakNet::BitStream *inStream, RakNet::BitStream *outStream)
+{
+    BOOST_FOREACH( packets_t::value_type &packet, packets )
+        packet.second->SetStreams(inStream, outStream);
+}
+
+bool mwmp::PlayerPacketController::ContainsPacket(RakNet::MessageID id)
+{
+    BOOST_FOREACH(packets_t::value_type &packet, packets) {
+        if (packet.first == id)
+            return true;
+    }
+    return false;
+}
diff --git a/components/openmw-mp/Controllers/PlayerPacketController.hpp b/components/openmw-mp/Controllers/PlayerPacketController.hpp
new file mode 100644
index 000000000..fc2927c65
--- /dev/null
+++ b/components/openmw-mp/Controllers/PlayerPacketController.hpp
@@ -0,0 +1,27 @@
+#ifndef OPENMW_PLAYERPACKETCONTROLLER_HPP
+#define OPENMW_PLAYERPACKETCONTROLLER_HPP
+
+
+#include <RakPeerInterface.h>
+#include "../Packets/Player/PlayerPacket.hpp"
+#include <map>
+#include <boost/shared_ptr.hpp>
+
+namespace mwmp
+{
+    class PlayerPacketController
+    {
+    public:
+        PlayerPacketController(RakNet::RakPeerInterface *peer);
+        PlayerPacket *GetPacket(RakNet::MessageID id);
+        void SetStream(RakNet::BitStream *inStream, RakNet::BitStream *outStream);
+
+        bool ContainsPacket(RakNet::MessageID id);
+
+        typedef std::map<unsigned char, boost::shared_ptr<PlayerPacket> > packets_t;
+    private:
+        packets_t packets;
+    };
+}
+
+#endif //OPENMW_PLAYERPACKETCONTROLLER_HPP
diff --git a/components/openmw-mp/Controllers/WorldPacketController.cpp b/components/openmw-mp/Controllers/WorldPacketController.cpp
new file mode 100644
index 000000000..dece05a83
--- /dev/null
+++ b/components/openmw-mp/Controllers/WorldPacketController.cpp
@@ -0,0 +1,75 @@
+#include <boost/shared_ptr.hpp>
+#include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
+
+#include "../Packets/World/PacketObjectDelete.hpp"
+#include "../Packets/World/PacketObjectPlace.hpp"
+#include "../Packets/World/PacketObjectScale.hpp"
+#include "../Packets/World/PacketObjectLock.hpp"
+#include "../Packets/World/PacketObjectUnlock.hpp"
+#include "../Packets/World/PacketObjectMove.hpp"
+#include "../Packets/World/PacketObjectRotate.hpp"
+#include "../Packets/World/PacketObjectAnimPlay.hpp"
+
+#include "../Packets/World/PacketContainer.hpp"
+#include "../Packets/World/PacketDoorState.hpp"
+#include "../Packets/World/PacketMusicPlay.hpp"
+#include "../Packets/World/PacketVideoPlay.hpp"
+
+#include "../Packets/World/PacketScriptLocalShort.hpp"
+#include "../Packets/World/PacketScriptLocalFloat.hpp"
+#include "../Packets/World/PacketScriptMemberShort.hpp"
+#include "../Packets/World/PacketScriptGlobalShort.hpp"
+
+#include "WorldPacketController.hpp"
+
+template <typename T>
+inline void AddPacket(mwmp::WorldPacketController::packets_t *packets, RakNet::RakPeerInterface *peer)
+{
+    T *packet = new T(peer);
+    typedef mwmp::WorldPacketController::packets_t::value_type value_t;
+    packets->insert(value_t(packet->GetPacketID(), value_t::second_type(packet)));
+}
+
+mwmp::WorldPacketController::WorldPacketController(RakNet::RakPeerInterface *peer)
+{
+    AddPacket<PacketObjectDelete>(&packets, peer);
+    AddPacket<PacketObjectPlace>(&packets, peer);
+    AddPacket<PacketObjectScale>(&packets, peer);
+    AddPacket<PacketObjectLock>(&packets, peer);
+    AddPacket<PacketObjectUnlock>(&packets, peer);
+    AddPacket<PacketObjectMove>(&packets, peer);
+    AddPacket<PacketObjectRotate>(&packets, peer);
+    AddPacket<PacketObjectAnimPlay>(&packets, peer);
+
+    AddPacket<PacketContainer>(&packets, peer);
+    AddPacket<PacketDoorState>(&packets, peer);
+    AddPacket<PacketMusicPlay>(&packets, peer);
+    AddPacket<PacketVideoPlay>(&packets, peer);
+
+    AddPacket<PacketScriptLocalShort>(&packets, peer);
+    AddPacket<PacketScriptLocalFloat>(&packets, peer);
+    AddPacket<PacketScriptMemberShort>(&packets, peer);
+    AddPacket<PacketScriptGlobalShort>(&packets, peer);
+}
+
+
+mwmp::WorldPacket *mwmp::WorldPacketController::GetPacket(RakNet::MessageID id)
+{
+    return packets[(unsigned char)id].get();
+}
+
+void mwmp::WorldPacketController::SetStream(RakNet::BitStream *inStream, RakNet::BitStream *outStream)
+{
+    BOOST_FOREACH( packets_t::value_type &packet, packets )
+        packet.second->SetStreams(inStream, outStream);
+}
+
+bool mwmp::WorldPacketController::ContainsPacket(RakNet::MessageID id)
+{
+    BOOST_FOREACH(packets_t::value_type &packet, packets) {
+        if (packet.first == id)
+            return true;
+    }
+    return false;
+}
diff --git a/components/openmw-mp/Controllers/WorldPacketController.hpp b/components/openmw-mp/Controllers/WorldPacketController.hpp
new file mode 100644
index 000000000..d96a8c886
--- /dev/null
+++ b/components/openmw-mp/Controllers/WorldPacketController.hpp
@@ -0,0 +1,27 @@
+#ifndef OPENMW_WORLDPACKETCONTROLLER_HPP
+#define OPENMW_WORLDPACKETCONTROLLER_HPP
+
+
+#include <RakPeerInterface.h>
+#include "../Packets/World/WorldPacket.hpp"
+#include <map>
+#include <boost/shared_ptr.hpp>
+
+namespace mwmp
+{
+    class WorldPacketController
+    {
+    public:
+        WorldPacketController(RakNet::RakPeerInterface *peer);
+        WorldPacket *GetPacket(RakNet::MessageID id);
+        void SetStream(RakNet::BitStream *inStream, RakNet::BitStream *outStream);
+
+        bool ContainsPacket(RakNet::MessageID id);
+
+        typedef std::map<unsigned char, boost::shared_ptr<WorldPacket> > packets_t;
+    private:
+        packets_t packets;
+    };
+}
+
+#endif //OPENMW_WORLDPACKETCONTROLLER_HPP
diff --git a/components/openmw-mp/Log.cpp b/components/openmw-mp/Log.cpp
new file mode 100644
index 000000000..e87c4a036
--- /dev/null
+++ b/components/openmw-mp/Log.cpp
@@ -0,0 +1,117 @@
+//
+// Created by koncord on 15.08.16.
+//
+
+#include <cstdarg>
+#include <iostream>
+#include <cstring>
+#include <ctime>
+#include <cstdio>
+#include <sstream>
+#include <vector>
+#include <boost/lexical_cast.hpp>
+#include "Log.hpp"
+
+using namespace std;
+
+Log *Log::sLog = NULL;
+
+Log::Log(int logLevel) : logLevel(logLevel)
+{
+
+}
+
+void Log::Create(int logLevel)
+{
+    if (sLog != NULL)
+        return;
+    sLog = new Log(logLevel);
+}
+
+void Log::Delete()
+{
+    if (sLog == NULL)
+        return;
+    delete sLog;
+    sLog = NULL;
+}
+
+const Log &Log::Get()
+{
+    return *sLog;
+}
+
+void Log::SetLevel(int level)
+{
+    sLog->logLevel = level;
+}
+
+const char* getTime()
+{
+    time_t t = time(0);
+    struct tm *tm = localtime(&t);
+    static char result[20];
+    sprintf(result, "%.4d-%.2d-%.2d %.2d:%.2d:%.2d",
+            1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
+            tm->tm_hour, tm->tm_min, tm->tm_sec);
+    return result;
+}
+
+void Log::print(int level, bool hasPrefix, const char *file, int line, const char *message, ...) const
+{
+    if (level < logLevel) return;
+    std::stringstream sstr;
+
+    if (hasPrefix)
+    {
+
+        sstr << "[" << getTime() << "] ";
+
+        if (file != 0 && line != 0)
+        {
+            sstr << "[" << file << ":";
+            sstr << line << "] ";
+        }
+
+        sstr << "[";
+        switch (level)
+        {
+        case LOG_WARN:
+            sstr << "WARN";
+            break;
+        case LOG_ERROR:
+            sstr << "ERR";
+            break;
+        case LOG_FATAL:
+            sstr << "FATAL";
+            break;
+        default:
+            sstr << "INFO";
+        }
+        sstr << "]: ";
+
+    }
+
+    sstr << message;
+    char back = *sstr.str().rbegin();
+    if (back != '\n')
+        sstr << '\n';
+    va_list args;
+    va_start(args, message);
+    vector<char> buf((unsigned long) (vsnprintf(NULL, 0, sstr.str().c_str(), args) + 1));
+    va_end(args);
+    va_start(args, message);
+    vsnprintf(buf.data(), buf.size(), sstr.str().c_str(), args);
+    va_end(args);
+    cout << buf.data() << flush;
+}
+
+string Log::getFilenameTimestamp()
+{
+    time_t rawtime = time(0);
+    struct tm *timeinfo = localtime(&rawtime);
+    char buffer[25];
+    strftime(buffer, 25, "%Y-%m-%d-%H_%M_%S", timeinfo);
+    std::string timestamp(buffer);
+    return timestamp;
+}
diff --git a/components/openmw-mp/Log.hpp b/components/openmw-mp/Log.hpp
new file mode 100644
index 000000000..1dc0189c8
--- /dev/null
+++ b/components/openmw-mp/Log.hpp
@@ -0,0 +1,62 @@
+//
+// Created by koncord on 15.08.16.
+//
+
+#ifndef OPENMW_LOG_HPP
+#define OPENMW_LOG_HPP
+
+#include <boost/filesystem.hpp>
+
+#ifdef __GNUC__
+#pragma GCC system_header
+#endif
+
+#if defined(NOLOGS)
+#define LOG_INIT(logLevel)
+#define LOG_QUIT()
+#define LOG_MESSAGE(level, msg, ...)
+#define LOG_MESSAGE_SIMPLE(level, msg, ...)
+#else
+#define LOG_INIT(logLevel) Log::Create(logLevel)
+#define LOG_QUIT() Log::Delete()
+#if defined(_MSC_VER)
+#define LOG_MESSAGE(level, msg, ...) Log::Get().print((level), (1), (__FILE__), (__LINE__), (msg), __VA_ARGS__)
+#define LOG_MESSAGE_SIMPLE(level, msg, ...) Log::Get().print((level), (1), (0), (0), (msg), __VA_ARGS__)
+#define LOG_APPEND(level, msg, ...) Log::Get().print((level), (0), (0), (0), (msg), __VA_ARGS__)
+#else
+#define LOG_MESSAGE(level, msg, args...) Log::Get().print((level), (1), (__FILE__), (__LINE__), (msg), ##args)
+#define LOG_MESSAGE_SIMPLE(level, msg, args...) Log::Get().print((level), (1), (0), (0), (msg), ##args)
+#define LOG_APPEND(level, msg, args...) Log::Get().print((level), (0), (0), (0), (msg), ##args)
+#endif
+#endif
+
+class Log
+{
+public:
+    enum
+    {
+        LOG_VERBOSE = 0,
+        LOG_INFO,
+        LOG_WARN,
+        LOG_ERROR,
+        LOG_FATAL
+    };
+    static void Create(int logLevel);
+    static void Delete();
+    static const Log &Get();
+    static void SetLevel(int level);
+    void print(int level, bool hasPrefix, const char *file, int line, const char *message, ...) const;
+
+    static std::string getFilenameTimestamp();
+private:
+    Log(int logLevel);
+    /// Not implemented
+    Log(const Log &);
+    /// Not implemented
+    Log &operator=(Log &);
+    static Log *sLog;
+    int logLevel;
+};
+
+
+#endif //OPENMW_LOG_HPP
diff --git a/components/openmw-mp/NetworkMessages.hpp b/components/openmw-mp/NetworkMessages.hpp
new file mode 100644
index 000000000..0da02b08f
--- /dev/null
+++ b/components/openmw-mp/NetworkMessages.hpp
@@ -0,0 +1,65 @@
+//
+// Created by koncord on 05.01.16.
+//
+
+#ifndef OPENMW_NETWORKMESSAGES_HPP
+#define OPENMW_NETWORKMESSAGES_HPP
+
+#include <MessageIdentifiers.h>
+
+enum GameMessages
+{
+    ID_MASTER_QUERY = ID_USER_PACKET_ENUM+1,
+    ID_PLAYER_BASEINFO,
+    ID_PLAYER_CHARGEN,
+    ID_PLAYER_POS,
+    ID_PLAYER_DYNAMICSTATS,
+    ID_PLAYER_ATTACK,
+    ID_USER_MYID,
+    ID_PLAYER_EQUIPMENT,
+    ID_USER_DISCONNECTED,
+    ID_GAME_DIE,
+    ID_GAME_RESURRECT,
+    ID_CHAT_MESSAGE,
+    ID_PLAYER_DRAWSTATE,
+
+    ID_PLAYER_ATTRIBUTE,
+    ID_PLAYER_SKILL,
+    ID_PLAYER_LEVEL,
+    ID_PLAYER_CHARCLASS,
+    ID_HANDSHAKE,
+    ID_LOADED,
+    ID_GUI_MESSAGEBOX,
+    ID_GAME_TIME,
+    ID_PLAYER_INVENTORY,
+    ID_PLAYER_SPELLBOOK,
+    ID_PLAYER_JOURNAL,
+    ID_PLAYER_ACTIVESKILLS,
+
+    ID_PLAYER_CELL_CHANGE,
+    ID_PLAYER_CELL_STATE,
+
+    ID_OBJECT_PLACE,
+    ID_OBJECT_DELETE,
+    ID_OBJECT_SCALE,
+    ID_OBJECT_LOCK,
+    ID_OBJECT_UNLOCK,
+    ID_OBJECT_MOVE,
+    ID_OBJECT_ROTATE,
+    ID_OBJECT_ANIM_PLAY,
+
+    ID_CONTAINER,
+    ID_DOOR_STATE,
+    ID_MUSIC_PLAY,
+    ID_VIDEO_PLAY,
+
+    ID_SCRIPT_LOCAL_SHORT,
+    ID_SCRIPT_LOCAL_FLOAT,
+    ID_SCRIPT_MEMBER_SHORT,
+    ID_SCRIPT_GLOBAL_SHORT,
+
+    ID_GAME_CONSOLE
+};
+
+
+#endif //OPENMW_NETWORKMESSAGES_HPP
diff --git a/components/openmw-mp/Packets/BasePacket.cpp b/components/openmw-mp/Packets/BasePacket.cpp
new file mode 100644
index 000000000..4ccb2e71b
--- /dev/null
+++ b/components/openmw-mp/Packets/BasePacket.cpp
@@ -0,0 +1,45 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <PacketPriority.h>
+#include <RakPeer.h>
+#include "BasePacket.hpp"
+
+using namespace mwmp;
+
+BasePacket::BasePacket(RakNet::RakPeerInterface *peer)
+{
+    packetID = 0;
+    priority = HIGH_PRIORITY;
+    reliability = RELIABLE_ORDERED;
+    this->peer = peer;
+}
+
+BasePacket::~BasePacket()
+{
+
+}
+
+void BasePacket::SetReadStream(RakNet::BitStream *bitStream)
+{
+    bsRead = bitStream;
+}
+
+void BasePacket::SetSendStream(RakNet::BitStream *bitStream)
+{
+    bsSend = bitStream;
+}
+
+void BasePacket::SetStreams(RakNet::BitStream *inStream, RakNet::BitStream *outStream)
+{
+    if (inStream != 0)
+        bsRead = inStream;
+    if (outStream != 0)
+        bsSend = outStream;
+}
+
+void BasePacket::RequestData(RakNet::RakNetGUID guid)
+{
+    bsSend->ResetWritePointer();
+    bsSend->Write(packetID);
+    bsSend->Write(guid);
+    peer->Send(bsSend, HIGH_PRIORITY, RELIABLE_ORDERED, 0, guid, false);
+}
diff --git a/components/openmw-mp/Packets/BasePacket.hpp b/components/openmw-mp/Packets/BasePacket.hpp
new file mode 100644
index 000000000..a9d1dce3e
--- /dev/null
+++ b/components/openmw-mp/Packets/BasePacket.hpp
@@ -0,0 +1,93 @@
+#ifndef OPENMW_BASEPACKET_HPP
+#define OPENMW_BASEPACKET_HPP
+
+#include <string>
+#include <RakNetTypes.h>
+#include <BitStream.h>
+#include <PacketPriority.h>
+#include <components/openmw-mp/Base/BasePlayer.hpp>
+
+
+namespace mwmp
+{
+    class BasePacket
+    {
+    public:
+        BasePacket(RakNet::RakPeerInterface *peer);
+
+        ~BasePacket();
+
+        void SetReadStream(RakNet::BitStream *bitStream);
+        void SetSendStream(RakNet::BitStream *bitStream);
+        void SetStreams(RakNet::BitStream *inStream, RakNet::BitStream *outStream);
+        virtual void RequestData(RakNet::RakNetGUID guid);
+
+        static size_t headerSize()
+        {
+            return (size_t)(1 + RakNet::RakNetGUID::size()); // packetID + RakNetGUID (uint64_t)
+        }
+
+        unsigned char GetPacketID()
+        {
+            return packetID;
+        }
+
+    protected:
+        template<class templateType>
+        void RW(templateType &data, unsigned int size, bool write)
+        {
+            if (write)
+                bs->Write(data, size);
+            else
+                bs->Read(data, size);
+        }
+
+        template<class templateType>
+        void RW(templateType &data, bool write)
+        {
+            if (write)
+                bs->Write(data);
+            else
+                bs->Read(data);
+        }
+
+        void RW(bool &data, bool write)
+        {
+            char _data;
+            if (write)
+            {
+                _data = data;
+                bs->Write(_data);
+            }
+            else
+            {
+                bs->Read(_data);
+                data = _data;
+            }
+        }
+
+        void RW(std::string &str, bool write)
+        {
+            if (write)
+            {
+                RakNet::RakString rstr(str.c_str());
+                bs->Write(rstr);
+            }
+            else
+            {
+                RakNet::RakString rstr;
+                bs->Read(rstr);
+                str = rstr.C_String();
+            }
+        }
+
+    protected:
+        unsigned char packetID;
+        PacketReliability reliability;
+        PacketPriority priority;
+        RakNet::BitStream *bsRead, *bsSend, *bs;
+        RakNet::RakPeerInterface *peer;
+    };
+}
+
+#endif //OPENMW_BASEPACKET_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketChatMessage.cpp b/components/openmw-mp/Packets/Player/PacketChatMessage.cpp
new file mode 100644
index 000000000..0c1e7a6fe
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketChatMessage.cpp
@@ -0,0 +1,18 @@
+//
+// Created by koncord on 06.03.16.
+//
+
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketChatMessage.hpp"
+
+mwmp::PacketChatMessage::PacketChatMessage(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_CHAT_MESSAGE;
+}
+
+void mwmp::PacketChatMessage::Packet(RakNet::BitStream *bs, mwmp::BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    RW(player->chatMessage, send);
+}
diff --git a/components/openmw-mp/Packets/Player/PacketChatMessage.hpp b/components/openmw-mp/Packets/Player/PacketChatMessage.hpp
new file mode 100644
index 000000000..c15dc1083
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketChatMessage.hpp
@@ -0,0 +1,21 @@
+//
+// Created by koncord on 06.03.16.
+//
+
+#ifndef OPENMW_PACKETCHATMESSAGE_HPP
+#define OPENMW_PACKETCHATMESSAGE_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketChatMessage : public PlayerPacket
+    {
+    public:
+        PacketChatMessage(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETCHATMESSAGE_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketConsole.hpp b/components/openmw-mp/Packets/Player/PacketConsole.hpp
new file mode 100644
index 000000000..57828a42b
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketConsole.hpp
@@ -0,0 +1,29 @@
+//
+// Created by koncord on 04.11.16.
+//
+
+#ifndef OPENMW_PACKETCONSOLE_HPP
+#define OPENMW_PACKETCONSOLE_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+namespace mwmp
+{
+    class PacketConsole: public PlayerPacket
+    {
+    public:
+        PacketConsole(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+        {
+            packetID = ID_GAME_CONSOLE;
+        }
+        void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+        {
+            PlayerPacket::Packet(bs, player, send);
+            RW(player->consoleAllowed, send);
+        }
+    };
+}
+
+
+#endif //OPENMW_PACKETCONSOLE_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketDie.hpp b/components/openmw-mp/Packets/Player/PacketDie.hpp
new file mode 100644
index 000000000..85c89e877
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketDie.hpp
@@ -0,0 +1,29 @@
+//
+// Created by koncord on 13.01.16.
+//
+
+#ifndef OPENMW_PACKETDIE_HPP
+#define OPENMW_PACKETDIE_HPP
+
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+namespace mwmp
+{
+    class PacketDie: public PlayerPacket
+    {
+    public:
+        PacketDie(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+        {
+            packetID = ID_GAME_DIE;
+        }
+        void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+        {
+            PlayerPacket::Packet(bs, player, send);
+            RW(player->creatureStats.mDead, send);
+        }
+    };
+}
+
+#endif //OPENMW_PACKETDIE_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketDisconnect.hpp b/components/openmw-mp/Packets/Player/PacketDisconnect.hpp
new file mode 100644
index 000000000..39cdbcbc1
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketDisconnect.hpp
@@ -0,0 +1,24 @@
+//
+// Created by koncord on 12.01.16.
+//
+
+#ifndef OPENMW_PACKETDISCONNECT_HPP
+#define OPENMW_PACKETDISCONNECT_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+namespace mwmp
+{
+    class PacketDisconnect : public PlayerPacket
+    {
+    public:
+        PacketDisconnect(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+        {
+            packetID = ID_USER_DISCONNECTED;
+        }
+    };
+}
+
+
+#endif //OPENMW_PACKETDISCONNECT_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp b/components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
new file mode 100644
index 000000000..18c4764c7
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
@@ -0,0 +1,28 @@
+//
+// Created by koncord on 23.07.16.
+//
+
+#include "PacketGUIBoxes.hpp"
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+using namespace mwmp;
+
+PacketGUIBoxes::PacketGUIBoxes(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_GUI_MESSAGEBOX;
+}
+
+void PacketGUIBoxes::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    RW(player->guiMessageBox.id, send);
+    RW(player->guiMessageBox.type, send);
+    RW(player->guiMessageBox.label, send);
+
+    RW(player->guiMessageBox.data, send);
+
+    if (player->guiMessageBox.type == BasePlayer::GUIMessageBox::CustomMessageBox)
+        RW(player->guiMessageBox.buttons, send);
+}
+
diff --git a/components/openmw-mp/Packets/Player/PacketGUIBoxes.hpp b/components/openmw-mp/Packets/Player/PacketGUIBoxes.hpp
new file mode 100644
index 000000000..8d71257f9
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketGUIBoxes.hpp
@@ -0,0 +1,22 @@
+//
+// Created by koncord on 23.07.16.
+//
+
+#ifndef OPENMW_PACKETGUIBOXES_HPP
+#define OPENMW_PACKETGUIBOXES_HPP
+
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketGUIBoxes : public PlayerPacket
+    {
+    public:
+        PacketGUIBoxes(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETGUIBOXES_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketHandshake.cpp b/components/openmw-mp/Packets/Player/PacketHandshake.cpp
new file mode 100644
index 000000000..983a7f6c5
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketHandshake.cpp
@@ -0,0 +1,20 @@
+//
+// Created by koncord on 28.04.16.
+//
+
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketHandshake.hpp"
+
+using namespace mwmp;
+
+PacketHandshake::PacketHandshake(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_HANDSHAKE;
+}
+
+void PacketHandshake::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+    RW(player->npc.mName, send);
+    RW(player->passw, send);
+}
diff --git a/components/openmw-mp/Packets/Player/PacketHandshake.hpp b/components/openmw-mp/Packets/Player/PacketHandshake.hpp
new file mode 100644
index 000000000..539be878b
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketHandshake.hpp
@@ -0,0 +1,21 @@
+//
+// Created by koncord on 28.04.16.
+//
+
+#ifndef OPENMW_PACKETHANDSHAKE_HPP
+#define OPENMW_PACKETHANDSHAKE_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketHandshake : public PlayerPacket
+    {
+    public:
+        PacketHandshake(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETHANDSHAKE_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketLoaded.hpp b/components/openmw-mp/Packets/Player/PacketLoaded.hpp
new file mode 100644
index 000000000..8f58a4938
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketLoaded.hpp
@@ -0,0 +1,22 @@
+//
+// Created by koncord on 17.09.16.
+//
+
+#ifndef OPENMW_PACKETLOADED_HPP
+#define OPENMW_PACKETLOADED_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketLoaded : public PlayerPacket
+    {
+    public:
+        PacketLoaded(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+        {
+            packetID = ID_LOADED;
+        }
+    };
+}
+
+#endif //OPENMW_PACKETLOADED_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.cpp b/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.cpp
new file mode 100644
index 000000000..0633534a0
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.cpp
@@ -0,0 +1,58 @@
+//
+// Created by koncord on 03.12.16.
+//
+
+#include "PacketPlayerActiveSkills.hpp"
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+using namespace mwmp;
+
+PacketPlayerActiveSkills::PacketPlayerActiveSkills(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_ACTIVESKILLS;
+}
+
+void PacketPlayerActiveSkills::Packet(RakNet::BitStream *bs, mwmp::BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    unsigned long spells = 0;
+
+    if (send)
+        spells = player->activeSpells.mSpells.size();
+
+    RW(spells, send);
+
+    if (send)
+        for (ESM::ActiveSpells::TContainer::const_iterator spell = player->activeSpells.mSpells.begin();
+             spell != player->activeSpells.mSpells.end(); ++spell)
+        {
+            RW(spell->first, true);
+            RW(spell->second.mTimeStamp, true);
+            unsigned long effects = spell->second.mEffects.size();
+            RW(effects, true);
+
+            for (std::vector<ESM::ActiveEffect>::const_iterator effect = spell->second.mEffects.begin();
+                 effect != spell->second.mEffects.end(); ++effect)
+                RW(effect, true);
+
+        }
+    else
+        for (unsigned int i = 0; i < spells; i++)
+        {
+            ESM::ActiveSpells::TContainer::value_type spell;
+
+            RW(spell.first, false);
+            RW(spell.second.mTimeStamp, false);
+            unsigned long effects;
+            RW(effects, false);
+
+            ESM::ActiveEffect effect;
+            for (unsigned int j = 0; j < effects; j++)
+            {
+                RW(effect, false);
+                spell.second.mEffects.push_back(effect);
+            }
+            player->activeSpells.mSpells.insert(spell);
+        }
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.hpp b/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.hpp
new file mode 100644
index 000000000..6b417633e
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.hpp
@@ -0,0 +1,21 @@
+//
+// Created by koncord on 03.12.16.
+//
+
+#ifndef OPENMW_PACKETPLAYERACTIVESKILLS_HPP
+#define OPENMW_PACKETPLAYERACTIVESKILLS_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerActiveSkills : public PlayerPacket
+    {
+    public:
+        PacketPlayerActiveSkills(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETPLAYERACTIVESKILLS_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp b/components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp
new file mode 100644
index 000000000..5ee41d65c
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp
@@ -0,0 +1,29 @@
+//
+// Created by koncord on 13.01.16.
+//
+
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketPlayerAttack.hpp"
+
+using namespace mwmp;
+
+PacketPlayerAttack::PacketPlayerAttack(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_ATTACK;
+}
+
+void PacketPlayerAttack::Packet(RakNet::BitStream *bs, mwmp::BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    RW(player->attack.attacker, send);
+    RW(player->attack.target, send);
+    RW(player->attack.refid, send);
+    RW(player->attack.type, send);
+    RW(player->attack.success, send);
+    RW(player->attack.damage, send);
+    //
+    RW(player->attack.pressed, send);
+    RW(player->attack.knockdown, send);
+    RW(player->attack.block, send);
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerAttack.hpp b/components/openmw-mp/Packets/Player/PacketPlayerAttack.hpp
new file mode 100644
index 000000000..8c79bd875
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerAttack.hpp
@@ -0,0 +1,22 @@
+//
+// Created by koncord on 13.01.16.
+//
+
+#ifndef OPENMW_PACKETPLAYERATTACK_HPP
+#define OPENMW_PACKETPLAYERATTACK_HPP
+
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerAttack : public PlayerPacket
+    {
+    public:
+        PacketPlayerAttack(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETPLAYERATTACK_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerAttribute.cpp b/components/openmw-mp/Packets/Player/PacketPlayerAttribute.cpp
new file mode 100644
index 000000000..598298f56
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerAttribute.cpp
@@ -0,0 +1,21 @@
+//
+// Created by koncord on 08.03.16.
+//
+
+#include "PacketPlayerAttribute.hpp"
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+using namespace mwmp;
+
+PacketPlayerAttribute::PacketPlayerAttribute(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_ATTRIBUTE;
+}
+
+void PacketPlayerAttribute::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    for (int i = 0; i < AttributeCount; ++i)
+        RW(player->creatureStats.mAttributes[i], send);
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerAttribute.hpp b/components/openmw-mp/Packets/Player/PacketPlayerAttribute.hpp
new file mode 100644
index 000000000..e603320e6
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerAttribute.hpp
@@ -0,0 +1,22 @@
+//
+// Created by koncord on 08.03.16.
+//
+
+#ifndef OPENMW_PACKETPLAYERATTRIBUTE_HPP
+#define OPENMW_PACKETPLAYERATTRIBUTE_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerAttribute : public PlayerPacket
+    {
+    public:
+        const static int AttributeCount = 8;
+        PacketPlayerAttribute(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETPLAYERATTRIBUTE_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.cpp b/components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.cpp
new file mode 100644
index 000000000..ee0e6d5f4
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.cpp
@@ -0,0 +1,28 @@
+//
+// Created by koncord on 07.01.16.
+//
+
+#include "PacketPlayerBaseInfo.hpp"
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+using namespace mwmp;
+
+PacketPlayerBaseInfo::PacketPlayerBaseInfo(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_BASEINFO;
+}
+
+void PacketPlayerBaseInfo::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    RW(player->npc.mName, send);
+    RW(player->npc.mModel, send);
+    RW(player->npc.mRace, send);
+    RW(player->npc.mHair, send);
+    RW(player->npc.mHead, send);
+
+    RW(player->npc.mFlags, send);
+
+    RW(player->birthsign, send);
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.hpp b/components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.hpp
new file mode 100644
index 000000000..765607490
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.hpp
@@ -0,0 +1,21 @@
+//
+// Created by koncord on 07.01.16.
+//
+
+#ifndef OPENMW_PACKETPLAYERBASEINFO_HPP
+#define OPENMW_PACKETPLAYERBASEINFO_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerBaseInfo : public PlayerPacket
+    {
+    public:
+        PacketPlayerBaseInfo(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETPLAYERBASEINFO_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCellChange.cpp b/components/openmw-mp/Packets/Player/PacketPlayerCellChange.cpp
new file mode 100644
index 000000000..c0c5e7fb7
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerCellChange.cpp
@@ -0,0 +1,24 @@
+//
+// Created by koncord on 15.01.16.
+//
+
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketPlayerCellChange.hpp"
+
+
+mwmp::PacketPlayerCellChange::PacketPlayerCellChange(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_CELL_CHANGE;
+    priority = IMMEDIATE_PRIORITY;
+    reliability = RELIABLE_ORDERED;
+}
+
+void mwmp::PacketPlayerCellChange::Packet(RakNet::BitStream *bs, mwmp::BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    RW(player->cell.mData.mFlags, send);
+    RW(player->cell.mData.mX, send);
+    RW(player->cell.mData.mY, send);
+    RW(player->cell.mName, send);
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCellChange.hpp b/components/openmw-mp/Packets/Player/PacketPlayerCellChange.hpp
new file mode 100644
index 000000000..d0c6bda3b
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerCellChange.hpp
@@ -0,0 +1,24 @@
+//
+// Created by koncord on 15.01.16.
+//
+
+#ifndef OPENMW_PACKETPLAYERCELLCHANGE_HPP
+#define OPENMW_PACKETPLAYERCELLCHANGE_HPP
+
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerCellChange : public PlayerPacket
+    {
+    public:
+        PacketPlayerCellChange(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+
+
+#endif //OPENMW_PACKETPLAYERCELLCHANGE_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCellState.cpp b/components/openmw-mp/Packets/Player/PacketPlayerCellState.cpp
new file mode 100644
index 000000000..523fb396a
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerCellState.cpp
@@ -0,0 +1,43 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketPlayerCellState.hpp"
+
+
+mwmp::PacketPlayerCellState::PacketPlayerCellState(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_CELL_STATE;
+    priority = IMMEDIATE_PRIORITY;
+    reliability = RELIABLE_ORDERED;
+}
+
+void mwmp::PacketPlayerCellState::Packet(RakNet::BitStream *bs, mwmp::BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    if (!send)
+        player->cellStateChanges.cellStates.clear();
+    else
+        player->cellStateChanges.count = (unsigned int)(player->cellStateChanges.cellStates.size());
+
+    RW(player->cellStateChanges.count, send);
+
+    for (unsigned int i = 0; i < player->cellStateChanges.count; i++)
+    {
+        CellState cellState;
+
+        if (send)
+        {
+            cellState = player->cellStateChanges.cellStates.at(i);
+        }
+        
+        RW(cellState.type, send);
+        RW(cellState.cell.mData.mFlags, send);
+        RW(cellState.cell.mData.mX, send);
+        RW(cellState.cell.mData.mY, send);
+        RW(cellState.cell.mName, send);
+
+        if (!send)
+        {
+            player->cellStateChanges.cellStates.push_back(cellState);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCellState.hpp b/components/openmw-mp/Packets/Player/PacketPlayerCellState.hpp
new file mode 100644
index 000000000..e4c6f2984
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerCellState.hpp
@@ -0,0 +1,20 @@
+#ifndef OPENMW_PACKETPLAYERCELLSTATE_HPP
+#define OPENMW_PACKETPLAYERCELLSTATE_HPP
+
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerCellState : public PlayerPacket
+    {
+    public:
+        PacketPlayerCellState(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+
+
+#endif //OPENMW_PACKETPLAYERCELLSTATE_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCharGen.cpp b/components/openmw-mp/Packets/Player/PacketPlayerCharGen.cpp
new file mode 100644
index 000000000..ded6fac99
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerCharGen.cpp
@@ -0,0 +1,19 @@
+//
+// Created by koncord on 08.03.16.
+//
+
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketPlayerCharGen.hpp"
+
+mwmp::PacketPlayerCharGen::PacketPlayerCharGen(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_CHARGEN;
+}
+
+void mwmp::PacketPlayerCharGen::Packet(RakNet::BitStream *bs, mwmp::BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    RW(player->charGenStage, send);
+
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCharGen.hpp b/components/openmw-mp/Packets/Player/PacketPlayerCharGen.hpp
new file mode 100644
index 000000000..781f0b617
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerCharGen.hpp
@@ -0,0 +1,24 @@
+//
+// Created by koncord on 08.03.16.
+//
+
+#ifndef OPENMW_PACKETPLAYERCHARGEN_HPP
+#define OPENMW_PACKETPLAYERCHARGEN_HPP
+
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerCharGen : public PlayerPacket
+    {
+    public:
+        PacketPlayerCharGen(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+
+
+#endif //OPENMW_PACKETPLAYERCHARGEN_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerClass.cpp b/components/openmw-mp/Packets/Player/PacketPlayerClass.cpp
new file mode 100644
index 000000000..f0872ec05
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerClass.cpp
@@ -0,0 +1,24 @@
+//
+// Created by koncord on 29.08.16.
+//
+
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketPlayerClass.hpp"
+
+mwmp::PacketPlayerClass::PacketPlayerClass(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_CHARCLASS;
+}
+
+void mwmp::PacketPlayerClass::Packet(RakNet::BitStream *bs, mwmp::BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    RW(player->charClass.mId, send);
+    if (player->charClass.mId.empty()) // custom class
+    {
+        RW(player->charClass.mName, send);
+        RW(player->charClass.mDescription, send);
+        RW(player->charClass.mData, send);
+    }
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerClass.hpp b/components/openmw-mp/Packets/Player/PacketPlayerClass.hpp
new file mode 100644
index 000000000..c3161e034
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerClass.hpp
@@ -0,0 +1,23 @@
+//
+// Created by koncord on 29.08.16.
+//
+
+#ifndef OPENMW_PACKETPLAYERCLASS_HPP
+#define OPENMW_PACKETPLAYERCLASS_HPP
+
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerClass : public PlayerPacket
+    {
+    public:
+        PacketPlayerClass(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+
+#endif //OPENMW_PACKETPLAYERCLASS_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerDrawState.cpp b/components/openmw-mp/Packets/Player/PacketPlayerDrawState.cpp
new file mode 100644
index 000000000..5bcfa1d45
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerDrawState.cpp
@@ -0,0 +1,20 @@
+//
+// Created by koncord on 15.01.16.
+//
+
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketPlayerDrawState.hpp"
+
+mwmp::PacketPlayerDrawState::PacketPlayerDrawState(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_DRAWSTATE;
+}
+
+void mwmp::PacketPlayerDrawState::Packet(RakNet::BitStream *bs, mwmp::BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    RW(player->movementFlags, send);
+
+    RW(player->drawState, send);
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerDrawState.hpp b/components/openmw-mp/Packets/Player/PacketPlayerDrawState.hpp
new file mode 100644
index 000000000..50f51bbd5
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerDrawState.hpp
@@ -0,0 +1,23 @@
+//
+// Created by koncord on 15.01.16.
+//
+
+#ifndef OPENMW_PACKETPLAYERDRAWSTATE_HPP
+#define OPENMW_PACKETPLAYERDRAWSTATE_HPP
+
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerDrawState : public PlayerPacket
+    {
+    public:
+        PacketPlayerDrawState(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+
+#endif //OPENMW_PACKETPLAYERDRAWSTATE_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerDynamicStats.cpp b/components/openmw-mp/Packets/Player/PacketPlayerDynamicStats.cpp
new file mode 100644
index 000000000..4538897ae
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerDynamicStats.cpp
@@ -0,0 +1,21 @@
+//
+// Created by koncord on 13.01.16.
+//
+
+#include "PacketPlayerDynamicStats.hpp"
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+using namespace mwmp;
+
+PacketPlayerDynamicStats::PacketPlayerDynamicStats(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_DYNAMICSTATS;
+}
+
+void PacketPlayerDynamicStats::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+    RW(player->creatureStats.mDynamic[0], send); // health
+    RW(player->creatureStats.mDynamic[1], send); // magic
+    RW(player->creatureStats.mDynamic[2], send); // fatigue
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerDynamicStats.hpp b/components/openmw-mp/Packets/Player/PacketPlayerDynamicStats.hpp
new file mode 100644
index 000000000..dd511acab
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerDynamicStats.hpp
@@ -0,0 +1,22 @@
+//
+// Created by koncord on 13.01.16.
+//
+
+#ifndef OPENMW_PACKETDYNAMICSTATS_HPP
+#define OPENMW_PACKETDYNAMICSTATS_HPP
+
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerDynamicStats : public PlayerPacket
+    {
+    public:
+        PacketPlayerDynamicStats(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETDYNAMICSTATS_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp b/components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp
new file mode 100644
index 000000000..fb28a9800
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp
@@ -0,0 +1,25 @@
+//
+// Created by koncord on 07.01.16.
+//
+
+#include "PacketPlayerEquipment.hpp"
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+using namespace mwmp;
+
+PacketPlayerEquipment::PacketPlayerEquipment(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_EQUIPMENT;
+}
+
+void PacketPlayerEquipment::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    for (int i = 0; i < 19; i++)
+    {
+        RW(player->equipedItems[i].refId, send);
+        RW(player->equipedItems[i].count, send);
+        RW(player->equipedItems[i].charge, send);
+    }
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerEquipment.hpp b/components/openmw-mp/Packets/Player/PacketPlayerEquipment.hpp
new file mode 100644
index 000000000..802b5851a
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerEquipment.hpp
@@ -0,0 +1,21 @@
+//
+// Created by koncord on 07.01.16.
+//
+
+#ifndef OPENMW_PACKETPLAYEREQUIPMENT_HPP
+#define OPENMW_PACKETPLAYEREQUIPMENT_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerEquipment : public PlayerPacket
+    {
+    public:
+        PacketPlayerEquipment(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETPLAYEREQUIPMENT_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerInventory.cpp b/components/openmw-mp/Packets/Player/PacketPlayerInventory.cpp
new file mode 100644
index 000000000..65f153edc
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerInventory.cpp
@@ -0,0 +1,47 @@
+//
+// Created by koncord on 22.10.16.
+//
+
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketPlayerInventory.hpp"
+
+using namespace std;
+using namespace mwmp;
+
+PacketPlayerInventory::PacketPlayerInventory(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_INVENTORY;
+}
+
+void PacketPlayerInventory::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    RW(player->inventoryChanges.action, send);
+
+    if (!send)
+        player->inventoryChanges.items.clear();
+    else
+        player->inventoryChanges.count = (unsigned int) (player->inventoryChanges.items.size());
+
+    RW(player->inventoryChanges.count, send);
+
+    for (unsigned int i = 0; i < player->inventoryChanges.count; i++)
+    {
+        Item item;
+
+        if (send)
+        {
+            item = player->inventoryChanges.items.at(i);
+        }
+
+        RW(item.refId, send);
+        RW(item.count, send);
+        RW(item.charge, send);
+
+        if (!send)
+        {
+            player->inventoryChanges.items.push_back(item);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerInventory.hpp b/components/openmw-mp/Packets/Player/PacketPlayerInventory.hpp
new file mode 100644
index 000000000..bc7375243
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerInventory.hpp
@@ -0,0 +1,22 @@
+//
+// Created by koncord on 22.10.16.
+//
+
+#ifndef OPENMW_PACKETPLAYERINVENTORY_HPP
+#define OPENMW_PACKETPLAYERINVENTORY_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerInventory : public PlayerPacket
+    {
+    public:
+        PacketPlayerInventory(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+
+#endif //OPENMW_PACKETPLAYERINVENTORY_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerJournal.cpp b/components/openmw-mp/Packets/Player/PacketPlayerJournal.cpp
new file mode 100644
index 000000000..92394cfad
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerJournal.cpp
@@ -0,0 +1,47 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketPlayerJournal.hpp"
+
+using namespace std;
+using namespace mwmp;
+
+PacketPlayerJournal::PacketPlayerJournal(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_JOURNAL;
+}
+
+void PacketPlayerJournal::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    if (!send)
+        player->journalChanges.journalItems.clear();
+    else
+        player->journalChanges.count = (unsigned int)(player->journalChanges.journalItems.size());
+
+    RW(player->journalChanges.count, send);
+
+    for (unsigned int i = 0; i < player->journalChanges.count; i++)
+    {
+        JournalItem journalItem;
+
+        if (send)
+            journalItem = player->journalChanges.journalItems.at(i);
+
+        RW(journalItem.type, send);
+        RW(journalItem.quest, send);
+        RW(journalItem.index, send);
+
+        if (journalItem.type == JournalItem::ENTRY)
+        {
+            RW(journalItem.actorCellRef.mRefID, send);
+            RW(journalItem.actorCellRef.mRefNum.mIndex, send);
+            RW(journalItem.actorCell.mData.mFlags, send);
+            RW(journalItem.actorCell.mData.mX, send);
+            RW(journalItem.actorCell.mData.mY, send);
+            RW(journalItem.actorCell.mName, send);
+        }
+
+        if (!send)
+            player->journalChanges.journalItems.push_back(journalItem);
+    }
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerJournal.hpp b/components/openmw-mp/Packets/Player/PacketPlayerJournal.hpp
new file mode 100644
index 000000000..d28014040
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerJournal.hpp
@@ -0,0 +1,18 @@
+#ifndef OPENMW_PACKETPLAYERJOURNAL_HPP
+#define OPENMW_PACKETPLAYERJOURNAL_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerJournal : public PlayerPacket
+    {
+    public:
+        PacketPlayerJournal(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+
+#endif //OPENMW_PACKETPLAYERJOURNAL_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerLevel.cpp b/components/openmw-mp/Packets/Player/PacketPlayerLevel.cpp
new file mode 100644
index 000000000..e847f3436
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerLevel.cpp
@@ -0,0 +1,16 @@
+#include "PacketPlayerLevel.hpp"
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+using namespace mwmp;
+
+PacketPlayerLevel::PacketPlayerLevel(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_LEVEL;
+}
+
+void PacketPlayerLevel::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    RW(player->creatureStats.mLevel, send);
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerLevel.hpp b/components/openmw-mp/Packets/Player/PacketPlayerLevel.hpp
new file mode 100644
index 000000000..2dc6758eb
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerLevel.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETPLAYERLEVEL_HPP
+#define OPENMW_PACKETPLAYERLEVEL_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerLevel : public PlayerPacket
+    {
+    public:
+        PacketPlayerLevel(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETPLAYERLEVEL_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerPosition.cpp b/components/openmw-mp/Packets/Player/PacketPlayerPosition.cpp
new file mode 100644
index 000000000..25f7290fa
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerPosition.cpp
@@ -0,0 +1,24 @@
+//
+// Created by koncord on 05.01.16.
+//
+
+#include "PacketPlayerPosition.hpp"
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+using namespace std;
+using namespace mwmp;
+
+PacketPlayerPosition::PacketPlayerPosition(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_POS;
+    priority = MEDIUM_PRIORITY;
+    //reliability = UNRELIABLE_SEQUENCED;
+}
+
+void PacketPlayerPosition::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    RW(player->position, send);
+    RW(player->direction, send);
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerPosition.hpp b/components/openmw-mp/Packets/Player/PacketPlayerPosition.hpp
new file mode 100644
index 000000000..a69a4838e
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerPosition.hpp
@@ -0,0 +1,21 @@
+//
+// Created by koncord on 05.01.16.
+//
+
+#ifndef OPENMW_PACKETPLAYERPOSITION_HPP
+#define OPENMW_PACKETPLAYERPOSITION_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerPosition : public PlayerPacket
+    {
+    public:
+        PacketPlayerPosition(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETPLAYERPOSITION_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp b/components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp
new file mode 100644
index 000000000..aeaf81fb4
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp
@@ -0,0 +1,28 @@
+//
+// Created by koncord on 17.03.16.
+//
+
+#include "PacketPlayerSkill.hpp"
+
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <components/esm/creaturestats.hpp>
+
+using namespace mwmp;
+
+PacketPlayerSkill::PacketPlayerSkill(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_SKILL;
+}
+
+void PacketPlayerSkill::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    for (int i = 0; i < SkillCount; ++i)
+        RW(player->npcStats.mSkills[i], send);
+
+    for (int i = 0; i < AttributeCount; ++i)
+        RW(player->npcStats.mSkillIncrease[i], send);
+
+    RW(player->npcStats.mLevelProgress, send);
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerSkill.hpp b/components/openmw-mp/Packets/Player/PacketPlayerSkill.hpp
new file mode 100644
index 000000000..8debb7245
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerSkill.hpp
@@ -0,0 +1,26 @@
+//
+// Created by koncord on 17.03.16.
+//
+
+#ifndef OPENMW_PACKETPLAYERSKILL_HPP
+#define OPENMW_PACKETPLAYERSKILL_HPP
+
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerSkill : public PlayerPacket
+    {
+    public:
+        const static int SkillCount = 27;
+        const static int AttributeCount = 8;
+        PacketPlayerSkill(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+
+
+#endif //OPENMW_PACKETPLAYERSKILL_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.cpp b/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.cpp
new file mode 100644
index 000000000..5671542e9
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.cpp
@@ -0,0 +1,42 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketPlayerSpellbook.hpp"
+
+using namespace std;
+using namespace mwmp;
+
+PacketPlayerSpellbook::PacketPlayerSpellbook(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_PLAYER_SPELLBOOK;
+}
+
+void PacketPlayerSpellbook::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    RW(player->spellbookChanges.action, send);
+
+    if (!send)
+        player->spellbookChanges.spells.clear();
+    else
+        player->spellbookChanges.count = (unsigned int) (player->spellbookChanges.spells.size());
+
+    RW(player->spellbookChanges.count, send);
+
+    for (unsigned int i = 0; i < player->spellbookChanges.count; i++)
+    {
+        ESM::Spell spell;
+
+        if (send)
+        {
+            spell = player->spellbookChanges.spells.at(i);
+        }
+
+        RW(spell.mId, send);
+
+        if (!send)
+        {
+            player->spellbookChanges.spells.push_back(spell);
+        }
+    }
+
+}
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.hpp b/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.hpp
new file mode 100644
index 000000000..7365c88a6
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.hpp
@@ -0,0 +1,18 @@
+#ifndef OPENMW_PACKETPLAYERSPELLBOOK_HPP
+#define OPENMW_PACKETPLAYERSPELLBOOK_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerSpellbook : public PlayerPacket
+    {
+    public:
+        PacketPlayerSpellbook(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+
+#endif //OPENMW_PACKETPLAYERSPELLBOOK_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketResurrect.hpp b/components/openmw-mp/Packets/Player/PacketResurrect.hpp
new file mode 100644
index 000000000..fa7810e44
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketResurrect.hpp
@@ -0,0 +1,30 @@
+//
+// Created by koncord on 13.01.16.
+//
+
+#ifndef OPENMW_PACKETRESURRECT_HPP
+#define OPENMW_PACKETRESURRECT_HPP
+
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+namespace mwmp
+{
+    class PacketResurrect: public PlayerPacket
+    {
+    public:
+        PacketResurrect(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+        {
+            packetID = ID_GAME_RESURRECT;
+        }
+        void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+        {
+            PlayerPacket::Packet(bs, player, send);
+            RW(player->creatureStats.mDead, send);
+        }
+    };
+}
+
+
+#endif //OPENMW_PACKETRESURRECT_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketSendMyID.hpp b/components/openmw-mp/Packets/Player/PacketSendMyID.hpp
new file mode 100644
index 000000000..5e6fa802c
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketSendMyID.hpp
@@ -0,0 +1,24 @@
+//
+// Created by koncord on 12.01.16.
+//
+
+#ifndef OPENMW_PACKETSENDMYID_HPP
+#define OPENMW_PACKETSENDMYID_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+namespace mwmp
+{
+    class PacketSendMyID : public PlayerPacket
+    {
+    public:
+        PacketSendMyID(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+        {
+            packetID = ID_USER_MYID;
+        }
+    };
+}
+
+
+#endif //OPENMW_PACKETSENDMYID_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketTime.cpp b/components/openmw-mp/Packets/Player/PacketTime.cpp
new file mode 100644
index 000000000..30abc871d
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketTime.cpp
@@ -0,0 +1,22 @@
+//
+// Created by koncord on 30.08.16.
+//
+
+#include "PacketTime.hpp"
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+using namespace mwmp;
+
+PacketTime::PacketTime(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_GAME_TIME;
+}
+
+void PacketTime::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    RW(player->month, send);
+    RW(player->day, send);
+    RW(player->hour, send);
+}
diff --git a/components/openmw-mp/Packets/Player/PacketTime.hpp b/components/openmw-mp/Packets/Player/PacketTime.hpp
new file mode 100644
index 000000000..69efa442b
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketTime.hpp
@@ -0,0 +1,23 @@
+//
+// Created by koncord on 30.08.16.
+//
+
+#ifndef OPENMW_TIMEPACKET_HPP
+#define OPENMW_TIMEPACKET_HPP
+
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketTime : public PlayerPacket
+    {
+    public:
+        PacketTime(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+
+#endif //OPENMW_TIMEPACKET_HPP
diff --git a/components/openmw-mp/Packets/Player/PlayerPacket.cpp b/components/openmw-mp/Packets/Player/PlayerPacket.cpp
new file mode 100644
index 000000000..32569f02a
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PlayerPacket.cpp
@@ -0,0 +1,50 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <PacketPriority.h>
+#include <RakPeer.h>
+#include "PlayerPacket.hpp"
+
+using namespace mwmp;
+
+void PlayerPacket::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
+{
+    this->player = player;
+    this->bs = bs;
+
+    if (send)
+    {
+        bs->Write(packetID);
+        bs->Write(player->guid);
+    }
+}
+
+PlayerPacket::PlayerPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer)
+{
+    packetID = 0;
+    priority = HIGH_PRIORITY;
+    reliability = RELIABLE_ORDERED;
+    this->peer = peer;
+}
+
+PlayerPacket::~PlayerPacket()
+{
+
+}
+
+void PlayerPacket::Send(BasePlayer *player, RakNet::AddressOrGUID destination)
+{
+    bsSend->ResetWritePointer();
+    Packet(bsSend, player, true);
+    peer->Send(bsSend, priority, reliability, 0, destination, false);
+}
+
+void PlayerPacket::Send(BasePlayer *player, bool toOther)
+{
+    bsSend->ResetWritePointer();
+    Packet(bsSend, player, true);
+    peer->Send(bsSend, priority, reliability, 0, player->guid, toOther);
+}
+
+void PlayerPacket::Read(BasePlayer *player)
+{
+    Packet(bsRead, player, false);
+}
diff --git a/components/openmw-mp/Packets/Player/PlayerPacket.hpp b/components/openmw-mp/Packets/Player/PlayerPacket.hpp
new file mode 100644
index 000000000..8d573d74e
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PlayerPacket.hpp
@@ -0,0 +1,34 @@
+#ifndef OPENMW_PLAYERPACKET_HPP
+#define OPENMW_PLAYERPACKET_HPP
+
+#include <string>
+#include <RakNetTypes.h>
+#include <BitStream.h>
+#include <PacketPriority.h>
+#include <components/openmw-mp/Base/BasePlayer.hpp>
+
+#include <components/openmw-mp/Packets/BasePacket.hpp>
+
+
+namespace mwmp
+{
+    class PlayerPacket : public BasePacket
+    {
+    public:
+        PlayerPacket(RakNet::RakPeerInterface *peer);
+
+        ~PlayerPacket();
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+
+        virtual void Send(BasePlayer *player, bool toOtherPlayers = true);
+        virtual void Send(BasePlayer *player, RakNet::AddressOrGUID destination);
+        virtual void Read(BasePlayer *player);
+
+    protected:
+        BasePlayer *player;
+
+    };
+}
+
+#endif //OPENMW_PLAYERPACKET_HPP
diff --git a/components/openmw-mp/Packets/World/PacketContainer.cpp b/components/openmw-mp/Packets/World/PacketContainer.cpp
new file mode 100644
index 000000000..74a273a43
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketContainer.cpp
@@ -0,0 +1,76 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketContainer.hpp"
+
+using namespace mwmp;
+
+PacketContainer::PacketContainer(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_CONTAINER;
+}
+
+void PacketContainer::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    RW(event->action, send);
+
+    if (send)
+    {
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+    }
+    else
+    {
+        event->objectChanges.objects.clear();
+    }
+
+    RW(event->objectChanges.count, send);
+
+    RW(event->cell.mData.mFlags, send);
+    RW(event->cell.mData.mX, send);
+    RW(event->cell.mData.mY, send);
+    RW(event->cell.mName, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+            worldObject.containerChanges.count = (unsigned int)(worldObject.containerChanges.items.size());
+        }
+        else
+        {
+            worldObject.containerChanges.items.clear();
+        }
+
+        RW(worldObject.refId, send);
+        RW(worldObject.refNumIndex, send);
+        RW(worldObject.containerChanges.count, send);
+
+        ContainerItem containerItem;
+
+        for (unsigned int i = 0; i < worldObject.containerChanges.count; i++)
+        {
+            if (send)
+            {
+                containerItem = worldObject.containerChanges.items.at(i);
+            }
+
+            RW(containerItem.refId, send);
+            RW(containerItem.count, send);
+            RW(containerItem.charge, send);
+            RW(containerItem.actionCount, send);
+
+            if (!send)
+            {
+                worldObject.containerChanges.items.push_back(containerItem);
+            }
+        }
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketContainer.hpp b/components/openmw-mp/Packets/World/PacketContainer.hpp
new file mode 100644
index 000000000..c1fcb6d89
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketContainer.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETCONTAINER_HPP
+#define OPENMW_PACKETCONTAINER_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketContainer : public WorldPacket
+    {
+    public:
+        PacketContainer(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETCONTAINER_HPP
diff --git a/components/openmw-mp/Packets/World/PacketDoorState.cpp b/components/openmw-mp/Packets/World/PacketDoorState.cpp
new file mode 100644
index 000000000..0df9cdcad
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketDoorState.cpp
@@ -0,0 +1,45 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketDoorState.hpp"
+
+using namespace mwmp;
+
+PacketDoorState::PacketDoorState(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_DOOR_STATE;
+}
+
+void PacketDoorState::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    RW(event->cell.mData.mFlags, send);
+    RW(event->cell.mData.mX, send);
+    RW(event->cell.mData.mY, send);
+    RW(event->cell.mName, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.refId, send);
+        RW(worldObject.refNumIndex, send);
+        RW(worldObject.doorState, send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketDoorState.hpp b/components/openmw-mp/Packets/World/PacketDoorState.hpp
new file mode 100644
index 000000000..130bbe1e3
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketDoorState.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETDOORSTATE_HPP
+#define OPENMW_PACKETDOORSTATE_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketDoorState : public WorldPacket
+    {
+    public:
+        PacketDoorState(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETDOORSTATE_HPP
diff --git a/components/openmw-mp/Packets/World/PacketMusicPlay.cpp b/components/openmw-mp/Packets/World/PacketMusicPlay.cpp
new file mode 100644
index 000000000..ef9f45962
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketMusicPlay.cpp
@@ -0,0 +1,38 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketMusicPlay.hpp"
+
+using namespace mwmp;
+
+PacketMusicPlay::PacketMusicPlay(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_MUSIC_PLAY;
+}
+
+void PacketMusicPlay::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.filename, send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketMusicPlay.hpp b/components/openmw-mp/Packets/World/PacketMusicPlay.hpp
new file mode 100644
index 000000000..69cb9635a
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketMusicPlay.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETMUSICPLAY_HPP
+#define OPENMW_PACKETMUSICPLAY_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketMusicPlay : public WorldPacket
+    {
+    public:
+        PacketMusicPlay(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETMUSICPLAY_HPP
diff --git a/components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp b/components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp
new file mode 100644
index 000000000..dfc1eca31
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp
@@ -0,0 +1,46 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketObjectAnimPlay.hpp"
+
+using namespace mwmp;
+
+PacketObjectAnimPlay::PacketObjectAnimPlay(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_OBJECT_ANIM_PLAY;
+}
+
+void PacketObjectAnimPlay::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    RW(event->cell.mData.mFlags, send);
+    RW(event->cell.mData.mX, send);
+    RW(event->cell.mData.mY, send);
+    RW(event->cell.mName, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.refId, send);
+        RW(worldObject.refNumIndex, send);
+        RW(worldObject.animGroup, send);
+        RW(worldObject.animMode, send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketObjectAnimPlay.hpp b/components/openmw-mp/Packets/World/PacketObjectAnimPlay.hpp
new file mode 100644
index 000000000..b22a87e79
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectAnimPlay.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETOBJECTANIMPLAY_HPP
+#define OPENMW_PACKETOBJECTANIMPLAY_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketObjectAnimPlay : public WorldPacket
+    {
+    public:
+        PacketObjectAnimPlay(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETOBJECTANIMPLAY_HPP
diff --git a/components/openmw-mp/Packets/World/PacketObjectDelete.cpp b/components/openmw-mp/Packets/World/PacketObjectDelete.cpp
new file mode 100644
index 000000000..ea0810177
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectDelete.cpp
@@ -0,0 +1,44 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketObjectDelete.hpp"
+
+using namespace mwmp;
+
+PacketObjectDelete::PacketObjectDelete(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_OBJECT_DELETE;
+}
+
+void PacketObjectDelete::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    RW(event->cell.mData.mFlags, send);
+    RW(event->cell.mData.mX, send);
+    RW(event->cell.mData.mY, send);
+    RW(event->cell.mName, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.refId, send);
+        RW(worldObject.refNumIndex, send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketObjectDelete.hpp b/components/openmw-mp/Packets/World/PacketObjectDelete.hpp
new file mode 100644
index 000000000..3f125244b
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectDelete.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETOBJECTDELETE_HPP
+#define OPENMW_PACKETOBJECTDELETE_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketObjectDelete : public WorldPacket
+    {
+    public:
+        PacketObjectDelete(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETOBJECTDELETE_HPP
diff --git a/components/openmw-mp/Packets/World/PacketObjectLock.cpp b/components/openmw-mp/Packets/World/PacketObjectLock.cpp
new file mode 100644
index 000000000..fc15ab531
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectLock.cpp
@@ -0,0 +1,45 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketObjectLock.hpp"
+
+using namespace mwmp;
+
+PacketObjectLock::PacketObjectLock(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_OBJECT_LOCK;
+}
+
+void PacketObjectLock::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    RW(event->cell.mData.mFlags, send);
+    RW(event->cell.mData.mX, send);
+    RW(event->cell.mData.mY, send);
+    RW(event->cell.mName, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.refId, send);
+        RW(worldObject.refNumIndex, send);
+        RW(worldObject.lockLevel, send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketObjectLock.hpp b/components/openmw-mp/Packets/World/PacketObjectLock.hpp
new file mode 100644
index 000000000..f65d27df1
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectLock.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETOBJECTLOCK_HPP
+#define OPENMW_PACKETOBJECTLOCK_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketObjectLock : public WorldPacket
+    {
+    public:
+        PacketObjectLock(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETOBJECTLOCK_HPP
diff --git a/components/openmw-mp/Packets/World/PacketObjectMove.cpp b/components/openmw-mp/Packets/World/PacketObjectMove.cpp
new file mode 100644
index 000000000..4d2e6d293
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectMove.cpp
@@ -0,0 +1,47 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketObjectMove.hpp"
+
+using namespace mwmp;
+
+PacketObjectMove::PacketObjectMove(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_OBJECT_MOVE;
+}
+
+void PacketObjectMove::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    RW(event->cell.mData.mFlags, send);
+    RW(event->cell.mData.mX, send);
+    RW(event->cell.mData.mY, send);
+    RW(event->cell.mName, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.refId, send);
+        RW(worldObject.refNumIndex, send);
+        RW(worldObject.pos.pos[0], send);
+        RW(worldObject.pos.pos[1], send);
+        RW(worldObject.pos.pos[2], send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketObjectMove.hpp b/components/openmw-mp/Packets/World/PacketObjectMove.hpp
new file mode 100644
index 000000000..9ebea8ff1
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectMove.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PacketObjectMove_HPP
+#define OPENMW_PacketObjectMove_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketObjectMove : public WorldPacket
+    {
+    public:
+        PacketObjectMove(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PacketObjectMove_HPP
diff --git a/components/openmw-mp/Packets/World/PacketObjectPlace.cpp b/components/openmw-mp/Packets/World/PacketObjectPlace.cpp
new file mode 100644
index 000000000..feb13e245
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectPlace.cpp
@@ -0,0 +1,48 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketObjectPlace.hpp"
+
+using namespace mwmp;
+
+PacketObjectPlace::PacketObjectPlace(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_OBJECT_PLACE;
+}
+
+void PacketObjectPlace::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    RW(event->cell.mData.mFlags, send);
+    RW(event->cell.mData.mX, send);
+    RW(event->cell.mData.mY, send);
+    RW(event->cell.mName, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.refId, send);
+        RW(worldObject.refNumIndex, send);
+        RW(worldObject.count, send);
+        RW(worldObject.charge, send);
+        RW(worldObject.goldValue, send);
+        RW(worldObject.pos, send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketObjectPlace.hpp b/components/openmw-mp/Packets/World/PacketObjectPlace.hpp
new file mode 100644
index 000000000..fb0d9f740
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectPlace.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETOBJECTPLACE_HPP
+#define OPENMW_PACKETOBJECTPLACE_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketObjectPlace : public WorldPacket
+    {
+    public:
+        PacketObjectPlace(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETOBJECTPLACE_HPP
diff --git a/components/openmw-mp/Packets/World/PacketObjectRotate.cpp b/components/openmw-mp/Packets/World/PacketObjectRotate.cpp
new file mode 100644
index 000000000..49d20d16c
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectRotate.cpp
@@ -0,0 +1,47 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketObjectRotate.hpp"
+
+using namespace mwmp;
+
+PacketObjectRotate::PacketObjectRotate(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_OBJECT_ROTATE;
+}
+
+void PacketObjectRotate::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    RW(event->cell.mData.mFlags, send);
+    RW(event->cell.mData.mX, send);
+    RW(event->cell.mData.mY, send);
+    RW(event->cell.mName, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.refId, send);
+        RW(worldObject.refNumIndex, send);
+        RW(worldObject.pos.rot[0], send);
+        RW(worldObject.pos.rot[1], send);
+        RW(worldObject.pos.rot[2], send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketObjectRotate.hpp b/components/openmw-mp/Packets/World/PacketObjectRotate.hpp
new file mode 100644
index 000000000..601f6039e
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectRotate.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETOBJECTROTATE_HPP
+#define OPENMW_PACKETOBJECTROTATE_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketObjectRotate : public WorldPacket
+    {
+    public:
+        PacketObjectRotate(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETOBJECTROTATE_HPP
diff --git a/components/openmw-mp/Packets/World/PacketObjectScale.cpp b/components/openmw-mp/Packets/World/PacketObjectScale.cpp
new file mode 100644
index 000000000..314a650f2
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectScale.cpp
@@ -0,0 +1,45 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketObjectScale.hpp"
+
+using namespace mwmp;
+
+PacketObjectScale::PacketObjectScale(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_OBJECT_SCALE;
+}
+
+void PacketObjectScale::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    RW(event->cell.mData.mFlags, send);
+    RW(event->cell.mData.mX, send);
+    RW(event->cell.mData.mY, send);
+    RW(event->cell.mName, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.refId, send);
+        RW(worldObject.refNumIndex, send);
+        RW(worldObject.scale, send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketObjectScale.hpp b/components/openmw-mp/Packets/World/PacketObjectScale.hpp
new file mode 100644
index 000000000..5991ada9f
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectScale.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETOBJECTSCALE_HPP
+#define OPENMW_PACKETOBJECTSCALE_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketObjectScale : public WorldPacket
+    {
+    public:
+        PacketObjectScale(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETOBJECTSCALE_HPP
diff --git a/components/openmw-mp/Packets/World/PacketObjectUnlock.cpp b/components/openmw-mp/Packets/World/PacketObjectUnlock.cpp
new file mode 100644
index 000000000..ff9436e35
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectUnlock.cpp
@@ -0,0 +1,44 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketObjectUnlock.hpp"
+
+using namespace mwmp;
+
+PacketObjectUnlock::PacketObjectUnlock(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_OBJECT_UNLOCK;
+}
+
+void PacketObjectUnlock::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    RW(event->cell.mData.mFlags, send);
+    RW(event->cell.mData.mX, send);
+    RW(event->cell.mData.mY, send);
+    RW(event->cell.mName, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.refId, send);
+        RW(worldObject.refNumIndex, send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketObjectUnlock.hpp b/components/openmw-mp/Packets/World/PacketObjectUnlock.hpp
new file mode 100644
index 000000000..1b4d4a7e0
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketObjectUnlock.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETOBJECTUNLOCK_HPP
+#define OPENMW_PACKETOBJECTUNLOCK_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketObjectUnlock : public WorldPacket
+    {
+    public:
+        PacketObjectUnlock(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETOBJECTUNLOCK_HPP
diff --git a/components/openmw-mp/Packets/World/PacketScriptGlobalShort.cpp b/components/openmw-mp/Packets/World/PacketScriptGlobalShort.cpp
new file mode 100644
index 000000000..5e3fbe301
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketScriptGlobalShort.cpp
@@ -0,0 +1,39 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketScriptGlobalShort.hpp"
+
+using namespace mwmp;
+
+PacketScriptGlobalShort::PacketScriptGlobalShort(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_SCRIPT_GLOBAL_SHORT;
+}
+
+void PacketScriptGlobalShort::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.varName, send);
+        RW(worldObject.shortVal, send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketScriptGlobalShort.hpp b/components/openmw-mp/Packets/World/PacketScriptGlobalShort.hpp
new file mode 100644
index 000000000..d0738c7cc
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketScriptGlobalShort.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETSCRIPTGLOBALSHORT_HPP
+#define OPENMW_PACKETSCRIPTGLOBALSHORT_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketScriptGlobalShort : public WorldPacket
+    {
+    public:
+        PacketScriptGlobalShort(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETSCRIPTGLOBALSHORT_HPP
diff --git a/components/openmw-mp/Packets/World/PacketScriptLocalFloat.cpp b/components/openmw-mp/Packets/World/PacketScriptLocalFloat.cpp
new file mode 100644
index 000000000..d72191dbb
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketScriptLocalFloat.cpp
@@ -0,0 +1,46 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketScriptLocalFloat.hpp"
+
+using namespace mwmp;
+
+PacketScriptLocalFloat::PacketScriptLocalFloat(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_SCRIPT_LOCAL_FLOAT;
+}
+
+void PacketScriptLocalFloat::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    RW(event->cell.mData.mFlags, send);
+    RW(event->cell.mData.mX, send);
+    RW(event->cell.mData.mY, send);
+    RW(event->cell.mName, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.refId, send);
+        RW(worldObject.refNumIndex, send);
+        RW(worldObject.index, send);
+        RW(worldObject.floatVal, send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketScriptLocalFloat.hpp b/components/openmw-mp/Packets/World/PacketScriptLocalFloat.hpp
new file mode 100644
index 000000000..8599609a4
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketScriptLocalFloat.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETSCRIPTLOCALFLOAT_HPP
+#define OPENMW_PACKETSCRIPTLOCALFLOAT_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketScriptLocalFloat : public WorldPacket
+    {
+    public:
+        PacketScriptLocalFloat(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETSCRIPTLOCALFLOAT_HPP
diff --git a/components/openmw-mp/Packets/World/PacketScriptLocalShort.cpp b/components/openmw-mp/Packets/World/PacketScriptLocalShort.cpp
new file mode 100644
index 000000000..441a190b4
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketScriptLocalShort.cpp
@@ -0,0 +1,46 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketScriptLocalShort.hpp"
+
+using namespace mwmp;
+
+PacketScriptLocalShort::PacketScriptLocalShort(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_SCRIPT_LOCAL_SHORT;
+}
+
+void PacketScriptLocalShort::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    RW(event->cell.mData.mFlags, send);
+    RW(event->cell.mData.mX, send);
+    RW(event->cell.mData.mY, send);
+    RW(event->cell.mName, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.refId, send);
+        RW(worldObject.refNumIndex, send);
+        RW(worldObject.index, send);
+        RW(worldObject.shortVal, send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketScriptLocalShort.hpp b/components/openmw-mp/Packets/World/PacketScriptLocalShort.hpp
new file mode 100644
index 000000000..cadb9b312
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketScriptLocalShort.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETSCRIPTLOCALSHORT_HPP
+#define OPENMW_PACKETSCRIPTLOCALSHORT_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketScriptLocalShort : public WorldPacket
+    {
+    public:
+        PacketScriptLocalShort(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETSCRIPTLOCALSHORT_HPP
diff --git a/components/openmw-mp/Packets/World/PacketScriptMemberShort.cpp b/components/openmw-mp/Packets/World/PacketScriptMemberShort.cpp
new file mode 100644
index 000000000..0cefc843a
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketScriptMemberShort.cpp
@@ -0,0 +1,40 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketScriptMemberShort.hpp"
+
+using namespace mwmp;
+
+PacketScriptMemberShort::PacketScriptMemberShort(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_SCRIPT_MEMBER_SHORT;
+}
+
+void PacketScriptMemberShort::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.refId, send);
+        RW(worldObject.index, send);
+        RW(worldObject.shortVal, send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketScriptMemberShort.hpp b/components/openmw-mp/Packets/World/PacketScriptMemberShort.hpp
new file mode 100644
index 000000000..e95b0ddce
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketScriptMemberShort.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETSCRIPTMEMBERSHORT_HPP
+#define OPENMW_PACKETSCRIPTMEMBERSHORT_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketScriptMemberShort : public WorldPacket
+    {
+    public:
+        PacketScriptMemberShort(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETSCRIPTMEMBERSHORT_HPP
diff --git a/components/openmw-mp/Packets/World/PacketVideoPlay.cpp b/components/openmw-mp/Packets/World/PacketVideoPlay.cpp
new file mode 100644
index 000000000..f2d9bf3d8
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketVideoPlay.cpp
@@ -0,0 +1,39 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketVideoPlay.hpp"
+
+using namespace mwmp;
+
+PacketVideoPlay::PacketVideoPlay(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_VIDEO_PLAY;
+}
+
+void PacketVideoPlay::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+
+    if (!send)
+        event->objectChanges.objects.clear();
+    else
+        event->objectChanges.count = (unsigned int)(event->objectChanges.objects.size());
+
+    RW(event->objectChanges.count, send);
+
+    WorldObject worldObject;
+
+    for (unsigned int i = 0; i < event->objectChanges.count; i++)
+    {
+        if (send)
+        {
+            worldObject = event->objectChanges.objects.at(i);
+        }
+
+        RW(worldObject.filename, send);
+        RW(worldObject.allowSkipping, send);
+
+        if (!send)
+        {
+            event->objectChanges.objects.push_back(worldObject);
+        }
+    }
+}
diff --git a/components/openmw-mp/Packets/World/PacketVideoPlay.hpp b/components/openmw-mp/Packets/World/PacketVideoPlay.hpp
new file mode 100644
index 000000000..bff4c6070
--- /dev/null
+++ b/components/openmw-mp/Packets/World/PacketVideoPlay.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETVIDEOPLAY_HPP
+#define OPENMW_PACKETVIDEOPLAY_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketVideoPlay : public WorldPacket
+    {
+    public:
+        PacketVideoPlay(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETVIDEOPLAY_HPP
diff --git a/components/openmw-mp/Packets/World/WorldPacket.cpp b/components/openmw-mp/Packets/World/WorldPacket.cpp
new file mode 100644
index 000000000..051b41d7d
--- /dev/null
+++ b/components/openmw-mp/Packets/World/WorldPacket.cpp
@@ -0,0 +1,50 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <PacketPriority.h>
+#include <RakPeer.h>
+#include "WorldPacket.hpp"
+
+using namespace mwmp;
+
+void WorldPacket::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
+{
+    this->event = event;
+    this->bs = bs;
+
+    if (send)
+    {
+        bs->Write(packetID);
+        bs->Write(event->guid);
+    }
+}
+
+WorldPacket::WorldPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer)
+{
+    packetID = 0;
+    priority = HIGH_PRIORITY;
+    reliability = RELIABLE_ORDERED;
+    this->peer = peer;
+}
+
+WorldPacket::~WorldPacket()
+{
+
+}
+
+void WorldPacket::Send(BaseEvent *event, RakNet::AddressOrGUID destination)
+{
+    bsSend->ResetWritePointer();
+    Packet(bsSend, event, true);
+    peer->Send(bsSend, priority, reliability, 0, destination, false);
+}
+
+void WorldPacket::Send(BaseEvent *event, bool toOther)
+{
+    bsSend->ResetWritePointer();
+    Packet(bsSend, event, true);
+    peer->Send(bsSend, priority, reliability, 0, event->guid, toOther);
+}
+
+void WorldPacket::Read(BaseEvent *event)
+{
+    Packet(bsRead, event, false);
+}
diff --git a/components/openmw-mp/Packets/World/WorldPacket.hpp b/components/openmw-mp/Packets/World/WorldPacket.hpp
new file mode 100644
index 000000000..71b6a3e37
--- /dev/null
+++ b/components/openmw-mp/Packets/World/WorldPacket.hpp
@@ -0,0 +1,34 @@
+#ifndef OPENMW_WORLDPACKET_HPP
+#define OPENMW_WORLDPACKET_HPP
+
+#include <string>
+#include <RakNetTypes.h>
+#include <BitStream.h>
+#include <PacketPriority.h>
+#include <components/openmw-mp/Base/BaseEvent.hpp>
+
+#include <components/openmw-mp/Packets/BasePacket.hpp>
+
+
+namespace mwmp
+{
+    class WorldPacket : public BasePacket
+    {
+    public:
+        WorldPacket(RakNet::RakPeerInterface *peer);
+
+        ~WorldPacket();
+
+        virtual void Packet(RakNet::BitStream *bs, BaseEvent *event, bool send);
+
+        virtual void Send(BaseEvent *event, bool toOtherPlayers = true);
+        virtual void Send(BaseEvent *event, RakNet::AddressOrGUID destination);
+        virtual void Read(BaseEvent *event);
+
+    protected:
+        BaseEvent *event;
+
+    };
+}
+
+#endif //OPENMW_WORLDPACKET_HPP
diff --git a/components/openmw-mp/Version.hpp b/components/openmw-mp/Version.hpp
new file mode 100644
index 000000000..e87958f65
--- /dev/null
+++ b/components/openmw-mp/Version.hpp
@@ -0,0 +1,13 @@
+//
+// Created by koncord on 27.08.16.
+//
+
+#ifndef OPENMW_VERSION_HPP
+#define OPENMW_VERSION_HPP
+
+#define TES3MP_VERSION "0.5.1"
+#define TES3MP_PROTO_VERSION 6
+
+#define TES3MP_DEFAULT_PASSW "SuperPassword"
+
+#endif //OPENMW_VERSION_HPP
diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index 6855429c3..dbdbf0c6e 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -65,21 +65,7 @@ btCollisionShape* BulletShape::duplicateCollisionShape(const btCollisionShape *s
 
     if(const btBvhTriangleMeshShape* trishape = dynamic_cast<const btBvhTriangleMeshShape*>(shape))
     {
-#if BT_BULLET_VERSION >= 283
         btScaledBvhTriangleMeshShape* newShape = new btScaledBvhTriangleMeshShape(const_cast<btBvhTriangleMeshShape*>(trishape), btVector3(1.f, 1.f, 1.f));
-#else
-        // work around btScaledBvhTriangleMeshShape bug ( https://code.google.com/p/bullet/issues/detail?id=371 ) in older bullet versions
-        const btTriangleMesh* oldMesh = static_cast<const btTriangleMesh*>(trishape->getMeshInterface());
-        btTriangleMesh* newMesh = new btTriangleMesh(*oldMesh);
-
-        // Do not build a new bvh (not needed, since it's the same as the original shape's bvh)
-        btOptimizedBvh* bvh = const_cast<btBvhTriangleMeshShape*>(trishape)->getOptimizedBvh();
-        TriangleMeshShape* newShape = new TriangleMeshShape(newMesh, true, bvh == NULL);
-        // Set original shape's bvh via pointer
-        // The pointer is safe because the BulletShapeInstance keeps a ref_ptr to the original BulletShape
-        if (bvh)
-            newShape->setOptimizedBvh(bvh);
-#endif
         return newShape;
     }
 
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index 111808e6e..18c37d97b 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -1,8 +1,9 @@
 #include "bulletshapemanager.hpp"
 
 #include <osg/NodeVisitor>
-#include <osg/Geode>
 #include <osg/TriangleFunctor>
+#include <osg/Transform>
+#include <osg/Drawable>
 
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
 
@@ -62,12 +63,6 @@ public:
 
     }
 
-    virtual void apply(osg::Geode& geode)
-    {
-        for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
-            apply(*geode.getDrawable(i));
-    }
-
     virtual void apply(osg::Drawable &drawable)
     {
         if (!mTriangleMesh)
@@ -190,4 +185,10 @@ void BulletShapeManager::updateCache(double referenceTime)
     mInstanceCache->removeUnreferencedObjectsInCache();
 }
 
+void BulletShapeManager::reportStats(unsigned int frameNumber, osg::Stats *stats)
+{
+    stats->setAttribute(frameNumber, "Shape", mCache->getCacheSize());
+    stats->setAttribute(frameNumber, "Shape Instance", mInstanceCache->getCacheSize());
+}
+
 }
diff --git a/components/resource/bulletshapemanager.hpp b/components/resource/bulletshapemanager.hpp
index 14b26962b..e6dba001c 100644
--- a/components/resource/bulletshapemanager.hpp
+++ b/components/resource/bulletshapemanager.hpp
@@ -42,6 +42,8 @@ namespace Resource
         /// @see ResourceManager::updateCache
         virtual void updateCache(double referenceTime);
 
+        void reportStats(unsigned int frameNumber, osg::Stats *stats);
+
     private:
         osg::ref_ptr<BulletShapeInstance> createInstance(const std::string& name);
 
diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
index 79da7d7ab..2e1422cf6 100644
--- a/components/resource/imagemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -2,7 +2,6 @@
 
 #include <osgDB/Registry>
 #include <osg/GLExtensions>
-#include <osg/Version>
 
 #include <components/vfs/manager.hpp>
 
@@ -14,6 +13,9 @@ USE_OSGPLUGIN(png)
 USE_OSGPLUGIN(tga)
 USE_OSGPLUGIN(dds)
 USE_OSGPLUGIN(jpeg)
+USE_OSGPLUGIN(bmp)
+USE_OSGPLUGIN(osg)
+USE_SERIALIZER_WRAPPER_LIBRARY(osg)
 #endif
 
 namespace
@@ -62,17 +64,10 @@ namespace Resource
             case(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT):
             case(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT):
             {
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
                 osg::GLExtensions* exts = osg::GLExtensions::Get(0, false);
                 if (exts && !exts->isTextureCompressionS3TCSupported
                         // This one works too. Should it be included in isTextureCompressionS3TCSupported()? Submitted as a patch to OSG.
                         && !osg::isGLExtensionSupported(0, "GL_S3_s3tc"))
-#else
-                osg::Texture::Extensions* exts = osg::Texture::getExtensions(0, false);
-                if (exts && !exts->isTextureCompressionS3TCSupported()
-                        // This one works too. Should it be included in isTextureCompressionS3TCSupported()? Submitted as a patch to OSG.
-                        && !osg::isGLExtensionSupported(0, "GL_S3_s3tc"))
-#endif
                 {
                     std::cerr << "Error loading " << filename << ": no S3TC texture compression support installed" << std::endl;
                     return false;
@@ -129,6 +124,7 @@ namespace Resource
             }
 
             osg::Image* image = result.getImage();
+            image->setFileName(normalized);
             if (!checkSupported(image, filename))
             {
                 mCache->addEntryToObjectCache(normalized, mWarningImage);
@@ -145,4 +141,9 @@ namespace Resource
         return mWarningImage;
     }
 
+    void ImageManager::reportStats(unsigned int frameNumber, osg::Stats *stats)
+    {
+        stats->setAttribute(frameNumber, "Image", mCache->getCacheSize());
+    }
+
 }
diff --git a/components/resource/imagemanager.hpp b/components/resource/imagemanager.hpp
index 8d9ad2c32..2c7a61828 100644
--- a/components/resource/imagemanager.hpp
+++ b/components/resource/imagemanager.hpp
@@ -10,11 +10,6 @@
 
 #include "resourcemanager.hpp"
 
-namespace osgViewer
-{
-    class Viewer;
-}
-
 namespace osgDB
 {
     class Options;
@@ -37,6 +32,8 @@ namespace Resource
 
         osg::Image* getWarningImage();
 
+        void reportStats(unsigned int frameNumber, osg::Stats* stats);
+
     private:
         osg::ref_ptr<osg::Image> mWarningImage;
         osg::ref_ptr<osgDB::Options> mOptions;
diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 4392f84c1..699fdfdd6 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -1,7 +1,6 @@
 #include "keyframemanager.hpp"
 
 #include <components/vfs/manager.hpp>
-#include <components/nifosg/nifloader.hpp>
 
 #include "objectcache.hpp"
 
@@ -35,6 +34,11 @@ namespace Resource
         }
     }
 
+    void KeyframeManager::reportStats(unsigned int frameNumber, osg::Stats *stats)
+    {
+        stats->setAttribute(frameNumber, "Keyframe", mCache->getCacheSize());
+    }
+
 
 
 }
diff --git a/components/resource/keyframemanager.hpp b/components/resource/keyframemanager.hpp
index 1c2c219bb..a5c1a7818 100644
--- a/components/resource/keyframemanager.hpp
+++ b/components/resource/keyframemanager.hpp
@@ -4,12 +4,9 @@
 #include <osg/ref_ptr>
 #include <string>
 
-#include "resourcemanager.hpp"
+#include <components/nifosg/nifloader.hpp>
 
-namespace NifOsg
-{
-    class KeyframeHolder;
-}
+#include "resourcemanager.hpp"
 
 namespace Resource
 {
@@ -25,6 +22,8 @@ namespace Resource
         /// Retrieve a read-only keyframe resource by name (case-insensitive).
         /// @note Throws an exception if the resource is not found.
         osg::ref_ptr<const NifOsg::KeyframeHolder> get(const std::string& name);
+
+        void reportStats(unsigned int frameNumber, osg::Stats* stats);
     };
 
 }
diff --git a/components/resource/multiobjectcache.cpp b/components/resource/multiobjectcache.cpp
index 352715f19..fcda455cc 100644
--- a/components/resource/multiobjectcache.cpp
+++ b/components/resource/multiobjectcache.cpp
@@ -76,4 +76,10 @@ namespace Resource
         }
     }
 
+    unsigned int MultiObjectCache::getCacheSize() const
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
+        return _objectCache.size();
+    }
+
 }
diff --git a/components/resource/multiobjectcache.hpp b/components/resource/multiobjectcache.hpp
index b677100f0..a314a9e4b 100644
--- a/components/resource/multiobjectcache.hpp
+++ b/components/resource/multiobjectcache.hpp
@@ -33,12 +33,14 @@ namespace Resource
         /** call releaseGLObjects on all objects attached to the object cache.*/
         void releaseGLObjects(osg::State* state);
 
+        unsigned int getCacheSize() const;
+
     protected:
 
         typedef std::multimap<std::string, osg::ref_ptr<osg::Object> >             ObjectCacheMap;
 
         ObjectCacheMap                          _objectCache;
-        OpenThreads::Mutex                      _objectCacheMutex;
+        mutable OpenThreads::Mutex              _objectCacheMutex;
 
     };
 
diff --git a/components/resource/niffilemanager.cpp b/components/resource/niffilemanager.cpp
index 82768cc2c..5076e9d84 100644
--- a/components/resource/niffilemanager.cpp
+++ b/components/resource/niffilemanager.cpp
@@ -1,6 +1,7 @@
 #include "niffilemanager.hpp"
 
 #include <osg/Object>
+#include <osg/Stats>
 
 #include <components/vfs/manager.hpp>
 
@@ -55,4 +56,9 @@ namespace Resource
         }
     }
 
+    void NifFileManager::reportStats(unsigned int frameNumber, osg::Stats *stats)
+    {
+        stats->setAttribute(frameNumber, "Nif", mCache->getCacheSize());
+    }
+
 }
diff --git a/components/resource/niffilemanager.hpp b/components/resource/niffilemanager.hpp
index 4b43ff24b..378daabf7 100644
--- a/components/resource/niffilemanager.hpp
+++ b/components/resource/niffilemanager.hpp
@@ -22,6 +22,8 @@ namespace Resource
         /// @note For performance reasons the NifFileManager does not handle case folding, needs
         /// to be done in advance by other managers accessing the NifFileManager.
         Nif::NIFFilePtr get(const std::string& name);
+
+        void reportStats(unsigned int frameNumber, osg::Stats *stats);
     };
 
 }
diff --git a/components/resource/objectcache.cpp b/components/resource/objectcache.cpp
index a0a3cf3a5..de0fa7a40 100644
--- a/components/resource/objectcache.cpp
+++ b/components/resource/objectcache.cpp
@@ -14,6 +14,7 @@
 #include "objectcache.hpp"
 
 #include <osg/Object>
+#include <osg/Node>
 
 namespace Resource
 {
@@ -48,6 +49,18 @@ osg::ref_ptr<osg::Object> ObjectCache::getRefFromObjectCache(const std::string&
     else return 0;
 }
 
+bool ObjectCache::checkInObjectCache(const std::string &fileName, double timeStamp)
+{
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
+    ObjectCacheMap::iterator itr = _objectCache.find(fileName);
+    if (itr!=_objectCache.end())
+    {
+        itr->second.second = timeStamp;
+        return true;
+    }
+    else return false;
+}
+
 void ObjectCache::updateTimeStampOfObjectsInCacheWithExternalReferences(double referenceTime)
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
@@ -119,4 +132,28 @@ void ObjectCache::releaseGLObjects(osg::State* state)
     }
 }
 
+void ObjectCache::accept(osg::NodeVisitor &nv)
+{
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
+
+    for(ObjectCacheMap::iterator itr = _objectCache.begin();
+        itr != _objectCache.end();
+        ++itr)
+    {
+        osg::Object* object = itr->second.first.get();
+        if (object)
+        {
+            osg::Node* node = dynamic_cast<osg::Node*>(object);
+            if (node)
+                node->accept(nv);
+        }
+    }
+}
+
+unsigned int ObjectCache::getCacheSize() const
+{
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
+    return _objectCache.size();
+}
+
 }
diff --git a/components/resource/objectcache.hpp b/components/resource/objectcache.hpp
index 79ebabd5b..e1caa4123 100644
--- a/components/resource/objectcache.hpp
+++ b/components/resource/objectcache.hpp
@@ -27,6 +27,7 @@ namespace osg
 {
     class Object;
     class State;
+    class NodeVisitor;
 }
 
 namespace Resource {
@@ -63,9 +64,18 @@ class ObjectCache : public osg::Referenced
         /** Get an ref_ptr<Object> from the object cache*/
         osg::ref_ptr<osg::Object> getRefFromObjectCache(const std::string& fileName);
 
+        /** Check if an object is in the cache, and if it is, update its usage time stamp. */
+        bool checkInObjectCache(const std::string& fileName, double timeStamp);
+
         /** call releaseGLObjects on all objects attached to the object cache.*/
         void releaseGLObjects(osg::State* state);
 
+        /** call node->accept(nv); for all nodes in the objectCache. */
+        void accept(osg::NodeVisitor& nv);
+
+        /** Get the number of objects in the cache. */
+        unsigned int getCacheSize() const;
+
     protected:
 
         virtual ~ObjectCache();
@@ -74,7 +84,7 @@ class ObjectCache : public osg::Referenced
         typedef std::map<std::string, ObjectTimeStampPair >             ObjectCacheMap;
 
         ObjectCacheMap                          _objectCache;
-        OpenThreads::Mutex                      _objectCacheMutex;
+        mutable OpenThreads::Mutex              _objectCacheMutex;
 
 };
 
diff --git a/components/resource/resourcemanager.cpp b/components/resource/resourcemanager.cpp
index 0a9784e6b..d19d9cf80 100644
--- a/components/resource/resourcemanager.cpp
+++ b/components/resource/resourcemanager.cpp
@@ -13,6 +13,10 @@ namespace Resource
 
     }
 
+    ResourceManager::~ResourceManager()
+    {
+    }
+
     void ResourceManager::updateCache(double referenceTime)
     {
         mCache->updateTimeStampOfObjectsInCacheWithExternalReferences(referenceTime);
diff --git a/components/resource/resourcemanager.hpp b/components/resource/resourcemanager.hpp
index 34fce0145..f07ac6f77 100644
--- a/components/resource/resourcemanager.hpp
+++ b/components/resource/resourcemanager.hpp
@@ -8,6 +8,11 @@ namespace VFS
     class Manager;
 }
 
+namespace osg
+{
+    class Stats;
+}
+
 namespace Resource
 {
     class ObjectCache;
@@ -18,6 +23,7 @@ namespace Resource
     {
     public:
         ResourceManager(const VFS::Manager* vfs);
+        virtual ~ResourceManager();
 
         /// Clear cache entries that have not been referenced for longer than expiryDelay.
         virtual void updateCache(double referenceTime);
@@ -27,6 +33,8 @@ namespace Resource
 
         const VFS::Manager* getVFS() const;
 
+        virtual void reportStats(unsigned int frameNumber, osg::Stats* stats) {}
+
     protected:
         const VFS::Manager* mVFS;
         osg::ref_ptr<Resource::ObjectCache> mCache;
diff --git a/components/resource/resourcesystem.cpp b/components/resource/resourcesystem.cpp
index 5772f2b85..091614a10 100644
--- a/components/resource/resourcesystem.cpp
+++ b/components/resource/resourcesystem.cpp
@@ -85,4 +85,10 @@ namespace Resource
         return mVFS;
     }
 
+    void ResourceSystem::reportStats(unsigned int frameNumber, osg::Stats *stats)
+    {
+        for (std::vector<ResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)
+            (*it)->reportStats(frameNumber, stats);
+    }
+
 }
diff --git a/components/resource/resourcesystem.hpp b/components/resource/resourcesystem.hpp
index 9b933ffc4..71541ade5 100644
--- a/components/resource/resourcesystem.hpp
+++ b/components/resource/resourcesystem.hpp
@@ -9,6 +9,11 @@ namespace VFS
     class Manager;
 }
 
+namespace osg
+{
+    class Stats;
+}
+
 namespace Resource
 {
 
@@ -49,6 +54,8 @@ namespace Resource
         /// @note May be called from any thread.
         const VFS::Manager* getVFS() const;
 
+        void reportStats(unsigned int frameNumber, osg::Stats* stats);
+
     private:
         std::auto_ptr<SceneManager> mSceneManager;
         std::auto_ptr<ImageManager> mImageManager;
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 29f7076f0..85c27cbc2 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -2,28 +2,29 @@
 
 #include <iostream>
 #include <osg/Node>
-#include <osg/Geode>
 #include <osg/UserDataContainer>
-#include <osg/Version>
 
 #include <osgParticle/ParticleSystem>
-#include <osgFX/Effect>
 
 #include <osgUtil/IncrementalCompileOperation>
 
-#include <osgViewer/Viewer>
-
 #include <osgDB/SharedStateManager>
 #include <osgDB/Registry>
 
 #include <components/nifosg/nifloader.hpp>
 #include <components/nif/niffile.hpp>
 
+#include <components/misc/stringops.hpp>
+
 #include <components/vfs/manager.hpp>
 
 #include <components/sceneutil/clone.hpp>
 #include <components/sceneutil/util.hpp>
 #include <components/sceneutil/controller.hpp>
+#include <components/sceneutil/optimizer.hpp>
+
+#include <components/shader/shadervisitor.hpp>
+#include <components/shader/shadermanager.hpp>
 
 #include "imagemanager.hpp"
 #include "niffilemanager.hpp"
@@ -33,12 +34,47 @@
 namespace
 {
 
-    /// @todo Do this in updateCallback so that animations are accounted for.
-    class InitWorldSpaceParticlesVisitor : public osg::NodeVisitor
+    class InitWorldSpaceParticlesCallback : public osg::NodeCallback
+    {
+    public:
+        virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+        {
+            osgParticle::ParticleSystem* partsys = static_cast<osgParticle::ParticleSystem*>(node);
+
+            // HACK: Ignore the InverseWorldMatrix transform the particle system is attached to
+            if (partsys->getNumParents() && partsys->getParent(0)->getNumParents())
+                transformInitialParticles(partsys, partsys->getParent(0)->getParent(0));
+
+            node->removeUpdateCallback(this);
+        }
+
+        void transformInitialParticles(osgParticle::ParticleSystem* partsys, osg::Node* node)
+        {
+            osg::NodePathList nodepaths = node->getParentalNodePaths();
+            if (nodepaths.empty())
+                return;
+            osg::Matrixf worldMat = osg::computeLocalToWorld(nodepaths[0]);
+            worldMat.orthoNormalize(worldMat); // scale is already applied on the particle node
+            for (int i=0; i<partsys->numParticles(); ++i)
+            {
+                partsys->getParticle(i)->transformPositionVelocity(worldMat);
+            }
+
+            // transform initial bounds to worldspace
+            osg::BoundingSphere sphere(partsys->getInitialBound());
+            SceneUtil::transformBoundingSphere(worldMat, sphere);
+            osg::BoundingBox box;
+            box.expandBy(sphere);
+            partsys->setInitialBound(box);
+        }
+
+    };
+
+    class InitParticlesVisitor : public osg::NodeVisitor
     {
     public:
         /// @param mask The node mask to set on ParticleSystem nodes.
-        InitWorldSpaceParticlesVisitor(unsigned int mask)
+        InitParticlesVisitor(unsigned int mask)
             : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
             , mMask(mask)
         {
@@ -52,59 +88,18 @@ namespace
                     && partsys->getUserDataContainer()->getDescriptions()[0] == "worldspace");
         }
 
-        void apply(osg::Geode& geode)
-        {
-            for (unsigned int i=0;i<geode.getNumDrawables();++i)
-            {
-                if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(geode.getDrawable(i)))
-                {
-                    if (isWorldSpaceParticleSystem(partsys))
-                    {
-                        // HACK: Ignore the InverseWorldMatrix transform the geode is attached to
-                        if (geode.getNumParents() && geode.getParent(0)->getNumParents())
-                            transformInitialParticles(partsys, geode.getParent(0)->getParent(0));
-                    }
-                    geode.setNodeMask(mMask);
-                }
-            }
-        }
-
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
-        // in OSG 3.3 and up Drawables can be directly in the scene graph without a Geode decorating them.
         void apply(osg::Drawable& drw)
         {
             if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(&drw))
             {
                 if (isWorldSpaceParticleSystem(partsys))
                 {
-                    // HACK: Ignore the InverseWorldMatrix transform the particle system is attached to
-                    if (partsys->getNumParents() && partsys->getParent(0)->getNumParents())
-                        transformInitialParticles(partsys, partsys->getParent(0)->getParent(0));
+                    partsys->addUpdateCallback(new InitWorldSpaceParticlesCallback);
                 }
                 partsys->setNodeMask(mMask);
             }
         }
-#endif
-
-        void transformInitialParticles(osgParticle::ParticleSystem* partsys, osg::Node* node)
-        {
-            osg::MatrixList mats = node->getWorldMatrices();
-            if (mats.empty())
-                return;
-            osg::Matrixf worldMat = mats[0];
-            worldMat.orthoNormalize(worldMat); // scale is already applied on the particle node
-            for (int i=0; i<partsys->numParticles(); ++i)
-            {
-                partsys->getParticle(i)->transformPositionVelocity(worldMat);
-            }
 
-            // transform initial bounds to worldspace
-            osg::BoundingSphere sphere(partsys->getInitialBound());
-            SceneUtil::transformBoundingSphere(worldMat, sphere);
-            osg::BoundingBox box;
-            box.expandBy(sphere);
-            partsys->setInitialBound(box);
-        }
     private:
         unsigned int mMask;
     };
@@ -113,6 +108,20 @@ namespace
 namespace Resource
 {
 
+    class SharedStateManager : public osgDB::SharedStateManager
+    {
+    public:
+        unsigned int getNumSharedTextures() const
+        {
+            return _sharedTextureList.size();
+        }
+
+        unsigned int getNumSharedStateSets() const
+        {
+            return _sharedStateSetList.size();
+        }
+    };
+
     /// Set texture filtering settings on textures contained in a FlipController.
     class SetFilterSettingsControllerVisitor : public SceneUtil::ControllerVisitor
     {
@@ -158,67 +167,29 @@ namespace Resource
 
         virtual void apply(osg::Node& node)
         {
-            if (osgFX::Effect* effect = dynamic_cast<osgFX::Effect*>(&node))
-                apply(*effect);
-
             osg::StateSet* stateset = node.getStateSet();
             if (stateset)
-                apply(stateset);
+                applyStateSet(stateset);
 
             traverse(node);
         }
 
-        void apply(osgFX::Effect& effect)
-        {
-            for (int i =0; i<effect.getNumTechniques(); ++i)
-            {
-                osgFX::Technique* tech = effect.getTechnique(i);
-                for (int pass=0; pass<tech->getNumPasses(); ++pass)
-                {
-                    if (tech->getPassStateSet(pass))
-                        apply(tech->getPassStateSet(pass));
-                }
-            }
-        }
-
-        virtual void apply(osg::Geode& geode)
-        {
-            osg::StateSet* stateset = geode.getStateSet();
-            if (stateset)
-                apply(stateset);
-
-            for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
-            {
-                osg::Drawable* drw = geode.getDrawable(i);
-                stateset = drw->getStateSet();
-                if (stateset)
-                    apply(stateset);
-            }
-        }
-
-        void apply(osg::StateSet* stateset)
+        void applyStateSet(osg::StateSet* stateset)
         {
             const osg::StateSet::TextureAttributeList& texAttributes = stateset->getTextureAttributeList();
             for(unsigned int unit=0;unit<texAttributes.size();++unit)
             {
                 osg::StateAttribute *texture = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
                 if (texture)
-                    apply(texture);
+                    applyStateAttribute(texture);
             }
         }
 
-        void apply(osg::StateAttribute* attr)
+        void applyStateAttribute(osg::StateAttribute* attr)
         {
             osg::Texture* tex = attr->asTexture();
             if (tex)
             {
-                if (tex->getUserDataContainer())
-                {
-                    const std::vector<std::string>& descriptions = tex->getUserDataContainer()->getDescriptions();
-                    if (std::find(descriptions.begin(), descriptions.end(), "dont_override_filter") != descriptions.end())
-                        return;
-                }
-
                 tex->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
                 tex->setFilter(osg::Texture::MAG_FILTER, mMagFilter);
                 tex->setMaxAnisotropy(mMaxAnisotropy);
@@ -234,7 +205,14 @@ namespace Resource
 
     SceneManager::SceneManager(const VFS::Manager *vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
         : ResourceManager(vfs)
+        , mShaderManager(new Shader::ShaderManager)
+        , mForceShaders(false)
+        , mClampLighting(true)
+        , mForcePerPixelLighting(false)
+        , mAutoUseNormalMaps(false)
+        , mAutoUseSpecularMaps(false)
         , mInstanceCache(new MultiObjectCache)
+        , mSharedStateManager(new SharedStateManager)
         , mImageManager(imageManager)
         , mNifFileManager(nifFileManager)
         , mMinFilter(osg::Texture::LINEAR_MIPMAP_LINEAR)
@@ -245,11 +223,94 @@ namespace Resource
     {
     }
 
+    void SceneManager::setForceShaders(bool force)
+    {
+        mForceShaders = force;
+    }
+
+    bool SceneManager::getForceShaders() const
+    {
+        return mForceShaders;
+    }
+
+    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node)
+    {
+        Shader::ShaderVisitor shaderVisitor(*mShaderManager.get(), *mImageManager, "objects_vertex.glsl", "objects_fragment.glsl");
+        shaderVisitor.setForceShaders(mForceShaders);
+        shaderVisitor.setClampLighting(mClampLighting);
+        shaderVisitor.setForcePerPixelLighting(mForcePerPixelLighting);
+        shaderVisitor.setAllowedToModifyStateSets(false);
+        node->accept(shaderVisitor);
+    }
+
+    void SceneManager::setClampLighting(bool clamp)
+    {
+        mClampLighting = clamp;
+    }
+
+    bool SceneManager::getClampLighting() const
+    {
+        return mClampLighting;
+    }
+
+    void SceneManager::setForcePerPixelLighting(bool force)
+    {
+        mForcePerPixelLighting = force;
+    }
+
+    bool SceneManager::getForcePerPixelLighting() const
+    {
+        return mForcePerPixelLighting;
+    }
+
+    void SceneManager::setAutoUseNormalMaps(bool use)
+    {
+        mAutoUseNormalMaps = use;
+    }
+
+    void SceneManager::setNormalMapPattern(const std::string &pattern)
+    {
+        mNormalMapPattern = pattern;
+    }
+
+    void SceneManager::setNormalHeightMapPattern(const std::string &pattern)
+    {
+        mNormalHeightMapPattern = pattern;
+    }
+
+    void SceneManager::setAutoUseSpecularMaps(bool use)
+    {
+        mAutoUseSpecularMaps = use;
+    }
+
+    void SceneManager::setSpecularMapPattern(const std::string &pattern)
+    {
+        mSpecularMapPattern = pattern;
+    }
+
     SceneManager::~SceneManager()
     {
         // this has to be defined in the .cpp file as we can't delete incomplete types
     }
 
+    Shader::ShaderManager &SceneManager::getShaderManager()
+    {
+        return *mShaderManager.get();
+    }
+
+    void SceneManager::setShaderPath(const std::string &path)
+    {
+        mShaderManager->setShaderPath(path);
+    }
+
+    bool SceneManager::checkLoaded(const std::string &name, double timeStamp)
+    {
+        std::string normalized = name;
+        mVFS->normalizeFilename(normalized);
+
+        return mCache->checkInObjectCache(normalized, timeStamp);
+    }
+
     /// @brief Callback to read image files from the VFS.
     class ImageReadCallback : public osgDB::ReadFileCallback
     {
@@ -315,6 +376,61 @@ namespace Resource
         }
     }
 
+    class CanOptimizeCallback : public SceneUtil::Optimizer::IsOperationPermissibleForObjectCallback
+    {
+    public:
+        bool isReservedName(const std::string& name) const
+        {
+            static std::set<std::string, Misc::StringUtils::CiComp> reservedNames;
+            if (reservedNames.empty())
+            {
+                const char* reserved[] = {"Head", "Neck", "Chest", "Groin", "Right Hand", "Left Hand", "Right Wrist", "Left Wrist", "Shield Bone", "Right Forearm", "Left Forearm", "Right Upper Arm", "Left Upper Arm", "Right Foot", "Left Foot", "Right Ankle", "Left Ankle", "Right Knee", "Left Knee", "Right Upper Leg", "Left Upper Leg", "Right Clavicle", "Left Clavicle", "Weapon Bone", "Tail",
+                                         "Bip01 L Hand", "Bip01 R Hand", "Bip01 Head", "Bip01 Spine1", "Bip01 Spine2", "Bip01 L Clavicle", "Bip01 R Clavicle", "bip01", "Root Bone", "Bip01 Neck",
+                                         "BoneOffset", "AttachLight", "ArrowBone", "Camera"};
+                reservedNames = std::set<std::string, Misc::StringUtils::CiComp>(reserved, reserved + sizeof(reserved)/sizeof(reserved[0]));
+            }
+            return reservedNames.find(name) != reservedNames.end();
+        }
+
+        virtual bool isOperationPermissibleForObjectImplementation(const SceneUtil::Optimizer* optimizer, const osg::Drawable* node,unsigned int option) const
+        {
+            if (option & SceneUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS)
+            {
+                if (node->asGeometry() && node->className() == std::string("Geometry"))
+                    return true;
+                else
+                    return false; //ParticleSystem would have to convert space of all the processors, RigGeometry would have to convert bones... theoretically possible, but very complicated
+            }
+            return (option & optimizer->getPermissibleOptimizationsForObject(node))!=0;
+        }
+
+        virtual bool isOperationPermissibleForObjectImplementation(const SceneUtil::Optimizer* optimizer, const osg::Node* node,unsigned int option) const
+        {
+            if (node->getNumDescriptions()>0) return false;
+            if (node->getDataVariance() == osg::Object::DYNAMIC) return false;
+            if (isReservedName(node->getName())) return false;
+
+            return (option & optimizer->getPermissibleOptimizationsForObject(node))!=0;
+        }
+    };
+
+    bool canOptimize(const std::string& filename)
+    {
+        // xmesh.nif can not be optimized because there are keyframes added in post
+        size_t slashpos = filename.find_last_of("\\/");
+        if (slashpos != std::string::npos && slashpos+1 < filename.size())
+        {
+            std::string basename = filename.substr(slashpos+1);
+            if (!basename.empty() && basename[0] == 'x')
+                return false;
+        }
+
+        // For spell VFX, DummyXX nodes must remain intact. Not adding those to reservedNames to avoid being overly cautious - instead, decide on filename
+        if (filename.find("vfx_pattern") != std::string::npos)
+            return false;
+        return true;
+    }
+
     osg::ref_ptr<const osg::Node> SceneManager::getTemplate(const std::string &name)
     {
         std::string normalized = name;
@@ -358,11 +474,32 @@ namespace Resource
             SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor(mMinFilter, mMagFilter, mMaxAnisotropy);
             loaded->accept(setFilterSettingsControllerVisitor);
 
+            Shader::ShaderVisitor shaderVisitor(*mShaderManager.get(), *mImageManager, "objects_vertex.glsl", "objects_fragment.glsl");
+            shaderVisitor.setForceShaders(mForceShaders);
+            shaderVisitor.setClampLighting(mClampLighting);
+            shaderVisitor.setForcePerPixelLighting(mForcePerPixelLighting);
+            shaderVisitor.setAutoUseNormalMaps(mAutoUseNormalMaps);
+            shaderVisitor.setNormalMapPattern(mNormalMapPattern);
+            shaderVisitor.setNormalHeightMapPattern(mNormalHeightMapPattern);
+            shaderVisitor.setAutoUseSpecularMaps(mAutoUseSpecularMaps);
+            shaderVisitor.setSpecularMapPattern(mSpecularMapPattern);
+            loaded->accept(shaderVisitor);
+
             // share state
+            // do this before optimizing so the optimizer will be able to combine nodes more aggressively
+            // note, because StateSets will be shared at this point, StateSets can not be modified inside the optimizer
             mSharedStateMutex.lock();
-            osgDB::Registry::instance()->getOrCreateSharedStateManager()->share(loaded.get());
+            mSharedStateManager->share(loaded.get());
             mSharedStateMutex.unlock();
 
+            if (canOptimize(normalized))
+            {
+                SceneUtil::Optimizer optimizer;
+                optimizer.setIsOperationPermissibleForObjectCallback(new CanOptimizeCallback);
+
+                optimizer.optimize(loaded, SceneUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS|SceneUtil::Optimizer::REMOVE_REDUNDANT_NODES|SceneUtil::Optimizer::MERGE_GEOMETRY);
+            }
+
             if (mIncrementalCompileOperation)
                 mIncrementalCompileOperation->add(loaded);
 
@@ -381,13 +518,34 @@ namespace Resource
         return node;
     }
 
+    class TemplateRef : public osg::Object
+    {
+    public:
+        TemplateRef(const Object* object)
+            : mObject(object) {}
+        TemplateRef() {}
+        TemplateRef(const TemplateRef& copy, const osg::CopyOp&) : mObject(copy.mObject) {}
+
+        META_Object(Resource, TemplateRef)
+
+    private:
+        osg::ref_ptr<const Object> mObject;
+    };
+
     osg::ref_ptr<osg::Node> SceneManager::createInstance(const std::string& name)
     {
         osg::ref_ptr<const osg::Node> scene = getTemplate(name);
         osg::ref_ptr<osg::Node> cloned = osg::clone(scene.get(), SceneUtil::CopyOp());
 
         // add a ref to the original template, to hint to the cache that it's still being used and should be kept in cache
-        cloned->getOrCreateUserDataContainer()->addUserObject(const_cast<osg::Node*>(scene.get()));
+        cloned->getOrCreateUserDataContainer()->addUserObject(new TemplateRef(scene));
+
+        // we can skip any scene graphs without update callbacks since we know that particle emitters will have an update callback set
+        if (cloned->getNumChildrenRequiringUpdateTraversal() > 0)
+        {
+            InitParticlesVisitor visitor (mParticleSystemMask);
+            cloned->accept(visitor);
+        }
 
         return cloned;
     }
@@ -415,12 +573,12 @@ namespace Resource
     void SceneManager::attachTo(osg::Node *instance, osg::Group *parentNode) const
     {
         parentNode->addChild(instance);
-        notifyAttached(instance);
     }
 
     void SceneManager::releaseGLObjects(osg::State *state)
     {
         mCache->releaseGLObjects(state);
+        mInstanceCache->releaseGLObjects(state);
     }
 
     void SceneManager::setIncrementalCompileOperation(osgUtil::IncrementalCompileOperation *ico)
@@ -428,12 +586,6 @@ namespace Resource
         mIncrementalCompileOperation = ico;
     }
 
-    void SceneManager::notifyAttached(osg::Node *node) const
-    {
-        InitWorldSpaceParticlesVisitor visitor (mParticleSystemMask);
-        node->accept(visitor);
-    }
-
     Resource::ImageManager* SceneManager::getImageManager()
     {
         return mImageManager;
@@ -445,8 +597,7 @@ namespace Resource
     }
 
     void SceneManager::setFilterSettings(const std::string &magfilter, const std::string &minfilter,
-                                           const std::string &mipmap, int maxAnisotropy,
-                                           osgViewer::Viewer *viewer)
+                                           const std::string &mipmap, int maxAnisotropy)
     {
         osg::Texture::FilterMode min = osg::Texture::LINEAR;
         osg::Texture::FilterMode mag = osg::Texture::LINEAR;
@@ -478,23 +629,15 @@ namespace Resource
                 min = osg::Texture::LINEAR_MIPMAP_LINEAR;
         }
 
-        if(viewer) viewer->stopThreading();
-
         mMinFilter = min;
         mMagFilter = mag;
         mMaxAnisotropy = std::max(1, maxAnisotropy);
 
-        mCache->clear();
-
         SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor (mMinFilter, mMagFilter, mMaxAnisotropy);
         SetFilterSettingsVisitor setFilterSettingsVisitor (mMinFilter, mMagFilter, mMaxAnisotropy);
-        if (viewer && viewer->getSceneData())
-        {
-            viewer->getSceneData()->accept(setFilterSettingsControllerVisitor);
-            viewer->getSceneData()->accept(setFilterSettingsVisitor);
-        }
 
-        if(viewer) viewer->startThreading();
+        mCache->accept(setFilterSettingsVisitor);
+        mCache->accept(setFilterSettingsControllerVisitor);
     }
 
     void SceneManager::applyFilterSettings(osg::Texture *tex)
@@ -511,9 +654,30 @@ namespace Resource
 
     void SceneManager::updateCache(double referenceTime)
     {
+        mSharedStateMutex.lock();
+        mSharedStateManager->prune();
+        mSharedStateMutex.unlock();
+
         ResourceManager::updateCache(referenceTime);
 
         mInstanceCache->removeUnreferencedObjectsInCache();
     }
 
+    void SceneManager::reportStats(unsigned int frameNumber, osg::Stats *stats)
+    {
+        {
+            OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*mIncrementalCompileOperation->getToCompiledMutex());
+            stats->setAttribute(frameNumber, "Compiling", mIncrementalCompileOperation->getToCompile().size());
+        }
+
+        {
+            OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mSharedStateMutex);
+            stats->setAttribute(frameNumber, "Texture", mSharedStateManager->getNumSharedTextures());
+            stats->setAttribute(frameNumber, "StateSet", mSharedStateManager->getNumSharedStateSets());
+        }
+
+        stats->setAttribute(frameNumber, "Node", mCache->getCacheSize());
+        stats->setAttribute(frameNumber, "Node Instance", mInstanceCache->getCacheSize());
+    }
+
 }
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 8357e63cd..62ffe0871 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <map>
+#include <memory>
 
 #include <osg/ref_ptr>
 #include <osg/Node>
@@ -14,6 +15,7 @@ namespace Resource
 {
     class ImageManager;
     class NifFileManager;
+    class SharedStateManager;
 }
 
 namespace osgUtil
@@ -21,9 +23,14 @@ namespace osgUtil
     class IncrementalCompileOperation;
 }
 
-namespace osgViewer
+namespace osgDB
 {
-    class Viewer;
+    class SharedStateManager;
+}
+
+namespace Shader
+{
+    class ShaderManager;
 }
 
 namespace Resource
@@ -39,6 +46,41 @@ namespace Resource
         SceneManager(const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager);
         ~SceneManager();
 
+        Shader::ShaderManager& getShaderManager();
+
+        /// Re-create shaders for this node, need to call this if texture stages or vertex color mode have changed.
+        void recreateShaders(osg::ref_ptr<osg::Node> node);
+
+        /// @see ShaderVisitor::setForceShaders
+        void setForceShaders(bool force);
+        bool getForceShaders() const;
+
+        /// @see ShaderVisitor::setClampLighting
+        void setClampLighting(bool clamp);
+        bool getClampLighting() const;
+
+        /// @see ShaderVisitor::setForcePerPixelLighting
+        void setForcePerPixelLighting(bool force);
+        bool getForcePerPixelLighting() const;
+
+        /// @see ShaderVisitor::setAutoUseNormalMaps
+        void setAutoUseNormalMaps(bool use);
+
+        /// @see ShaderVisitor::setNormalMapPattern
+        void setNormalMapPattern(const std::string& pattern);
+
+        /// @see ShaderVisitor::setNormalHeightMapPattern
+        void setNormalHeightMapPattern(const std::string& pattern);
+
+        void setAutoUseSpecularMaps(bool use);
+
+        void setSpecularMapPattern(const std::string& pattern);
+
+        void setShaderPath(const std::string& path);
+
+        /// Check if a given scene is loaded and if so, update its usage timestamp to prevent it from being unloaded
+        bool checkLoaded(const std::string& name, double referenceTime);
+
         /// Get a read-only copy of this scene "template"
         /// @note If the given filename does not exist or fails to load, an error marker mesh will be used instead.
         ///  If even the error marker mesh can not be found, an exception is thrown.
@@ -75,18 +117,14 @@ namespace Resource
         /// Set up an IncrementalCompileOperation for background compiling of loaded scenes.
         void setIncrementalCompileOperation(osgUtil::IncrementalCompileOperation* ico);
 
-        /// @note SceneManager::attachTo calls this method automatically, only needs to be called by users if manually attaching
-        void notifyAttached(osg::Node* node) const;
-
         Resource::ImageManager* getImageManager();
 
         /// @param mask The node mask to apply to loaded particle system nodes.
         void setParticleSystemMask(unsigned int mask);
 
-        /// @param viewer used to apply the new filter settings to the existing scene graph. If there is no scene yet, you can pass a NULL viewer.
+        /// @warning It is unsafe to call this method while the draw thread is using textures! call Viewer::stopThreading first.
         void setFilterSettings(const std::string &magfilter, const std::string &minfilter,
-                               const std::string &mipmap, int maxAnisotropy,
-                               osgViewer::Viewer *viewer);
+                               const std::string &mipmap, int maxAnisotropy);
 
         /// Apply filter settings to the given texture. Note, when loading an object through this scene manager (i.e. calling getTemplate or createInstance)
         /// the filter settings are applied automatically. This method is provided for textures that were created outside of the SceneManager.
@@ -99,12 +137,25 @@ namespace Resource
         /// @see ResourceManager::updateCache
         virtual void updateCache(double referenceTime);
 
+        virtual void reportStats(unsigned int frameNumber, osg::Stats* stats);
+
     private:
 
         osg::ref_ptr<osg::Node> createInstance(const std::string& name);
 
+        std::auto_ptr<Shader::ShaderManager> mShaderManager;
+        bool mForceShaders;
+        bool mClampLighting;
+        bool mForcePerPixelLighting;
+        bool mAutoUseNormalMaps;
+        std::string mNormalMapPattern;
+        std::string mNormalHeightMapPattern;
+        bool mAutoUseSpecularMaps;
+        std::string mSpecularMapPattern;
+
         osg::ref_ptr<MultiObjectCache> mInstanceCache;
 
+        osg::ref_ptr<Resource::SharedStateManager> mSharedStateManager;
         OpenThreads::Mutex mSharedStateMutex;
 
         Resource::ImageManager* mImageManager;
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
new file mode 100644
index 000000000..d696c9ecc
--- /dev/null
+++ b/components/resource/stats.cpp
@@ -0,0 +1,316 @@
+#include "stats.hpp"
+
+#include <sstream>
+#include <iomanip>
+
+#include <osg/PolygonMode>
+
+#include <osgText/Text>
+
+#include <osgViewer/Viewer>
+#include <osgViewer/Renderer>
+
+namespace Resource
+{
+
+StatsHandler::StatsHandler():
+    _key(osgGA::GUIEventAdapter::KEY_F4),
+    _initialized(false),
+    _statsType(false),
+    _statsWidth(1280.0f),
+    _statsHeight(1024.0f),
+    _font("fonts/arial.ttf"),
+    _characterSize(20.0f)
+{
+    _camera = new osg::Camera;
+    _camera->getOrCreateStateSet()->setGlobalDefaults();
+    _camera->setRenderer(new osgViewer::Renderer(_camera.get()));
+    _camera->setProjectionResizePolicy(osg::Camera::FIXED);
+
+    _resourceStatsChildNum = 0;
+}
+
+bool StatsHandler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdapter &aa)
+{
+    if (ea.getHandled()) return false;
+
+    switch(ea.getEventType())
+    {
+        case(osgGA::GUIEventAdapter::KEYDOWN):
+        {
+            if (ea.getKey()== _key)
+            {
+                osgViewer::View* myview = dynamic_cast<osgViewer::View*>(&aa);
+                if (!myview) return false;
+
+                osgViewer::ViewerBase* viewer = myview->getViewerBase();
+
+                toggle(viewer);
+
+                aa.requestRedraw();
+                return true;
+            }
+            break;
+        }
+        case osgGA::GUIEventAdapter::RESIZE:
+        {
+            setWindowSize(ea.getWindowWidth(), ea.getWindowHeight());
+            break;
+        }
+        default:
+            break;
+    }
+    return false;
+}
+
+void StatsHandler::setWindowSize(int width, int height)
+{
+    if (width <= 0 || height <= 0)
+        return;
+
+    _camera->setViewport(0, 0, width, height);
+    if (fabs(height*_statsWidth) <= fabs(width*_statsHeight))
+    {
+        _camera->setProjectionMatrix(osg::Matrix::ortho2D(_statsWidth - width*_statsHeight/height, _statsWidth,0.0,_statsHeight));
+    }
+    else
+    {
+        _camera->setProjectionMatrix(osg::Matrix::ortho2D(0.0,_statsWidth,_statsHeight-height*_statsWidth/width,_statsHeight));
+    }
+
+}
+
+void StatsHandler::toggle(osgViewer::ViewerBase *viewer)
+{
+    if (!_initialized)
+    {
+        setUpHUDCamera(viewer);
+        setUpScene(viewer);
+    }
+
+    _statsType = !_statsType;
+
+    if (!_statsType)
+    {
+        _camera->setNodeMask(0);
+        _switch->setAllChildrenOff();
+
+        viewer->getViewerStats()->collectStats("resource", false);
+    }
+    else
+    {
+        _camera->setNodeMask(0xffffffff);
+        _switch->setSingleChildOn(_resourceStatsChildNum);
+
+        viewer->getViewerStats()->collectStats("resource", true);
+    }
+}
+
+void StatsHandler::setUpHUDCamera(osgViewer::ViewerBase* viewer)
+{
+    // Try GraphicsWindow first so we're likely to get the main viewer window
+    osg::GraphicsContext* context = dynamic_cast<osgViewer::GraphicsWindow*>(_camera->getGraphicsContext());
+
+    if (!context)
+    {
+        osgViewer::Viewer::Windows windows;
+        viewer->getWindows(windows);
+
+        if (!windows.empty()) context = windows.front();
+        else
+        {
+            // No GraphicsWindows were found, so let's try to find a GraphicsContext
+            context = _camera->getGraphicsContext();
+
+            if (!context)
+            {
+                osgViewer::Viewer::Contexts contexts;
+                viewer->getContexts(contexts);
+
+                if (contexts.empty()) return;
+
+                context = contexts.front();
+            }
+        }
+    }
+
+    _camera->setGraphicsContext(context);
+
+    _camera->setRenderOrder(osg::Camera::POST_RENDER, 11);
+
+    _camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
+    _camera->setViewMatrix(osg::Matrix::identity());
+    setWindowSize(context->getTraits()->width, context->getTraits()->height);
+
+    // only clear the depth buffer
+    _camera->setClearMask(0);
+    _camera->setAllowEventFocus(false);
+
+    _camera->setRenderer(new osgViewer::Renderer(_camera.get()));
+
+    _initialized = true;
+}
+
+osg::Geometry* createBackgroundRectangle(const osg::Vec3& pos, const float width, const float height, osg::Vec4& color)
+{
+    osg::StateSet *ss = new osg::StateSet;
+
+    osg::Geometry* geometry = new osg::Geometry;
+
+    geometry->setUseDisplayList(false);
+    geometry->setStateSet(ss);
+
+    osg::Vec3Array* vertices = new osg::Vec3Array;
+    geometry->setVertexArray(vertices);
+
+    vertices->push_back(osg::Vec3(pos.x(), pos.y(), 0));
+    vertices->push_back(osg::Vec3(pos.x(), pos.y()-height,0));
+    vertices->push_back(osg::Vec3(pos.x()+width, pos.y()-height,0));
+    vertices->push_back(osg::Vec3(pos.x()+width, pos.y(),0));
+
+    osg::Vec4Array* colors = new osg::Vec4Array;
+    colors->push_back(color);
+    geometry->setColorArray(colors, osg::Array::BIND_OVERALL);
+
+    osg::DrawElementsUShort *base =  new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_FAN,0);
+    base->push_back(0);
+    base->push_back(1);
+    base->push_back(2);
+    base->push_back(3);
+
+    geometry->addPrimitiveSet(base);
+
+    return geometry;
+}
+
+class ResourceStatsTextDrawCallback : public osg::Drawable::DrawCallback
+{
+public:
+    ResourceStatsTextDrawCallback(osg::Stats* stats, const std::vector<std::string>& statNames)
+        : _stats(stats)
+        , _statNames(statNames)
+    {
+    }
+
+    virtual void drawImplementation(osg::RenderInfo& renderInfo,const osg::Drawable* drawable) const
+    {
+        if (!_stats) return;
+
+        osgText::Text* text = (osgText::Text*)(drawable);
+
+        std::ostringstream viewStr;
+        viewStr.setf(std::ios::left, std::ios::adjustfield);
+        viewStr.width(14);
+        // Used fixed formatting, as scientific will switch to "...e+.." notation for
+        // large numbers of vertices/drawables/etc.
+        viewStr.setf(std::ios::fixed);
+        viewStr.precision(0);
+
+        unsigned int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber()-1;
+
+        for (std::vector<std::string>::const_iterator it = _statNames.begin(); it != _statNames.end(); ++it)
+        {
+            if (it->empty())
+                viewStr << std::endl;
+            else
+            {
+                double value = 0.0;
+                if (_stats->getAttribute(frameNumber, *it, value))
+                    viewStr << std::setw(8) << value << std::endl;
+                else
+                    viewStr << std::setw(8) << "." << std::endl;
+            }
+        }
+
+        text->setText(viewStr.str());
+
+        text->drawImplementation(renderInfo);
+    }
+
+    osg::ref_ptr<osg::Stats> _stats;
+    std::vector<std::string> _statNames;
+};
+
+void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
+{
+    _switch = new osg::Switch;
+
+    _camera->addChild(_switch);
+
+    osg::StateSet* stateset = _switch->getOrCreateStateSet();
+    stateset->setMode(GL_LIGHTING,osg::StateAttribute::OFF);
+    stateset->setMode(GL_BLEND,osg::StateAttribute::ON);
+    stateset->setMode(GL_DEPTH_TEST,osg::StateAttribute::OFF);
+#ifdef OSG_GL1_AVAILABLE
+    stateset->setAttribute(new osg::PolygonMode(), osg::StateAttribute::PROTECTED);
+#endif
+
+    osg::Vec3 pos(_statsWidth-300.f, _statsHeight-500.0f,0.0f);
+    osg::Vec4 backgroundColor(0.0, 0.0, 0.0f, 0.3);
+    osg::Vec4 staticTextColor(1.0, 1.0, 0.0f, 1.0);
+    osg::Vec4 dynamicTextColor(1.0, 1.0, 1.0f, 1.0);
+    float backgroundMargin = 5;
+    float backgroundSpacing = 3;
+
+    // resource stats
+    {
+        osg::Group* group = new osg::Group;
+        group->setCullingActive(false);
+        _resourceStatsChildNum = _switch->getNumChildren();
+        _switch->addChild(group, false);
+
+        const char* statNames[] = {"Compiling", "WorkQueue", "WorkThread", "", "Texture", "StateSet", "Node", "Node Instance", "Shape", "Shape Instance", "Image", "Nif", "Keyframe", "Terrain Cell", "Terrain Texture", "", "UnrefQueue"};
+
+        int numLines = sizeof(statNames) / sizeof(statNames[0]);
+
+        group->addChild(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
+                                                        10 * _characterSize + 2 * backgroundMargin,
+                                                        numLines * _characterSize + 2 * backgroundMargin,
+                                                        backgroundColor));
+
+        osg::ref_ptr<osgText::Text> staticText = new osgText::Text;
+        group->addChild( staticText.get() );
+        staticText->setColor(staticTextColor);
+        staticText->setFont(_font);
+        staticText->setCharacterSize(_characterSize);
+        staticText->setPosition(pos);
+
+        std::ostringstream viewStr;
+        viewStr.clear();
+        viewStr.setf(std::ios::left, std::ios::adjustfield);
+        viewStr.width(14);
+        for (size_t i = 0; i<sizeof(statNames)/sizeof(statNames[0]); ++i)
+        {
+            viewStr << statNames[i] << std::endl;
+        }
+
+        staticText->setText(viewStr.str());
+
+        pos.x() += 10 * _characterSize + 2 * backgroundMargin + backgroundSpacing;
+
+        group->addChild(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
+                                                        5 * _characterSize + 2 * backgroundMargin,
+                                                        numLines * _characterSize + 2 * backgroundMargin,
+                                                        backgroundColor));
+
+        osg::ref_ptr<osgText::Text> statsText = new osgText::Text;
+        group->addChild( statsText.get() );
+
+        statsText->setColor(dynamicTextColor);
+        statsText->setFont(_font);
+        statsText->setCharacterSize(_characterSize);
+        statsText->setPosition(pos);
+        statsText->setText("");
+        statsText->setDrawCallback(new ResourceStatsTextDrawCallback(viewer->getViewerStats(), std::vector<std::string>(statNames, statNames + numLines)));
+    }
+}
+
+
+void StatsHandler::getUsage(osg::ApplicationUsage &usage) const
+{
+    usage.addKeyboardMouseBinding(_key, "On screen resource usage stats.");
+}
+
+
+
+}
diff --git a/components/resource/stats.hpp b/components/resource/stats.hpp
new file mode 100644
index 000000000..bd3890d9b
--- /dev/null
+++ b/components/resource/stats.hpp
@@ -0,0 +1,59 @@
+#ifndef OPENMW_COMPONENTS_RESOURCE_STATS_H
+#define OPENMW_COMPONENTS_RESOURCE_STATS_H
+
+#include <osgGA/GUIEventHandler>
+
+namespace osgViewer
+{
+    class ViewerBase;
+}
+
+namespace osg
+{
+    class Switch;
+}
+
+namespace Resource
+{
+
+    class StatsHandler : public osgGA::GUIEventHandler
+    {
+    public:
+        StatsHandler();
+
+        void setKey(int key) { _key = key; }
+        int getKey() const { return _key; }
+
+        bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa);
+
+        void setWindowSize(int w, int h);
+
+        void toggle(osgViewer::ViewerBase* viewer);
+
+        void setUpHUDCamera(osgViewer::ViewerBase* viewer);
+        void setUpScene(osgViewer::ViewerBase* viewer);
+
+        /** Get the keyboard and mouse usage of this manipulator.*/
+        virtual void getUsage(osg::ApplicationUsage& usage) const;
+
+    private:
+        osg::ref_ptr<osg::Switch> _switch;
+        int _key;
+        osg::ref_ptr<osg::Camera>  _camera;
+        bool _initialized;
+        bool _statsType;
+
+        float                               _statsWidth;
+        float                               _statsHeight;
+
+        std::string                         _font;
+        float                               _leftPos;
+        float                               _characterSize;
+
+        int _resourceStatsChildNum;
+
+    };
+
+}
+
+#endif
diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index d8cfa428a..79defe196 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -1,10 +1,11 @@
 #include "attach.hpp"
 
 #include <stdexcept>
+#include <iostream>
 
 #include <osg/NodeVisitor>
 #include <osg/Group>
-#include <osg/Geode>
+#include <osg/Geometry>
 #include <osg/FrontFace>
 #include <osg/PositionAttitudeTransform>
 #include <osg/MatrixTransform>
@@ -29,25 +30,58 @@ namespace SceneUtil
             mFilter2 = "tri " + mFilter;
         }
 
+        virtual void apply(osg::MatrixTransform& node)
+        {
+            applyNode(node);
+        }
+        virtual void apply(osg::Geometry& node)
+        {
+            applyNode(node);
+        }
         virtual void apply(osg::Node& node)
+        {
+            applyNode(node);
+        }
+        virtual void apply(osg::Group& node)
+        {
+            applyNode(node);
+        }
+
+        void applyNode(osg::Node& node)
         {
             std::string lowerName = Misc::StringUtils::lowerCase(node.getName());
             if ((lowerName.size() >= mFilter.size() && lowerName.compare(0, mFilter.size(), mFilter) == 0)
                     || (lowerName.size() >= mFilter2.size() && lowerName.compare(0, mFilter2.size(), mFilter2) == 0))
-            {
-                mParent->addChild(&node);
-            }
+                mToCopy.push_back(&node);
             else
                 traverse(node);
         }
 
+        void doCopy()
+        {
+            for (std::vector<osg::ref_ptr<osg::Node> >::iterator it = mToCopy.begin(); it != mToCopy.end(); ++it)
+            {
+                osg::ref_ptr<osg::Node> node = *it;
+                if (node->getNumParents() > 1)
+                    std::cerr << "CopyRigVisitor warning: node has multiple parents" << std::endl;
+                while (node->getNumParents())
+                    node->getParent(0)->removeChild(node);
+
+                mParent->addChild(node);
+            }
+            mToCopy.clear();
+        }
+
     private:
+        typedef std::vector<osg::ref_ptr<osg::Node> > NodeVector;
+        NodeVector mToCopy;
+
         osg::ref_ptr<osg::Group> mParent;
         std::string mFilter;
         std::string mFilter2;
     };
 
-    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<osg::Node> toAttach, osg::Node *master, const std::string &filter, const std::string &attachNode)
+    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<osg::Node> toAttach, osg::Node *master, const std::string &filter, osg::Group* attachNode)
     {
         if (dynamic_cast<SceneUtil::Skeleton*>(toAttach.get()))
         {
@@ -55,18 +89,23 @@ namespace SceneUtil
 
             CopyRigVisitor copyVisitor(handle, filter);
             toAttach->accept(copyVisitor);
+            copyVisitor.doCopy();
 
-            master->asGroup()->addChild(handle);
-
-            return handle;
+            if (handle->getNumChildren() == 1)
+            {
+                osg::ref_ptr<osg::Node> newHandle = handle->getChild(0);
+                handle->removeChild(newHandle);
+                master->asGroup()->addChild(newHandle);
+                return newHandle;
+            }
+            else
+            {
+                master->asGroup()->addChild(handle);
+                return handle;
+            }
         }
         else
         {
-            FindByNameVisitor find(attachNode);
-            master->accept(find);
-            if (!find.mFoundNode)
-                throw std::runtime_error(std::string("Can't find attachment node ") + attachNode);
-
             FindByNameVisitor findBoneOffset("BoneOffset");
             toAttach->accept(findBoneOffset);
 
@@ -82,9 +121,13 @@ namespace SceneUtil
                 trans->setPosition(boneOffset->getMatrix().getTrans());
                 // The BoneOffset rotation seems to be incorrect
                 trans->setAttitude(osg::Quat(osg::DegreesToRadians(-90.f), osg::Vec3f(1,0,0)));
+
+                // Now that we used it, get rid of the redundant node.
+                if (boneOffset->getNumChildren() == 0 && boneOffset->getNumParents() == 1)
+                    boneOffset->getParent(0)->removeChild(boneOffset);
             }
 
-            if (attachNode.find("Left") != std::string::npos)
+            if (attachNode->getName().find("Left") != std::string::npos)
             {
                 if (!trans)
                     trans = new osg::PositionAttitudeTransform;
@@ -93,20 +136,26 @@ namespace SceneUtil
                 // Need to invert culling because of the negative scale
                 // Note: for absolute correctness we would need to check the current front face for every mesh then invert it
                 // However MW isn't doing this either, so don't. Assuming all meshes are using backface culling is more efficient.
-                osg::FrontFace* frontFace = new osg::FrontFace;
-                frontFace->setMode(osg::FrontFace::CLOCKWISE);
-                trans->getOrCreateStateSet()->setAttributeAndModes(frontFace, osg::StateAttribute::ON);
+                static osg::ref_ptr<osg::StateSet> frontFaceStateSet;
+                if (!frontFaceStateSet)
+                {
+                    frontFaceStateSet = new osg::StateSet;
+                    osg::FrontFace* frontFace = new osg::FrontFace;
+                    frontFace->setMode(osg::FrontFace::CLOCKWISE);
+                    frontFaceStateSet->setAttributeAndModes(frontFace, osg::StateAttribute::ON);
+                }
+                trans->setStateSet(frontFaceStateSet);
             }
 
             if (trans)
             {
-                find.mFoundNode->addChild(trans);
+                attachNode->addChild(trans);
                 trans->addChild(toAttach);
                 return trans;
             }
             else
             {
-                find.mFoundNode->addChild(toAttach);
+                attachNode->addChild(toAttach);
                 return toAttach;
             }
         }
diff --git a/components/sceneutil/attach.hpp b/components/sceneutil/attach.hpp
index 72f7809e9..a8a2239a8 100644
--- a/components/sceneutil/attach.hpp
+++ b/components/sceneutil/attach.hpp
@@ -8,6 +8,7 @@
 namespace osg
 {
     class Node;
+    class Group;
 }
 
 namespace SceneUtil
@@ -18,7 +19,7 @@ namespace SceneUtil
     /// Otherwise, just attach all of the toAttach scenegraph to the attachment node on the master scenegraph, with no filtering.
     /// @note The master scene graph is expected to include a skeleton.
     /// @return A newly created node that is directly attached to the master scene graph
-    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<osg::Node> toAttach, osg::Node* master, const std::string& filter, const std::string& attachNode);
+    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<osg::Node> toAttach, osg::Node* master, const std::string& filter, osg::Group* attachNode);
 
 }
 
diff --git a/components/sceneutil/clone.cpp b/components/sceneutil/clone.cpp
index 784195e7e..26f3f5c7c 100644
--- a/components/sceneutil/clone.cpp
+++ b/components/sceneutil/clone.cpp
@@ -81,11 +81,6 @@ namespace SceneUtil
 #endif
 
             osg::Drawable* cloned = osg::clone(drawable, copyop);
-#if OSG_VERSION_LESS_THAN(3,3,3)
-            // work around OSG 3.2 not respecting the DEEP_COPY_CALLBACK flag
-            if (cloned->getUpdateCallback())
-                cloned->setUpdateCallback(osg::clone(cloned->getUpdateCallback(), *this));
-#endif
             return cloned;
         }
         if (dynamic_cast<const SceneUtil::RigGeometry*>(drawable))
diff --git a/components/sceneutil/controller.cpp b/components/sceneutil/controller.cpp
index 7762b48d0..6cd0cb036 100644
--- a/components/sceneutil/controller.cpp
+++ b/components/sceneutil/controller.cpp
@@ -3,9 +3,9 @@
 #include "statesetupdater.hpp"
 
 #include <osg/Drawable>
-#include <osg/Geode>
+#include <osg/Geometry>
+#include <osg/MatrixTransform>
 #include <osg/NodeCallback>
-#include <osg/Version>
 
 namespace SceneUtil
 {
@@ -65,11 +65,22 @@ namespace SceneUtil
 
     void ControllerVisitor::apply(osg::Node &node)
     {
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
+        applyNode(node);
+    }
+
+    void ControllerVisitor::apply(osg::MatrixTransform &node)
+    {
+        applyNode(node);
+    }
+
+    void ControllerVisitor::apply(osg::Geometry &node)
+    {
+        applyNode(node);
+    }
+
+    void ControllerVisitor::applyNode(osg::Node &node)
+    {
         osg::Callback* callback = node.getUpdateCallback();
-#else
-        osg::NodeCallback* callback = node.getUpdateCallback();
-#endif
         while (callback)
         {
             if (Controller* ctrl = dynamic_cast<Controller*>(callback))
@@ -87,26 +98,8 @@ namespace SceneUtil
             callback = callback->getNestedCallback();
         }
 
-        traverse(node);
-    }
-
-    void ControllerVisitor::apply(osg::Geode &geode)
-    {
-        for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
-        {
-            osg::Drawable* drw = geode.getDrawable(i);
-
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
-            osg::Callback* callback = drw->getUpdateCallback();
-#else
-            osg::Drawable::UpdateCallback* callback = drw->getUpdateCallback();
-#endif
-
-            if (Controller* ctrl = dynamic_cast<Controller*>(callback))
-                visit(geode, *ctrl);
-        }
-
-        apply(static_cast<osg::Node&>(geode));
+        if (node.getNumChildrenRequiringUpdateTraversal() > 0)
+            traverse(node);
     }
 
     AssignControllerSourcesVisitor::AssignControllerSourcesVisitor()
diff --git a/components/sceneutil/controller.hpp b/components/sceneutil/controller.hpp
index 7399ecad5..fd8964ae1 100644
--- a/components/sceneutil/controller.hpp
+++ b/components/sceneutil/controller.hpp
@@ -63,7 +63,13 @@ namespace SceneUtil
         ControllerVisitor();
 
         virtual void apply(osg::Node& node);
-        virtual void apply(osg::Geode& geode);
+
+        // Technically not required as the default implementation would trickle down to apply(Node&) anyway,
+        // but we'll shortcut instead to avoid the chain of virtual function calls
+        virtual void apply(osg::MatrixTransform& node);
+        virtual void apply(osg::Geometry& node);
+
+        void applyNode(osg::Node& node);
 
         virtual void visit(osg::Node& node, Controller& ctrl) = 0;
     };
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 64448e73e..bd8ef8af4 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -3,7 +3,6 @@
 #include <stdexcept>
 
 #include <osg/NodeVisitor>
-#include <osg/Geode>
 
 #include <osgUtil/CullVisitor>
 
@@ -14,6 +13,20 @@
 namespace SceneUtil
 {
 
+    class LightStateCache
+    {
+    public:
+        osg::Light* lastAppliedLight[8];
+    };
+
+    LightStateCache* getLightStateCache(unsigned int contextid)
+    {
+        static std::vector<LightStateCache> cacheVector;
+        if (cacheVector.size() < contextid+1)
+            cacheVector.resize(contextid+1);
+        return &cacheVector[contextid];
+    }
+
     // Resets the modelview matrix to just the view matrix before applying lights.
     class LightStateAttribute : public osg::StateAttribute
     {
@@ -45,19 +58,43 @@ namespace SceneUtil
 
         virtual void apply(osg::State& state) const
         {
+            if (mLights.empty())
+                return;
             osg::Matrix modelViewMatrix = state.getModelViewMatrix();
 
             state.applyModelViewMatrix(state.getInitialViewMatrix());
 
+            LightStateCache* cache = getLightStateCache(state.getContextID());
+
             for (unsigned int i=0; i<mLights.size(); ++i)
             {
-                mLights[i]->setLightNum(i+mIndex);
-                mLights[i]->apply(state);
+                osg::Light* current = cache->lastAppliedLight[i+mIndex];
+                if (current != mLights[i].get())
+                {
+                    applyLight((GLenum)((int)GL_LIGHT0 + i + mIndex), mLights[i].get());
+                    cache->lastAppliedLight[i+mIndex] = mLights[i].get();
+                }
             }
 
             state.applyModelViewMatrix(modelViewMatrix);
         }
 
+        void applyLight(GLenum lightNum, const osg::Light* light) const
+        {
+            glLightfv( lightNum, GL_AMBIENT,               light->getAmbient().ptr() );
+            glLightfv( lightNum, GL_DIFFUSE,               light->getDiffuse().ptr() );
+            glLightfv( lightNum, GL_SPECULAR,              light->getSpecular().ptr() );
+            glLightfv( lightNum, GL_POSITION,              light->getPosition().ptr() );
+            // TODO: enable this once spot lights are supported
+            // need to transform SPOT_DIRECTION by the world matrix?
+            //glLightfv( lightNum, GL_SPOT_DIRECTION,        light->getDirection().ptr() );
+            //glLightf ( lightNum, GL_SPOT_EXPONENT,         light->getSpotExponent() );
+            //glLightf ( lightNum, GL_SPOT_CUTOFF,           light->getSpotCutoff() );
+            glLightf ( lightNum, GL_CONSTANT_ATTENUATION,  light->getConstantAttenuation() );
+            glLightf ( lightNum, GL_LINEAR_ATTENUATION,    light->getLinearAttenuation() );
+            glLightf ( lightNum, GL_QUADRATIC_ATTENUATION, light->getQuadraticAttenuation() );
+        }
+
     private:
         unsigned int mIndex;
 
@@ -118,7 +155,7 @@ namespace SceneUtil
             : osg::NodeCallback(copy, copyop)
             { }
 
-        META_Object(SceneUtil, SceneUtil::LightManagerUpdateCallback)
+        META_Object(SceneUtil, LightManagerUpdateCallback)
 
         virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
         {
@@ -192,19 +229,28 @@ namespace SceneUtil
             return found->second;
         else
         {
-
+            osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
             std::vector<osg::ref_ptr<osg::Light> > lights;
             for (unsigned int i=0; i<lightList.size();++i)
+            {
                 lights.push_back(lightList[i]->mLightSource->getLight(frameNum));
+            }
 
+            // the first light state attribute handles the actual state setting for all lights
+            // it's best to batch these up so that we don't need to touch the modelView matrix more than necessary
             osg::ref_ptr<LightStateAttribute> attr = new LightStateAttribute(mStartLight, lights);
-
-            osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
-
             // don't use setAttributeAndModes, that does not support light indices!
             stateset->setAttribute(attr, osg::StateAttribute::ON);
             stateset->setAssociatedModes(attr, osg::StateAttribute::ON);
 
+            // need to push some dummy attributes to ensure proper state tracking
+            // lights need to reset to their default when the StateSet is popped
+            for (unsigned int i=1; i<lightList.size(); ++i)
+            {
+                osg::ref_ptr<LightStateAttribute> dummy = new LightStateAttribute(mStartLight+i, std::vector<osg::ref_ptr<osg::Light> >());
+                stateset->setAttribute(dummy, osg::StateAttribute::ON);
+            }
+
             stateSetCache.insert(std::make_pair(hash, stateset));
             return stateset;
         }
@@ -239,9 +285,66 @@ namespace SceneUtil
         return it->second;
     }
 
+    class DisableLight : public osg::StateAttribute
+    {
+    public:
+        DisableLight() : mIndex(0) {}
+        DisableLight(int index) : mIndex(index) {}
+
+        DisableLight(const DisableLight& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
+            : osg::StateAttribute(copy,copyop), mIndex(copy.mIndex) {}
+
+        virtual osg::Object* cloneType() const { return new DisableLight(mIndex); }
+        virtual osg::Object* clone(const osg::CopyOp& copyop) const { return new DisableLight(*this,copyop); }
+        virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const DisableLight *>(obj)!=NULL; }
+        virtual const char* libraryName() const { return "SceneUtil"; }
+        virtual const char* className() const { return "DisableLight"; }
+        virtual Type getType() const { return LIGHT; }
+
+        unsigned int getMember() const
+        {
+            return mIndex;
+        }
+
+        virtual bool getModeUsage(ModeUsage & usage) const
+        {
+            usage.usesMode(GL_LIGHT0 + mIndex);
+            return true;
+        }
+
+        virtual int compare(const StateAttribute &sa) const
+        {
+            throw std::runtime_error("DisableLight::compare: unimplemented");
+        }
+
+        virtual void apply(osg::State& state) const
+        {
+            int lightNum = GL_LIGHT0 + mIndex;
+            glLightfv( lightNum, GL_AMBIENT,               mNull.ptr() );
+            glLightfv( lightNum, GL_DIFFUSE,               mNull.ptr() );
+            glLightfv( lightNum, GL_SPECULAR,              mNull.ptr() );
+
+            LightStateCache* cache = getLightStateCache(state.getContextID());
+            cache->lastAppliedLight[mIndex] = NULL;
+        }
+
+    private:
+        unsigned int mIndex;
+        osg::Vec4f mNull;
+    };
+
     void LightManager::setStartLight(int start)
     {
         mStartLight = start;
+
+        // Set default light state to zero
+        // This is necessary because shaders don't respect glDisable(GL_LIGHTX) so in addition to disabling
+        // we'll have to set a light state that has no visible effect
+        for (int i=start; i<8; ++i)
+        {
+            osg::ref_ptr<DisableLight> defaultLight (new DisableLight(i));
+            getOrCreateStateSet()->setAttributeAndModes(defaultLight, osg::StateAttribute::OFF);
+        }
     }
 
     int LightManager::getStartLight() const
@@ -265,13 +368,13 @@ namespace SceneUtil
         mId = sLightId++;
 
         for (int i=0; i<2; ++i)
-            mLight[i] = osg::clone(copy.mLight[i].get(), copyop);
+            mLight[i] = new osg::Light(*copy.mLight[i].get(), copyop);
     }
 
 
     bool sortLights (const LightManager::LightSourceViewBound* left, const LightManager::LightSourceViewBound* right)
     {
-        return left->mViewBound.center().length2() - left->mViewBound.radius2()/4.f < right->mViewBound.center().length2() - right->mViewBound.radius2()/4.f;
+        return left->mViewBound.center().length2() - left->mViewBound.radius2()*81 < right->mViewBound.center().length2() - right->mViewBound.radius2()*81;
     }
 
     void LightListCallback::operator()(osg::Node *node, osg::NodeVisitor *nv)
@@ -325,11 +428,15 @@ namespace SceneUtil
             for (unsigned int i=0; i<lights.size(); ++i)
             {
                 const LightManager::LightSourceViewBound& l = lights[i];
+
+                if (mIgnoredLightSources.count(l.mLightSource))
+                    continue;
+
                 if (l.mViewBound.intersects(nodeBound))
                     mLightList.push_back(&l);
             }
         }
-        if (mLightList.size())
+        if (!mLightList.empty())
         {
             unsigned int maxLights = static_cast<unsigned int> (8 - mLightManager->getStartLight());
 
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 0d8610ead..2c7a6a3d8 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SCENEUTIL_LIGHTMANAGER_H
 #define OPENMW_COMPONENTS_SCENEUTIL_LIGHTMANAGER_H
 
+#include <set>
+
 #include <osg/Light>
 
 #include <osg/Group>
@@ -30,7 +32,7 @@ namespace SceneUtil
 
     public:
 
-        META_Node(SceneUtil, SceneUtil::LightSource)
+        META_Node(SceneUtil, LightSource)
 
         LightSource();
 
@@ -62,7 +64,7 @@ namespace SceneUtil
         void setLight(osg::Light* light)
         {
             mLight[0] = light;
-            mLight[1] = osg::clone(light);
+            mLight[1] = new osg::Light(*light);
         }
 
         /// Get the unique ID for this light source.
@@ -77,7 +79,7 @@ namespace SceneUtil
     {
     public:
 
-        META_Node(SceneUtil, SceneUtil::LightManager)
+        META_Node(SceneUtil, LightManager)
 
         LightManager();
 
@@ -157,16 +159,20 @@ namespace SceneUtil
             : osg::Object(copy, copyop), osg::NodeCallback(copy, copyop)
             , mLightManager(copy.mLightManager)
             , mLastFrameNumber(0)
+            , mIgnoredLightSources(copy.mIgnoredLightSources)
         {}
 
         META_Object(SceneUtil, LightListCallback)
 
         void operator()(osg::Node* node, osg::NodeVisitor* nv);
 
+        std::set<SceneUtil::LightSource*>& getIgnoredLightSources() { return mIgnoredLightSources; }
+
     private:
         LightManager* mLightManager;
         unsigned int mLastFrameNumber;
         LightManager::LightList mLightList;
+        std::set<SceneUtil::LightSource*> mIgnoredLightSources;
     };
 
 }
diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index 6499c54b1..5ad9bd6dc 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -36,7 +36,6 @@ namespace SceneUtil
         light->setLinearAttenuation(linearAttenuation);
         light->setQuadraticAttenuation(quadraticAttenuation);
         light->setConstantAttenuation(0.f);
-
     }
 
     void addLight (osg::Group* node, const ESM::Light* esmLight, unsigned int partsysMask, unsigned int lightMask, bool isExterior, bool outQuadInLin, bool useQuadratic,
@@ -68,6 +67,14 @@ namespace SceneUtil
             attachTo = trans;
         }
 
+        osg::ref_ptr<LightSource> lightSource = createLightSource(esmLight, lightMask, isExterior, outQuadInLin, useQuadratic, quadraticValue,
+                                                                  quadraticRadiusMult, useLinear, linearRadiusMult, linearValue);
+        attachTo->addChild(lightSource);
+    }
+
+    osg::ref_ptr<LightSource> createLightSource(const ESM::Light* esmLight, unsigned int lightMask, bool isExterior, bool outQuadInLin, bool useQuadratic, float quadraticValue,
+                                                float quadraticRadiusMult, bool useLinear, float linearRadiusMult, float linearValue, const osg::Vec4f& ambient)
+    {
         osg::ref_ptr<SceneUtil::LightSource> lightSource (new SceneUtil::LightSource);
         osg::ref_ptr<osg::Light> light (new osg::Light);
         lightSource->setNodeMask(lightMask);
@@ -85,7 +92,7 @@ namespace SceneUtil
             diffuse.a() = 1;
         }
         light->setDiffuse(diffuse);
-        light->setAmbient(osg::Vec4f(0,0,0,1));
+        light->setAmbient(ambient);
         light->setSpecular(osg::Vec4f(0,0,0,0));
 
         lightSource->setLight(light);
@@ -103,7 +110,6 @@ namespace SceneUtil
 
         lightSource->addUpdateCallback(ctrl);
 
-        attachTo->addChild(lightSource);
+        return lightSource;
     }
-
 }
diff --git a/components/sceneutil/lightutil.hpp b/components/sceneutil/lightutil.hpp
index 810ffa318..95172e239 100644
--- a/components/sceneutil/lightutil.hpp
+++ b/components/sceneutil/lightutil.hpp
@@ -1,6 +1,9 @@
 #ifndef OPENMW_COMPONENTS_LIGHTUTIL_H
 #define OPENMW_COMPONENTS_LIGHTUTIL_H
 
+#include <osg/ref_ptr>
+#include <osg/Vec4f>
+
 namespace osg
 {
     class Group;
@@ -8,11 +11,12 @@ namespace osg
 
 namespace ESM
 {
-    class Light;
+    struct Light;
 }
 
 namespace SceneUtil
 {
+    class LightSource;
 
     /// @brief Convert an ESM::Light to a SceneUtil::LightSource, and add it to a sub graph.
     /// @note If the sub graph contains a node named "AttachLight" (case insensitive), then the light is added to that.
@@ -27,6 +31,15 @@ namespace SceneUtil
                    float quadraticValue, float quadraticRadiusMult, bool useLinear, float linearRadiusMult,
                    float linearValue);
 
+    /// @brief Convert an ESM::Light to a SceneUtil::LightSource, and return it.
+    /// @param esmLight The light definition coming from the game files containing radius, color, flicker, etc.
+    /// @param lightMask Mask to assign to the newly created LightSource.
+    /// @param isExterior Is the light outside? May be used for deciding which attenuation settings to use.
+    /// @param ambient Ambient component of the light.
+    /// @par Attenuation parameters come from the game INI file.
+    osg::ref_ptr<LightSource> createLightSource (const ESM::Light* esmLight, unsigned int lightMask, bool isExterior, bool outQuadInLin, bool useQuadratic,
+                   float quadraticValue, float quadraticRadiusMult, bool useLinear, float linearRadiusMult, float linearValue, const osg::Vec4f& ambient=osg::Vec4f(0,0,0,1));
+
 }
 
 #endif
diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp
new file mode 100644
index 000000000..1aadc19d6
--- /dev/null
+++ b/components/sceneutil/optimizer.cpp
@@ -0,0 +1,1892 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+/* Modified for OpenMW */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "optimizer.hpp"
+
+#include <osg/Transform>
+#include <osg/MatrixTransform>
+#include <osg/PositionAttitudeTransform>
+#include <osg/LOD>
+#include <osg/Billboard>
+#include <osg/Geometry>
+#include <osg/Notify>
+#include <osg/Texture>
+#include <osg/Timer>
+#include <osg/io_utils>
+
+#include <osgUtil/TransformAttributeFunctor>
+#include <osgUtil/Statistics>
+#include <osgUtil/MeshOptimizers>
+
+#include <typeinfo>
+#include <algorithm>
+#include <numeric>
+#include <sstream>
+
+#include <iterator>
+
+using namespace osgUtil;
+
+namespace SceneUtil
+{
+
+void Optimizer::reset()
+{
+}
+
+void Optimizer::optimize(osg::Node* node, unsigned int options)
+{
+    StatsVisitor stats;
+
+    if (osg::getNotifyLevel()>=osg::INFO)
+    {
+        node->accept(stats);
+        stats.totalUpStats();
+        OSG_NOTICE<<std::endl<<"Stats before:"<<std::endl;
+        stats.print(osg::notify(osg::NOTICE));
+    }
+
+    if (options & FLATTEN_STATIC_TRANSFORMS)
+    {
+        OSG_INFO<<"Optimizer::optimize() doing FLATTEN_STATIC_TRANSFORMS"<<std::endl;
+
+        int i=0;
+        bool result = false;
+        do
+        {
+            OSG_DEBUG << "** RemoveStaticTransformsVisitor *** Pass "<<i<<std::endl;
+            FlattenStaticTransformsVisitor fstv(this);
+            node->accept(fstv);
+            result = fstv.removeTransforms(node);
+            ++i;
+        } while (result);
+
+        // now combine any adjacent static transforms.
+        CombineStaticTransformsVisitor cstv(this);
+        node->accept(cstv);
+        cstv.removeTransforms(node);
+    }
+
+    if (options & REMOVE_REDUNDANT_NODES)
+    {
+        OSG_INFO<<"Optimizer::optimize() doing REMOVE_REDUNDANT_NODES"<<std::endl;
+
+        RemoveEmptyNodesVisitor renv(this);
+        node->accept(renv);
+        renv.removeEmptyNodes();
+
+        RemoveRedundantNodesVisitor rrnv(this);
+        node->accept(rrnv);
+        rrnv.removeRedundantNodes();
+
+        MergeGroupsVisitor mgrp(this);
+        node->accept(mgrp);
+    }
+
+    if (options & MERGE_GEOMETRY)
+    {
+        OSG_INFO<<"Optimizer::optimize() doing MERGE_GEOMETRY"<<std::endl;
+
+        osg::Timer_t startTick = osg::Timer::instance()->tick();
+
+        MergeGeometryVisitor mgv(this);
+        mgv.setTargetMaximumNumberOfVertices(10000);
+        node->accept(mgv);
+
+        osg::Timer_t endTick = osg::Timer::instance()->tick();
+
+        OSG_INFO<<"MERGE_GEOMETRY took "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
+    }
+
+    if (options & VERTEX_POSTTRANSFORM)
+    {
+        OSG_INFO<<"Optimizer::optimize() doing VERTEX_POSTTRANSFORM"<<std::endl;
+        VertexCacheVisitor vcv;
+        node->accept(vcv);
+        vcv.optimizeVertices();
+    }
+
+    if (options & VERTEX_PRETRANSFORM)
+    {
+        OSG_INFO<<"Optimizer::optimize() doing VERTEX_PRETRANSFORM"<<std::endl;
+        VertexAccessOrderVisitor vaov;
+        node->accept(vaov);
+        vaov.optimizeOrder();
+    }
+
+    if (osg::getNotifyLevel()>=osg::INFO)
+    {
+        stats.reset();
+        node->accept(stats);
+        stats.totalUpStats();
+        OSG_NOTICE<<std::endl<<"Stats after:"<<std::endl;
+        stats.print(osg::notify(osg::NOTICE));
+    }
+}
+
+
+
+
+////////////////////////////////////////////////////////////////////////////
+// Flatten static transforms
+////////////////////////////////////////////////////////////////////////////
+
+class CollectLowestTransformsVisitor : public BaseOptimizerVisitor
+{
+    public:
+
+
+        CollectLowestTransformsVisitor(Optimizer* optimizer=0):
+                    BaseOptimizerVisitor(optimizer,Optimizer::FLATTEN_STATIC_TRANSFORMS),
+                    _transformFunctor(osg::Matrix())
+        {
+            setTraversalMode(osg::NodeVisitor::TRAVERSE_PARENTS);
+        }
+
+        virtual void apply(osg::Node& node)
+        {
+            if (node.getNumParents())
+            {
+                traverse(node);
+            }
+            else
+            {
+                // for all current objects mark a NULL transform for them.
+                registerWithCurrentObjects(0);
+            }
+        }
+
+        virtual void apply(osg::LOD& lod)
+        {
+            _currentObjectList.push_back(&lod);
+
+            traverse(lod);
+
+            _currentObjectList.pop_back();
+        }
+
+        virtual void apply(osg::Transform& transform)
+        {
+            // for all current objects associated this transform with them.
+            registerWithCurrentObjects(&transform);
+        }
+
+        virtual void apply(osg::Geode& geode)
+        {
+            traverse(geode);
+        }
+
+        virtual void apply(osg::Billboard& geode)
+        {
+            traverse(geode);
+        }
+
+
+        void collectDataFor(osg::Node* node)
+        {
+            _currentObjectList.push_back(node);
+
+            node->accept(*this);
+
+            _currentObjectList.pop_back();
+        }
+
+        void collectDataFor(osg::Billboard* billboard)
+        {
+            _currentObjectList.push_back(billboard);
+
+            billboard->accept(*this);
+
+            _currentObjectList.pop_back();
+        }
+
+        void collectDataFor(osg::Drawable* drawable)
+        {
+            _currentObjectList.push_back(drawable);
+
+            const osg::Drawable::ParentList& parents = drawable->getParents();
+            for(osg::Drawable::ParentList::const_iterator itr=parents.begin();
+                itr!=parents.end();
+                ++itr)
+            {
+                (*itr)->accept(*this);
+            }
+
+            _currentObjectList.pop_back();
+        }
+
+        void setUpMaps();
+        void disableTransform(osg::Transform* transform);
+        bool removeTransforms(osg::Node* nodeWeCannotRemove);
+
+        inline bool isOperationPermissibleForObject(const osg::Object* object) const
+        {
+            const osg::Node* node = object->asNode();
+            if (node)
+            {
+                const osg::Drawable* drawable = node->asDrawable();
+                if (drawable)
+                     return isOperationPermissibleForObject(drawable);
+                else
+                    return isOperationPermissibleForObject(node);
+            }
+            return true;
+        }
+
+        inline bool isOperationPermissibleForObject(const osg::Drawable* drawable) const
+        {
+            return BaseOptimizerVisitor::isOperationPermissibleForObject(drawable);
+        }
+
+        inline bool isOperationPermissibleForObject(const osg::Node* node) const
+        {
+            return BaseOptimizerVisitor::isOperationPermissibleForObject(node);
+        }
+
+    protected:
+
+        struct TransformStruct
+        {
+            typedef std::set<osg::Object*> ObjectSet;
+
+            TransformStruct():_canBeApplied(true) {}
+
+            void add(osg::Object* obj)
+            {
+                _objectSet.insert(obj);
+            }
+
+            bool        _canBeApplied;
+            ObjectSet   _objectSet;
+        };
+
+        struct ObjectStruct
+        {
+            typedef std::set<osg::Transform*> TransformSet;
+
+            ObjectStruct():_canBeApplied(true),_moreThanOneMatrixRequired(false) {}
+
+            void add(osg::Transform* transform)
+            {
+                if (transform)
+                {
+                    if (transform->getDataVariance()!=osg::Transform::STATIC) _moreThanOneMatrixRequired=true;
+                    else if (transform->getReferenceFrame()!=osg::Transform::RELATIVE_RF) _moreThanOneMatrixRequired=true;
+                    else
+                    {
+                        if (_transformSet.empty()) transform->computeLocalToWorldMatrix(_firstMatrix,0);
+                        else
+                        {
+                            osg::Matrix matrix;
+                            transform->computeLocalToWorldMatrix(matrix,0);
+                            if (_firstMatrix!=matrix) _moreThanOneMatrixRequired=true;
+                        }
+                    }
+                }
+                else
+                {
+                    if (!_transformSet.empty())
+                    {
+                        if (!_firstMatrix.isIdentity()) _moreThanOneMatrixRequired=true;
+                    }
+
+                }
+                _transformSet.insert(transform);
+            }
+
+            bool            _canBeApplied;
+            bool            _moreThanOneMatrixRequired;
+            osg::Matrix     _firstMatrix;
+            TransformSet    _transformSet;
+        };
+
+
+        void registerWithCurrentObjects(osg::Transform* transform)
+        {
+            for(ObjectList::iterator itr=_currentObjectList.begin();
+                itr!=_currentObjectList.end();
+                ++itr)
+            {
+                _objectMap[*itr].add(transform);
+            }
+        }
+
+        typedef std::map<osg::Transform*,TransformStruct>   TransformMap;
+        typedef std::map<osg::Object*,ObjectStruct>         ObjectMap;
+        typedef std::vector<osg::Object*>                   ObjectList;
+
+        void disableObject(osg::Object* object)
+        {
+            disableObject(_objectMap.find(object));
+        }
+
+        void disableObject(ObjectMap::iterator itr);
+        void doTransform(osg::Object* obj,osg::Matrix& matrix);
+
+        osgUtil::TransformAttributeFunctor _transformFunctor;
+        TransformMap    _transformMap;
+        ObjectMap       _objectMap;
+        ObjectList      _currentObjectList;
+
+};
+
+
+void CollectLowestTransformsVisitor::doTransform(osg::Object* obj,osg::Matrix& matrix)
+{
+    osg::Node* node = obj->asNode();
+    if (!node)
+        return;
+    osg::Drawable* drawable = node->asDrawable();
+    if (drawable)
+    {
+        osgUtil::TransformAttributeFunctor tf(matrix);
+        drawable->accept(tf);
+        drawable->dirtyBound();
+        drawable->dirtyDisplayList();
+
+        return;
+    }
+
+    osg::LOD* lod = dynamic_cast<osg::LOD*>(obj);
+    if (lod)
+    {
+        osg::Matrix matrix_no_trans = matrix;
+        matrix_no_trans.setTrans(0.0f,0.0f,0.0f);
+
+        osg::Vec3 v111(1.0f,1.0f,1.0f);
+        osg::Vec3 new_v111 = v111*matrix_no_trans;
+        float ratio = new_v111.length()/v111.length();
+
+        // move center point.
+        lod->setCenter(lod->getCenter()*matrix);
+
+        // adjust ranges to new scale.
+        for(unsigned int i=0;i<lod->getNumRanges();++i)
+        {
+            lod->setRange(i,lod->getMinRange(i)*ratio,lod->getMaxRange(i)*ratio);
+        }
+
+        lod->dirtyBound();
+        return;
+    }
+
+    osg::Billboard* billboard = dynamic_cast<osg::Billboard*>(obj);
+    if (billboard)
+    {
+        osg::Matrix matrix_no_trans = matrix;
+        matrix_no_trans.setTrans(0.0f,0.0f,0.0f);
+
+        osgUtil::TransformAttributeFunctor tf(matrix_no_trans);
+
+        osg::Vec3 axis = osg::Matrix::transform3x3(tf._im,billboard->getAxis());
+        axis.normalize();
+        billboard->setAxis(axis);
+
+        osg::Vec3 normal = osg::Matrix::transform3x3(tf._im,billboard->getNormal());
+        normal.normalize();
+        billboard->setNormal(normal);
+
+
+        for(unsigned int i=0;i<billboard->getNumDrawables();++i)
+        {
+            billboard->setPosition(i,billboard->getPosition(i)*matrix);
+            billboard->getDrawable(i)->accept(tf);
+            billboard->getDrawable(i)->dirtyBound();
+        }
+
+        billboard->dirtyBound();
+
+        return;
+    }
+}
+
+void CollectLowestTransformsVisitor::disableObject(ObjectMap::iterator itr)
+{
+    if (itr==_objectMap.end())
+    {
+        return;
+    }
+
+    if (itr->second._canBeApplied)
+    {
+        // we havn't been disabled yet so we need to disable,
+        itr->second._canBeApplied = false;
+
+        // and then inform everybody we have been disabled.
+        for(ObjectStruct::TransformSet::iterator titr = itr->second._transformSet.begin();
+            titr != itr->second._transformSet.end();
+            ++titr)
+        {
+            disableTransform(*titr);
+        }
+    }
+}
+
+void CollectLowestTransformsVisitor::disableTransform(osg::Transform* transform)
+{
+    TransformMap::iterator itr=_transformMap.find(transform);
+    if (itr==_transformMap.end())
+    {
+        return;
+    }
+
+    if (itr->second._canBeApplied)
+    {
+
+        // we havn't been disabled yet so we need to disable,
+        itr->second._canBeApplied = false;
+        // and then inform everybody we have been disabled.
+        for(TransformStruct::ObjectSet::iterator oitr = itr->second._objectSet.begin();
+            oitr != itr->second._objectSet.end();
+            ++oitr)
+        {
+            disableObject(*oitr);
+        }
+    }
+}
+
+void CollectLowestTransformsVisitor::setUpMaps()
+{
+    // create the TransformMap from the ObjectMap
+    ObjectMap::iterator oitr;
+    for(oitr=_objectMap.begin();
+        oitr!=_objectMap.end();
+        ++oitr)
+    {
+        osg::Object* object = oitr->first;
+        ObjectStruct& os = oitr->second;
+
+        for(ObjectStruct::TransformSet::iterator titr = os._transformSet.begin();
+            titr != os._transformSet.end();
+            ++titr)
+        {
+            _transformMap[*titr].add(object);
+        }
+    }
+
+    // disable all the objects which have more than one matrix associated
+    // with them, and then disable all transforms which have an object associated
+    // them that can't be applied, and then disable all objects which have
+    // disabled transforms associated, recursing until all disabled
+    // associativity.
+    // and disable all objects that the operation is not permisable for)
+    for(oitr=_objectMap.begin();
+        oitr!=_objectMap.end();
+        ++oitr)
+    {
+        osg::Object* object = oitr->first;
+        ObjectStruct& os = oitr->second;
+        if (os._canBeApplied)
+        {
+            if (os._moreThanOneMatrixRequired || !isOperationPermissibleForObject(object))
+            {
+                disableObject(oitr);
+            }
+        }
+    }
+
+}
+
+bool CollectLowestTransformsVisitor::removeTransforms(osg::Node* nodeWeCannotRemove)
+{
+    // transform the objects that can be applied.
+    for(ObjectMap::iterator oitr=_objectMap.begin();
+        oitr!=_objectMap.end();
+        ++oitr)
+    {
+        osg::Object* object = oitr->first;
+        ObjectStruct& os = oitr->second;
+        if (os._canBeApplied)
+        {
+            doTransform(object,os._firstMatrix);
+        }
+    }
+
+
+    bool transformRemoved = false;
+
+    // clean up the transforms.
+    for(TransformMap::iterator titr=_transformMap.begin();
+        titr!=_transformMap.end();
+        ++titr)
+    {
+        if (titr->first!=0 && titr->second._canBeApplied)
+        {
+            if (titr->first!=nodeWeCannotRemove)
+            {
+                transformRemoved = true;
+
+                osg::ref_ptr<osg::Transform> transform = titr->first;
+                osg::ref_ptr<osg::Group>     group = new osg::Group;
+                group->setName( transform->getName() );
+                group->setDataVariance(osg::Object::STATIC);
+                group->setNodeMask(transform->getNodeMask());
+                group->setStateSet(transform->getStateSet());
+                group->setUpdateCallback(transform->getUpdateCallback());
+                group->setEventCallback(transform->getEventCallback());
+                group->setCullCallback(transform->getCullCallback());
+                group->setUserDataContainer(transform->getUserDataContainer());
+                group->setDescriptions(transform->getDescriptions());
+                for(unsigned int i=0;i<transform->getNumChildren();++i)
+                {
+                    group->addChild(transform->getChild(i));
+                }
+
+                for(int i2=transform->getNumParents()-1;i2>=0;--i2)
+                {
+                    transform->getParent(i2)->replaceChild(transform.get(),group.get());
+                }
+            }
+            else
+            {
+                osg::MatrixTransform* mt = titr->first->asMatrixTransform();
+                if (mt) mt->setMatrix(osg::Matrix::identity());
+                else
+                {
+                    osg::PositionAttitudeTransform* pat = titr->first->asPositionAttitudeTransform();
+                    if (pat)
+                    {
+                        pat->setPosition(osg::Vec3(0.0f,0.0f,0.0f));
+                        pat->setAttitude(osg::Quat());
+                        pat->setPivotPoint(osg::Vec3(0.0f,0.0f,0.0f));
+                    }
+                    else
+                    {
+                        OSG_WARN<<"Warning:: during Optimize::CollectLowestTransformsVisitor::removeTransforms(Node*)"<<std::endl;
+                        OSG_WARN<<"          unhandled of setting of indentity matrix on "<< titr->first->className()<<std::endl;
+                        OSG_WARN<<"          model will appear in the incorrect position."<<std::endl;
+                    }
+                }
+
+            }
+        }
+    }
+    _objectMap.clear();
+    _transformMap.clear();
+
+    return transformRemoved;
+}
+
+void Optimizer::FlattenStaticTransformsVisitor::apply(osg::Node& node)
+{
+    traverse(node);
+}
+
+
+void Optimizer::FlattenStaticTransformsVisitor::apply(osg::Drawable& drawable)
+{
+    osg::Geometry *geometry = drawable.asGeometry();
+    if((geometry) && (isOperationPermissibleForObject(&drawable)))
+    {
+        if(geometry->getVertexArray() && geometry->getVertexArray()->referenceCount() > 1) {
+            geometry->setVertexArray(dynamic_cast<osg::Array*>(geometry->getVertexArray()->clone(osg::CopyOp::DEEP_COPY_ALL)));
+        }
+        if(geometry->getNormalArray() && geometry->getNormalArray()->referenceCount() > 1) {
+            geometry->setNormalArray(dynamic_cast<osg::Array*>(geometry->getNormalArray()->clone(osg::CopyOp::DEEP_COPY_ALL)));
+        }
+    }
+    _drawableSet.insert(&drawable);
+}
+
+void Optimizer::FlattenStaticTransformsVisitor::apply(osg::Billboard& billboard)
+{
+    if (!_transformStack.empty())
+    {
+        _billboardSet.insert(&billboard);
+    }
+}
+
+void Optimizer::FlattenStaticTransformsVisitor::apply(osg::Transform& transform)
+{
+    if (!_transformStack.empty())
+    {
+        // we need to disable any transform higher in the list.
+        _transformSet.insert(_transformStack.back());
+    }
+
+    _transformStack.push_back(&transform);
+
+    // simple traverse the children as if this Transform didn't exist.
+    traverse(transform);
+
+    _transformStack.pop_back();
+}
+
+bool Optimizer::FlattenStaticTransformsVisitor::removeTransforms(osg::Node* nodeWeCannotRemove)
+{
+    CollectLowestTransformsVisitor cltv(_optimizer);
+
+    for(NodeSet::iterator nitr=_excludedNodeSet.begin();
+        nitr!=_excludedNodeSet.end();
+        ++nitr)
+    {
+        cltv.collectDataFor(*nitr);
+    }
+
+    for(DrawableSet::iterator ditr=_drawableSet.begin();
+        ditr!=_drawableSet.end();
+        ++ditr)
+    {
+        cltv.collectDataFor(*ditr);
+    }
+
+    for(BillboardSet::iterator bitr=_billboardSet.begin();
+        bitr!=_billboardSet.end();
+        ++bitr)
+    {
+        cltv.collectDataFor(*bitr);
+    }
+
+    cltv.setUpMaps();
+
+    for(TransformSet::iterator titr=_transformSet.begin();
+        titr!=_transformSet.end();
+        ++titr)
+    {
+        cltv.disableTransform(*titr);
+    }
+
+
+    return cltv.removeTransforms(nodeWeCannotRemove);
+}
+
+////////////////////////////////////////////////////////////////////////////
+// CombineStaticTransforms
+////////////////////////////////////////////////////////////////////////////
+
+void Optimizer::CombineStaticTransformsVisitor::apply(osg::MatrixTransform& transform)
+{
+    if (transform.getDataVariance()==osg::Object::STATIC &&
+        transform.getNumChildren()==1 &&
+        transform.getChild(0)->asTransform()!=0 &&
+        transform.getChild(0)->asTransform()->asMatrixTransform()!=0 &&
+        transform.getChild(0)->asTransform()->getDataVariance()==osg::Object::STATIC &&
+        isOperationPermissibleForObject(&transform) && isOperationPermissibleForObject(transform.getChild(0)))
+    {
+        _transformSet.insert(&transform);
+    }
+
+    traverse(transform);
+}
+
+bool Optimizer::CombineStaticTransformsVisitor::removeTransforms(osg::Node* nodeWeCannotRemove)
+{
+    if (nodeWeCannotRemove && nodeWeCannotRemove->asTransform()!=0 && nodeWeCannotRemove->asTransform()->asMatrixTransform()!=0)
+    {
+        // remove topmost node from transform set if it exists there.
+        TransformSet::iterator itr = _transformSet.find(nodeWeCannotRemove->asTransform()->asMatrixTransform());
+        if (itr!=_transformSet.end()) _transformSet.erase(itr);
+    }
+
+    bool transformRemoved = false;
+
+    while (!_transformSet.empty())
+    {
+        // get the first available transform to combine.
+        osg::ref_ptr<osg::MatrixTransform> transform = *_transformSet.begin();
+        _transformSet.erase(_transformSet.begin());
+
+        if (transform->getNumChildren()==1 &&
+            transform->getChild(0)->asTransform()!=0 &&
+            transform->getChild(0)->asTransform()->asMatrixTransform()!=0 &&
+            transform->getChild(0)->asTransform()->getDataVariance()==osg::Object::STATIC)
+        {
+            // now combine with its child.
+            osg::MatrixTransform* child = transform->getChild(0)->asTransform()->asMatrixTransform();
+
+            osg::Matrix newMatrix = child->getMatrix()*transform->getMatrix();
+            child->setMatrix(newMatrix);
+            if (transform->getStateSet())
+            {
+                if(child->getStateSet()) child->getStateSet()->merge(*transform->getStateSet());
+                else child->setStateSet(transform->getStateSet());
+            }
+
+            transformRemoved = true;
+
+            osg::Node::ParentList parents = transform->getParents();
+            for(osg::Node::ParentList::iterator pitr=parents.begin();
+                pitr!=parents.end();
+                ++pitr)
+            {
+                (*pitr)->replaceChild(transform.get(),child);
+            }
+
+        }
+
+    }
+    return transformRemoved;
+}
+
+////////////////////////////////////////////////////////////////////////////
+// RemoveEmptyNodes.
+////////////////////////////////////////////////////////////////////////////
+
+void Optimizer::RemoveEmptyNodesVisitor::apply(osg::Group& group)
+{
+    if (group.getNumParents()>0)
+    {
+        // only remove empty groups, but not empty occluders.
+        if (group.getNumChildren()==0 && isOperationPermissibleForObject(&group) &&
+            (typeid(group)==typeid(osg::Group) || (group.asTransform())) &&
+            (group.getNumChildrenRequiringUpdateTraversal()==0 && group.getNumChildrenRequiringEventTraversal()==0) )
+        {
+            _redundantNodeList.insert(&group);
+        }
+    }
+    traverse(group);
+}
+
+void Optimizer::RemoveEmptyNodesVisitor::removeEmptyNodes()
+{
+
+    NodeList newEmptyGroups;
+
+    // keep iterator through until scene graph is cleaned of empty nodes.
+    while (!_redundantNodeList.empty())
+    {
+        for(NodeList::iterator itr=_redundantNodeList.begin();
+            itr!=_redundantNodeList.end();
+            ++itr)
+        {
+
+            osg::ref_ptr<osg::Node> nodeToRemove = (*itr);
+
+            // take a copy of parents list since subsequent removes will modify the original one.
+            osg::Node::ParentList parents = nodeToRemove->getParents();
+
+            for(osg::Node::ParentList::iterator pitr=parents.begin();
+                pitr!=parents.end();
+                ++pitr)
+            {
+                osg::Group* parent = *pitr;
+                parent->removeChild(nodeToRemove.get());
+                if (parent->getNumChildren()==0 && isOperationPermissibleForObject(parent)) newEmptyGroups.insert(parent);
+            }
+        }
+
+        _redundantNodeList.clear();
+        _redundantNodeList.swap(newEmptyGroups);
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////
+// RemoveRedundantNodes.
+////////////////////////////////////////////////////////////////////////////
+
+bool Optimizer::RemoveRedundantNodesVisitor::isOperationPermissible(osg::Node& node)
+{
+    return node.getNumParents()>0 &&
+           !node.getStateSet() &&
+           !node.getCullCallback() &&
+           !node.getEventCallback() &&
+           !node.getUpdateCallback() &&
+           isOperationPermissibleForObject(&node);
+}
+
+void Optimizer::RemoveRedundantNodesVisitor::apply(osg::Group& group)
+{
+    if (group.getNumChildren()==1 &&
+        typeid(group)==typeid(osg::Group) &&
+        isOperationPermissible(group))
+    {
+        _redundantNodeList.insert(&group);
+    }
+
+    traverse(group);
+}
+
+
+
+void Optimizer::RemoveRedundantNodesVisitor::apply(osg::Transform& transform)
+{
+    if (transform.getDataVariance()==osg::Object::STATIC &&
+        isOperationPermissible(transform))
+    {
+        osg::Matrix matrix;
+        transform.computeWorldToLocalMatrix(matrix,NULL);
+        if (matrix.isIdentity())
+        {
+            _redundantNodeList.insert(&transform);
+        }
+    }
+    traverse(transform);
+}
+
+
+void Optimizer::RemoveRedundantNodesVisitor::removeRedundantNodes()
+{
+
+    for(NodeList::iterator itr=_redundantNodeList.begin();
+        itr!=_redundantNodeList.end();
+        ++itr)
+    {
+        osg::ref_ptr<osg::Group> group = (*itr)->asGroup();
+        if (group.valid())
+        {
+            // take a copy of parents list since subsequent removes will modify the original one.
+            osg::Node::ParentList parents = group->getParents();
+
+            for(osg::Node::ParentList::iterator pitr=parents.begin();
+                pitr!=parents.end();
+                ++pitr)
+            {
+                for (unsigned int i=0; i<group->getNumChildren(); ++i)
+                {
+                    osg::Node* child = group->getChild(i);
+                    (*pitr)->addChild(child);
+                }
+
+                (*pitr)->removeChild(group);
+            }
+
+            group->removeChildren(0, group->getNumChildren());
+        }
+        else
+        {
+            OSG_WARN<<"Optimizer::RemoveRedundantNodesVisitor::removeRedundantNodes() - failed dynamic_cast"<<std::endl;
+        }
+    }
+    _redundantNodeList.clear();
+}
+
+
+
+////////////////////////////////////////////////////////////////////////////
+// code to merge geometry object which share, state, and attribute bindings.
+////////////////////////////////////////////////////////////////////////////
+
+#define COMPARE_BINDING(lhs, rhs) \
+        if (osg::getBinding(lhs)<osg::getBinding(rhs)) return true; \
+        if (osg::getBinding(rhs)<osg::getBinding(lhs)) return false;
+
+
+struct LessGeometry
+{
+    bool operator() (const osg::Geometry* lhs,const osg::Geometry* rhs) const
+    {
+        if (lhs->getStateSet()<rhs->getStateSet()) return true;
+        if (rhs->getStateSet()<lhs->getStateSet()) return false;
+
+        COMPARE_BINDING(lhs->getNormalArray(), rhs->getNormalArray())
+        COMPARE_BINDING(lhs->getColorArray(), rhs->getColorArray())
+        COMPARE_BINDING(lhs->getSecondaryColorArray(), rhs->getSecondaryColorArray())
+        COMPARE_BINDING(lhs->getFogCoordArray(), rhs->getFogCoordArray())
+
+
+        if (lhs->getNumTexCoordArrays()<rhs->getNumTexCoordArrays()) return true;
+        if (rhs->getNumTexCoordArrays()<lhs->getNumTexCoordArrays()) return false;
+
+        // therefore lhs->getNumTexCoordArrays()==rhs->getNumTexCoordArrays()
+
+        unsigned int i;
+        for(i=0;i<lhs->getNumTexCoordArrays();++i)
+        {
+            if (rhs->getTexCoordArray(i))
+            {
+                if (!lhs->getTexCoordArray(i)) return true;
+            }
+            else if (lhs->getTexCoordArray(i)) return false;
+        }
+
+        for(i=0;i<lhs->getNumVertexAttribArrays();++i)
+        {
+            if (rhs->getVertexAttribArray(i))
+            {
+                if (!lhs->getVertexAttribArray(i)) return true;
+            }
+            else if (lhs->getVertexAttribArray(i)) return false;
+        }
+
+
+        if (osg::getBinding(lhs->getNormalArray())==osg::Array::BIND_OVERALL)
+        {
+            // assumes that the bindings and arrays are set up correctly, this
+            // should be the case after running computeCorrectBindingsAndArraySizes();
+            const osg::Array* lhs_normalArray = lhs->getNormalArray();
+            const osg::Array* rhs_normalArray = rhs->getNormalArray();
+            if (lhs_normalArray->getType()<rhs_normalArray->getType()) return true;
+            if (rhs_normalArray->getType()<lhs_normalArray->getType()) return false;
+            switch(lhs_normalArray->getType())
+            {
+            case(osg::Array::Vec3bArrayType):
+                if ((*static_cast<const osg::Vec3bArray*>(lhs_normalArray))[0]<(*static_cast<const osg::Vec3bArray*>(rhs_normalArray))[0]) return true;
+                if ((*static_cast<const osg::Vec3bArray*>(rhs_normalArray))[0]<(*static_cast<const osg::Vec3bArray*>(lhs_normalArray))[0]) return false;
+                break;
+            case(osg::Array::Vec3sArrayType):
+                if ((*static_cast<const osg::Vec3sArray*>(lhs_normalArray))[0]<(*static_cast<const osg::Vec3sArray*>(rhs_normalArray))[0]) return true;
+                if ((*static_cast<const osg::Vec3sArray*>(rhs_normalArray))[0]<(*static_cast<const osg::Vec3sArray*>(lhs_normalArray))[0]) return false;
+                break;
+            case(osg::Array::Vec3ArrayType):
+                if ((*static_cast<const osg::Vec3Array*>(lhs_normalArray))[0]<(*static_cast<const osg::Vec3Array*>(rhs_normalArray))[0]) return true;
+                if ((*static_cast<const osg::Vec3Array*>(rhs_normalArray))[0]<(*static_cast<const osg::Vec3Array*>(lhs_normalArray))[0]) return false;
+                break;
+            default:
+                break;
+            }
+        }
+
+        if (osg::getBinding(lhs->getColorArray())==osg::Array::BIND_OVERALL)
+        {
+            const osg::Array* lhs_colorArray = lhs->getColorArray();
+            const osg::Array* rhs_colorArray = rhs->getColorArray();
+            if (lhs_colorArray->getType()<rhs_colorArray->getType()) return true;
+            if (rhs_colorArray->getType()<lhs_colorArray->getType()) return false;
+            switch(lhs_colorArray->getType())
+            {
+                case(osg::Array::Vec4ubArrayType):
+                    if ((*static_cast<const osg::Vec4ubArray*>(lhs_colorArray))[0]<(*static_cast<const osg::Vec4ubArray*>(rhs_colorArray))[0]) return true;
+                    if ((*static_cast<const osg::Vec4ubArray*>(rhs_colorArray))[0]<(*static_cast<const osg::Vec4ubArray*>(lhs_colorArray))[0]) return false;
+                    break;
+                case(osg::Array::Vec3ArrayType):
+                    if ((*static_cast<const osg::Vec3Array*>(lhs_colorArray))[0]<(*static_cast<const osg::Vec3Array*>(rhs_colorArray))[0]) return true;
+                    if ((*static_cast<const osg::Vec3Array*>(rhs_colorArray))[0]<(*static_cast<const osg::Vec3Array*>(lhs_colorArray))[0]) return false;
+                    break;
+                case(osg::Array::Vec4ArrayType):
+                    if ((*static_cast<const osg::Vec4Array*>(lhs_colorArray))[0]<(*static_cast<const osg::Vec4Array*>(rhs_colorArray))[0]) return true;
+                    if ((*static_cast<const osg::Vec4Array*>(rhs_colorArray))[0]<(*static_cast<const osg::Vec4Array*>(lhs_colorArray))[0]) return false;
+                    break;
+                default:
+                    break;
+            }
+
+        }
+
+        return false;
+
+    }
+};
+
+struct LessGeometryPrimitiveType
+{
+    bool operator() (const osg::Geometry* lhs,const osg::Geometry* rhs) const
+    {
+        for(unsigned int i=0;
+            i<lhs->getNumPrimitiveSets() && i<rhs->getNumPrimitiveSets();
+            ++i)
+        {
+            if (lhs->getPrimitiveSet(i)->getType()<rhs->getPrimitiveSet(i)->getType()) return true;
+            else if (rhs->getPrimitiveSet(i)->getType()<lhs->getPrimitiveSet(i)->getType()) return false;
+
+            if (lhs->getPrimitiveSet(i)->getMode()<rhs->getPrimitiveSet(i)->getMode()) return true;
+            else if (rhs->getPrimitiveSet(i)->getMode()<lhs->getPrimitiveSet(i)->getMode()) return false;
+
+        }
+        return lhs->getNumPrimitiveSets()<rhs->getNumPrimitiveSets();
+    }
+};
+
+
+/// Shortcut to get size of an array, even if pointer is NULL.
+inline unsigned int getSize(const osg::Array * a) { return a ? a->getNumElements() : 0; }
+
+/// When merging geometries, tests if two arrays can be merged, regarding to their number of components, and the number of vertices.
+bool isArrayCompatible(unsigned int numVertice1, unsigned int numVertice2, const osg::Array* compare1, const osg::Array* compare2)
+{
+    // Sumed up truth table:
+    //  If array (1 or 2) not empty and vertices empty => error, should not happen (allows simplification in formulae below)
+    //  If one side has both vertices and array, and the other side has only vertices => then arrays cannot be merged
+    //  Else, arrays can be merged
+    //assert(numVertice1 || !getSize(compare1));
+    //assert(numVertice2 || !getSize(compare2));
+    return !(   (numVertice1 && !getSize(compare1) && getSize(compare2))
+             || (numVertice2 && !getSize(compare2) && getSize(compare1)) );
+}
+
+/// Return true only if both geometries have same array type and if arrays (such as TexCoords) are compatible (i.e. both empty or both filled)
+bool isAbleToMerge(const osg::Geometry& g1, const osg::Geometry& g2)
+{
+    unsigned int numVertice1( getSize(g1.getVertexArray()) );
+    unsigned int numVertice2( getSize(g2.getVertexArray()) );
+
+    // first verify arrays size
+    if (!isArrayCompatible(numVertice1,numVertice2,g1.getNormalArray(),g2.getNormalArray()) ||
+        !isArrayCompatible(numVertice1,numVertice2,g1.getColorArray(),g2.getColorArray()) ||
+        !isArrayCompatible(numVertice1,numVertice2,g1.getSecondaryColorArray(),g2.getSecondaryColorArray()) ||
+        !isArrayCompatible(numVertice1,numVertice2,g1.getFogCoordArray(),g2.getFogCoordArray()) ||
+        g1.getNumTexCoordArrays()!=g2.getNumTexCoordArrays()) return false;
+
+    for (unsigned int eachTexCoordArray=0;eachTexCoordArray<g1.getNumTexCoordArrays();++eachTexCoordArray)
+    {
+        if (!isArrayCompatible(numVertice1,numVertice2,g1.getTexCoordArray(eachTexCoordArray),g2.getTexCoordArray(eachTexCoordArray))) return false;
+    }
+
+    // then verify data type compatibility
+    if (g1.getVertexArray() && g2.getVertexArray() && g1.getVertexArray()->getDataType()!=g2.getVertexArray()->getDataType()) return false;
+    if (g1.getNormalArray() && g2.getNormalArray() && g1.getNormalArray()->getDataType()!=g2.getNormalArray()->getDataType()) return false;
+    if (g1.getColorArray() && g2.getColorArray() && g1.getColorArray()->getDataType()!=g2.getColorArray()->getDataType()) return false;
+    if (g1.getSecondaryColorArray() && g2.getSecondaryColorArray() && g1.getSecondaryColorArray()->getDataType()!=g2.getSecondaryColorArray()->getDataType()) return false;
+    if (g1.getFogCoordArray() && g2.getNormalArray() && g1.getFogCoordArray()->getDataType()!=g2.getFogCoordArray()->getDataType()) return false;
+    return true;
+}
+
+
+void Optimizer::MergeGeometryVisitor::pushStateSet(osg::StateSet *stateSet)
+{
+    _stateSetStack.push_back(stateSet);
+    checkAllowedToMerge();
+}
+
+void Optimizer::MergeGeometryVisitor::popStateSet()
+{
+    _stateSetStack.pop_back();
+    checkAllowedToMerge();
+}
+
+void Optimizer::MergeGeometryVisitor::checkAllowedToMerge()
+{
+    int renderingHint = 0;
+    bool override = false;
+    for (std::vector<osg::StateSet*>::const_iterator it = _stateSetStack.begin(); it != _stateSetStack.end(); ++it)
+    {
+        osg::StateSet* stateSet = *it;
+        osg::StateSet::RenderBinMode mode = stateSet->getRenderBinMode();
+        if (override && (!mode & osg::StateSet::PROTECTED_RENDERBIN_DETAILS))
+            continue;
+        if (mode & osg::StateSet::USE_RENDERBIN_DETAILS)
+            renderingHint = stateSet->getRenderingHint();
+        if (mode & osg::StateSet::OVERRIDE_RENDERBIN_DETAILS)
+            override = true;
+    }
+    // Can't merge Geometry that are using a transparent sorting bin as that would cause the sorting to break.
+    _allowedToMerge = renderingHint != osg::StateSet::TRANSPARENT_BIN;
+}
+
+void Optimizer::MergeGeometryVisitor::apply(osg::Group &group)
+{
+    if (group.getStateSet())
+        pushStateSet(group.getStateSet());
+
+    if (_allowedToMerge)
+        mergeGroup(group);
+
+    traverse(group);
+
+    if (group.getStateSet())
+        popStateSet();
+}
+
+bool Optimizer::MergeGeometryVisitor::mergeGroup(osg::Group& group)
+{
+    if (!isOperationPermissibleForObject(&group)) return false;
+
+    if (group.getNumChildren()>=2)
+    {
+
+        typedef std::vector<osg::Geometry*>                         DuplicateList;
+        typedef std::vector< osg::ref_ptr<osg::Drawable> >          DrawableList;
+        typedef std::map<osg::Geometry*,DuplicateList,LessGeometry> GeometryDuplicateMap;
+
+        typedef std::vector<DuplicateList> MergeList;
+
+        GeometryDuplicateMap geometryDuplicateMap;
+        DrawableList standardDrawables;
+
+        unsigned int i;
+        for(i=0;i<group.getNumChildren();++i)
+        {
+            osg::Drawable* drawable = group.getChild(i)->asDrawable();
+            if (drawable)
+            {
+                osg::Geometry* geom = drawable->asGeometry();
+                if (geom)
+                {
+                    //geom->computeCorrectBindingsAndArraySizes();
+
+                    if (!geometryContainsSharedArrays(*geom) &&
+                        geom->getDataVariance()!=osg::Object::DYNAMIC &&
+                        isOperationPermissibleForObject(geom))
+                    {
+                        geometryDuplicateMap[geom].push_back(geom);
+                    }
+                    else
+                    {
+                        standardDrawables.push_back(drawable);
+                    }
+                }
+                else
+                {
+                    standardDrawables.push_back(drawable);
+                }
+            }
+        }
+
+#if 1
+        // first try to group geometries with the same properties
+        // (i.e. array types) to avoid loss of data during merging
+        MergeList mergeListChecked;        // List of drawables just before merging, grouped by "compatibility" and vertex limit
+        MergeList mergeList;            // Intermediate list of drawables, grouped ony by "compatibility"
+        for(GeometryDuplicateMap::iterator itr=geometryDuplicateMap.begin();
+            itr!=geometryDuplicateMap.end();
+            ++itr)
+        {
+            if (itr->second.empty()) continue;
+            if (itr->second.size()==1)
+            {
+                mergeList.push_back(DuplicateList());
+                DuplicateList* duplicateList = &mergeList.back();
+                duplicateList->push_back(itr->second[0]);
+                continue;
+            }
+
+            std::sort(itr->second.begin(),itr->second.end(),LessGeometryPrimitiveType());
+
+            // initialize the temporary list by pushing the first geometry
+            MergeList mergeListTmp;
+            mergeListTmp.push_back(DuplicateList());
+            DuplicateList* duplicateList = &mergeListTmp.back();
+            duplicateList->push_back(itr->second[0]);
+
+            for(DuplicateList::iterator dupItr=itr->second.begin()+1;
+                dupItr!=itr->second.end();
+                ++dupItr)
+            {
+                osg::Geometry* geomToPush = *dupItr;
+
+                // try to group geomToPush with another geometry
+                MergeList::iterator eachMergeList=mergeListTmp.begin();
+                for(;eachMergeList!=mergeListTmp.end();++eachMergeList)
+                {
+                    if (!eachMergeList->empty() && eachMergeList->front()!=NULL
+                        && isAbleToMerge(*eachMergeList->front(),*geomToPush))
+                    {
+                        eachMergeList->push_back(geomToPush);
+                        break;
+                    }
+                }
+
+                // if no suitable group was found, then a new one is created
+                if (eachMergeList==mergeListTmp.end())
+                {
+                    mergeListTmp.push_back(DuplicateList());
+                    duplicateList = &mergeListTmp.back();
+                    duplicateList->push_back(geomToPush);
+                }
+            }
+
+            // copy the group in the mergeListChecked
+            for(MergeList::iterator eachMergeList=mergeListTmp.begin();eachMergeList!=mergeListTmp.end();++eachMergeList)
+            {
+                mergeListChecked.push_back(*eachMergeList);
+            }
+        }
+
+        // then build merge list using _targetMaximumNumberOfVertices
+        bool needToDoMerge = false;
+        // dequeue each DuplicateList when vertices limit is reached or when all elements has been checked
+        for(;!mergeListChecked.empty();)
+        {
+            MergeList::iterator itr=mergeListChecked.begin();
+            DuplicateList& duplicateList(*itr);
+            if (duplicateList.size()==0)
+            {
+                mergeListChecked.erase(itr);
+                continue;
+            }
+
+            if (duplicateList.size()==1)
+            {
+                mergeList.push_back(duplicateList);
+                mergeListChecked.erase(itr);
+                continue;
+            }
+
+            unsigned int numVertices(duplicateList.front()->getVertexArray() ? duplicateList.front()->getVertexArray()->getNumElements() : 0);
+            DuplicateList::iterator eachGeom(duplicateList.begin()+1);
+            // until all geometries have been checked or _targetMaximumNumberOfVertices is reached
+            for(;eachGeom!=duplicateList.end(); ++eachGeom)
+            {
+                unsigned int numAddVertices((*eachGeom)->getVertexArray() ? (*eachGeom)->getVertexArray()->getNumElements() : 0);
+                if ((numVertices+numAddVertices)>_targetMaximumNumberOfVertices)
+                {
+                    break;
+                }
+                else
+                {
+                    numVertices += numAddVertices;
+                }
+            }
+
+            // push back if bellow the limit
+            if (eachGeom==duplicateList.end())
+            {
+                if (duplicateList.size()>1) needToDoMerge = true;
+                mergeList.push_back(duplicateList);
+                mergeListChecked.erase(itr);
+            }
+            // else split the list to store what is below the limit and retry on what is above
+            else
+            {
+                mergeList.push_back(DuplicateList());
+                DuplicateList* duplicateListResult = &mergeList.back();
+                duplicateListResult->insert(duplicateListResult->end(),duplicateList.begin(),eachGeom);
+                duplicateList.erase(duplicateList.begin(),eachGeom);
+                if (duplicateListResult->size()>1) needToDoMerge = true;
+            }
+        }
+
+        if (needToDoMerge)
+        {
+            // now do the merging of geometries
+            for(MergeList::iterator mitr = mergeList.begin();
+                mitr != mergeList.end();
+                ++mitr)
+            {
+                DuplicateList& duplicateList = *mitr;
+                if (duplicateList.size()>1)
+                {
+                    osg::Geometry* lhs = duplicateList.front();
+                    for(DuplicateList::iterator ditr = duplicateList.begin()+1;
+                        ditr != duplicateList.end();
+                        ++ditr)
+                    {
+                        mergeGeometry(*lhs,**ditr);
+
+                        group.removeChild(*ditr);
+                    }
+                }
+            }
+        }
+
+#else
+        // don't merge geometry if its above a maximum number of vertices.
+        for(GeometryDuplicateMap::iterator itr=geometryDuplicateMap.begin();
+            itr!=geometryDuplicateMap.end();
+            ++itr)
+        {
+            if (itr->second.size()>1)
+            {
+                std::sort(itr->second.begin(),itr->second.end(),LessGeometryPrimitiveType());
+                osg::Geometry* lhs = itr->second[0];
+                for(DuplicateList::iterator dupItr=itr->second.begin()+1;
+                    dupItr!=itr->second.end();
+                    ++dupItr)
+                {
+
+                    osg::Geometry* rhs = *dupItr;
+
+                    if (lhs->getVertexArray() && lhs->getVertexArray()->getNumElements()>=_targetMaximumNumberOfVertices)
+                    {
+                        lhs = rhs;
+                        continue;
+                    }
+
+                    if (rhs->getVertexArray() && rhs->getVertexArray()->getNumElements()>=_targetMaximumNumberOfVertices)
+                    {
+                        continue;
+                    }
+
+                    if (lhs->getVertexArray() && rhs->getVertexArray() &&
+                        (lhs->getVertexArray()->getNumElements()+rhs->getVertexArray()->getNumElements())>=_targetMaximumNumberOfVertices)
+                    {
+                        continue;
+                    }
+
+                    if (mergeGeometry(*lhs,*rhs))
+                    {
+                        geode.removeDrawable(rhs);
+
+                        static int co = 0;
+                        OSG_INFO<<"merged and removed Geometry "<<++co<<std::endl;
+                    }
+                }
+            }
+        }
+#endif
+
+    }
+
+
+    // convert all polygon primitives which has 3 indices into TRIANGLES, 4 indices into QUADS.
+    unsigned int i;
+    for(i=0;i<group.getNumChildren();++i)
+    {
+        osg::Drawable* drawable = group.getChild(i)->asDrawable();
+        if (!drawable)
+            continue;
+        osg::Geometry* geom = drawable->asGeometry();
+        if (geom)
+        {
+            osg::Geometry::PrimitiveSetList& primitives = geom->getPrimitiveSetList();
+            for(osg::Geometry::PrimitiveSetList::iterator itr=primitives.begin();
+                itr!=primitives.end();
+                ++itr)
+            {
+                osg::PrimitiveSet* prim = itr->get();
+                if (prim->getMode()==osg::PrimitiveSet::POLYGON)
+                {
+                    if (prim->getNumIndices()==3)
+                    {
+                        prim->setMode(osg::PrimitiveSet::TRIANGLES);
+                    }
+                    else if (prim->getNumIndices()==4)
+                    {
+                        prim->setMode(osg::PrimitiveSet::QUADS);
+                    }
+                }
+            }
+        }
+    }
+
+    // now merge any compatible primitives.
+    for(i=0;i<group.getNumChildren();++i)
+    {
+        osg::Drawable* drawable = group.getChild(i)->asDrawable();
+        if (!drawable)
+            continue;
+        osg::Geometry* geom = drawable->asGeometry();
+        if (geom)
+        {
+            if (geom->getNumPrimitiveSets()>0 &&
+                osg::getBinding(geom->getNormalArray())!=osg::Array::BIND_PER_PRIMITIVE_SET &&
+                osg::getBinding(geom->getColorArray())!=osg::Array::BIND_PER_PRIMITIVE_SET &&
+                osg::getBinding(geom->getSecondaryColorArray())!=osg::Array::BIND_PER_PRIMITIVE_SET &&
+                osg::getBinding(geom->getFogCoordArray())!=osg::Array::BIND_PER_PRIMITIVE_SET)
+            {
+
+#if 1
+                bool doneCombine = false;
+
+                osg::Geometry::PrimitiveSetList& primitives = geom->getPrimitiveSetList();
+                unsigned int lhsNo=0;
+                unsigned int rhsNo=1;
+                while(rhsNo<primitives.size())
+                {
+                    osg::PrimitiveSet* lhs = primitives[lhsNo].get();
+                    osg::PrimitiveSet* rhs = primitives[rhsNo].get();
+
+                    bool combine = false;
+
+                    if (lhs->getType()==rhs->getType() &&
+                        lhs->getMode()==rhs->getMode())
+                    {
+
+                        switch(lhs->getMode())
+                        {
+                        case(osg::PrimitiveSet::POINTS):
+                        case(osg::PrimitiveSet::LINES):
+                        case(osg::PrimitiveSet::TRIANGLES):
+                        case(osg::PrimitiveSet::QUADS):
+                            combine = true;
+                            break;
+                        }
+
+                    }
+
+                    if (combine)
+                    {
+
+                        switch(lhs->getType())
+                        {
+                        case(osg::PrimitiveSet::DrawArraysPrimitiveType):
+                            combine = mergePrimitive(*(static_cast<osg::DrawArrays*>(lhs)),*(static_cast<osg::DrawArrays*>(rhs)));
+                            break;
+                        case(osg::PrimitiveSet::DrawArrayLengthsPrimitiveType):
+                            combine = mergePrimitive(*(static_cast<osg::DrawArrayLengths*>(lhs)),*(static_cast<osg::DrawArrayLengths*>(rhs)));
+                            break;
+                        case(osg::PrimitiveSet::DrawElementsUBytePrimitiveType):
+                            combine = mergePrimitive(*(static_cast<osg::DrawElementsUByte*>(lhs)),*(static_cast<osg::DrawElementsUByte*>(rhs)));
+                            break;
+                        case(osg::PrimitiveSet::DrawElementsUShortPrimitiveType):
+                            combine = mergePrimitive(*(static_cast<osg::DrawElementsUShort*>(lhs)),*(static_cast<osg::DrawElementsUShort*>(rhs)));
+                            break;
+                        case(osg::PrimitiveSet::DrawElementsUIntPrimitiveType):
+                            combine = mergePrimitive(*(static_cast<osg::DrawElementsUInt*>(lhs)),*(static_cast<osg::DrawElementsUInt*>(rhs)));
+                            break;
+                        default:
+                            combine = false;
+                            break;
+                        }
+                    }
+
+                    if (combine)
+                    {
+                        // make this primitive set as invalid and needing cleaning up.
+                        rhs->setMode(0xffffff);
+                        doneCombine = true;
+                        ++rhsNo;
+                    }
+                    else
+                    {
+                        lhsNo = rhsNo;
+                        ++rhsNo;
+                    }
+                }
+
+    #if 1
+                if (doneCombine)
+                {
+                    // now need to clean up primitiveset so it no longer contains the rhs combined primitives.
+
+                    // first swap with a empty primitiveSet to empty it completely.
+                    osg::Geometry::PrimitiveSetList oldPrimitives;
+                    primitives.swap(oldPrimitives);
+
+                    // now add the active primitive sets
+                    for(osg::Geometry::PrimitiveSetList::iterator pitr = oldPrimitives.begin();
+                        pitr != oldPrimitives.end();
+                        ++pitr)
+                    {
+                        if ((*pitr)->getMode()!=0xffffff) primitives.push_back(*pitr);
+                    }
+                }
+    #endif
+
+#else
+
+                osg::Geometry::PrimitiveSetList& primitives = geom->getPrimitiveSetList();
+                unsigned int primNo=0;
+                while(primNo+1<primitives.size())
+                {
+                    osg::PrimitiveSet* lhs = primitives[primNo].get();
+                    osg::PrimitiveSet* rhs = primitives[primNo+1].get();
+
+                    bool combine = false;
+
+                    if (lhs->getType()==rhs->getType() &&
+                        lhs->getMode()==rhs->getMode())
+                    {
+
+                        switch(lhs->getMode())
+                        {
+                        case(osg::PrimitiveSet::POINTS):
+                        case(osg::PrimitiveSet::LINES):
+                        case(osg::PrimitiveSet::TRIANGLES):
+                        case(osg::PrimitiveSet::QUADS):
+                            combine = true;
+                            break;
+                        }
+
+                    }
+
+                    if (combine)
+                    {
+
+                        switch(lhs->getType())
+                        {
+                        case(osg::PrimitiveSet::DrawArraysPrimitiveType):
+                            combine = mergePrimitive(*(static_cast<osg::DrawArrays*>(lhs)),*(static_cast<osg::DrawArrays*>(rhs)));
+                            break;
+                        case(osg::PrimitiveSet::DrawArrayLengthsPrimitiveType):
+                            combine = mergePrimitive(*(static_cast<osg::DrawArrayLengths*>(lhs)),*(static_cast<osg::DrawArrayLengths*>(rhs)));
+                            break;
+                        case(osg::PrimitiveSet::DrawElementsUBytePrimitiveType):
+                            combine = mergePrimitive(*(static_cast<osg::DrawElementsUByte*>(lhs)),*(static_cast<osg::DrawElementsUByte*>(rhs)));
+                            break;
+                        case(osg::PrimitiveSet::DrawElementsUShortPrimitiveType):
+                            combine = mergePrimitive(*(static_cast<osg::DrawElementsUShort*>(lhs)),*(static_cast<osg::DrawElementsUShort*>(rhs)));
+                            break;
+                        case(osg::PrimitiveSet::DrawElementsUIntPrimitiveType):
+                            combine = mergePrimitive(*(static_cast<osg::DrawElementsUInt*>(lhs)),*(static_cast<osg::DrawElementsUInt*>(rhs)));
+                            break;
+                        default:
+                            break;
+                        }
+                    }
+                    if (combine)
+                    {
+                        primitives.erase(primitives.begin()+primNo+1);
+                    }
+
+                    if (!combine)
+                    {
+                        primNo++;
+                    }
+                }
+#endif
+            }
+        }
+
+
+    }
+
+//    geode.dirtyBound();
+
+
+    return false;
+}
+
+bool Optimizer::MergeGeometryVisitor::geometryContainsSharedArrays(osg::Geometry& geom)
+{
+    if (geom.getVertexArray() && geom.getVertexArray()->referenceCount()>1) return true;
+    if (geom.getNormalArray() && geom.getNormalArray()->referenceCount()>1) return true;
+    if (geom.getColorArray() && geom.getColorArray()->referenceCount()>1) return true;
+    if (geom.getSecondaryColorArray() && geom.getSecondaryColorArray()->referenceCount()>1) return true;
+    if (geom.getFogCoordArray() && geom.getFogCoordArray()->referenceCount()>1) return true;
+
+
+    for(unsigned int unit=0;unit<geom.getNumTexCoordArrays();++unit)
+    {
+        osg::Array* tex = geom.getTexCoordArray(unit);
+        if (tex && tex->referenceCount()>1) return true;
+    }
+
+    // shift the indices of the incoming primitives to account for the pre existing geometry.
+    for(osg::Geometry::PrimitiveSetList::iterator primItr=geom.getPrimitiveSetList().begin();
+        primItr!=geom.getPrimitiveSetList().end();
+        ++primItr)
+    {
+        if ((*primItr)->referenceCount()>1) return true;
+    }
+
+
+    return false;
+}
+
+
+class MergeArrayVisitor : public osg::ArrayVisitor
+{
+    protected:
+        osg::Array* _lhs;
+        int         _offset;
+    public:
+        MergeArrayVisitor() :
+            _lhs(0),
+            _offset(0) {}
+
+
+        /// try to merge the content of two arrays.
+        bool merge(osg::Array* lhs,osg::Array* rhs, int offset=0)
+        {
+            if (lhs==0 || rhs==0) return true;
+            if (lhs->getType()!=rhs->getType()) return false;
+
+            _lhs = lhs;
+            _offset = offset;
+
+            rhs->accept(*this);
+            return true;
+        }
+
+        template<typename T>
+        void _merge(T& rhs)
+        {
+            T* lhs = static_cast<T*>(_lhs);
+            lhs->insert(lhs->end(),rhs.begin(),rhs.end());
+        }
+
+        template<typename T>
+        void _mergeAndOffset(T& rhs)
+        {
+            T* lhs = static_cast<T*>(_lhs);
+
+            typename T::iterator itr;
+            for(itr = rhs.begin();
+                itr != rhs.end();
+                ++itr)
+            {
+                lhs->push_back(*itr + _offset);
+            }
+        }
+
+        virtual void apply(osg::Array&) { OSG_WARN << "Warning: Optimizer's MergeArrayVisitor cannot merge Array type." << std::endl; }
+
+        virtual void apply(osg::ByteArray& rhs) { if (_offset) _mergeAndOffset(rhs); else  _merge(rhs); }
+        virtual void apply(osg::ShortArray& rhs) { if (_offset) _mergeAndOffset(rhs); else  _merge(rhs); }
+        virtual void apply(osg::IntArray& rhs) { if (_offset) _mergeAndOffset(rhs); else  _merge(rhs); }
+        virtual void apply(osg::UByteArray& rhs) { if (_offset) _mergeAndOffset(rhs); else  _merge(rhs); }
+        virtual void apply(osg::UShortArray& rhs) { if (_offset) _mergeAndOffset(rhs); else  _merge(rhs); }
+        virtual void apply(osg::UIntArray& rhs) { if (_offset) _mergeAndOffset(rhs); else  _merge(rhs); }
+
+        virtual void apply(osg::Vec4ubArray& rhs) { _merge(rhs); }
+        virtual void apply(osg::FloatArray& rhs) { _merge(rhs); }
+        virtual void apply(osg::Vec2Array& rhs) { _merge(rhs); }
+        virtual void apply(osg::Vec3Array& rhs) { _merge(rhs); }
+        virtual void apply(osg::Vec4Array& rhs) { _merge(rhs); }
+
+        virtual void apply(osg::DoubleArray& rhs) { _merge(rhs); }
+        virtual void apply(osg::Vec2dArray& rhs) { _merge(rhs); }
+        virtual void apply(osg::Vec3dArray& rhs) { _merge(rhs); }
+        virtual void apply(osg::Vec4dArray& rhs) { _merge(rhs); }
+
+        virtual void apply(osg::Vec2bArray&  rhs) { _merge(rhs); }
+        virtual void apply(osg::Vec3bArray&  rhs) { _merge(rhs); }
+        virtual void apply(osg::Vec4bArray&  rhs) { _merge(rhs); }
+        virtual void apply(osg::Vec2sArray& rhs) { _merge(rhs); }
+        virtual void apply(osg::Vec3sArray& rhs) { _merge(rhs); }
+        virtual void apply(osg::Vec4sArray& rhs) { _merge(rhs); }
+};
+
+bool Optimizer::MergeGeometryVisitor::mergeGeometry(osg::Geometry& lhs,osg::Geometry& rhs)
+{
+
+    MergeArrayVisitor merger;
+
+    unsigned int base = 0;
+    if (lhs.getVertexArray() && rhs.getVertexArray())
+    {
+
+        base = lhs.getVertexArray()->getNumElements();
+        if (!merger.merge(lhs.getVertexArray(),rhs.getVertexArray()))
+        {
+            OSG_DEBUG << "MergeGeometry: vertex array not merged. Some data may be lost." <<std::endl;
+        }
+    }
+    else if (rhs.getVertexArray())
+    {
+        base = 0;
+        lhs.setVertexArray(rhs.getVertexArray());
+    }
+
+
+    if (lhs.getNormalArray() && rhs.getNormalArray() && lhs.getNormalArray()->getBinding()!=osg::Array::BIND_OVERALL)
+    {
+        if (!merger.merge(lhs.getNormalArray(),rhs.getNormalArray()))
+        {
+            OSG_DEBUG << "MergeGeometry: normal array not merged. Some data may be lost." <<std::endl;
+        }
+    }
+    else if (rhs.getNormalArray())
+    {
+        lhs.setNormalArray(rhs.getNormalArray());
+    }
+
+
+    if (lhs.getColorArray() && rhs.getColorArray() && lhs.getColorArray()->getBinding()!=osg::Array::BIND_OVERALL)
+    {
+        if (!merger.merge(lhs.getColorArray(),rhs.getColorArray()))
+        {
+            OSG_DEBUG << "MergeGeometry: color array not merged. Some data may be lost." <<std::endl;
+        }
+    }
+    else if (rhs.getColorArray())
+    {
+        lhs.setColorArray(rhs.getColorArray());
+    }
+
+    if (lhs.getSecondaryColorArray() && rhs.getSecondaryColorArray() && lhs.getSecondaryColorArray()->getBinding()!=osg::Array::BIND_OVERALL)
+    {
+        if (!merger.merge(lhs.getSecondaryColorArray(),rhs.getSecondaryColorArray()))
+        {
+            OSG_DEBUG << "MergeGeometry: secondary color array not merged. Some data may be lost." <<std::endl;
+        }
+    }
+    else if (rhs.getSecondaryColorArray())
+    {
+        lhs.setSecondaryColorArray(rhs.getSecondaryColorArray());
+    }
+
+    if (lhs.getFogCoordArray() && rhs.getFogCoordArray() && lhs.getFogCoordArray()->getBinding()!=osg::Array::BIND_OVERALL)
+    {
+        if (!merger.merge(lhs.getFogCoordArray(),rhs.getFogCoordArray()))
+        {
+            OSG_DEBUG << "MergeGeometry: fog coord array not merged. Some data may be lost." <<std::endl;
+        }
+    }
+    else if (rhs.getFogCoordArray())
+    {
+        lhs.setFogCoordArray(rhs.getFogCoordArray());
+    }
+
+
+    unsigned int unit;
+    for(unit=0;unit<lhs.getNumTexCoordArrays();++unit)
+    {
+        if (!merger.merge(lhs.getTexCoordArray(unit),rhs.getTexCoordArray(unit)))
+        {
+            OSG_DEBUG << "MergeGeometry: tex coord array not merged. Some data may be lost." <<std::endl;
+        }
+    }
+
+    for(unit=0;unit<lhs.getNumVertexAttribArrays();++unit)
+    {
+        if (!merger.merge(lhs.getVertexAttribArray(unit),rhs.getVertexAttribArray(unit)))
+        {
+            OSG_DEBUG << "MergeGeometry: vertex attrib array not merged. Some data may be lost." <<std::endl;
+        }
+    }
+
+
+    // shift the indices of the incoming primitives to account for the pre existing geometry.
+    osg::Geometry::PrimitiveSetList::iterator primItr;
+    for(primItr=rhs.getPrimitiveSetList().begin(); primItr!=rhs.getPrimitiveSetList().end(); ++primItr)
+    {
+        osg::PrimitiveSet* primitive = primItr->get();
+
+        switch(primitive->getType())
+        {
+        case(osg::PrimitiveSet::DrawElementsUBytePrimitiveType):
+            {
+                osg::DrawElementsUByte* primitiveUByte = static_cast<osg::DrawElementsUByte*>(primitive);
+                unsigned int currentMaximum = 0;
+                for(osg::DrawElementsUByte::iterator eitr=primitiveUByte->begin();
+                    eitr!=primitiveUByte->end();
+                    ++eitr)
+                {
+                    currentMaximum = osg::maximum(currentMaximum,(unsigned int)*eitr);
+                }
+                if ((base+currentMaximum)>=65536)
+                {
+                    // must promote to a DrawElementsUInt
+                    osg::DrawElementsUInt* new_primitive = new osg::DrawElementsUInt(primitive->getMode());
+                    std::copy(primitiveUByte->begin(),primitiveUByte->end(),std::back_inserter(*new_primitive));
+                    new_primitive->offsetIndices(base);
+                    (*primItr) = new_primitive;
+                } else if ((base+currentMaximum)>=256)
+                {
+                    // must promote to a DrawElementsUShort
+                    osg::DrawElementsUShort* new_primitive = new osg::DrawElementsUShort(primitive->getMode());
+                    std::copy(primitiveUByte->begin(),primitiveUByte->end(),std::back_inserter(*new_primitive));
+                    new_primitive->offsetIndices(base);
+                    (*primItr) = new_primitive;
+                }
+                else
+                {
+                    primitive->offsetIndices(base);
+                }
+            }
+            break;
+
+        case(osg::PrimitiveSet::DrawElementsUShortPrimitiveType):
+            {
+                osg::DrawElementsUShort* primitiveUShort = static_cast<osg::DrawElementsUShort*>(primitive);
+                unsigned int currentMaximum = 0;
+                for(osg::DrawElementsUShort::iterator eitr=primitiveUShort->begin();
+                    eitr!=primitiveUShort->end();
+                    ++eitr)
+                {
+                    currentMaximum = osg::maximum(currentMaximum,(unsigned int)*eitr);
+                }
+                if ((base+currentMaximum)>=65536)
+                {
+                    // must promote to a DrawElementsUInt
+                    osg::DrawElementsUInt* new_primitive = new osg::DrawElementsUInt(primitive->getMode());
+                    std::copy(primitiveUShort->begin(),primitiveUShort->end(),std::back_inserter(*new_primitive));
+                    new_primitive->offsetIndices(base);
+                    (*primItr) = new_primitive;
+                }
+                else
+                {
+                    primitive->offsetIndices(base);
+                }
+            }
+            break;
+
+        case(osg::PrimitiveSet::DrawArraysPrimitiveType):
+        case(osg::PrimitiveSet::DrawArrayLengthsPrimitiveType):
+        case(osg::PrimitiveSet::DrawElementsUIntPrimitiveType):
+        default:
+            primitive->offsetIndices(base);
+            break;
+        }
+    }
+
+    for(primItr=rhs.getPrimitiveSetList().begin(); primItr!=rhs.getPrimitiveSetList().end(); ++primItr)
+    {
+        lhs.addPrimitiveSet(primItr->get());
+    }
+
+    lhs.dirtyBound();
+    lhs.dirtyDisplayList();
+
+    return true;
+}
+
+bool Optimizer::MergeGeometryVisitor::mergePrimitive(osg::DrawArrays& lhs,osg::DrawArrays& rhs)
+{
+    if (lhs.getFirst()+lhs.getCount()==rhs.getFirst())
+    {
+        lhs.setCount(lhs.getCount()+rhs.getCount());
+        return true;
+    }
+    return false;
+}
+
+bool Optimizer::MergeGeometryVisitor::mergePrimitive(osg::DrawArrayLengths& lhs,osg::DrawArrayLengths& rhs)
+{
+    int lhs_count = std::accumulate(lhs.begin(),lhs.end(),0);
+
+    if (lhs.getFirst()+lhs_count==rhs.getFirst())
+    {
+        lhs.insert(lhs.end(),rhs.begin(),rhs.end());
+        return true;
+    }
+    return false;
+}
+
+bool Optimizer::MergeGeometryVisitor::mergePrimitive(osg::DrawElementsUByte& lhs,osg::DrawElementsUByte& rhs)
+{
+    lhs.insert(lhs.end(),rhs.begin(),rhs.end());
+    return true;
+}
+
+bool Optimizer::MergeGeometryVisitor::mergePrimitive(osg::DrawElementsUShort& lhs,osg::DrawElementsUShort& rhs)
+{
+    lhs.insert(lhs.end(),rhs.begin(),rhs.end());
+    return true;
+}
+
+bool Optimizer::MergeGeometryVisitor::mergePrimitive(osg::DrawElementsUInt& lhs,osg::DrawElementsUInt& rhs)
+{
+    lhs.insert(lhs.end(),rhs.begin(),rhs.end());
+    return true;
+}
+
+
+
+bool Optimizer::MergeGroupsVisitor::isOperationPermissible(osg::Group& node)
+{
+    return !node.asTransform() &&
+           !node.getCullCallback() &&
+           !node.getEventCallback() &&
+           !node.getUpdateCallback() &&
+            isOperationPermissibleForObject(&node);
+}
+
+void Optimizer::MergeGroupsVisitor::apply(osg::Group &group)
+{
+    if (group.getNumChildren() <= 1)
+        traverse(group);
+    else
+    {
+        typedef std::map<osg::StateSet*, std::set<osg::Group*> > GroupMap;
+        GroupMap childGroups;
+        for (unsigned int i=0; i<group.getNumChildren(); ++i)
+        {
+            osg::Node* child = group.getChild(i);
+            osg::Group* childGroup = child->asGroup();
+            if (childGroup && isOperationPermissible(*childGroup))
+            {
+                childGroups[childGroup->getStateSet()].insert(childGroup);
+            }
+        }
+
+        for (GroupMap::iterator it = childGroups.begin(); it != childGroups.end(); ++it)
+        {
+            const std::set<osg::Group*>& groupSet = it->second;
+            if (groupSet.size() <= 1)
+                continue;
+            else
+            {
+                osg::Group* first = *groupSet.begin();
+                for (std::set<osg::Group*>::const_iterator groupIt = ++groupSet.begin(); groupIt != groupSet.end(); ++groupIt)
+                {
+                    osg::Group* toMerge = *groupIt;
+                    for (unsigned int i=0; i<toMerge->getNumChildren(); ++i)
+                        first->addChild(toMerge->getChild(i));
+                    toMerge->removeChildren(0, toMerge->getNumChildren());
+                    group.removeChild(toMerge);
+                }
+            }
+        }
+        traverse(group);
+    }
+}
+
+}
diff --git a/components/sceneutil/optimizer.hpp b/components/sceneutil/optimizer.hpp
new file mode 100644
index 000000000..804938074
--- /dev/null
+++ b/components/sceneutil/optimizer.hpp
@@ -0,0 +1,432 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+/* Modified for OpenMW */
+
+#ifndef OPENMW_OSGUTIL_OPTIMIZER
+#define OPENMW_OSGUTIL_OPTIMIZER
+
+#include <osg/NodeVisitor>
+#include <osg/Matrix>
+#include <osg/Geometry>
+#include <osg/Transform>
+#include <osg/Texture2D>
+
+//#include <osgUtil/Export>
+
+#include <set>
+
+//namespace osgUtil {
+namespace SceneUtil {
+
+// forward declare
+class Optimizer;
+
+/** Helper base class for implementing Optimizer techniques.*/
+class BaseOptimizerVisitor : public osg::NodeVisitor
+{
+    public:
+
+        BaseOptimizerVisitor(Optimizer* optimizer, unsigned int operation):
+            osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN),
+            _optimizer(optimizer),
+            _operationType(operation)
+        {
+            setNodeMaskOverride(0xffffffff);
+        }
+
+        inline bool isOperationPermissibleForObject(const osg::StateSet* object) const;
+        inline bool isOperationPermissibleForObject(const osg::StateAttribute* object) const;
+        inline bool isOperationPermissibleForObject(const osg::Drawable* object) const;
+        inline bool isOperationPermissibleForObject(const osg::Node* object) const;
+
+    protected:
+
+        Optimizer*      _optimizer;
+        unsigned int _operationType;
+};
+
+/** Traverses scene graph to improve efficiency. See OptimizationOptions.
+  * For example of usage see examples/osgimpostor or osgviewer.
+  */
+
+class Optimizer
+{
+
+    public:
+
+        Optimizer() {}
+        virtual ~Optimizer() {}
+
+        enum OptimizationOptions
+        {
+            FLATTEN_STATIC_TRANSFORMS = (1 << 0),
+            REMOVE_REDUNDANT_NODES =    (1 << 1),
+            REMOVE_LOADED_PROXY_NODES = (1 << 2),
+            COMBINE_ADJACENT_LODS =     (1 << 3),
+            SHARE_DUPLICATE_STATE =     (1 << 4),
+            MERGE_GEOMETRY =            (1 << 5),
+            CHECK_GEOMETRY =            (1 << 6), // deprecated, currently no-op
+            MAKE_FAST_GEOMETRY =        (1 << 7),
+            SPATIALIZE_GROUPS =         (1 << 8),
+            COPY_SHARED_NODES =         (1 << 9),
+            TRISTRIP_GEOMETRY =         (1 << 10),
+            TESSELLATE_GEOMETRY =       (1 << 11),
+            OPTIMIZE_TEXTURE_SETTINGS = (1 << 12),
+            MERGE_GEODES =              (1 << 13),
+            FLATTEN_BILLBOARDS =        (1 << 14),
+            TEXTURE_ATLAS_BUILDER =     (1 << 15),
+            STATIC_OBJECT_DETECTION =   (1 << 16),
+            FLATTEN_STATIC_TRANSFORMS_DUPLICATING_SHARED_SUBGRAPHS = (1 << 17),
+            INDEX_MESH =                (1 << 18),
+            VERTEX_POSTTRANSFORM =      (1 << 19),
+            VERTEX_PRETRANSFORM =       (1 << 20),
+            DEFAULT_OPTIMIZATIONS = FLATTEN_STATIC_TRANSFORMS |
+                                REMOVE_REDUNDANT_NODES |
+                                REMOVE_LOADED_PROXY_NODES |
+                                COMBINE_ADJACENT_LODS |
+                                SHARE_DUPLICATE_STATE |
+                                MERGE_GEOMETRY |
+                                MAKE_FAST_GEOMETRY |
+                                CHECK_GEOMETRY |
+                                OPTIMIZE_TEXTURE_SETTINGS |
+                                STATIC_OBJECT_DETECTION,
+            ALL_OPTIMIZATIONS = FLATTEN_STATIC_TRANSFORMS_DUPLICATING_SHARED_SUBGRAPHS |
+                                REMOVE_REDUNDANT_NODES |
+                                REMOVE_LOADED_PROXY_NODES |
+                                COMBINE_ADJACENT_LODS |
+                                SHARE_DUPLICATE_STATE |
+                                MERGE_GEODES |
+                                MERGE_GEOMETRY |
+                                MAKE_FAST_GEOMETRY |
+                                CHECK_GEOMETRY |
+                                SPATIALIZE_GROUPS |
+                                COPY_SHARED_NODES |
+                                TRISTRIP_GEOMETRY |
+                                OPTIMIZE_TEXTURE_SETTINGS |
+                                TEXTURE_ATLAS_BUILDER |
+                                STATIC_OBJECT_DETECTION
+        };
+
+        /** Reset internal data to initial state - the getPermissibleOptionsMap is cleared.*/
+        void reset();
+
+        /** Traverse the node and its subgraph with a series of optimization
+          * visitors, specified by the OptimizationOptions.*/
+        virtual void optimize(osg::Node* node, unsigned int options);
+
+
+        /** Callback for customizing what operations are permitted on objects in the scene graph.*/
+        struct IsOperationPermissibleForObjectCallback : public osg::Referenced
+        {
+            virtual bool isOperationPermissibleForObjectImplementation(const Optimizer* optimizer, const osg::StateSet* stateset,unsigned int option) const
+            {
+                return optimizer->isOperationPermissibleForObjectImplementation(stateset,option);
+            }
+
+            virtual bool isOperationPermissibleForObjectImplementation(const Optimizer* optimizer, const osg::StateAttribute* attribute,unsigned int option) const
+            {
+                return optimizer->isOperationPermissibleForObjectImplementation(attribute,option);
+            }
+
+            virtual bool isOperationPermissibleForObjectImplementation(const Optimizer* optimizer, const osg::Drawable* drawable,unsigned int option) const
+            {
+                return optimizer->isOperationPermissibleForObjectImplementation(drawable,option);
+            }
+
+            virtual bool isOperationPermissibleForObjectImplementation(const Optimizer* optimizer, const osg::Node* node,unsigned int option) const
+            {
+                return optimizer->isOperationPermissibleForObjectImplementation(node,option);
+            }
+
+        };
+
+        /** Set the callback for customizing what operations are permitted on objects in the scene graph.*/
+        void setIsOperationPermissibleForObjectCallback(IsOperationPermissibleForObjectCallback* callback) { _isOperationPermissibleForObjectCallback=callback; }
+
+        /** Get the callback for customizing what operations are permitted on objects in the scene graph.*/
+        IsOperationPermissibleForObjectCallback* getIsOperationPermissibleForObjectCallback() { return _isOperationPermissibleForObjectCallback.get(); }
+
+        /** Get the callback for customizing what operations are permitted on objects in the scene graph.*/
+        const IsOperationPermissibleForObjectCallback* getIsOperationPermissibleForObjectCallback() const { return _isOperationPermissibleForObjectCallback.get(); }
+
+
+        inline void setPermissibleOptimizationsForObject(const osg::Object* object, unsigned int options)
+        {
+            _permissibleOptimizationsMap[object] = options;
+        }
+
+        inline unsigned int getPermissibleOptimizationsForObject(const osg::Object* object) const
+        {
+            PermissibleOptimizationsMap::const_iterator itr = _permissibleOptimizationsMap.find(object);
+            if (itr!=_permissibleOptimizationsMap.end()) return itr->second;
+            else return 0xffffffff;
+        }
+
+
+        inline bool isOperationPermissibleForObject(const osg::StateSet* object, unsigned int option) const
+        {
+            if (_isOperationPermissibleForObjectCallback.valid())
+                return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
+            else
+                return isOperationPermissibleForObjectImplementation(object,option);
+        }
+
+        inline bool isOperationPermissibleForObject(const osg::StateAttribute* object, unsigned int option) const
+        {
+            if (_isOperationPermissibleForObjectCallback.valid())
+                return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
+            else
+                return isOperationPermissibleForObjectImplementation(object,option);
+        }
+
+        inline bool isOperationPermissibleForObject(const osg::Drawable* object, unsigned int option) const
+        {
+            if (_isOperationPermissibleForObjectCallback.valid())
+                return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
+            else
+                return isOperationPermissibleForObjectImplementation(object,option);
+        }
+
+        inline bool isOperationPermissibleForObject(const osg::Node* object, unsigned int option) const
+        {
+            if (_isOperationPermissibleForObjectCallback.valid())
+                return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
+            else
+                return isOperationPermissibleForObjectImplementation(object,option);
+        }
+
+        bool isOperationPermissibleForObjectImplementation(const osg::StateSet* stateset, unsigned int option) const
+        {
+            return (option & getPermissibleOptimizationsForObject(stateset))!=0;
+        }
+
+        bool isOperationPermissibleForObjectImplementation(const osg::StateAttribute* attribute, unsigned int option) const
+        {
+            return (option & getPermissibleOptimizationsForObject(attribute))!=0;
+        }
+
+        bool isOperationPermissibleForObjectImplementation(const osg::Drawable* drawable, unsigned int option) const
+        {
+            if (option & (REMOVE_REDUNDANT_NODES|MERGE_GEOMETRY))
+            {
+                if (drawable->getUserData()) return false;
+                if (drawable->getUpdateCallback()) return false;
+                if (drawable->getEventCallback()) return false;
+                if (drawable->getCullCallback()) return false;
+            }
+            return (option & getPermissibleOptimizationsForObject(drawable))!=0;
+        }
+
+        bool isOperationPermissibleForObjectImplementation(const osg::Node* node, unsigned int option) const
+        {
+            if (option & (REMOVE_REDUNDANT_NODES|COMBINE_ADJACENT_LODS|FLATTEN_STATIC_TRANSFORMS))
+            {
+                if (node->getUserData()) return false;
+                if (node->getUpdateCallback()) return false;
+                if (node->getEventCallback()) return false;
+                if (node->getCullCallback()) return false;
+                if (node->getNumDescriptions()>0) return false;
+                if (node->getStateSet()) return false;
+                if (node->getNodeMask()!=0xffffffff) return false;
+                // if (!node->getName().empty()) return false;
+            }
+
+            return (option & getPermissibleOptimizationsForObject(node))!=0;
+        }
+
+    protected:
+
+        osg::ref_ptr<IsOperationPermissibleForObjectCallback> _isOperationPermissibleForObjectCallback;
+
+        typedef std::map<const osg::Object*,unsigned int> PermissibleOptimizationsMap;
+        PermissibleOptimizationsMap _permissibleOptimizationsMap;
+
+    public:
+
+        /** Flatten Static Transform nodes by applying their transform to the
+          * geometry on the leaves of the scene graph, then removing the
+          * now redundant transforms.  Static transformed subgraphs that have multiple
+          * parental paths above them are not flattened, if you require this then
+          * the subgraphs have to be duplicated - for this use the
+          * FlattenStaticTransformsDuplicatingSharedSubgraphsVisitor. */
+        class FlattenStaticTransformsVisitor : public BaseOptimizerVisitor
+        {
+            public:
+
+                FlattenStaticTransformsVisitor(Optimizer* optimizer=0):
+                    BaseOptimizerVisitor(optimizer, FLATTEN_STATIC_TRANSFORMS) {}
+
+                virtual void apply(osg::Node& geode);
+                virtual void apply(osg::Drawable& drawable);
+                virtual void apply(osg::Billboard& geode);
+                virtual void apply(osg::Transform& transform);
+
+                bool removeTransforms(osg::Node* nodeWeCannotRemove);
+
+            protected:
+
+                typedef std::vector<osg::Transform*>                TransformStack;
+                typedef std::set<osg::Drawable*>                    DrawableSet;
+                typedef std::set<osg::Billboard*>                   BillboardSet;
+                typedef std::set<osg::Node* >                       NodeSet;
+                typedef std::set<osg::Transform*>                   TransformSet;
+
+                TransformStack  _transformStack;
+                NodeSet         _excludedNodeSet;
+                DrawableSet     _drawableSet;
+                BillboardSet    _billboardSet;
+                TransformSet    _transformSet;
+        };
+
+
+        /** Combine Static Transform nodes that sit above one another.*/
+        class CombineStaticTransformsVisitor : public BaseOptimizerVisitor
+        {
+            public:
+
+                CombineStaticTransformsVisitor(Optimizer* optimizer=0):
+                    BaseOptimizerVisitor(optimizer, FLATTEN_STATIC_TRANSFORMS) {}
+
+                virtual void apply(osg::MatrixTransform& transform);
+
+                bool removeTransforms(osg::Node* nodeWeCannotRemove);
+
+            protected:
+
+                typedef std::set<osg::MatrixTransform*> TransformSet;
+                TransformSet  _transformSet;
+        };
+
+        /** Remove rendundant nodes, such as groups with one single child.*/
+        class RemoveEmptyNodesVisitor : public BaseOptimizerVisitor
+        {
+            public:
+
+
+                typedef std::set<osg::Node*> NodeList;
+                NodeList                     _redundantNodeList;
+
+                RemoveEmptyNodesVisitor(Optimizer* optimizer=0):
+                    BaseOptimizerVisitor(optimizer, REMOVE_REDUNDANT_NODES) {}
+
+                virtual void apply(osg::Group& group);
+
+                void removeEmptyNodes();
+
+        };
+
+        /** Remove redundant nodes, such as groups with one single child.*/
+        class RemoveRedundantNodesVisitor : public BaseOptimizerVisitor
+        {
+            public:
+
+                typedef std::set<osg::Node*> NodeList;
+                NodeList                     _redundantNodeList;
+
+                RemoveRedundantNodesVisitor(Optimizer* optimizer=0):
+                    BaseOptimizerVisitor(optimizer, REMOVE_REDUNDANT_NODES) {}
+
+                virtual void apply(osg::Group& group);
+                virtual void apply(osg::Transform& transform);
+
+                bool isOperationPermissible(osg::Node& node);
+
+                void removeRedundantNodes();
+
+        };
+
+        /** Merge adjacent Groups that have the same StateSet. */
+        class MergeGroupsVisitor : public SceneUtil::BaseOptimizerVisitor
+        {
+        public:
+            MergeGroupsVisitor(SceneUtil::Optimizer* optimizer)
+                : BaseOptimizerVisitor(optimizer, REMOVE_REDUNDANT_NODES)
+            {
+            }
+
+            bool isOperationPermissible(osg::Group& node);
+
+            virtual void apply(osg::Group& group);
+        };
+
+        class MergeGeometryVisitor : public BaseOptimizerVisitor
+        {
+            public:
+
+                /// default to traversing all children.
+                MergeGeometryVisitor(Optimizer* optimizer=0) :
+                    BaseOptimizerVisitor(optimizer, MERGE_GEOMETRY),
+                    _targetMaximumNumberOfVertices(10000), _allowedToMerge(true) {}
+
+                void setTargetMaximumNumberOfVertices(unsigned int num)
+                {
+                    _targetMaximumNumberOfVertices = num;
+                }
+
+                unsigned int getTargetMaximumNumberOfVertices() const
+                {
+                    return _targetMaximumNumberOfVertices;
+                }
+
+                void pushStateSet(osg::StateSet* stateSet);
+                void popStateSet();
+                void checkAllowedToMerge();
+
+                virtual void apply(osg::Group& group);
+                virtual void apply(osg::Billboard&) { /* don't do anything*/ }
+
+                bool mergeGroup(osg::Group& group);
+
+                static bool geometryContainsSharedArrays(osg::Geometry& geom);
+
+                static bool mergeGeometry(osg::Geometry& lhs,osg::Geometry& rhs);
+
+                static bool mergePrimitive(osg::DrawArrays& lhs,osg::DrawArrays& rhs);
+                static bool mergePrimitive(osg::DrawArrayLengths& lhs,osg::DrawArrayLengths& rhs);
+                static bool mergePrimitive(osg::DrawElementsUByte& lhs,osg::DrawElementsUByte& rhs);
+                static bool mergePrimitive(osg::DrawElementsUShort& lhs,osg::DrawElementsUShort& rhs);
+                static bool mergePrimitive(osg::DrawElementsUInt& lhs,osg::DrawElementsUInt& rhs);
+
+            protected:
+
+                unsigned int _targetMaximumNumberOfVertices;
+                std::vector<osg::StateSet*> _stateSetStack;
+                bool _allowedToMerge;
+        };
+
+};
+
+inline bool BaseOptimizerVisitor::isOperationPermissibleForObject(const osg::StateSet* object) const
+{
+    return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) :  true;
+}
+
+inline bool BaseOptimizerVisitor::isOperationPermissibleForObject(const osg::StateAttribute* object) const
+{
+    return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) :  true;
+}
+
+inline bool BaseOptimizerVisitor::isOperationPermissibleForObject(const osg::Drawable* object) const
+{
+    return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) :  true;
+}
+
+inline bool BaseOptimizerVisitor::isOperationPermissibleForObject(const osg::Node* object) const
+{
+    return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) :  true;
+}
+
+}
+
+#endif
diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
new file mode 100644
index 000000000..1497beb2b
--- /dev/null
+++ b/components/sceneutil/pathgridutil.cpp
@@ -0,0 +1,233 @@
+#include "pathgridutil.hpp"
+
+#include <osg/Geometry>
+
+#include <components/esm/loadland.hpp>
+#include <components/esm/loadpgrd.hpp>
+
+namespace SceneUtil
+{
+    const unsigned short DiamondVertexCount = 6;
+    const unsigned short DiamondIndexCount = 24;
+    const unsigned short DiamondWireframeIndexCount = 24;
+
+    const unsigned short DiamondConnectorVertexCount = 4;
+
+    const unsigned short DiamondTotalVertexCount = DiamondVertexCount + DiamondConnectorVertexCount;
+
+    const float DiamondWireframeScalar = 1.1f;
+
+    const osg::Vec3f DiamondPoints[DiamondVertexCount] =
+    {
+        osg::Vec3f( 0.f, 0.f, DiamondHalfHeight * 2.f),
+        osg::Vec3f(-DiamondHalfWidth, -DiamondHalfWidth,  DiamondHalfHeight),
+        osg::Vec3f(-DiamondHalfWidth,  DiamondHalfWidth,  DiamondHalfHeight),
+        osg::Vec3f( DiamondHalfWidth, -DiamondHalfWidth,  DiamondHalfHeight),
+        osg::Vec3f( DiamondHalfWidth,  DiamondHalfWidth,  DiamondHalfHeight),
+        osg::Vec3f( 0.f, 0.f, 0.f)
+    };
+
+    const unsigned short DiamondIndices[DiamondIndexCount] =
+    {
+        0, 2, 1,
+        0, 1, 3,
+        0, 3, 4,
+        0, 4, 2,
+        5, 1, 2,
+        5, 3, 1,
+        5, 4, 3,
+        5, 2, 4
+    };
+
+    const unsigned short DiamondWireframeIndices[DiamondWireframeIndexCount] =
+    {
+        0, 1,
+        0, 2,
+        0, 3,
+        0, 4,
+        1, 2,
+        2, 4,
+        4, 3,
+        3, 1,
+        5, 1,
+        5, 2,
+        5, 3,
+        5, 4
+    };
+
+    const unsigned short DiamondConnectorVertices[DiamondConnectorVertexCount] =
+    {
+        1, 2, 3, 4
+    };
+
+    const osg::Vec4f DiamondColors[DiamondVertexCount] =
+    {
+        osg::Vec4f(0.f, 0.f, 1.f, 1.f),
+        osg::Vec4f(0.f, .05f, .95f, 1.f),
+        osg::Vec4f(0.f, .1f, .95f, 1.f),
+        osg::Vec4f(0.f, .15f, .95f, 1.f),
+        osg::Vec4f(0.f, .2f, .95f, 1.f),
+        osg::Vec4f(0.f, .25f, 9.f, 1.f)
+    };
+
+    const osg::Vec4f DiamondEdgeColor = osg::Vec4f(0.5f, 1.f, 1.f, 1.f);
+    const osg::Vec4f DiamondWireColor = osg::Vec4f(0.72f, 0.f, 0.96f, 1.f);
+    const osg::Vec4f DiamondFocusWireColor = osg::Vec4f(0.91f, 0.66f, 1.f, 1.f);
+
+    osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid)
+    {
+        const unsigned short PointCount = static_cast<unsigned short>(pathgrid.mPoints.size());
+        const size_t EdgeCount = pathgrid.mEdges.size();
+
+        const unsigned short VertexCount = PointCount * DiamondTotalVertexCount;
+        const unsigned short ColorCount = VertexCount;
+        const size_t PointIndexCount = PointCount * DiamondIndexCount;
+        const size_t EdgeIndexCount = EdgeCount * 2;
+
+        osg::ref_ptr<osg::Geometry> gridGeometry = new osg::Geometry();
+
+        osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(VertexCount);
+        osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(ColorCount);
+        osg::ref_ptr<osg::DrawElementsUShort> pointIndices =
+            new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, PointIndexCount);
+        osg::ref_ptr<osg::DrawElementsUShort> lineIndices =
+            new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, EdgeIndexCount);
+
+        // Add each point/node
+        for (unsigned short pointIndex = 0; pointIndex < PointCount; ++pointIndex)
+        {
+            const ESM::Pathgrid::Point& point = pathgrid.mPoints[pointIndex];
+            osg::Vec3f position = osg::Vec3f(point.mX, point.mY, point.mZ);
+
+            unsigned short vertexOffset = pointIndex * DiamondTotalVertexCount;
+            unsigned short indexOffset = pointIndex * DiamondIndexCount;
+
+            // Point
+            for (unsigned short i = 0; i < DiamondVertexCount; ++i)
+            {
+                (*vertices)[vertexOffset + i] = position + DiamondPoints[i];
+                (*colors)[vertexOffset + i] = DiamondColors[i];
+            }
+
+            for (unsigned short i = 0; i < DiamondIndexCount; ++i)
+            {
+                pointIndices->setElement(indexOffset + i, vertexOffset + DiamondIndices[i]);
+            }
+
+            // Connectors
+            vertexOffset += DiamondVertexCount;
+            for (unsigned short i = 0; i < DiamondConnectorVertexCount; ++i)
+            {
+                (*vertices)[vertexOffset + i] = position + DiamondPoints[DiamondConnectorVertices[i]];
+                (*colors)[vertexOffset + i] = DiamondEdgeColor;
+            }
+        }
+
+        // Add edges
+        unsigned short lineIndex = 0;
+
+        for (ESM::Pathgrid::EdgeList::const_iterator edge = pathgrid.mEdges.begin();
+            edge != pathgrid.mEdges.end(); ++edge)
+        {
+            if (edge->mV0 == edge->mV1 || edge->mV0 < 0 || edge->mV0 >= PointCount ||
+                edge->mV1 < 0 || edge->mV1 >= PointCount)
+                continue;
+
+            const ESM::Pathgrid::Point& from = pathgrid.mPoints[edge->mV0];
+            const ESM::Pathgrid::Point& to = pathgrid.mPoints[edge->mV1];
+
+            osg::Vec3f fromPos = osg::Vec3f(from.mX, from.mY, from.mZ);
+            osg::Vec3f toPos = osg::Vec3f(to.mX, to.mY, to.mZ);
+            osg::Vec3f dir = toPos - fromPos;
+            dir.normalize();
+
+            osg::Quat rot = osg::Quat(-osg::PI / 2, osg::Vec3(0, 0, 1));
+            dir = rot * dir;
+
+            unsigned short diamondIndex = 0;
+            if (dir.isNaN())
+                diamondIndex = 0;
+            else if (dir.y() >= 0 && dir.x() > 0)
+                diamondIndex = 3;
+            else if (dir.x() <= 0 && dir.y() > 0)
+                diamondIndex = 1;
+            else if (dir.y() <= 0 && dir.x() < 0)
+                diamondIndex = 0;
+            else if (dir.x() >= 0 && dir.y() < 0)
+                diamondIndex = 2;
+
+            unsigned short fromIndex = static_cast<unsigned short>(edge->mV0);
+            unsigned short toIndex = static_cast<unsigned short>(edge->mV1);
+
+            lineIndices->setElement(lineIndex++, fromIndex * DiamondTotalVertexCount + DiamondVertexCount + diamondIndex);
+            lineIndices->setElement(lineIndex++, toIndex * DiamondTotalVertexCount + DiamondVertexCount + diamondIndex);
+        }
+
+        lineIndices->resize(lineIndex);
+
+        gridGeometry->setVertexArray(vertices);
+        gridGeometry->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
+        gridGeometry->addPrimitiveSet(pointIndices);
+        gridGeometry->addPrimitiveSet(lineIndices);
+        gridGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+
+        return gridGeometry;
+    }
+
+    osg::ref_ptr<osg::Geometry> createPathgridSelectedWireframe(const ESM::Pathgrid& pathgrid,
+        const std::vector<unsigned short>& selected)
+    {
+        const unsigned short PointCount = selected.size();
+
+        const unsigned short VertexCount = PointCount * DiamondVertexCount;
+        const unsigned short ColorCount = VertexCount;
+        const size_t IndexCount = PointCount * DiamondWireframeIndexCount;
+
+        osg::ref_ptr<osg::Geometry> wireframeGeometry = new osg::Geometry();
+
+        osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(VertexCount);
+        osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(ColorCount);
+        osg::ref_ptr<osg::DrawElementsUShort> indices =
+            new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, IndexCount);
+
+        osg::Vec3f wireOffset = osg::Vec3f(0, 0, (1 - DiamondWireframeScalar) * DiamondHalfHeight);
+
+        // Add each point/node
+        for (unsigned short it = 0; it < PointCount; ++it)
+        {
+            const ESM::Pathgrid::Point& point = pathgrid.mPoints[selected[it]];
+            osg::Vec3f position = osg::Vec3f(point.mX, point.mY, point.mZ) + wireOffset;
+
+            unsigned short vertexOffset = it * DiamondVertexCount;
+            unsigned short indexOffset = it * DiamondWireframeIndexCount;
+
+            // Point
+            for (unsigned short i = 0; i < DiamondVertexCount; ++i)
+            {
+                (*vertices)[vertexOffset + i] = position + DiamondPoints[i] * DiamondWireframeScalar;
+
+                if (it == PointCount - 1)
+                    (*colors)[vertexOffset + i] = DiamondFocusWireColor;
+                else
+                    (*colors)[vertexOffset + i] = DiamondWireColor;
+            }
+
+            for (unsigned short i = 0; i < DiamondWireframeIndexCount; ++i)
+            {
+                indices->setElement(indexOffset + i, vertexOffset + DiamondWireframeIndices[i]);
+            }
+        }
+
+        wireframeGeometry->setVertexArray(vertices);
+        wireframeGeometry->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
+        wireframeGeometry->addPrimitiveSet(indices);
+        wireframeGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+
+        return wireframeGeometry;
+    }
+
+    unsigned short getPathgridNode(unsigned short vertexIndex)
+    {
+        return vertexIndex / (DiamondVertexCount + DiamondConnectorVertexCount);
+    }
+}
diff --git a/components/sceneutil/pathgridutil.hpp b/components/sceneutil/pathgridutil.hpp
new file mode 100644
index 000000000..de0ff35ed
--- /dev/null
+++ b/components/sceneutil/pathgridutil.hpp
@@ -0,0 +1,25 @@
+#ifndef OPENMW_COMPONENTS_PATHGRIDUTIL_H
+#define OPENMW_COMPONENTS_PATHGRIDUTIL_H
+
+#include <osg/ref_ptr>
+#include <osg/Geometry>
+
+namespace ESM
+{
+    struct Pathgrid;
+}
+
+namespace SceneUtil
+{
+    const float DiamondHalfHeight = 40.f;
+    const float DiamondHalfWidth = 16.f;
+
+    osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid);
+
+    osg::ref_ptr<osg::Geometry> createPathgridSelectedWireframe(const ESM::Pathgrid& pathgrid,
+        const std::vector<unsigned short>& selected);
+
+    unsigned short getPathgridNode(unsigned short vertexIndex);
+}
+
+#endif
diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index be8d97a4c..ba779df3e 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -4,9 +4,6 @@
 #include <iostream>
 #include <cstdlib>
 
-#include <osg/Version>
-#include <osg/MatrixTransform>
-
 #include "skeleton.hpp"
 #include "util.hpp"
 
@@ -74,6 +71,7 @@ RigGeometry::RigGeometry()
     setCullCallback(new UpdateRigGeometry);
     setUpdateCallback(new UpdateRigBounds);
     setSupportsDisplayList(false);
+    setUseVertexBufferObjects(true);
     setComputeBoundingBoxCallback(new DummyComputeBoundCallback);
 }
 
@@ -96,34 +94,57 @@ void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
     if (from.getStateSet())
         setStateSet(from.getStateSet());
 
-    // copy over primitive sets.
-    getPrimitiveSetList() = from.getPrimitiveSetList();
+    // shallow copy primitive sets & vertex attributes that we will not modify
+    setPrimitiveSetList(from.getPrimitiveSetList());
+    setColorArray(from.getColorArray());
+    setSecondaryColorArray(from.getSecondaryColorArray());
+    setFogCoordArray(from.getFogCoordArray());
 
-    if (from.getColorArray())
-        setColorArray(from.getColorArray());
+    // need to copy over texcoord list manually due to a missing null pointer check in setTexCoordArrayList(), this has been fixed in OSG 3.5
+    osg::Geometry::ArrayList& texCoordList = from.getTexCoordArrayList();
+    for (unsigned int i=0; i<texCoordList.size(); ++i)
+        if (texCoordList[i])
+            setTexCoordArray(i, texCoordList[i], osg::Array::BIND_PER_VERTEX);
 
-    if (from.getSecondaryColorArray())
-        setSecondaryColorArray(from.getSecondaryColorArray());
+    setVertexAttribArrayList(from.getVertexAttribArrayList());
 
-    if (from.getFogCoordArray())
-        setFogCoordArray(from.getFogCoordArray());
+    // vertices and normals are modified every frame, so we need to deep copy them.
+    // assign a dedicated VBO to make sure that modifications don't interfere with source geometry's VBO.
+    osg::ref_ptr<osg::VertexBufferObject> vbo (new osg::VertexBufferObject);
+    vbo->setUsage(GL_DYNAMIC_DRAW_ARB);
 
-    for(unsigned int ti=0;ti<from.getNumTexCoordArrays();++ti)
+    osg::ref_ptr<osg::Array> vertexArray = osg::clone(from.getVertexArray(), osg::CopyOp::DEEP_COPY_ALL);
+    if (vertexArray)
     {
-        if (from.getTexCoordArray(ti))
-            setTexCoordArray(ti,from.getTexCoordArray(ti));
+        vertexArray->setVertexBufferObject(vbo);
+        setVertexArray(vertexArray);
     }
 
-    osg::Geometry::ArrayList& arrayList = from.getVertexAttribArrayList();
-    for(unsigned int vi=0;vi< arrayList.size();++vi)
+    if (osg::Array* normals = from.getNormalArray())
     {
-        osg::Array* array = arrayList[vi].get();
-        if (array)
-            setVertexAttribArray(vi,array);
+        osg::ref_ptr<osg::Array> normalArray = osg::clone(normals, osg::CopyOp::DEEP_COPY_ALL);
+        if (normalArray)
+        {
+            normalArray->setVertexBufferObject(vbo);
+            setNormalArray(normalArray, osg::Array::BIND_PER_VERTEX);
+        }
     }
 
-    setVertexArray(dynamic_cast<osg::Array*>(from.getVertexArray()->clone(osg::CopyOp::DEEP_COPY_ALL)));
-    setNormalArray(dynamic_cast<osg::Array*>(from.getNormalArray()->clone(osg::CopyOp::DEEP_COPY_ALL)), osg::Array::BIND_PER_VERTEX);
+
+    if (osg::Vec4Array* tangents = dynamic_cast<osg::Vec4Array*>(from.getTexCoordArray(7)))
+    {
+        mSourceTangents = tangents;
+        osg::ref_ptr<osg::Array> tangentArray = osg::clone(tangents, osg::CopyOp::DEEP_COPY_ALL);
+        tangentArray->setVertexBufferObject(vbo);
+        setTexCoordArray(7, tangentArray, osg::Array::BIND_PER_VERTEX);
+    }
+    else
+        mSourceTangents = NULL;
+}
+
+osg::ref_ptr<osg::Geometry> RigGeometry::getSourceGeometry()
+{
+    return mSourceGeometry;
 }
 
 bool RigGeometry::initFromParentSkeleton(osg::NodeVisitor* nv)
@@ -224,14 +245,16 @@ void RigGeometry::update(osg::NodeVisitor* nv)
         return;
     mLastFrameNumber = nv->getTraversalNumber();
 
-    mSkeleton->updateBoneMatrices(nv);
+    mSkeleton->updateBoneMatrices(nv->getTraversalNumber());
 
     // skinning
     osg::Vec3Array* positionSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getVertexArray());
     osg::Vec3Array* normalSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getNormalArray());
+    osg::Vec4Array* tangentSrc = mSourceTangents;
 
     osg::Vec3Array* positionDst = static_cast<osg::Vec3Array*>(getVertexArray());
     osg::Vec3Array* normalDst = static_cast<osg::Vec3Array*>(getNormalArray());
+    osg::Vec4Array* tangentDst = static_cast<osg::Vec4Array*>(getTexCoordArray(7));
 
     for (Bone2VertexMap::const_iterator it = mBone2VertexMap.begin(); it != mBone2VertexMap.end(); ++it)
     {
@@ -248,18 +271,29 @@ void RigGeometry::update(osg::NodeVisitor* nv)
             const osg::Matrixf& boneMatrix = bone->mMatrixInSkeletonSpace;
             accumulateMatrix(invBindMatrix, boneMatrix, weight, resultMat);
         }
-        resultMat = resultMat * mGeomToSkelMatrix;
+        if (mGeomToSkelMatrix)
+            resultMat *= (*mGeomToSkelMatrix);
 
         for (std::vector<unsigned short>::const_iterator vertexIt = it->second.begin(); vertexIt != it->second.end(); ++vertexIt)
         {
             unsigned short vertex = *vertexIt;
             (*positionDst)[vertex] = resultMat.preMult((*positionSrc)[vertex]);
-            (*normalDst)[vertex] = osg::Matrix::transform3x3((*normalSrc)[vertex], resultMat);
+            if (normalDst)
+                (*normalDst)[vertex] = osg::Matrix::transform3x3((*normalSrc)[vertex], resultMat);
+            if (tangentDst)
+            {
+                osg::Vec4f srcTangent = (*tangentSrc)[vertex];
+                osg::Vec3f transformedTangent = osg::Matrix::transform3x3(osg::Vec3f(srcTangent.x(), srcTangent.y(), srcTangent.z()), resultMat);
+                (*tangentDst)[vertex] = osg::Vec4f(transformedTangent, srcTangent.w());
+            }
         }
     }
 
     positionDst->dirty();
-    normalDst->dirty();
+    if (normalDst)
+        normalDst->dirty();
+    if (tangentDst)
+        tangentDst->dirty();
 }
 
 void RigGeometry::updateBounds(osg::NodeVisitor *nv)
@@ -274,45 +308,56 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
         return;
     mBoundsFirstFrame = false;
 
-    mSkeleton->updateBoneMatrices(nv);
+    mSkeleton->updateBoneMatrices(nv->getTraversalNumber());
 
-    updateGeomToSkelMatrix(nv);
+    updateGeomToSkelMatrix(nv->getNodePath());
 
     osg::BoundingBox box;
     for (BoneSphereMap::const_iterator it = mBoneSphereMap.begin(); it != mBoneSphereMap.end(); ++it)
     {
         Bone* bone = it->first;
         osg::BoundingSpheref bs = it->second;
-        transformBoundingSphere(bone->mMatrixInSkeletonSpace * mGeomToSkelMatrix, bs);
+        if (mGeomToSkelMatrix)
+            transformBoundingSphere(bone->mMatrixInSkeletonSpace * (*mGeomToSkelMatrix), bs);
+        else
+            transformBoundingSphere(bone->mMatrixInSkeletonSpace, bs);
         box.expandBy(bs);
     }
 
-    _boundingBox = box;
-    _boundingBoxComputed = true;
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
-    // in OSG 3.3.3 and up Drawable inherits from Node, so has a bounding sphere as well.
-    _boundingSphere = osg::BoundingSphere(_boundingBox);
-    _boundingSphereComputed = true;
-#endif
-    for (unsigned int i=0; i<getNumParents(); ++i)
-        getParent(i)->dirtyBound();
+    if (box != _boundingBox)
+    {
+        _boundingBox = box;
+        _boundingSphere = osg::BoundingSphere(_boundingBox);
+        _boundingSphereComputed = true;
+        for (unsigned int i=0; i<getNumParents(); ++i)
+            getParent(i)->dirtyBound();
+    }
 }
 
-void RigGeometry::updateGeomToSkelMatrix(osg::NodeVisitor *nv)
+void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath)
 {
-    mSkelToGeomPath.clear();
     bool foundSkel = false;
-    for (osg::NodePath::const_iterator it = nv->getNodePath().begin(); it != nv->getNodePath().end(); ++it)
+    osg::ref_ptr<osg::RefMatrix> geomToSkelMatrix;
+    for (osg::NodePath::const_iterator it = nodePath.begin(); it != nodePath.end(); ++it)
     {
+        osg::Node* node = *it;
         if (!foundSkel)
         {
-            if (*it == mSkeleton)
+            if (node == mSkeleton)
                 foundSkel = true;
         }
         else
-            mSkelToGeomPath.push_back(*it);
+        {
+            if (osg::Transform* trans = node->asTransform())
+            {
+                if (!geomToSkelMatrix)
+                    geomToSkelMatrix = new osg::RefMatrix;
+                trans->computeWorldToLocalMatrix(*geomToSkelMatrix, NULL);
+            }
+        }
     }
-    mGeomToSkelMatrix = osg::computeWorldToLocal(mSkelToGeomPath);
+    if (geomToSkelMatrix && !geomToSkelMatrix->isIdentity())
+        mGeomToSkelMatrix = geomToSkelMatrix;
 }
 
 void RigGeometry::setInfluenceMap(osg::ref_ptr<InfluenceMap> influenceMap)
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index 03c287b81..39829bcb0 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -13,6 +13,9 @@ namespace SceneUtil
     /// @brief Mesh skinning implementation.
     /// @note A RigGeometry may be attached directly to a Skeleton, or somewhere below a Skeleton.
     /// Note though that the RigGeometry ignores any transforms below the Skeleton, so the attachment point is not that important.
+    /// @note To avoid race conditions, the rig geometry needs to be double buffered. This can be done
+    /// using a FrameSwitch node that has two RigGeometry children. In the future we may want to consider implementing
+    /// the double buffering inside RigGeometry.
     class RigGeometry : public osg::Geometry
     {
     public:
@@ -36,8 +39,12 @@ namespace SceneUtil
 
         void setInfluenceMap(osg::ref_ptr<InfluenceMap> influenceMap);
 
+        /// Initialize this geometry from the source geometry.
+        /// @note The source geometry will not be modified.
         void setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeom);
 
+        osg::ref_ptr<osg::Geometry> getSourceGeometry();
+
         // Called automatically by our CullCallback
         void update(osg::NodeVisitor* nv);
 
@@ -46,10 +53,10 @@ namespace SceneUtil
 
     private:
         osg::ref_ptr<osg::Geometry> mSourceGeometry;
+        osg::ref_ptr<osg::Vec4Array> mSourceTangents;
         Skeleton* mSkeleton;
 
-        osg::NodePath mSkelToGeomPath;
-        osg::Matrixf mGeomToSkelMatrix;
+        osg::ref_ptr<osg::RefMatrix> mGeomToSkelMatrix;
 
         osg::ref_ptr<InfluenceMap> mInfluenceMap;
 
@@ -72,7 +79,7 @@ namespace SceneUtil
 
         bool initFromParentSkeleton(osg::NodeVisitor* nv);
 
-        void updateGeomToSkelMatrix(osg::NodeVisitor* nv);
+        void updateGeomToSkelMatrix(const osg::NodePath& nodePath);
     };
 
 }
diff --git a/components/sceneutil/serialize.cpp b/components/sceneutil/serialize.cpp
new file mode 100644
index 000000000..64094275c
--- /dev/null
+++ b/components/sceneutil/serialize.cpp
@@ -0,0 +1,144 @@
+#include "serialize.hpp"
+
+#include <osgDB/ObjectWrapper>
+#include <osgDB/Registry>
+
+#include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/sceneutil/skeleton.hpp>
+#include <components/sceneutil/riggeometry.hpp>
+
+namespace SceneUtil
+{
+
+template <class Cls>
+static osg::Object* createInstanceFunc() { return new Cls; }
+
+class PositionAttitudeTransformSerializer : public osgDB::ObjectWrapper
+{
+public:
+    PositionAttitudeTransformSerializer()
+        : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::PositionAttitudeTransform>, "SceneUtil::PositionAttitudeTransform", "osg::Object osg::Node osg::Group osg::Transform SceneUtil::PositionAttitudeTransform")
+    {
+        addSerializer( new osgDB::PropByRefSerializer< SceneUtil::PositionAttitudeTransform, osg::Vec3f >(
+            "position", osg::Vec3f(), &SceneUtil::PositionAttitudeTransform::getPosition, &SceneUtil::PositionAttitudeTransform::setPosition), osgDB::BaseSerializer::RW_VEC3F );
+        addSerializer( new osgDB::PropByRefSerializer< SceneUtil::PositionAttitudeTransform, osg::Quat >(
+            "attitude", osg::Quat(), &SceneUtil::PositionAttitudeTransform::getAttitude, &SceneUtil::PositionAttitudeTransform::setAttitude), osgDB::BaseSerializer::RW_QUAT );
+        addSerializer( new osgDB::PropByRefSerializer< SceneUtil::PositionAttitudeTransform, osg::Vec3f >(
+            "scale", osg::Vec3f(), &SceneUtil::PositionAttitudeTransform::getScale, &SceneUtil::PositionAttitudeTransform::setScale), osgDB::BaseSerializer::RW_VEC3F );
+    }
+};
+
+class SkeletonSerializer : public osgDB::ObjectWrapper
+{
+public:
+    SkeletonSerializer()
+        : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::Skeleton>, "SceneUtil::Skeleton", "osg::Object osg::Node osg::Group SceneUtil::Skeleton")
+    {
+    }
+};
+
+class FrameSwitchSerializer : public osgDB::ObjectWrapper
+{
+public:
+    FrameSwitchSerializer()
+        : osgDB::ObjectWrapper(createInstanceFunc<osg::Group>, "NifOsg::FrameSwitch", "osg::Object osg::Node osg::Group NifOsg::FrameSwitch")
+    {
+    }
+};
+
+class RigGeometrySerializer : public osgDB::ObjectWrapper
+{
+public:
+    RigGeometrySerializer()
+        : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::RigGeometry>, "SceneUtil::RigGeometry", "osg::Object osg::Node osg::Drawable osg::Geometry SceneUtil::RigGeometry")
+    {
+    }
+};
+
+class LightManagerSerializer : public osgDB::ObjectWrapper
+{
+public:
+    LightManagerSerializer()
+        : osgDB::ObjectWrapper(createInstanceFunc<osg::Group>, "SceneUtil::LightManager", "osg::Object osg::Node osg::Group SceneUtil::LightManager")
+    {
+    }
+};
+
+class CameraRelativeTransformSerializer : public osgDB::ObjectWrapper
+{
+public:
+    CameraRelativeTransformSerializer()
+        : osgDB::ObjectWrapper(createInstanceFunc<osg::Group>, "MWRender::CameraRelativeTransform", "osg::Object osg::Node osg::Group MWRender::CameraRelativeTransform")
+    {
+    }
+};
+
+osgDB::ObjectWrapper* makeDummySerializer(const std::string& classname)
+{
+    return new osgDB::ObjectWrapper(createInstanceFunc<osg::DummyObject>, classname, "osg::Object");
+}
+
+class GeometrySerializer : public osgDB::ObjectWrapper
+{
+public:
+    GeometrySerializer()
+        : osgDB::ObjectWrapper(createInstanceFunc<osg::Drawable>, "osg::Geometry", "osg::Object osg::Drawable osg::Geometry")
+    {
+    }
+};
+
+void registerSerializers()
+{
+    static bool done = false;
+    if (!done)
+    {
+        osgDB::ObjectWrapperManager* mgr = osgDB::Registry::instance()->getObjectWrapperManager();
+        mgr->addWrapper(new PositionAttitudeTransformSerializer);
+        mgr->addWrapper(new SkeletonSerializer);
+        mgr->addWrapper(new FrameSwitchSerializer);
+        mgr->addWrapper(new RigGeometrySerializer);
+        mgr->addWrapper(new LightManagerSerializer);
+        mgr->addWrapper(new CameraRelativeTransformSerializer);
+
+        // Don't serialize Geometry data as we are more interested in the overall structure rather than tons of vertex data that would make the file large and hard to read.
+        mgr->removeWrapper(mgr->findWrapper("osg::Geometry"));
+        mgr->addWrapper(new GeometrySerializer);
+
+        // ignore the below for now to avoid warning spam
+        const char* ignore[] = {
+            "MWRender::PtrHolder",
+            "Resource::TemplateRef",
+            "SceneUtil::LightListCallback",
+            "SceneUtil::LightManagerUpdateCallback",
+            "SceneUtil::UpdateRigBounds",
+            "SceneUtil::UpdateRigGeometry",
+            "SceneUtil::LightSource",
+            "SceneUtil::StateSetUpdater",
+            "NifOsg::NodeUserData",
+            "NifOsg::FlipController",
+            "NifOsg::KeyframeController",
+            "NifOsg::TextKeyMapHolder",
+            "NifOsg::Emitter",
+            "NifOsg::ParticleSystem",
+            "NifOsg::GrowFadeAffector",
+            "NifOsg::InverseWorldMatrix",
+            "NifOsg::StaticBoundingBoxCallback",
+            "NifOsg::GeomMorpherController",
+            "NifOsg::UpdateMorphGeometry",
+            "osgMyGUI::Drawable",
+            "osg::DrawCallback",
+            "osgOQ::ClearQueriesCallback",
+            "osgOQ::RetrieveQueriesCallback",
+            "osg::DummyObject"
+        };
+        for (size_t i=0; i<sizeof(ignore)/sizeof(ignore[0]); ++i)
+        {
+            mgr->addWrapper(makeDummySerializer(ignore[i]));
+        }
+
+
+        done = true;
+    }
+}
+
+}
diff --git a/components/sceneutil/serialize.hpp b/components/sceneutil/serialize.hpp
new file mode 100644
index 000000000..7dc59605e
--- /dev/null
+++ b/components/sceneutil/serialize.hpp
@@ -0,0 +1,12 @@
+#ifndef OPENMW_COMPONENTS_SCENEUTIL_SERIALIZE_H
+#define OPENMW_COMPONENTS_SCENEUTIL_SERIALIZE_H
+
+namespace SceneUtil
+{
+
+    /// Register osg node serializers for certain SceneUtil classes if not already done so
+    void registerSerializers();
+
+}
+
+#endif
diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp
index d1299c058..f3c2aef77 100644
--- a/components/sceneutil/skeleton.cpp
+++ b/components/sceneutil/skeleton.cpp
@@ -38,6 +38,8 @@ Skeleton::Skeleton()
     , mNeedToUpdateBoneMatrices(true)
     , mActive(true)
     , mLastFrameNumber(0)
+    , mTraversedEvenFrame(false)
+    , mTraversedOddFrame(false)
 {
 
 }
@@ -48,6 +50,8 @@ Skeleton::Skeleton(const Skeleton &copy, const osg::CopyOp &copyop)
     , mNeedToUpdateBoneMatrices(true)
     , mActive(copy.mActive)
     , mLastFrameNumber(0)
+    , mTraversedEvenFrame(false)
+    , mTraversedOddFrame(false)
 {
 
 }
@@ -104,12 +108,17 @@ Bone* Skeleton::getBone(const std::string &name)
     return bone;
 }
 
-void Skeleton::updateBoneMatrices(osg::NodeVisitor* nv)
+void Skeleton::updateBoneMatrices(unsigned int traversalNumber)
 {
-    if (nv->getTraversalNumber() != mLastFrameNumber)
+    if (traversalNumber != mLastFrameNumber)
         mNeedToUpdateBoneMatrices = true;
 
-    mLastFrameNumber = nv->getTraversalNumber();
+    mLastFrameNumber = traversalNumber;
+
+    if (mLastFrameNumber % 2 == 0)
+        mTraversedEvenFrame = true;
+    else
+        mTraversedOddFrame = true;
 
     if (mNeedToUpdateBoneMatrices)
     {
@@ -135,16 +144,34 @@ bool Skeleton::getActive() const
     return mActive;
 }
 
+void Skeleton::markDirty()
+{
+    mTraversedEvenFrame = false;
+    mTraversedOddFrame = false;
+    mBoneCache.clear();
+    mBoneCacheInit = false;
+}
+
 void Skeleton::traverse(osg::NodeVisitor& nv)
 {
     if (!getActive() && nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR
             // need to process at least 2 frames before shutting off update, since we need to have both frame-alternating RigGeometries initialized
             // this would be more naturally handled if the double-buffering was implemented in RigGeometry itself rather than in a FrameSwitch decorator node
-            && mLastFrameNumber != 0 && mLastFrameNumber+2 <= nv.getTraversalNumber())
+            && mLastFrameNumber != 0 && mTraversedEvenFrame && mTraversedOddFrame)
         return;
     osg::Group::traverse(nv);
 }
 
+void Skeleton::childInserted(unsigned int)
+{
+    markDirty();
+}
+
+void Skeleton::childRemoved(unsigned int, unsigned int)
+{
+    markDirty();
+}
+
 Bone::Bone()
     : mNode(NULL)
 {
diff --git a/components/sceneutil/skeleton.hpp b/components/sceneutil/skeleton.hpp
index d98d36751..24dcc6b3f 100644
--- a/components/sceneutil/skeleton.hpp
+++ b/components/sceneutil/skeleton.hpp
@@ -45,7 +45,7 @@ namespace SceneUtil
         Bone* getBone(const std::string& name);
 
         /// Request an update of bone matrices. May be a no-op if already updated in this frame.
-        void updateBoneMatrices(osg::NodeVisitor* nv);
+        void updateBoneMatrices(unsigned int traversalNumber);
 
         /// Set the skinning active flag. Inactive skeletons will not have their child rigs updated.
         /// You should set this flag to false if you know that bones are not currently moving.
@@ -55,6 +55,11 @@ namespace SceneUtil
 
         void traverse(osg::NodeVisitor& nv);
 
+        void markDirty();
+
+        virtual void childInserted(unsigned int);
+        virtual void childRemoved(unsigned int, unsigned int);
+
     private:
         // The root bone is not a "real" bone, it has no corresponding node in the scene graph.
         // As far as the scene graph goes we support multiple root bones.
@@ -69,6 +74,8 @@ namespace SceneUtil
         bool mActive;
 
         unsigned int mLastFrameNumber;
+        bool mTraversedEvenFrame;
+        bool mTraversedOddFrame;
     };
 
 }
diff --git a/components/sceneutil/statesetupdater.cpp b/components/sceneutil/statesetupdater.cpp
index 0e325082e..5a5ecaded 100644
--- a/components/sceneutil/statesetupdater.cpp
+++ b/components/sceneutil/statesetupdater.cpp
@@ -15,7 +15,7 @@ namespace SceneUtil
             for (int i=0; i<2; ++i) // Using SHALLOW_COPY for StateAttributes, if users want to modify it is their responsibility to set a non-shared one first
                                     // This can be done conveniently in user implementations of the setDefaults() method
             {
-                mStateSets[i] = static_cast<osg::StateSet*>(osg::clone(src, osg::CopyOp::SHALLOW_COPY));
+                mStateSets[i] = new osg::StateSet(*src, osg::CopyOp::SHALLOW_COPY);
                 setDefaults(mStateSets[i]);
             }
         }
@@ -65,7 +65,7 @@ namespace SceneUtil
         : StateSetUpdater(copy, copyop)
     {
         for (unsigned int i=0; i<copy.mCtrls.size(); ++i)
-            mCtrls.push_back(static_cast<StateSetUpdater*>(osg::clone(copy.mCtrls[i].get(), copyop)));
+            mCtrls.push_back(osg::clone(copy.mCtrls[i].get(), copyop));
     }
 
     unsigned int CompositeStateSetUpdater::getNumControllers()
diff --git a/components/sceneutil/unrefqueue.cpp b/components/sceneutil/unrefqueue.cpp
index a5eb1654e..7e5646ecb 100644
--- a/components/sceneutil/unrefqueue.cpp
+++ b/components/sceneutil/unrefqueue.cpp
@@ -2,7 +2,6 @@
 
 #include <deque>
 
-#include <osg/Object>
 //#include <osg/Timer>
 //#include <iostream>
 
@@ -14,7 +13,7 @@ namespace SceneUtil
     class UnrefWorkItem : public SceneUtil::WorkItem
     {
     public:
-        std::deque<osg::ref_ptr<const osg::Object> > mObjects;
+        std::deque<osg::ref_ptr<const osg::Referenced> > mObjects;
 
         virtual void doWork()
         {
@@ -30,7 +29,7 @@ namespace SceneUtil
         mWorkItem = new UnrefWorkItem;
     }
 
-    void UnrefQueue::push(const osg::Object *obj)
+    void UnrefQueue::push(const osg::Referenced *obj)
     {
         mWorkItem->mObjects.push_back(obj);
     }
@@ -40,9 +39,14 @@ namespace SceneUtil
         if (mWorkItem->mObjects.empty())
             return;
 
-        workQueue->addWorkItem(mWorkItem);
+        workQueue->addWorkItem(mWorkItem, true);
 
         mWorkItem = new UnrefWorkItem;
     }
 
+    unsigned int UnrefQueue::getNumItems() const
+    {
+        return mWorkItem->mObjects.size();
+    }
+
 }
diff --git a/components/sceneutil/unrefqueue.hpp b/components/sceneutil/unrefqueue.hpp
index 85b1d31e1..4a2724927 100644
--- a/components/sceneutil/unrefqueue.hpp
+++ b/components/sceneutil/unrefqueue.hpp
@@ -4,11 +4,6 @@
 #include <osg/ref_ptr>
 #include <osg/Referenced>
 
-namespace osg
-{
-    class Object;
-}
-
 namespace SceneUtil
 {
     class WorkQueue;
@@ -22,12 +17,14 @@ namespace SceneUtil
         UnrefQueue();
 
         /// Adds an object to the list of objects to be unreferenced. Call from the main thread.
-        void push(const osg::Object* obj);
+        void push(const osg::Referenced* obj);
 
         /// Adds a WorkItem to the given WorkQueue that will clear the list of objects in a worker thread, thus unreferencing them.
         /// Call from the main thread.
         void flush(SceneUtil::WorkQueue* workQueue);
 
+        unsigned int getNumItems() const;
+
     private:
         osg::ref_ptr<UnrefWorkItem> mWorkItem;
     };
diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
index 0a5ad2d00..74b9be63d 100644
--- a/components/sceneutil/visitor.cpp
+++ b/components/sceneutil/visitor.cpp
@@ -1,6 +1,6 @@
 #include "visitor.hpp"
 
-#include <osg/Geode>
+#include <osg/MatrixTransform>
 
 #include <osgParticle/ParticleSystem>
 
@@ -9,20 +9,35 @@
 namespace SceneUtil
 {
 
-    void FindByNameVisitor::apply(osg::Group &group)
+    bool FindByNameVisitor::checkGroup(osg::Group &group)
     {
         if (Misc::StringUtils::ciEqual(group.getName(), mNameToFind))
         {
             mFoundNode = &group;
-            return;
+            return true;
         }
-        traverse(group);
+        return false;
+    }
+
+    void FindByNameVisitor::apply(osg::Group &group)
+    {
+        if (!checkGroup(group))
+            traverse(group);
+    }
+
+    void FindByNameVisitor::apply(osg::MatrixTransform &node)
+    {
+        if (!checkGroup(node))
+            traverse(node);
+    }
+
+    void FindByNameVisitor::apply(osg::Geometry&)
+    {
     }
 
-    void DisableFreezeOnCullVisitor::apply(osg::Geode &geode)
+    void DisableFreezeOnCullVisitor::apply(osg::MatrixTransform &node)
     {
-        for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
-            apply(*geode.getDrawable(i));
+        traverse(node);
     }
 
     void DisableFreezeOnCullVisitor::apply(osg::Drawable& drw)
diff --git a/components/sceneutil/visitor.hpp b/components/sceneutil/visitor.hpp
index dcfefe9cd..209f2d9bd 100644
--- a/components/sceneutil/visitor.hpp
+++ b/components/sceneutil/visitor.hpp
@@ -21,6 +21,11 @@ namespace SceneUtil
 
         virtual void apply(osg::Group& group);
 
+        virtual void apply(osg::MatrixTransform& node);
+        virtual void apply(osg::Geometry& node);
+
+        bool checkGroup(osg::Group& group);
+
         std::string mNameToFind;
         osg::Group* mFoundNode;
     };
@@ -34,7 +39,8 @@ namespace SceneUtil
         {
         }
 
-        virtual void apply(osg::Geode &geode);
+        virtual void apply(osg::MatrixTransform& node);
+
         virtual void apply(osg::Drawable& drw);
     };
 
diff --git a/components/sceneutil/waterutil.cpp b/components/sceneutil/waterutil.cpp
new file mode 100644
index 000000000..562b0ee73
--- /dev/null
+++ b/components/sceneutil/waterutil.cpp
@@ -0,0 +1,79 @@
+#include "waterutil.hpp"
+
+#include <osg/Depth>
+#include <osg/Geometry>
+#include <osg/Material>
+#include <osg/StateSet>
+
+namespace SceneUtil
+{
+    osg::ref_ptr<osg::Geometry> createWaterGeometry(float size, int segments, float textureRepeats)
+    {
+        osg::ref_ptr<osg::Vec3Array> verts (new osg::Vec3Array);
+        osg::ref_ptr<osg::Vec2Array> texcoords (new osg::Vec2Array);
+
+        // some drivers don't like huge triangles, so we do some subdivisons
+        // a paged solution would be even better
+        const float step = size/segments;
+        const float texCoordStep = textureRepeats / segments;
+        for (int x=0; x<segments; ++x)
+        {
+            for (int y=0; y<segments; ++y)
+            {
+                float x1 = -size/2.f + x*step;
+                float y1 = -size/2.f + y*step;
+                float x2 = x1 + step;
+                float y2 = y1 + step;
+
+                verts->push_back(osg::Vec3f(x1, y2, 0.f));
+                verts->push_back(osg::Vec3f(x1, y1, 0.f));
+                verts->push_back(osg::Vec3f(x2, y1, 0.f));
+                verts->push_back(osg::Vec3f(x2, y2, 0.f));
+
+                float u1 = x*texCoordStep;
+                float v1 = y*texCoordStep;
+                float u2 = u1 + texCoordStep;
+                float v2 = v1 + texCoordStep;
+
+                texcoords->push_back(osg::Vec2f(u1, v2));
+                texcoords->push_back(osg::Vec2f(u1, v1));
+                texcoords->push_back(osg::Vec2f(u2, v1));
+                texcoords->push_back(osg::Vec2f(u2, v2));
+            }
+        }
+
+        osg::ref_ptr<osg::Geometry> waterGeom (new osg::Geometry);
+        waterGeom->setVertexArray(verts);
+        waterGeom->setTexCoordArray(0, texcoords);
+
+        osg::ref_ptr<osg::Vec3Array> normal (new osg::Vec3Array);
+        normal->push_back(osg::Vec3f(0,0,1));
+        waterGeom->setNormalArray(normal, osg::Array::BIND_OVERALL);
+
+        waterGeom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS,0,verts->size()));
+        return waterGeom;
+    }
+
+    osg::ref_ptr<osg::StateSet> createSimpleWaterStateSet(float alpha, int renderBin)
+    {
+        osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);
+
+        osg::ref_ptr<osg::Material> material (new osg::Material);
+        material->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
+        material->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, alpha));
+        material->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, 1.f));
+        material->setColorMode(osg::Material::OFF);
+        stateset->setAttributeAndModes(material, osg::StateAttribute::ON);
+
+        stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
+        stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+
+        osg::ref_ptr<osg::Depth> depth (new osg::Depth);
+        depth->setWriteMask(false);
+        stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+
+        stateset->setRenderBinDetails(renderBin, "RenderBin");
+
+        return stateset;
+    }
+}
diff --git a/components/sceneutil/waterutil.hpp b/components/sceneutil/waterutil.hpp
new file mode 100644
index 000000000..7b8c38010
--- /dev/null
+++ b/components/sceneutil/waterutil.hpp
@@ -0,0 +1,19 @@
+#ifndef OPENMW_COMPONENTS_WATERUTIL_H
+#define OPENMW_COMPONENTS_WATERUTIL_H
+
+#include <osg/ref_ptr>
+
+namespace osg
+{
+    class Geometry;
+    class StateSet;
+}
+
+namespace SceneUtil
+{
+    osg::ref_ptr<osg::Geometry> createWaterGeometry(float size, int segments, float textureRepeats);
+
+    osg::ref_ptr<osg::StateSet> createSimpleWaterStateSet(float alpha, int renderBin);
+}
+
+#endif
diff --git a/components/sceneutil/workqueue.cpp b/components/sceneutil/workqueue.cpp
index bb1d1f1f7..831c70a3f 100644
--- a/components/sceneutil/workqueue.cpp
+++ b/components/sceneutil/workqueue.cpp
@@ -55,7 +55,7 @@ WorkQueue::~WorkQueue()
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
         while (!mQueue.empty())
-            mQueue.pop();
+            mQueue.pop_back();
         mIsReleased = true;
         mCondition.broadcast();
     }
@@ -67,7 +67,7 @@ WorkQueue::~WorkQueue()
     }
 }
 
-void WorkQueue::addWorkItem(osg::ref_ptr<WorkItem> item)
+void WorkQueue::addWorkItem(osg::ref_ptr<WorkItem> item, bool front)
 {
     if (item->isDone())
     {
@@ -76,7 +76,10 @@ void WorkQueue::addWorkItem(osg::ref_ptr<WorkItem> item)
     }
 
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
-    mQueue.push(item);
+    if (front)
+        mQueue.push_front(item);
+    else
+        mQueue.push_back(item);
     mCondition.signal();
 }
 
@@ -87,16 +90,33 @@ osg::ref_ptr<WorkItem> WorkQueue::removeWorkItem()
     {
         mCondition.wait(&mMutex);
     }
-    if (mQueue.size())
+    if (!mQueue.empty())
     {
         osg::ref_ptr<WorkItem> item = mQueue.front();
-        mQueue.pop();
+        mQueue.pop_front();
         return item;
     }
     else
         return NULL;
 }
 
+unsigned int WorkQueue::getNumItems() const
+{
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
+    return mQueue.size();
+}
+
+unsigned int WorkQueue::getNumActiveThreads() const
+{
+    unsigned int count = 0;
+    for (unsigned int i=0; i<mThreads.size(); ++i)
+    {
+        if (mThreads[i]->isActive())
+            ++count;
+    }
+    return count;
+}
+
 WorkThread::WorkThread(WorkQueue *workQueue)
     : mWorkQueue(workQueue)
 {
@@ -109,9 +129,16 @@ void WorkThread::run()
         osg::ref_ptr<WorkItem> item = mWorkQueue->removeWorkItem();
         if (!item)
             return;
+        mActive = true;
         item->doWork();
         item->signalDone();
+        mActive = false;
     }
 }
 
+bool WorkThread::isActive() const
+{
+    return mActive;
+}
+
 }
diff --git a/components/sceneutil/workqueue.hpp b/components/sceneutil/workqueue.hpp
index bc2e55647..7de6a5af5 100644
--- a/components/sceneutil/workqueue.hpp
+++ b/components/sceneutil/workqueue.hpp
@@ -31,6 +31,9 @@ namespace SceneUtil
         /// Internal use by the WorkQueue.
         void signalDone();
 
+        /// Set abort flag in order to return from doWork() as soon as possible. May not be respected by all WorkItems.
+        virtual void abort() {}
+
     protected:
         OpenThreads::Atomic mDone;
         OpenThreads::Mutex mMutex;
@@ -50,18 +53,23 @@ namespace SceneUtil
 
         /// Add a new work item to the back of the queue.
         /// @par The work item's waitTillDone() method may be used by the caller to wait until the work is complete.
-        void addWorkItem(osg::ref_ptr<WorkItem> item);
+        /// @param front If true, add item to the front of the queue. If false (default), add to the back.
+        void addWorkItem(osg::ref_ptr<WorkItem> item, bool front=false);
 
         /// Get the next work item from the front of the queue. If the queue is empty, waits until a new item is added.
         /// If the workqueue is in the process of being destroyed, may return NULL.
         /// @par Used internally by the WorkThread.
         osg::ref_ptr<WorkItem> removeWorkItem();
 
+        unsigned int getNumItems() const;
+
+        unsigned int getNumActiveThreads() const;
+
     private:
         bool mIsReleased;
-        std::queue<osg::ref_ptr<WorkItem> > mQueue;
+        std::deque<osg::ref_ptr<WorkItem> > mQueue;
 
-        OpenThreads::Mutex mMutex;
+        mutable OpenThreads::Mutex mMutex;
         OpenThreads::Condition mCondition;
 
         std::vector<WorkThread*> mThreads;
@@ -75,8 +83,11 @@ namespace SceneUtil
 
         virtual void run();
 
+        bool isActive() const;
+
     private:
         WorkQueue* mWorkQueue;
+        volatile bool mActive;
     };
 
 
diff --git a/components/sceneutil/writescene.cpp b/components/sceneutil/writescene.cpp
new file mode 100644
index 000000000..19e8dd73b
--- /dev/null
+++ b/components/sceneutil/writescene.cpp
@@ -0,0 +1,26 @@
+#include "writescene.hpp"
+
+#include <stdexcept>
+
+#include <osgDB/Registry>
+
+#include <boost/filesystem/fstream.hpp>
+
+#include "serialize.hpp"
+
+void SceneUtil::writeScene(osg::Node *node, const std::string& filename, const std::string& format)
+{
+    registerSerializers();
+
+    osgDB::ReaderWriter* rw = osgDB::Registry::instance()->getReaderWriterForExtension("osgt");
+    if (!rw)
+        throw std::runtime_error("can not find readerwriter for " + format);
+
+    boost::filesystem::ofstream stream;
+    stream.open(filename);
+
+    osg::ref_ptr<osgDB::Options> options = new osgDB::Options;
+    options->setPluginStringData("fileType", format);
+
+    rw->writeNode(*node, stream, options);
+}
diff --git a/components/sceneutil/writescene.hpp b/components/sceneutil/writescene.hpp
new file mode 100644
index 000000000..307251fe8
--- /dev/null
+++ b/components/sceneutil/writescene.hpp
@@ -0,0 +1,18 @@
+#ifndef OPENMW_COMPONENTS_WRITESCENE_H
+#define OPENMW_COMPONENTS_WRITESCENE_H
+
+#include <string>
+
+namespace osg
+{
+    class Node;
+}
+
+namespace SceneUtil
+{
+
+    void writeScene(osg::Node* node, const std::string& filename, const std::string& format);
+
+}
+
+#endif
diff --git a/components/sdlutil/sdlcursormanager.cpp b/components/sdlutil/sdlcursormanager.cpp
index afe240609..411fb3694 100644
--- a/components/sdlutil/sdlcursormanager.cpp
+++ b/components/sdlutil/sdlcursormanager.cpp
@@ -3,6 +3,7 @@
 #include <cassert>
 #include <stdexcept>
 #include <iostream>
+#include <cstdlib>
 
 #include <SDL_mouse.h>
 #include <SDL_endian.h>
@@ -81,6 +82,8 @@ namespace
 
     osg::ref_ptr<osg::Image> decompress (osg::ref_ptr<osg::Image> source, float rotDegrees)
     {
+        // TODO: use software decompression once S3TC patent expires
+
         int width = source->s();
         int height = source->t();
 
@@ -130,9 +133,13 @@ namespace
         osg::ref_ptr<osg::Geometry> geom;
 
 #if defined(__APPLE__)
-        // Extra flip needed on Intel graphics OS X systems due to a driver bug
+        // Extra flip needed on OS X systems due to a driver bug
+        const char* envval = getenv("OPENMW_CURSOR_WORKAROUND");
+        bool workaround = !envval || envval == std::string("1");
         std::string vendorString = (const char*)glGetString(GL_VENDOR);
-        if (vendorString.find("Intel") != std::string::npos)
+        if (!envval)
+            workaround = vendorString.find("Intel") != std::string::npos || vendorString.find("ATI") != std::string::npos || vendorString.find("AMD") != std::string::npos;
+        if (workaround)
             geom = osg::createTexturedQuadGeometry(osg::Vec3(-1,1,0), osg::Vec3(2,0,0), osg::Vec3(0,-2,0));
         else
 #endif
@@ -211,12 +218,12 @@ namespace SDLUtil
         SDL_SetCursor(mCursorMap.find(name)->second);
     }
 
-    void SDLCursorManager::createCursor(const std::string& name, int rotDegrees, osg::Image* image, Uint8 size_x, Uint8 size_y, Uint8 hotspot_x, Uint8 hotspot_y)
+    void SDLCursorManager::createCursor(const std::string& name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y)
     {
-        _createCursorFromResource(name, rotDegrees, image, size_x, size_y, hotspot_x, hotspot_y);
+        _createCursorFromResource(name, rotDegrees, image, hotspot_x, hotspot_y);
     }
 
-    void SDLCursorManager::_createCursorFromResource(const std::string& name, int rotDegrees, osg::Image* image, Uint8 size_x, Uint8 size_y, Uint8 hotspot_x, Uint8 hotspot_y)
+    void SDLCursorManager::_createCursorFromResource(const std::string& name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y)
     {
         osg::ref_ptr<osg::Image> decompressed;
 
@@ -239,8 +246,6 @@ namespace SDLUtil
 
         //clean up
         SDL_FreeSurface(surf);
-
-        _setGUICursor(name);
     }
 
 }
diff --git a/components/sdlutil/sdlcursormanager.hpp b/components/sdlutil/sdlcursormanager.hpp
index 0db578039..f338778d1 100644
--- a/components/sdlutil/sdlcursormanager.hpp
+++ b/components/sdlutil/sdlcursormanager.hpp
@@ -29,10 +29,10 @@ namespace SDLUtil
         ///        name of the cursor we changed to ("arrow", "ibeam", etc)
         virtual void cursorChanged(const std::string &name);
 
-        virtual void createCursor(const std::string &name, int rotDegrees, osg::Image* image, Uint8 size_x, Uint8 size_y, Uint8 hotspot_x, Uint8 hotspot_y);
+        virtual void createCursor(const std::string &name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y);
 
     private:
-        void _createCursorFromResource(const std::string &name, int rotDegrees, osg::Image* image, Uint8 size_x, Uint8 size_y, Uint8 hotspot_x, Uint8 hotspot_y);
+        void _createCursorFromResource(const std::string &name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y);
         void _putPixel(SDL_Surface *surface, int x, int y, Uint32 pixel);
 
         void _setGUICursor(const std::string& name);
diff --git a/components/sdlutil/sdlgraphicswindow.cpp b/components/sdlutil/sdlgraphicswindow.cpp
index a0483e84d..c2cf2536e 100644
--- a/components/sdlutil/sdlgraphicswindow.cpp
+++ b/components/sdlutil/sdlgraphicswindow.cpp
@@ -2,8 +2,6 @@
 
 #include <SDL_video.h>
 
-#include <osg/Version>
-
 namespace SDLUtil
 {
 
@@ -93,7 +91,7 @@ void GraphicsWindowSDL2::init()
     SDL_Window *oldWin = SDL_GL_GetCurrentWindow();
     SDL_GLContext oldCtx = SDL_GL_GetCurrentContext();
    
-#ifdef OPENGL_ES
+#if defined(OPENGL_ES) || defined(ANDROID)
      SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
      SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
      SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);    
@@ -112,11 +110,7 @@ void GraphicsWindowSDL2::init()
 
     mValid = true;
 
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,4)
     getEventQueue()->syncWindowRectangleWithGraphicsContext();
-#else
-    getEventQueue()->syncWindowRectangleWithGraphcisContext();
-#endif
 }
 
 
@@ -133,11 +127,7 @@ bool GraphicsWindowSDL2::realizeImplementation()
 
     SDL_ShowWindow(mWindow);
 
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,4)
     getEventQueue()->syncWindowRectangleWithGraphicsContext();
-#else
-    getEventQueue()->syncWindowRectangleWithGraphcisContext();
-#endif
 
     mRealized = true;
 
diff --git a/components/sdlutil/sdlinputwrapper.cpp b/components/sdlutil/sdlinputwrapper.cpp
index 647a65005..bc7c0d78a 100644
--- a/components/sdlutil/sdlinputwrapper.cpp
+++ b/components/sdlutil/sdlinputwrapper.cpp
@@ -89,23 +89,28 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
                     if (!evt.key.repeat)
                         mKeyboardListener->keyPressed(evt.key);
 
-                    // temporary for the stats viewer
-                    if (evt.key.keysym.sym == SDLK_F3)
-                        mViewer->getEventQueue()->keyPress(osgGA::GUIEventAdapter::KEY_F3);
+                    if (evt.key.keysym.sym >= SDLK_F1 && evt.key.keysym.sym <= SDLK_F12)
+                        mViewer->getEventQueue()->keyPress(osgGA::GUIEventAdapter::KEY_F1 + (evt.key.keysym.sym - SDLK_F1));
 
                     break;
                 case SDL_KEYUP:
                     if (!evt.key.repeat)
                         mKeyboardListener->keyReleased(evt.key);
 
-                    // temporary for the stats viewer
-                    if (evt.key.keysym.sym == SDLK_F3)
-                        mViewer->getEventQueue()->keyRelease(osgGA::GUIEventAdapter::KEY_F3);
+                    if (evt.key.keysym.sym >= SDLK_F1 && evt.key.keysym.sym <= SDLK_F12)
+                        mViewer->getEventQueue()->keyRelease(osgGA::GUIEventAdapter::KEY_F1 + (evt.key.keysym.sym - SDLK_F1));
 
+                    break;
+                case SDL_TEXTEDITING:
                     break;
                 case SDL_TEXTINPUT:
                     mKeyboardListener->textInput(evt.text);
                     break;
+
+#if SDL_VERSION_ATLEAST(2, 0, 4)
+                case SDL_KEYMAPCHANGED:
+                    break;
+#endif
                 case SDL_JOYHATMOTION: //As we manage everything with GameController, don't even bother with these.
                 case SDL_JOYAXISMOTION:
                 case SDL_JOYBUTTONDOWN:
diff --git a/components/sdlutil/sdlinputwrapper.hpp b/components/sdlutil/sdlinputwrapper.hpp
index a821b9012..62d6a565c 100644
--- a/components/sdlutil/sdlinputwrapper.hpp
+++ b/components/sdlutil/sdlinputwrapper.hpp
@@ -6,6 +6,7 @@
 #include <osg/ref_ptr>
 
 #include <SDL_events.h>
+#include <SDL_version.h>
 
 #include "OISCompat.hpp"
 #include "events.hpp"
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index 0e5324bd9..0c0600cc0 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -390,7 +390,7 @@ std::string Manager::getString(const std::string &setting, const std::string &ca
         return it->second;
 
     throw std::runtime_error(std::string("Trying to retrieve a non-existing setting: ") + setting
-                             + ".\nMake sure the settings-default.cfg file file was properly installed.");
+                             + ".\nMake sure the settings-default.cfg file was properly installed.");
 }
 
 float Manager::getFloat (const std::string& setting, const std::string& category)
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
new file mode 100644
index 000000000..ce77f46dc
--- /dev/null
+++ b/components/shader/shadermanager.cpp
@@ -0,0 +1,163 @@
+#include "shadermanager.hpp"
+
+#include <fstream>
+#include <iostream>
+#include <algorithm>
+
+#include <osg/Program>
+
+#include <boost/lexical_cast.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include <boost/algorithm/string.hpp>
+
+#include <OpenThreads/ScopedLock>
+
+namespace Shader
+{
+
+    void ShaderManager::setShaderPath(const std::string &path)
+    {
+        mPath = path;
+    }
+
+    bool parseIncludes(boost::filesystem::path shaderPath, std::string& source)
+    {
+        boost::replace_all(source, "\r\n", "\n");
+
+        std::set<boost::filesystem::path> includedFiles;
+        size_t foundPos = 0;
+        int fileNumber = 1;
+        while ((foundPos = source.find("#include")) != std::string::npos)
+        {
+            size_t start = source.find('"', foundPos);
+            if (start == std::string::npos || start == source.size()-1)
+            {
+                std::cerr << "Invalid #include " << std::endl;
+                return false;
+            }
+            size_t end = source.find('"', start+1);
+            if (end == std::string::npos)
+            {
+                std::cerr << "Invalid #include " << std::endl;
+                return false;
+            }
+            std::string includeFilename = source.substr(start+1, end-(start+1));
+            boost::filesystem::path includePath = shaderPath / includeFilename;
+            boost::filesystem::ifstream includeFstream;
+            includeFstream.open(includePath);
+            if (includeFstream.fail())
+            {
+                std::cerr << "Failed to open " << includePath.string() << std::endl;
+                return false;
+            }
+
+            std::stringstream buffer;
+            buffer << includeFstream.rdbuf();
+
+            // insert #line directives so we get correct line numbers in compiler errors
+            int includedFileNumber = fileNumber++;
+
+            int lineNumber = std::count(source.begin(), source.begin() + foundPos, '\n');
+
+            std::stringstream toInsert;
+            toInsert << "#line 0 " << includedFileNumber << "\n" << buffer.str() << "\n#line " << lineNumber << " 0\n";
+
+            source.replace(foundPos, (end-foundPos+1), toInsert.str());
+
+            if (includedFiles.insert(includePath).second == false)
+            {
+                std::cerr << "Detected cyclic #includes" << std::endl;
+                return false;
+            }
+        }
+        return true;
+    }
+
+    bool parseDefines(std::string& source, const ShaderManager::DefineMap& defines)
+    {
+        const char escapeCharacter = '@';
+        size_t foundPos = 0;
+        while ((foundPos = source.find(escapeCharacter)) != std::string::npos)
+        {
+            size_t endPos = source.find_first_of(" \n\r()[].;", foundPos);
+            if (endPos == std::string::npos)
+            {
+                std::cerr << "Unexpected EOF" << std::endl;
+                return false;
+            }
+            std::string define = source.substr(foundPos+1, endPos - (foundPos+1));
+            ShaderManager::DefineMap::const_iterator defineFound = defines.find(define);
+            if (defineFound == defines.end())
+            {
+                std::cerr << "Undefined " << define << std::endl;
+                return false;
+            }
+            else
+            {
+                source.replace(foundPos, endPos-foundPos, defineFound->second);
+            }
+        }
+        return true;
+    }
+
+    osg::ref_ptr<osg::Shader> ShaderManager::getShader(const std::string &shaderTemplate, const ShaderManager::DefineMap &defines, osg::Shader::Type shaderType)
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
+
+        // read the template if we haven't already
+        TemplateMap::iterator templateIt = mShaderTemplates.find(shaderTemplate);
+        if (templateIt == mShaderTemplates.end())
+        {
+            boost::filesystem::path p = (boost::filesystem::path(mPath) / shaderTemplate);
+            boost::filesystem::ifstream stream;
+            stream.open(p);
+            if (stream.fail())
+            {
+                std::cerr << "Failed to open " << p.string() << std::endl;
+                return NULL;
+            }
+            std::stringstream buffer;
+            buffer << stream.rdbuf();
+
+            // parse includes
+            std::string source = buffer.str();
+            if (!parseIncludes(boost::filesystem::path(mPath), source))
+                return NULL;
+
+            templateIt = mShaderTemplates.insert(std::make_pair(shaderTemplate, source)).first;
+        }
+
+        ShaderMap::iterator shaderIt = mShaders.find(std::make_pair(shaderTemplate, defines));
+        if (shaderIt == mShaders.end())
+        {
+            std::string shaderSource = templateIt->second;
+            if (!parseDefines(shaderSource, defines))
+                return NULL;
+
+            osg::ref_ptr<osg::Shader> shader (new osg::Shader(shaderType));
+            shader->setShaderSource(shaderSource);
+            // Assign a unique name to allow the SharedStateManager to compare shaders efficiently
+            static unsigned int counter = 0;
+            shader->setName(boost::lexical_cast<std::string>(counter++));
+
+            shaderIt = mShaders.insert(std::make_pair(std::make_pair(shaderTemplate, defines), shader)).first;
+        }
+        return shaderIt->second;
+    }
+
+    osg::ref_ptr<osg::Program> ShaderManager::getProgram(osg::ref_ptr<osg::Shader> vertexShader, osg::ref_ptr<osg::Shader> fragmentShader)
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
+        ProgramMap::iterator found = mPrograms.find(std::make_pair(vertexShader, fragmentShader));
+        if (found == mPrograms.end())
+        {
+            osg::ref_ptr<osg::Program> program (new osg::Program);
+            program->addShader(vertexShader);
+            program->addShader(fragmentShader);
+            found = mPrograms.insert(std::make_pair(std::make_pair(vertexShader, fragmentShader), program)).first;
+        }
+        return found->second;
+    }
+
+}
diff --git a/components/shader/shadermanager.hpp b/components/shader/shadermanager.hpp
new file mode 100644
index 000000000..5196dbe80
--- /dev/null
+++ b/components/shader/shadermanager.hpp
@@ -0,0 +1,55 @@
+#ifndef OPENMW_COMPONENTS_SHADERMANAGER_H
+#define OPENMW_COMPONENTS_SHADERMANAGER_H
+
+#include <string>
+#include <map>
+
+#include <osg/ref_ptr>
+
+#include <osg/Shader>
+
+#include <OpenThreads/Mutex>
+
+namespace Shader
+{
+
+    /// @brief Reads shader template files and turns them into a concrete shader, based on a list of define's.
+    /// @par Shader templates can get the value of a define with the syntax @define.
+    class ShaderManager
+    {
+    public:
+        void setShaderPath(const std::string& path);
+
+        typedef std::map<std::string, std::string> DefineMap;
+
+        /// Create or retrieve a shader instance.
+        /// @param shaderTemplate The filename of the shader template.
+        /// @param defines Define values that can be retrieved by the shader template.
+        /// @param shaderType The type of shader (usually vertex or fragment shader).
+        /// @note May return NULL on failure.
+        /// @note Thread safe.
+        osg::ref_ptr<osg::Shader> getShader(const std::string& shaderTemplate, const DefineMap& defines, osg::Shader::Type shaderType);
+
+        osg::ref_ptr<osg::Program> getProgram(osg::ref_ptr<osg::Shader> vertexShader, osg::ref_ptr<osg::Shader> fragmentShader);
+
+
+    private:
+        std::string mPath;
+
+        // <name, code>
+        typedef std::map<std::string, std::string> TemplateMap;
+        TemplateMap mShaderTemplates;
+
+        typedef std::pair<std::string, DefineMap> MapKey;
+        typedef std::map<MapKey, osg::ref_ptr<osg::Shader> > ShaderMap;
+        ShaderMap mShaders;
+
+        typedef std::map<std::pair<osg::ref_ptr<osg::Shader>, osg::ref_ptr<osg::Shader> >, osg::ref_ptr<osg::Program> > ProgramMap;
+        ProgramMap mPrograms;
+
+        OpenThreads::Mutex mMutex;
+    };
+
+}
+
+#endif
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
new file mode 100644
index 000000000..33fd9186f
--- /dev/null
+++ b/components/shader/shadervisitor.cpp
@@ -0,0 +1,408 @@
+#include "shadervisitor.hpp"
+
+#include <iostream>
+
+#include <osg/Texture>
+#include <osg/Material>
+#include <osg/Geometry>
+#include <osg/Image>
+
+#include <osgUtil/TangentSpaceGenerator>
+
+#include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string.hpp>
+
+#include <components/resource/imagemanager.hpp>
+#include <components/vfs/manager.hpp>
+#include <components/sceneutil/riggeometry.hpp>
+
+#include "shadermanager.hpp"
+
+namespace Shader
+{
+
+    ShaderVisitor::ShaderRequirements::ShaderRequirements()
+        : mShaderRequired(false)
+        , mColorMaterial(false)
+        , mVertexColorMode(GL_AMBIENT_AND_DIFFUSE)
+        , mMaterialOverridden(false)
+        , mNormalHeight(false)
+        , mTexStageRequiringTangents(-1)
+    {
+    }
+
+    ShaderVisitor::ShaderRequirements::~ShaderRequirements()
+    {
+
+    }
+
+    ShaderVisitor::ShaderVisitor(ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string &defaultVsTemplate, const std::string &defaultFsTemplate)
+        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        , mForceShaders(false)
+        , mClampLighting(true)
+        , mForcePerPixelLighting(false)
+        , mAllowedToModifyStateSets(true)
+        , mAutoUseNormalMaps(false)
+        , mAutoUseSpecularMaps(false)
+        , mShaderManager(shaderManager)
+        , mImageManager(imageManager)
+        , mDefaultVsTemplate(defaultVsTemplate)
+        , mDefaultFsTemplate(defaultFsTemplate)
+    {
+        mRequirements.push_back(ShaderRequirements());
+    }
+
+    void ShaderVisitor::setForceShaders(bool force)
+    {
+        mForceShaders = force;
+    }
+
+    void ShaderVisitor::setClampLighting(bool clamp)
+    {
+        mClampLighting = clamp;
+    }
+
+    void ShaderVisitor::setForcePerPixelLighting(bool force)
+    {
+        mForcePerPixelLighting = force;
+    }
+
+    void ShaderVisitor::apply(osg::Node& node)
+    {
+        if (node.getStateSet())
+        {
+            pushRequirements();
+            applyStateSet(node.getStateSet(), node);
+            traverse(node);
+            popRequirements();
+        }
+        else
+            traverse(node);
+    }
+
+    osg::StateSet* getWritableStateSet(osg::Node& node)
+    {
+        if (!node.getStateSet())
+            return node.getOrCreateStateSet();
+
+        osg::ref_ptr<osg::StateSet> newStateSet = new osg::StateSet(*node.getStateSet(), osg::CopyOp::SHALLOW_COPY);
+        node.setStateSet(newStateSet);
+        return newStateSet.get();
+    }
+
+    const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap", "specularMap", "decalMap" };
+    bool isTextureNameRecognized(const std::string& name)
+    {
+        for (unsigned int i=0; i<sizeof(defaultTextures)/sizeof(defaultTextures[0]); ++i)
+            if (name == defaultTextures[i])
+                return true;
+        return false;
+    }
+
+    void ShaderVisitor::applyStateSet(osg::ref_ptr<osg::StateSet> stateset, osg::Node& node)
+    {
+        osg::StateSet* writableStateSet = NULL;
+        if (mAllowedToModifyStateSets)
+            writableStateSet = node.getStateSet();
+        const osg::StateSet::TextureAttributeList& texAttributes = stateset->getTextureAttributeList();
+        if (!texAttributes.empty())
+        {
+            const osg::Texture* diffuseMap = NULL;
+            const osg::Texture* normalMap = NULL;
+            const osg::Texture* specularMap = NULL;
+            for(unsigned int unit=0;unit<texAttributes.size();++unit)
+            {
+                const osg::StateAttribute *attr = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
+                if (attr)
+                {
+                    const osg::Texture* texture = attr->asTexture();
+                    if (texture)
+                    {
+                        std::string texName = texture->getName();
+                        if ((texName.empty() || !isTextureNameRecognized(texName)) && unit == 0)
+                            texName = "diffuseMap";
+
+                        if (texName == "normalHeightMap")
+                        {
+                            mRequirements.back().mNormalHeight = true;
+                            texName = "normalMap";
+                        }
+
+                        if (!texName.empty())
+                        {
+                            mRequirements.back().mTextures[unit] = texName;
+                            if (texName == "normalMap")
+                            {
+                                mRequirements.back().mTexStageRequiringTangents = unit;
+                                mRequirements.back().mShaderRequired = true;
+                                if (!writableStateSet)
+                                    writableStateSet = getWritableStateSet(node);
+                                // normal maps are by default off since the FFP can't render them, now that we'll use shaders switch to On
+                                writableStateSet->setTextureMode(unit, GL_TEXTURE_2D, osg::StateAttribute::ON);
+                                normalMap = texture;
+                            }
+                            else if (texName == "diffuseMap")
+                                diffuseMap = texture;
+                            else if (texName == "specularMap")
+                                specularMap = texture;
+                        }
+                        else
+                            std::cerr << "ShaderVisitor encountered unknown texture " << texture << std::endl;
+                    }
+                }
+            }
+
+            if (mAutoUseNormalMaps && diffuseMap != NULL && normalMap == NULL && diffuseMap->getImage(0))
+            {
+                std::string normalMapFileName = diffuseMap->getImage(0)->getFileName();
+
+                osg::ref_ptr<osg::Image> image;
+                bool normalHeight = false;
+                std::string normalHeightMap = normalMapFileName;
+                boost::replace_last(normalHeightMap, ".", mNormalHeightMapPattern + ".");
+                if (mImageManager.getVFS()->exists(normalHeightMap))
+                {
+                    image = mImageManager.getImage(normalHeightMap);
+                    normalHeight = true;
+                }
+                else
+                {
+                    boost::replace_last(normalMapFileName, ".", mNormalMapPattern + ".");
+                    if (mImageManager.getVFS()->exists(normalMapFileName))
+                    {
+                        image = mImageManager.getImage(normalMapFileName);
+                    }
+                }
+
+                if (image)
+                {
+                    osg::ref_ptr<osg::Texture2D> normalMapTex (new osg::Texture2D(image));
+                    normalMapTex->setWrap(osg::Texture::WRAP_S, diffuseMap->getWrap(osg::Texture::WRAP_S));
+                    normalMapTex->setWrap(osg::Texture::WRAP_T, diffuseMap->getWrap(osg::Texture::WRAP_T));
+                    normalMapTex->setFilter(osg::Texture::MIN_FILTER, diffuseMap->getFilter(osg::Texture::MIN_FILTER));
+                    normalMapTex->setFilter(osg::Texture::MAG_FILTER, diffuseMap->getFilter(osg::Texture::MAG_FILTER));
+                    normalMapTex->setMaxAnisotropy(diffuseMap->getMaxAnisotropy());
+                    normalMapTex->setName("normalMap");
+
+                    int unit = texAttributes.size();
+                    if (!writableStateSet)
+                        writableStateSet = getWritableStateSet(node);
+                    writableStateSet->setTextureAttributeAndModes(unit, normalMapTex, osg::StateAttribute::ON);
+                    mRequirements.back().mTextures[unit] = "normalMap";
+                    mRequirements.back().mTexStageRequiringTangents = unit;
+                    mRequirements.back().mShaderRequired = true;
+                    mRequirements.back().mNormalHeight = normalHeight;
+                }
+            }
+            if (mAutoUseSpecularMaps && diffuseMap != NULL && specularMap == NULL && diffuseMap->getImage(0))
+            {
+                std::string specularMapFileName = diffuseMap->getImage(0)->getFileName();
+                boost::replace_last(specularMapFileName, ".", mSpecularMapPattern + ".");
+                if (mImageManager.getVFS()->exists(specularMapFileName))
+                {
+                    osg::ref_ptr<osg::Texture2D> specularMapTex (new osg::Texture2D(mImageManager.getImage(specularMapFileName)));
+                    specularMapTex->setWrap(osg::Texture::WRAP_S, diffuseMap->getWrap(osg::Texture::WRAP_S));
+                    specularMapTex->setWrap(osg::Texture::WRAP_T, diffuseMap->getWrap(osg::Texture::WRAP_T));
+                    specularMapTex->setFilter(osg::Texture::MIN_FILTER, diffuseMap->getFilter(osg::Texture::MIN_FILTER));
+                    specularMapTex->setFilter(osg::Texture::MAG_FILTER, diffuseMap->getFilter(osg::Texture::MAG_FILTER));
+                    specularMapTex->setMaxAnisotropy(diffuseMap->getMaxAnisotropy());
+                    specularMapTex->setName("specularMap");
+
+                    int unit = texAttributes.size();
+                    if (!writableStateSet)
+                        writableStateSet = getWritableStateSet(node);
+                    writableStateSet->setTextureAttributeAndModes(unit, specularMapTex, osg::StateAttribute::ON);
+                    mRequirements.back().mTextures[unit] = "specularMap";
+                    mRequirements.back().mShaderRequired = true;
+                }
+            }
+        }
+
+        const osg::StateSet::AttributeList& attributes = stateset->getAttributeList();
+        for (osg::StateSet::AttributeList::const_iterator it = attributes.begin(); it != attributes.end(); ++it)
+        {
+            if (it->first.first == osg::StateAttribute::MATERIAL)
+            {
+                if (!mRequirements.back().mMaterialOverridden || it->second.second & osg::StateAttribute::PROTECTED)
+                {
+                    if (it->second.second & osg::StateAttribute::OVERRIDE)
+                        mRequirements.back().mMaterialOverridden = true;
+
+                    const osg::Material* mat = static_cast<const osg::Material*>(it->second.first.get());
+                    mRequirements.back().mColorMaterial = (mat->getColorMode() != osg::Material::OFF);
+                    mRequirements.back().mVertexColorMode = mat->getColorMode();
+                }
+            }
+        }
+    }
+
+    void ShaderVisitor::pushRequirements()
+    {
+        mRequirements.push_back(mRequirements.back());
+    }
+
+    void ShaderVisitor::popRequirements()
+    {
+        mRequirements.pop_back();
+    }
+
+    void ShaderVisitor::createProgram(const ShaderRequirements &reqs, osg::Node& node)
+    {
+        osg::StateSet* writableStateSet = NULL;
+        if (mAllowedToModifyStateSets)
+            writableStateSet = node.getOrCreateStateSet();
+        else
+            writableStateSet = getWritableStateSet(node);
+
+        ShaderManager::DefineMap defineMap;
+        for (unsigned int i=0; i<sizeof(defaultTextures)/sizeof(defaultTextures[0]); ++i)
+        {
+            defineMap[defaultTextures[i]] = "0";
+            defineMap[std::string(defaultTextures[i]) + std::string("UV")] = "0";
+        }
+        for (std::map<int, std::string>::const_iterator texIt = reqs.mTextures.begin(); texIt != reqs.mTextures.end(); ++texIt)
+        {
+            defineMap[texIt->second] = "1";
+            defineMap[texIt->second + std::string("UV")] = boost::lexical_cast<std::string>(texIt->first);
+        }
+
+        if (!reqs.mColorMaterial)
+            defineMap["colorMode"] = "0";
+        else
+        {
+            switch (reqs.mVertexColorMode)
+            {
+            case GL_AMBIENT:
+                defineMap["colorMode"] = "3";
+                break;
+            default:
+            case GL_AMBIENT_AND_DIFFUSE:
+                defineMap["colorMode"] = "2";
+                break;
+            case GL_EMISSION:
+                defineMap["colorMode"] = "1";
+                break;
+            }
+        }
+
+        defineMap["forcePPL"] = mForcePerPixelLighting ? "1" : "0";
+        defineMap["clamp"] = mClampLighting ? "1" : "0";
+
+        defineMap["parallax"] = reqs.mNormalHeight ? "1" : "0";
+
+        osg::ref_ptr<osg::Shader> vertexShader (mShaderManager.getShader(mDefaultVsTemplate, defineMap, osg::Shader::VERTEX));
+        osg::ref_ptr<osg::Shader> fragmentShader (mShaderManager.getShader(mDefaultFsTemplate, defineMap, osg::Shader::FRAGMENT));
+
+        if (vertexShader && fragmentShader)
+        {
+            writableStateSet->setAttributeAndModes(mShaderManager.getProgram(vertexShader, fragmentShader), osg::StateAttribute::ON);
+
+            for (std::map<int, std::string>::const_iterator texIt = reqs.mTextures.begin(); texIt != reqs.mTextures.end(); ++texIt)
+            {
+                writableStateSet->addUniform(new osg::Uniform(texIt->second.c_str(), texIt->first), osg::StateAttribute::ON);
+            }
+        }
+    }
+
+    void ShaderVisitor::apply(osg::Geometry& geometry)
+    {
+        bool needPop = (geometry.getStateSet() != NULL);
+        if (geometry.getStateSet())
+        {
+            pushRequirements();
+            applyStateSet(geometry.getStateSet(), geometry);
+        }
+
+        if (!mRequirements.empty())
+        {
+            const ShaderRequirements& reqs = mRequirements.back();
+
+            osg::ref_ptr<osg::Geometry> sourceGeometry = &geometry;
+            SceneUtil::RigGeometry* rig = dynamic_cast<SceneUtil::RigGeometry*>(&geometry);
+            if (rig)
+                sourceGeometry = rig->getSourceGeometry();
+
+            if (mAllowedToModifyStateSets)
+            {
+                // make sure that all UV sets are there
+                for (std::map<int, std::string>::const_iterator it = reqs.mTextures.begin(); it != reqs.mTextures.end(); ++it)
+                {
+                    if (sourceGeometry->getTexCoordArray(it->first) == NULL)
+                        sourceGeometry->setTexCoordArray(it->first, sourceGeometry->getTexCoordArray(0));
+                }
+            }
+
+            if (reqs.mTexStageRequiringTangents != -1 && mAllowedToModifyStateSets)
+            {
+                osg::ref_ptr<osgUtil::TangentSpaceGenerator> generator (new osgUtil::TangentSpaceGenerator);
+                generator->generate(sourceGeometry, reqs.mTexStageRequiringTangents);
+
+                sourceGeometry->setTexCoordArray(7, generator->getTangentArray(), osg::Array::BIND_PER_VERTEX);
+            }
+
+            if (rig)
+                rig->setSourceGeometry(sourceGeometry);
+
+            // TODO: find a better place for the stateset
+            if (reqs.mShaderRequired || mForceShaders)
+                createProgram(reqs, geometry);
+        }
+
+        if (needPop)
+            popRequirements();
+    }
+
+    void ShaderVisitor::apply(osg::Drawable& drawable)
+    {
+        // non-Geometry drawable (e.g. particle system)
+        bool needPop = (drawable.getStateSet() != NULL);
+
+        if (drawable.getStateSet())
+        {
+            pushRequirements();
+            applyStateSet(drawable.getStateSet(), drawable);
+        }
+
+        if (!mRequirements.empty())
+        {
+            const ShaderRequirements& reqs = mRequirements.back();
+            // TODO: find a better place for the stateset
+            if (reqs.mShaderRequired || mForceShaders)
+                createProgram(reqs, drawable);
+        }
+
+        if (needPop)
+            popRequirements();
+    }
+
+    void ShaderVisitor::setAllowedToModifyStateSets(bool allowed)
+    {
+        mAllowedToModifyStateSets = allowed;
+    }
+
+    void ShaderVisitor::setAutoUseNormalMaps(bool use)
+    {
+        mAutoUseNormalMaps = use;
+    }
+
+    void ShaderVisitor::setNormalMapPattern(const std::string &pattern)
+    {
+        mNormalMapPattern = pattern;
+    }
+
+    void ShaderVisitor::setNormalHeightMapPattern(const std::string &pattern)
+    {
+        mNormalHeightMapPattern = pattern;
+    }
+
+    void ShaderVisitor::setAutoUseSpecularMaps(bool use)
+    {
+        mAutoUseSpecularMaps = use;
+    }
+
+    void ShaderVisitor::setSpecularMapPattern(const std::string &pattern)
+    {
+        mSpecularMapPattern = pattern;
+    }
+
+}
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
new file mode 100644
index 000000000..8f4597ff3
--- /dev/null
+++ b/components/shader/shadervisitor.hpp
@@ -0,0 +1,103 @@
+#ifndef OPENMW_COMPONENTS_SHADERVISITOR_H
+#define OPENMW_COMPONENTS_SHADERVISITOR_H
+
+#include <osg/NodeVisitor>
+
+namespace Resource
+{
+    class ImageManager;
+}
+
+namespace Shader
+{
+
+    class ShaderManager;
+
+    /// @brief Adjusts the given subgraph to render using shaders.
+    class ShaderVisitor : public osg::NodeVisitor
+    {
+    public:
+        ShaderVisitor(ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string& defaultVsTemplate, const std::string& defaultFsTemplate);
+
+        /// By default, only bump mapped objects will have a shader added to them.
+        /// Setting force = true will cause all objects to render using shaders, regardless of having a bump map.
+        void setForceShaders(bool force);
+
+        /// Set whether lighting is clamped for visual compatibility with the fixed function pipeline.
+        void setClampLighting(bool clamp);
+
+        /// By default, only bump mapped objects use per-pixel lighting.
+        /// Setting force = true will cause all shaders to use per-pixel lighting, regardless of having a bump map.
+        void setForcePerPixelLighting(bool force);
+
+        /// Set if we are allowed to modify StateSets encountered in the graph (default true).
+        /// @par If set to false, then instead of modifying, the StateSet will be cloned and this new StateSet will be assigned to the node.
+        /// @par This option is useful when the ShaderVisitor is run on a "live" subgraph that may have already been submitted for rendering.
+        void setAllowedToModifyStateSets(bool allowed);
+
+        /// Automatically use normal maps if a file with suitable name exists (see normal map pattern).
+        void setAutoUseNormalMaps(bool use);
+
+        void setNormalMapPattern(const std::string& pattern);
+        void setNormalHeightMapPattern(const std::string& pattern);
+
+        void setAutoUseSpecularMaps(bool use);
+
+        void setSpecularMapPattern(const std::string& pattern);
+
+        virtual void apply(osg::Node& node);
+
+        virtual void apply(osg::Drawable& drawable);
+        virtual void apply(osg::Geometry& geometry);
+
+        void applyStateSet(osg::ref_ptr<osg::StateSet> stateset, osg::Node& node);
+
+        void pushRequirements();
+        void popRequirements();
+
+    private:
+        bool mForceShaders;
+        bool mClampLighting;
+        bool mForcePerPixelLighting;
+        bool mAllowedToModifyStateSets;
+
+        bool mAutoUseNormalMaps;
+        std::string mNormalMapPattern;
+        std::string mNormalHeightMapPattern;
+
+        bool mAutoUseSpecularMaps;
+        std::string mSpecularMapPattern;
+
+        ShaderManager& mShaderManager;
+        Resource::ImageManager& mImageManager;
+
+        struct ShaderRequirements
+        {
+            ShaderRequirements();
+            ~ShaderRequirements();
+
+            // <texture stage, texture name>
+            std::map<int, std::string> mTextures;
+
+            bool mShaderRequired;
+
+            bool mColorMaterial;
+            // osg::Material::ColorMode
+            int mVertexColorMode;
+            bool mMaterialOverridden;
+            bool mNormalHeight; // true if normal map has height info in alpha channel
+
+            // -1 == no tangents required
+            int mTexStageRequiringTangents;
+        };
+        std::vector<ShaderRequirements> mRequirements;
+
+        std::string mDefaultVsTemplate;
+        std::string mDefaultFsTemplate;
+
+        void createProgram(const ShaderRequirements& reqs, osg::Node& node);
+    };
+
+}
+
+#endif
diff --git a/components/terrain/buffercache.cpp b/components/terrain/buffercache.cpp
index 2a72ea59b..3bf5d5651 100644
--- a/components/terrain/buffercache.cpp
+++ b/components/terrain/buffercache.cpp
@@ -23,7 +23,7 @@ osg::ref_ptr<IndexArrayType> createIndexBuffer(unsigned int flags, unsigned int
 
     bool anyDeltas = (lodDeltas[Terrain::North] || lodDeltas[Terrain::South] || lodDeltas[Terrain::West] || lodDeltas[Terrain::East]);
 
-    size_t increment = 1 << lodLevel;
+    size_t increment = static_cast<size_t>(1) << lodLevel;
     assert(increment < verts);
 
     osg::ref_ptr<IndexArrayType> indices (new IndexArrayType(osg::PrimitiveSet::TRIANGLES));
@@ -75,7 +75,7 @@ osg::ref_ptr<IndexArrayType> createIndexBuffer(unsigned int flags, unsigned int
 
         // South
         size_t row = 0;
-        size_t outerStep = 1 << (lodDeltas[Terrain::South] + lodLevel);
+        size_t outerStep = static_cast<size_t>(1) << (lodDeltas[Terrain::South] + lodLevel);
         for (size_t col = 0; col < verts-1; col += outerStep)
         {
             indices->push_back(verts*col+row);
@@ -124,7 +124,7 @@ osg::ref_ptr<IndexArrayType> createIndexBuffer(unsigned int flags, unsigned int
         // West
         size_t col = 0;
         outerStep = size_t(1) << (lodDeltas[Terrain::West] + lodLevel);
-        for (size_t row = 0; row < verts-1; row += outerStep)
+        for (row = 0; row < verts-1; row += outerStep)
         {
             indices->push_back(verts*col+row+outerStep);
             indices->push_back(verts*col+row);
@@ -148,7 +148,7 @@ osg::ref_ptr<IndexArrayType> createIndexBuffer(unsigned int flags, unsigned int
         // East
         col = verts-1;
         outerStep = size_t(1) << (lodDeltas[Terrain::East] + lodLevel);
-        for (size_t row = 0; row < verts-1; row += outerStep)
+        for (row = 0; row < verts-1; row += outerStep)
         {
             indices->push_back(verts*col+row);
             indices->push_back(verts*col+row+outerStep);
@@ -219,7 +219,7 @@ namespace Terrain
 
         osg::ref_ptr<osg::DrawElements> buffer;
 
-        if (verts*verts > (0xffffu))
+        if (verts*verts <= (0xffffu))
             buffer = createIndexBuffer<osg::DrawElementsUShort>(flags, verts);
         else
             buffer = createIndexBuffer<osg::DrawElementsUInt>(flags, verts);
diff --git a/components/terrain/buffercache.hpp b/components/terrain/buffercache.hpp
index d1a57f811..172b9d672 100644
--- a/components/terrain/buffercache.hpp
+++ b/components/terrain/buffercache.hpp
@@ -3,6 +3,7 @@
 
 #include <osg/ref_ptr>
 #include <osg/Array>
+#include <osg/PrimitiveSet>
 
 #include <map>
 
diff --git a/components/terrain/defs.hpp b/components/terrain/defs.hpp
index 234e05a98..c2342c50d 100644
--- a/components/terrain/defs.hpp
+++ b/components/terrain/defs.hpp
@@ -20,6 +20,8 @@ namespace Terrain
         std::string mNormalMap;
         bool mParallax; // Height info in normal map alpha channel?
         bool mSpecular; // Specular info in diffuse map alpha channel?
+
+        bool requiresShaders() const { return !mNormalMap.empty() || mSpecular; }
     };
 
 }
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index 59d06f254..fa87c53ec 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -1,30 +1,77 @@
 #include "material.hpp"
 
+#include <iostream>
+#include <stdexcept>
+
 #include <osg/Depth>
 #include <osg/TexEnvCombine>
 #include <osg/Texture2D>
 #include <osg/TexMat>
 #include <osg/Material>
-#include <osg/TexEnvCombine>
+
+#include <components/shader/shadermanager.hpp>
+
 
 namespace Terrain
 {
 
-    FixedFunctionTechnique::FixedFunctionTechnique(const std::vector<osg::ref_ptr<osg::Texture2D> >& layers,
+    osg::ref_ptr<osg::TexMat> getBlendmapTexMat(int blendmapScale)
+    {
+        static std::map<int, osg::ref_ptr<osg::TexMat> > texMatMap;
+        osg::ref_ptr<osg::TexMat> texMat = texMatMap[blendmapScale];
+        if (!texMat)
+        {
+            texMat = new osg::TexMat;
+            osg::Matrixf matrix;
+            float scale = (blendmapScale/(static_cast<float>(blendmapScale)+1.f));
+            matrix.preMultTranslate(osg::Vec3f(0.5f, 0.5f, 0.f));
+            matrix.preMultScale(osg::Vec3f(scale, scale, 1.f));
+            matrix.preMultTranslate(osg::Vec3f(-0.5f, -0.5f, 0.f));
+
+            texMatMap[blendmapScale] = texMat;
+        }
+        return texMat;
+    }
+
+    osg::ref_ptr<osg::TexMat> getLayerTexMat(float layerTileSize)
+    {
+        static std::map<float, osg::ref_ptr<osg::TexMat> > texMatMap;
+        osg::ref_ptr<osg::TexMat> texMat = texMatMap[layerTileSize];
+        if (!texMat)
+        {
+            texMat = new osg::TexMat;
+            texMat->setMatrix(osg::Matrix::scale(osg::Vec3f(layerTileSize,layerTileSize,1.f)));
+
+            texMatMap[layerTileSize] = texMat;
+        }
+        return texMat;
+    }
+
+    osg::ref_ptr<osg::Depth> getEqualDepth()
+    {
+        static osg::ref_ptr<osg::Depth> depth;
+        if (!depth)
+        {
+            depth = new osg::Depth;
+            depth->setFunction(osg::Depth::EQUAL);
+        }
+        return depth;
+    }
+
+    FixedFunctionTechnique::FixedFunctionTechnique(const std::vector<TextureLayer>& layers,
                                                    const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize)
     {
         bool firstLayer = true;
         int i=0;
-        for (std::vector<osg::ref_ptr<osg::Texture2D> >::const_iterator it = layers.begin(); it != layers.end(); ++it)
+        for (std::vector<TextureLayer>::const_iterator it = layers.begin(); it != layers.end(); ++it)
         {
             osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);
 
             if (!firstLayer)
             {
                 stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
-                osg::ref_ptr<osg::Depth> depth (new osg::Depth);
-                depth->setFunction(osg::Depth::EQUAL);
-                stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+
+                stateset->setAttributeAndModes(getEqualDepth(), osg::StateAttribute::ON);
             }
 
             int texunit = 0;
@@ -35,17 +82,15 @@ namespace Terrain
                 stateset->setTextureAttributeAndModes(texunit, blendmap.get());
 
                 // This is to map corner vertices directly to the center of a blendmap texel.
-                osg::Matrixf texMat;
-                float scale = (blendmapScale/(static_cast<float>(blendmapScale)+1.f));
-                texMat.preMultTranslate(osg::Vec3f(0.5f, 0.5f, 0.f));
-                texMat.preMultScale(osg::Vec3f(scale, scale, 1.f));
-                texMat.preMultTranslate(osg::Vec3f(-0.5f, -0.5f, 0.f));
+                stateset->setTextureAttributeAndModes(texunit, getBlendmapTexMat(blendmapScale));
 
-                stateset->setTextureAttributeAndModes(texunit, new osg::TexMat(texMat));
-
-                osg::ref_ptr<osg::TexEnvCombine> texEnvCombine (new osg::TexEnvCombine);
-                texEnvCombine->setCombine_RGB(osg::TexEnvCombine::REPLACE);
-                texEnvCombine->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+                static osg::ref_ptr<osg::TexEnvCombine> texEnvCombine;
+                if (!texEnvCombine)
+                {
+                    texEnvCombine = new osg::TexEnvCombine;
+                    texEnvCombine->setCombine_RGB(osg::TexEnvCombine::REPLACE);
+                    texEnvCombine->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+                }
 
                 stateset->setTextureAttributeAndModes(texunit, texEnvCombine, osg::StateAttribute::ON);
 
@@ -53,12 +98,73 @@ namespace Terrain
             }
 
             // Add the actual layer texture multiplied by the alpha map.
-            osg::ref_ptr<osg::Texture2D> tex = *it;
+            osg::ref_ptr<osg::Texture2D> tex = it->mDiffuseMap;
             stateset->setTextureAttributeAndModes(texunit, tex.get());
 
-            osg::ref_ptr<osg::TexMat> texMat (new osg::TexMat);
-            texMat->setMatrix(osg::Matrix::scale(osg::Vec3f(layerTileSize,layerTileSize,1.f)));
-            stateset->setTextureAttributeAndModes(texunit, texMat, osg::StateAttribute::ON);
+            stateset->setTextureAttributeAndModes(texunit, getLayerTexMat(layerTileSize), osg::StateAttribute::ON);
+
+            firstLayer = false;
+
+            addPass(stateset);
+        }
+    }
+
+    ShaderTechnique::ShaderTechnique(Shader::ShaderManager& shaderManager, bool forcePerPixelLighting, bool clampLighting, const std::vector<TextureLayer>& layers,
+                                                   const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize)
+    {
+        bool firstLayer = true;
+        int i=0;
+        for (std::vector<TextureLayer>::const_iterator it = layers.begin(); it != layers.end(); ++it)
+        {
+            osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);
+
+            if (!firstLayer)
+            {
+                stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
+                stateset->setAttributeAndModes(getEqualDepth(), osg::StateAttribute::ON);
+            }
+
+            int texunit = 0;
+
+            stateset->setTextureAttributeAndModes(texunit, it->mDiffuseMap);
+
+            stateset->setTextureAttributeAndModes(texunit, getLayerTexMat(layerTileSize), osg::StateAttribute::ON);
+
+            stateset->addUniform(new osg::Uniform("diffuseMap", texunit));
+
+            if(!firstLayer)
+            {
+                ++texunit;
+                osg::ref_ptr<osg::Texture2D> blendmap = blendmaps.at(i++);
+
+                stateset->setTextureAttributeAndModes(texunit, blendmap.get());
+
+                stateset->setTextureAttributeAndModes(texunit, getBlendmapTexMat(blendmapScale));
+                stateset->addUniform(new osg::Uniform("blendMap", texunit));
+            }
+
+            if (it->mNormalMap)
+            {
+                ++texunit;
+                stateset->setTextureAttributeAndModes(texunit, it->mNormalMap);
+                stateset->addUniform(new osg::Uniform("normalMap", texunit));
+            }
+
+            Shader::ShaderManager::DefineMap defineMap;
+            defineMap["forcePPL"] = forcePerPixelLighting ? "1" : "0";
+            defineMap["clamp"] = clampLighting ? "1" : "0";
+            defineMap["normalMap"] = (it->mNormalMap) ? "1" : "0";
+            defineMap["blendMap"] = !firstLayer ? "1" : "0";
+            defineMap["colorMode"] = "2";
+            defineMap["specularMap"] = it->mSpecular ? "1" : "0";
+            defineMap["parallax"] = (it->mNormalMap && it->mParallax) ? "1" : "0";
+
+            osg::ref_ptr<osg::Shader> vertexShader = shaderManager.getShader("terrain_vertex.glsl", defineMap, osg::Shader::VERTEX);
+            osg::ref_ptr<osg::Shader> fragmentShader = shaderManager.getShader("terrain_fragment.glsl", defineMap, osg::Shader::FRAGMENT);
+            if (!vertexShader || !fragmentShader)
+                throw std::runtime_error("Unable to create shader");
+
+            stateset->setAttributeAndModes(shaderManager.getProgram(vertexShader, fragmentShader));
 
             firstLayer = false;
 
@@ -66,23 +172,34 @@ namespace Terrain
         }
     }
 
-    Effect::Effect(const std::vector<osg::ref_ptr<osg::Texture2D> > &layers, const std::vector<osg::ref_ptr<osg::Texture2D> > &blendmaps,
+    Effect::Effect(bool useShaders, bool forcePerPixelLighting, bool clampLighting, Shader::ShaderManager* shaderManager, const std::vector<TextureLayer> &layers, const std::vector<osg::ref_ptr<osg::Texture2D> > &blendmaps,
                    int blendmapScale, float layerTileSize)
-        : mLayers(layers)
+        : mShaderManager(shaderManager)
+        , mUseShaders(useShaders)
+        , mForcePerPixelLighting(forcePerPixelLighting)
+        , mClampLighting(clampLighting)
+        , mLayers(layers)
         , mBlendmaps(blendmaps)
         , mBlendmapScale(blendmapScale)
         , mLayerTileSize(layerTileSize)
     {
-        osg::ref_ptr<osg::Material> material (new osg::Material);
-        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-        getOrCreateStateSet()->setAttributeAndModes(material, osg::StateAttribute::ON);
-
         selectTechnique(0);
     }
 
     bool Effect::define_techniques()
     {
-        addTechnique(new FixedFunctionTechnique(mLayers, mBlendmaps, mBlendmapScale, mLayerTileSize));
+        try
+        {
+            if (mUseShaders && mShaderManager)
+                addTechnique(new ShaderTechnique(*mShaderManager, mForcePerPixelLighting, mClampLighting, mLayers, mBlendmaps, mBlendmapScale, mLayerTileSize));
+            else
+                addTechnique(new FixedFunctionTechnique(mLayers, mBlendmaps, mBlendmapScale, mLayerTileSize));
+        }
+        catch (std::exception& e)
+        {
+            std::cerr << "Error: " << e.what() << std::endl;
+            addTechnique(new FixedFunctionTechnique(mLayers, mBlendmaps, mBlendmapScale, mLayerTileSize));
+        }
 
         return true;
     }
diff --git a/components/terrain/material.hpp b/components/terrain/material.hpp
index dd00e41ed..c13b21e8f 100644
--- a/components/terrain/material.hpp
+++ b/components/terrain/material.hpp
@@ -11,14 +11,38 @@ namespace osg
     class Texture2D;
 }
 
+namespace Shader
+{
+    class ShaderManager;
+}
+
 namespace Terrain
 {
 
+    struct TextureLayer
+    {
+        osg::ref_ptr<osg::Texture2D> mDiffuseMap;
+        osg::ref_ptr<osg::Texture2D> mNormalMap; // optional
+        bool mParallax;
+        bool mSpecular;
+    };
+
     class FixedFunctionTechnique : public osgFX::Technique
     {
     public:
         FixedFunctionTechnique(
-                const std::vector<osg::ref_ptr<osg::Texture2D> >& layers,
+                const std::vector<TextureLayer>& layers,
+                const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize);
+
+    protected:
+        virtual void define_passes() {}
+    };
+
+    class ShaderTechnique : public osgFX::Technique
+    {
+    public:
+        ShaderTechnique(Shader::ShaderManager& shaderManager, bool forcePerPixelLighting, bool clampLighting,
+                const std::vector<TextureLayer>& layers,
                 const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize);
 
     protected:
@@ -28,8 +52,8 @@ namespace Terrain
     class Effect : public osgFX::Effect
     {
     public:
-        Effect(
-                const std::vector<osg::ref_ptr<osg::Texture2D> >& layers,
+        Effect(bool useShaders, bool forcePerPixelLighting, bool clampLighting, Shader::ShaderManager* shaderManager,
+                const std::vector<TextureLayer>& layers,
                 const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize);
 
         virtual bool define_techniques();
@@ -48,7 +72,11 @@ namespace Terrain
         }
 
     private:
-        std::vector<osg::ref_ptr<osg::Texture2D> > mLayers;
+        Shader::ShaderManager* mShaderManager;
+        bool mUseShaders;
+        bool mForcePerPixelLighting;
+        bool mClampLighting;
+        std::vector<TextureLayer> mLayers;
         std::vector<osg::ref_ptr<osg::Texture2D> > mBlendmaps;
         int mBlendmapScale;
         float mLayerTileSize;
diff --git a/components/terrain/storage.cpp b/components/terrain/storage.cpp
deleted file mode 100644
index bdc819481..000000000
--- a/components/terrain/storage.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "storage.hpp"
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 4f0e464ce..6113178d3 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include <osg/UserDataContainer>
+#include <osg/Material>
 
 #include <OpenThreads/ScopedLock>
 
@@ -17,9 +17,7 @@
 #include <components/esm/loadland.hpp>
 
 #include <osg/Geometry>
-#include <osg/Geode>
 #include <osg/KdTree>
-#include <osg/Version>
 
 #include <osgFX/Effect>
 
@@ -51,12 +49,16 @@ namespace
 namespace Terrain
 {
 
-TerrainGrid::TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, Storage* storage, int nodeMask, SceneUtil::UnrefQueue* unrefQueue)
+TerrainGrid::TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, Storage* storage, int nodeMask, Shader::ShaderManager* shaderManager, SceneUtil::UnrefQueue* unrefQueue)
     : Terrain::World(parent, resourceSystem, ico, storage, nodeMask)
     , mNumSplits(4)
     , mCache((storage->getCellVertices()-1)/static_cast<float>(mNumSplits) + 1)
     , mUnrefQueue(unrefQueue)
+    , mShaderManager(shaderManager)
 {
+    osg::ref_ptr<osg::Material> material (new osg::Material);
+    material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+    mTerrainRoot->getOrCreateStateSet()->setAttributeAndModes(material, osg::StateAttribute::ON);
 }
 
 TerrainGrid::~TerrainGrid()
@@ -149,11 +151,17 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
         osg::ref_ptr<osg::Node> textureCompileDummy (new osg::Node);
         unsigned int dummyTextureCounter = 0;
 
-        std::vector<osg::ref_ptr<osg::Texture2D> > layerTextures;
+        bool useShaders = mResourceSystem->getSceneManager()->getForceShaders();
+        if (!mResourceSystem->getSceneManager()->getClampLighting())
+            useShaders = true; // always use shaders when lighting is unclamped, this is to avoid lighting seams between a terrain chunk with normal maps and one without normal maps
+        std::vector<TextureLayer> layers;
         {
             OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mTextureCacheMutex);
             for (std::vector<LayerInfo>::const_iterator it = layerList.begin(); it != layerList.end(); ++it)
             {
+                TextureLayer textureLayer;
+                textureLayer.mParallax = it->mParallax;
+                textureLayer.mSpecular = it->mSpecular;
                 osg::ref_ptr<osg::Texture2D> texture = mTextureCache[it->mDiffuseMap];
                 if (!texture)
                 {
@@ -163,8 +171,28 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
                     mResourceSystem->getSceneManager()->applyFilterSettings(texture);
                     mTextureCache[it->mDiffuseMap] = texture;
                 }
-                layerTextures.push_back(texture);
-                textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, layerTextures.back());
+                textureLayer.mDiffuseMap = texture;
+                textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, texture);
+
+                if (!it->mNormalMap.empty())
+                {
+                    texture = mTextureCache[it->mNormalMap];
+                    if (!texture)
+                    {
+                        texture = new osg::Texture2D(mResourceSystem->getImageManager()->getImage(it->mNormalMap));
+                        texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+                        texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+                        mResourceSystem->getSceneManager()->applyFilterSettings(texture);
+                        mTextureCache[it->mNormalMap] = texture;
+                    }
+                    textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, texture);
+                    textureLayer.mNormalMap = texture;
+                }
+
+                if (it->requiresShaders())
+                    useShaders = true;
+
+                layers.push_back(textureLayer);
             }
         }
 
@@ -176,7 +204,6 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
             texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
             texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
             texture->setResizeNonPowerOfTwoHint(false);
-            texture->getOrCreateUserDataContainer()->addDescription("dont_override_filter");
             blendmapTextures.push_back(texture);
 
             textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, blendmapTextures.back());
@@ -187,19 +214,14 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
             geometry->setTexCoordArray(i, mCache.getUVBuffer());
 
         float blendmapScale = ESM::Land::LAND_TEXTURE_SIZE*chunkSize;
-        osg::ref_ptr<osgFX::Effect> effect (new Terrain::Effect(layerTextures, blendmapTextures, blendmapScale, blendmapScale));
+        osg::ref_ptr<osgFX::Effect> effect (new Terrain::Effect(mShaderManager ? useShaders : false, mResourceSystem->getSceneManager()->getForcePerPixelLighting(), mResourceSystem->getSceneManager()->getClampLighting(),
+                                                                mShaderManager, layers, blendmapTextures, blendmapScale, blendmapScale));
 
         effect->addCullCallback(new SceneUtil::LightListCallback);
 
         transform->addChild(effect);
 
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
         osg::Node* toAttach = geometry.get();
-#else
-        osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-        geode->addDrawable(geometry);
-        osg::Node* toAttach = geode.get();
-#endif
 
         effect->addChild(toAttach);
 
@@ -285,4 +307,23 @@ void TerrainGrid::updateCache()
     }
 }
 
+void TerrainGrid::updateTextureFiltering()
+{
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mTextureCacheMutex);
+    for (TextureCache::iterator it = mTextureCache.begin(); it != mTextureCache.end(); ++it)
+        mResourceSystem->getSceneManager()->applyFilterSettings(it->second);
+}
+
+void TerrainGrid::reportStats(unsigned int frameNumber, osg::Stats *stats)
+{
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mGridCacheMutex);
+        stats->setAttribute(frameNumber, "Terrain Cell", mGridCache.size());
+    }
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mTextureCacheMutex);
+        stats->setAttribute(frameNumber, "Terrain Texture", mTextureCache.size());
+    }
+}
+
 }
diff --git a/components/terrain/terraingrid.hpp b/components/terrain/terraingrid.hpp
index 46a95e817..d619ed8f7 100644
--- a/components/terrain/terraingrid.hpp
+++ b/components/terrain/terraingrid.hpp
@@ -4,13 +4,22 @@
 #include <osg/Vec2f>
 
 #include "world.hpp"
-#include "material.hpp"
 
 namespace SceneUtil
 {
     class UnrefQueue;
 }
 
+namespace Shader
+{
+    class ShaderManager;
+}
+
+namespace osg
+{
+    class Texture2D;
+}
+
 namespace Terrain
 {
 
@@ -18,7 +27,7 @@ namespace Terrain
     class TerrainGrid : public Terrain::World
     {
     public:
-        TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, Storage* storage, int nodeMask, SceneUtil::UnrefQueue* unrefQueue = NULL);
+        TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, Storage* storage, int nodeMask, Shader::ShaderManager* shaderManager = NULL, SceneUtil::UnrefQueue* unrefQueue = NULL);
         ~TerrainGrid();
 
         /// Load a terrain cell and store it in cache for later use.
@@ -36,6 +45,12 @@ namespace Terrain
         /// @note Thread safe.
         void updateCache();
 
+        /// Apply the scene manager's texture filtering settings to all cached textures.
+        /// @note Thread safe.
+        void updateTextureFiltering();
+
+        void reportStats(unsigned int frameNumber, osg::Stats *stats);
+
     private:
         osg::ref_ptr<osg::Node> buildTerrain (osg::Group* parent, float chunkSize, const osg::Vec2f& chunkCenter);
 
@@ -55,6 +70,8 @@ namespace Terrain
         BufferCache mCache;
 
         osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
+
+        Shader::ShaderManager* mShaderManager;
     };
 
 }
diff --git a/components/terrain/world.cpp b/components/terrain/world.cpp
index b56e87e1d..f699cdc75 100644
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@@ -18,6 +18,7 @@ World::World(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUt
     mTerrainRoot = new osg::Group;
     mTerrainRoot->setNodeMask(nodeMask);
     mTerrainRoot->getOrCreateStateSet()->setRenderingHint(osg::StateSet::OPAQUE_BIN);
+    mTerrainRoot->setName("Terrain Root");
 
     mParent->addChild(mTerrainRoot);
 }
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index 992438a6a..cc2285e45 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -9,6 +9,7 @@
 namespace osg
 {
     class Group;
+    class Stats;
 }
 
 namespace osgUtil
@@ -39,8 +40,12 @@ namespace Terrain
               Storage* storage, int nodeMask);
         virtual ~World();
 
+        virtual void updateTextureFiltering() {}
+
         virtual void updateCache() {}
 
+        virtual void reportStats(unsigned int frameNumber, osg::Stats* stats) {}
+
         float getHeightAt (const osg::Vec3f& worldPos);
 
         virtual osg::ref_ptr<osg::Node> cacheCell(int x, int y) {return NULL;}
diff --git a/components/vfs/bsaarchive.hpp b/components/vfs/bsaarchive.hpp
index 25ad60e0a..a6e274037 100644
--- a/components/vfs/bsaarchive.hpp
+++ b/components/vfs/bsaarchive.hpp
@@ -34,4 +34,4 @@ namespace VFS
 
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/docs/cs-manual/Makefile b/docs/cs-manual/Makefile
deleted file mode 100644
index 9d62dc5ab..000000000
--- a/docs/cs-manual/Makefile
+++ /dev/null
@@ -1,216 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = build
-
-# User-friendly check for sphinx-build
-ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
-endif
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-
-.PHONY: help
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  applehelp  to make an Apple Help Book"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  xml        to make Docutils-native XML files"
-	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-	@echo "  coverage   to run coverage check of the documentation (if enabled)"
-
-.PHONY: clean
-clean:
-	rm -rf $(BUILDDIR)/*
-
-.PHONY: html
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-.PHONY: dirhtml
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-.PHONY: singlehtml
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-.PHONY: pickle
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-.PHONY: json
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-.PHONY: htmlhelp
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-.PHONY: qthelp
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/OpenMWCSManual.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/OpenMWCSManual.qhc"
-
-.PHONY: applehelp
-applehelp:
-	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
-	@echo
-	@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
-	@echo "N.B. You won't be able to view it unless you put it in" \
-	      "~/Library/Documentation/Help or install it in your application" \
-	      "bundle."
-
-.PHONY: devhelp
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/OpenMWCSManual"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/OpenMWCSManual"
-	@echo "# devhelp"
-
-.PHONY: epub
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-.PHONY: latex
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-.PHONY: latexpdf
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-.PHONY: latexpdfja
-latexpdfja:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through platex and dvipdfmx..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-.PHONY: text
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-.PHONY: man
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-.PHONY: texinfo
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-.PHONY: info
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-.PHONY: gettext
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-.PHONY: changes
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-.PHONY: linkcheck
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-.PHONY: doctest
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-.PHONY: coverage
-coverage:
-	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
-	@echo "Testing of coverage in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/coverage/python.txt."
-
-.PHONY: xml
-xml:
-	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
-	@echo
-	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
-
-.PHONY: pseudoxml
-pseudoxml:
-	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
-	@echo
-	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/docs/cs-manual/make.bat b/docs/cs-manual/make.bat
deleted file mode 100644
index 744d60007..000000000
--- a/docs/cs-manual/make.bat
+++ /dev/null
@@ -1,263 +0,0 @@
-@ECHO OFF
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set BUILDDIR=build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
-set I18NSPHINXOPTS=%SPHINXOPTS% source
-if NOT "%PAPER%" == "" (
-	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
-	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
-)
-
-if "%1" == "" goto help
-
-if "%1" == "help" (
-	:help
-	echo.Please use `make ^<target^>` where ^<target^> is one of
-	echo.  html       to make standalone HTML files
-	echo.  dirhtml    to make HTML files named index.html in directories
-	echo.  singlehtml to make a single large HTML file
-	echo.  pickle     to make pickle files
-	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and a HTML help project
-	echo.  qthelp     to make HTML files and a qthelp project
-	echo.  devhelp    to make HTML files and a Devhelp project
-	echo.  epub       to make an epub
-	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	echo.  text       to make text files
-	echo.  man        to make manual pages
-	echo.  texinfo    to make Texinfo files
-	echo.  gettext    to make PO message catalogs
-	echo.  changes    to make an overview over all changed/added/deprecated items
-	echo.  xml        to make Docutils-native XML files
-	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
-	echo.  linkcheck  to check all external links for integrity
-	echo.  doctest    to run all doctests embedded in the documentation if enabled
-	echo.  coverage   to run coverage check of the documentation if enabled
-	goto end
-)
-
-if "%1" == "clean" (
-	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
-	del /q /s %BUILDDIR%\*
-	goto end
-)
-
-
-REM Check if sphinx-build is available and fallback to Python version if any
-%SPHINXBUILD% 1>NUL 2>NUL
-if errorlevel 9009 goto sphinx_python
-goto sphinx_ok
-
-:sphinx_python
-
-set SPHINXBUILD=python -m sphinx.__init__
-%SPHINXBUILD% 2> nul
-if errorlevel 9009 (
-	echo.
-	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-	echo.installed, then set the SPHINXBUILD environment variable to point
-	echo.to the full path of the 'sphinx-build' executable. Alternatively you
-	echo.may add the Sphinx directory to PATH.
-	echo.
-	echo.If you don't have Sphinx installed, grab it from
-	echo.http://sphinx-doc.org/
-	exit /b 1
-)
-
-:sphinx_ok
-
-
-if "%1" == "html" (
-	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
-	goto end
-)
-
-if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
-	goto end
-)
-
-if "%1" == "singlehtml" (
-	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
-	goto end
-)
-
-if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the pickle files.
-	goto end
-)
-
-if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the JSON files.
-	goto end
-)
-
-if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run HTML Help Workshop with the ^
-.hhp project file in %BUILDDIR%/htmlhelp.
-	goto end
-)
-
-if "%1" == "qthelp" (
-	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run "qcollectiongenerator" with the ^
-.qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\OpenMWCSManual.qhcp
-	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\OpenMWCSManual.ghc
-	goto end
-)
-
-if "%1" == "devhelp" (
-	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished.
-	goto end
-)
-
-if "%1" == "epub" (
-	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The epub file is in %BUILDDIR%/epub.
-	goto end
-)
-
-if "%1" == "latex" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "latexpdf" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	cd %BUILDDIR%/latex
-	make all-pdf
-	cd %~dp0
-	echo.
-	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "latexpdfja" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	cd %BUILDDIR%/latex
-	make all-pdf-ja
-	cd %~dp0
-	echo.
-	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "text" (
-	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The text files are in %BUILDDIR%/text.
-	goto end
-)
-
-if "%1" == "man" (
-	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The manual pages are in %BUILDDIR%/man.
-	goto end
-)
-
-if "%1" == "texinfo" (
-	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
-	goto end
-)
-
-if "%1" == "gettext" (
-	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
-	goto end
-)
-
-if "%1" == "changes" (
-	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.The overview file is in %BUILDDIR%/changes.
-	goto end
-)
-
-if "%1" == "linkcheck" (
-	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Link check complete; look for any errors in the above output ^
-or in %BUILDDIR%/linkcheck/output.txt.
-	goto end
-)
-
-if "%1" == "doctest" (
-	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of doctests in the sources finished, look at the ^
-results in %BUILDDIR%/doctest/output.txt.
-	goto end
-)
-
-if "%1" == "coverage" (
-	%SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of coverage in the sources finished, look at the ^
-results in %BUILDDIR%/coverage/python.txt.
-	goto end
-)
-
-if "%1" == "xml" (
-	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The XML files are in %BUILDDIR%/xml.
-	goto end
-)
-
-if "%1" == "pseudoxml" (
-	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
-	goto end
-)
-
-:end
diff --git a/docs/cs-manual/source/index.rst b/docs/cs-manual/source/index.rst
deleted file mode 100644
index ce50b8c95..000000000
--- a/docs/cs-manual/source/index.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-.. OpenMW CS Manual documentation master file, created by
-   sphinx-quickstart on Fri Feb  5 21:28:27 2016.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-#####################
-OpenMW CS user manual
-#####################
-
-The following document is the complete user manual for *OpenMW CS*, the
-construction set for the OpenMW game engine. It is intended to serve both as an
-introduction and a reference for the application. Even if you are familiar with
-modding *The Elder Scrolls III: Morrowind* you should at least read the first
-few chapters to familiarise yourself with the new interface.
-
-.. warning::
-   OpenMW CS is still software in development. The manual does not cover any of
-   its shortcomings, it is written as if everything was working as inteded.
-   Please report any software problems as bugs in the software, not errors in
-   the manual.
-
-.. toctree::
-   :caption: Table of Contents
-   :maxdepth: 2
-
-   foreword
-   tour
-   files-and-directories
-   starting-dialog
-
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 000000000..6ee8d6987
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1,3 @@
+breathe
+parse_cmake
+sphinx
diff --git a/docs/source/_static/.keep b/docs/source/_static/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/docs/cs-manual/source/conf.py b/docs/source/conf.py
similarity index 65%
rename from docs/cs-manual/source/conf.py
rename to docs/source/conf.py
index 28931a4a0..273b2f7d5 100644
--- a/docs/cs-manual/source/conf.py
+++ b/docs/source/conf.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-# OpenMW CS Manual documentation build configuration file, created by
-# sphinx-quickstart on Fri Feb  5 21:28:27 2016.
+# OpenMW documentation build configuration file, created by
+# sphinx-quickstart on Wed May 14 15:16:35 2014.
 #
 # This file is execfile()d with the current directory set to its
 # containing dir.
@@ -11,14 +11,21 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
-
-import sys
+import glob
 import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+project_root = os.path.abspath('../../')
+sys.path.insert(0, project_root)
+
+
+def insensitive_glob(pattern):
+    def either(c):
+        return '[%s%s]' % (c.lower(), c.upper()) if c.isalpha() else c
+    return glob.glob(''.join(map(either, pattern)))
 
 # -- General configuration ------------------------------------------------
 
@@ -29,14 +36,48 @@ import os
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.doctest',
+    'sphinx.ext.todo',
+    'sphinx.ext.coverage',
+    'sphinx.ext.viewcode',
 ]
 
+try:
+    import breathe
+    extensions.append('breathe')
+except ImportError:
+    print("WARNING: Unable to import breathe, code documentation won't be generated.")
+
+# Where breathe can find the source files
+openmw_path = os.path.join(project_root, "apps", "openmw")
+openmw_sub_dirs = os.walk(openmw_path).next()[1]
+openmw_headers = insensitive_glob(os.path.join(openmw_path, "*.hpp"))
+for dir in openmw_sub_dirs:
+    openmw_headers += insensitive_glob(os.path.join(openmw_path, dir, "*.hpp"))
+# massage the headers to get the relative path needed
+openmw_headers = [os.path.relpath(x, openmw_path) for x in openmw_headers]
+
+opencs_path = os.path.join(project_root, "apps", "opencs")
+opencs_sub_dirs = os.walk(opencs_path).next()[1]
+opencs_headers = insensitive_glob(os.path.join(opencs_path, "*.hpp"))
+opencs_sub_sub_dirs = []
+for dir in opencs_sub_dirs:
+    opencs_headers += insensitive_glob(os.path.join(opencs_path, dir, "*.hpp"))
+    opencs_sub_sub_dirs += os.walk(os.path.join(opencs_path, dir)).next()[1]
+    for sub_dir in opencs_sub_sub_dirs:
+        opencs_headers += insensitive_glob(os.path.join(opencs_path, dir, sub_dir, "*.hpp"))
+opencs_headers = [os.path.relpath(x, opencs_path) for x in opencs_headers]
+
+breathe_projects_source = {
+    "openmw": (openmw_path, openmw_headers),
+    "opencs": (opencs_path, opencs_headers),
+}
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-# source_suffix = ['.rst', '.md']
+# The suffix of source filenames.
 source_suffix = '.rst'
 
 # The encoding of source files.
@@ -46,25 +87,31 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'OpenMW CS Manual'
-copyright = u'2016, The OpenMW Project'
-author = u'HiPhish'
+project = u'OpenMW'
+copyright = u'2016, OpenMW Team'
+
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'0.0'
 # The full version, including alpha/beta/rc tags.
-release = u'0.0'
+
+try:
+    from parse_cmake import parsing
+    cmake_raw = open(project_root+'/CMakeLists.txt', 'r').read()
+    cmake_data = parsing.parse(cmake_raw)
+    release = version = '.'.join([cmake_data[24][1][1].contents,
+                                 cmake_data[25][1][1].contents,
+                                 cmake_data[26][1][1].contents])
+except ImportError:
+    release = "UNRELEASED"
+    print("WARNING: Unable to import parse_cmake, version will be set to: {0}.".format(release))
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = None
+#language = cpp
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -100,15 +147,13 @@ pygments_style = 'sphinx'
 # If true, keep warnings as "system message" paragraphs in the built documents.
 #keep_warnings = False
 
-# If true, `todo` and `todoList` produce output, else they produce nothing.
-todo_include_todos = False
-
+primary_domain = 'c'
 
 # -- Options for HTML output ----------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'alabaster'
+html_theme = 'default'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -137,7 +182,9 @@ html_theme = 'alabaster'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ['_static',
+                    'manuals/openmw-cs/_static'
+                    ]
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -185,22 +232,9 @@ html_static_path = ['_static']
 # This is the file name suffix for HTML files (e.g. ".xhtml").
 #html_file_suffix = None
 
-# Language to be used for generating the HTML full-text search index.
-# Sphinx supports the following languages:
-#   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
-#   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
-#html_search_language = 'en'
-
-# A dictionary with options for the search language support, empty by default.
-# Now only 'ja' uses this config value
-#html_search_options = {'type': 'default'}
-
-# The name of a javascript file (relative to the configuration directory) that
-# implements a search results scorer. If empty, the default will be used.
-#html_search_scorer = 'scorer.js'
-
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'OpenMWCSManualdoc'
+htmlhelp_basename = 'OpenMWdoc'
+
 
 # -- Options for LaTeX output ---------------------------------------------
 
@@ -213,17 +247,14 @@ latex_elements = {
 
 # Additional stuff for the LaTeX preamble.
 #'preamble': '',
-
-# Latex figure (float) alignment
-#'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'OpenMWCSManual.tex', u'OpenMW CS Manual Documentation',
-     u'HiPhish', 'manual'),
+  ('index', 'OpenMW.tex', u'OpenMW Documentation',
+   u'Bret Curtis', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -252,8 +283,8 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'openmwcsmanual', u'OpenMW CS Manual Documentation',
-     [author], 1)
+    ('index', 'openmw', u'OpenMW Documentation',
+     [u'Bret Curtis'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -266,9 +297,9 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'OpenMWCSManual', u'OpenMW CS Manual Documentation',
-     author, 'OpenMWCSManual', 'One line description of project.',
-     'Miscellaneous'),
+  ('index', 'OpenMW', u'OpenMW Documentation',
+   u'Bret Curtis', 'OpenMW', 'One line description of project.',
+   'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.
@@ -282,77 +313,3 @@ texinfo_documents = [
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
-
-
-# -- Options for Epub output ----------------------------------------------
-
-# Bibliographic Dublin Core info.
-epub_title = project
-epub_author = author
-epub_publisher = author
-epub_copyright = copyright
-
-# The basename for the epub file. It defaults to the project name.
-#epub_basename = project
-
-# The HTML theme for the epub output. Since the default themes are not
-# optimized for small screen space, using the same theme for HTML and epub
-# output is usually not wise. This defaults to 'epub', a theme designed to save
-# visual space.
-#epub_theme = 'epub'
-
-# The language of the text. It defaults to the language option
-# or 'en' if the language is not set.
-#epub_language = ''
-
-# The scheme of the identifier. Typical schemes are ISBN or URL.
-#epub_scheme = ''
-
-# The unique identifier of the text. This can be a ISBN number
-# or the project homepage.
-#epub_identifier = ''
-
-# A unique identification for the text.
-#epub_uid = ''
-
-# A tuple containing the cover image and cover page html template filenames.
-#epub_cover = ()
-
-# A sequence of (type, uri, title) tuples for the guide element of content.opf.
-#epub_guide = ()
-
-# HTML files that should be inserted before the pages created by sphinx.
-# The format is a list of tuples containing the path and title.
-#epub_pre_files = []
-
-# HTML files that should be inserted after the pages created by sphinx.
-# The format is a list of tuples containing the path and title.
-#epub_post_files = []
-
-# A list of files that should not be packed into the epub file.
-epub_exclude_files = ['search.html']
-
-# The depth of the table of contents in toc.ncx.
-#epub_tocdepth = 3
-
-# Allow duplicate toc entries.
-#epub_tocdup = True
-
-# Choose between 'default' and 'includehidden'.
-#epub_tocscope = 'default'
-
-# Fix unsupported image types using the Pillow.
-#epub_fix_images = False
-
-# Scale large images.
-#epub_max_image_width = 0
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#epub_show_urls = 'inline'
-
-# If false, no index is generated.
-#epub_use_index = True
-
-
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}
diff --git a/docs/source/index.rst b/docs/source/index.rst
new file mode 100644
index 000000000..f51cda909
--- /dev/null
+++ b/docs/source/index.rst
@@ -0,0 +1,20 @@
+Welcome to OpenMW's Documentation!
+==================================
+
+Sections
+--------
+
+.. toctree::
+    :maxdepth: 2
+
+    manuals/index
+    reference/index
+    source/index
+
+
+Indices and Tables
+==================
+
+* :ref:`genindex`
+* :ref:`search`
+
diff --git a/docs/source/manuals/index.rst b/docs/source/manuals/index.rst
new file mode 100644
index 000000000..2bf1fff5e
--- /dev/null
+++ b/docs/source/manuals/index.rst
@@ -0,0 +1,7 @@
+User Manuals
+============
+
+.. toctree::
+    :maxdepth: 2
+
+    openmw-cs/index
diff --git a/docs/cs-manual/source/_static/images/chapter-1/add-record.png b/docs/source/manuals/openmw-cs/_static/images/chapter-1/add-record.png
similarity index 100%
rename from docs/cs-manual/source/_static/images/chapter-1/add-record.png
rename to docs/source/manuals/openmw-cs/_static/images/chapter-1/add-record.png
diff --git a/docs/cs-manual/source/_static/images/chapter-1/edit-record.png b/docs/source/manuals/openmw-cs/_static/images/chapter-1/edit-record.png
similarity index 100%
rename from docs/cs-manual/source/_static/images/chapter-1/edit-record.png
rename to docs/source/manuals/openmw-cs/_static/images/chapter-1/edit-record.png
diff --git a/docs/cs-manual/source/_static/images/chapter-1/new-project.png b/docs/source/manuals/openmw-cs/_static/images/chapter-1/new-project.png
similarity index 100%
rename from docs/cs-manual/source/_static/images/chapter-1/new-project.png
rename to docs/source/manuals/openmw-cs/_static/images/chapter-1/new-project.png
diff --git a/docs/cs-manual/source/_static/images/chapter-1/objects.png b/docs/source/manuals/openmw-cs/_static/images/chapter-1/objects.png
similarity index 100%
rename from docs/cs-manual/source/_static/images/chapter-1/objects.png
rename to docs/source/manuals/openmw-cs/_static/images/chapter-1/objects.png
diff --git a/docs/cs-manual/source/_static/images/chapter-1/opening-dialogue.png b/docs/source/manuals/openmw-cs/_static/images/chapter-1/opening-dialogue.png
similarity index 100%
rename from docs/cs-manual/source/_static/images/chapter-1/opening-dialogue.png
rename to docs/source/manuals/openmw-cs/_static/images/chapter-1/opening-dialogue.png
diff --git a/docs/cs-manual/source/files-and-directories.rst b/docs/source/manuals/openmw-cs/files-and-directories.rst
similarity index 100%
rename from docs/cs-manual/source/files-and-directories.rst
rename to docs/source/manuals/openmw-cs/files-and-directories.rst
diff --git a/docs/cs-manual/source/foreword.rst b/docs/source/manuals/openmw-cs/foreword.rst
similarity index 100%
rename from docs/cs-manual/source/foreword.rst
rename to docs/source/manuals/openmw-cs/foreword.rst
diff --git a/docs/source/manuals/openmw-cs/index.rst b/docs/source/manuals/openmw-cs/index.rst
new file mode 100644
index 000000000..c9f682f17
--- /dev/null
+++ b/docs/source/manuals/openmw-cs/index.rst
@@ -0,0 +1,24 @@
+OpenMW CS User Manual
+#####################
+
+The following document is the complete user manual for *OpenMW CS*, the
+construction set for the OpenMW game engine. It is intended to serve both as an
+introduction and a reference for the application. Even if you are familiar with
+modding *The Elder Scrolls III: Morrowind* you should at least read the first
+few chapters to familiarise yourself with the new interface.
+
+.. warning::
+    OpenMW CS is still software in development. The manual does not cover any of
+    its shortcomings, it is written as if everything was working as inteded.
+    Please report any software problems as bugs in the software, not errors in
+    the manual.
+
+.. toctree::
+    :caption: Table of Contents
+    :maxdepth: 2
+
+    foreword
+    tour
+    files-and-directories
+    starting-dialog
+
diff --git a/docs/cs-manual/source/starting-dialog.rst b/docs/source/manuals/openmw-cs/starting-dialog.rst
similarity index 100%
rename from docs/cs-manual/source/starting-dialog.rst
rename to docs/source/manuals/openmw-cs/starting-dialog.rst
diff --git a/docs/cs-manual/source/tour.rst b/docs/source/manuals/openmw-cs/tour.rst
similarity index 90%
rename from docs/cs-manual/source/tour.rst
rename to docs/source/manuals/openmw-cs/tour.rst
index 0e92fe6fa..9844948ea 100644
--- a/docs/cs-manual/source/tour.rst
+++ b/docs/source/manuals/openmw-cs/tour.rst
@@ -3,9 +3,9 @@ A Tour through OpenMW CS: making a magic ring
 
 In this first chapter we will create a mod that adds a new ring with a simple
 enchantment to the game. The ring will give its wearer a permanent Night Vision
-effect while being worn. You don't need prior knowledge about modding
-Morrowind, but you should be familiar with the game itself. There will be no
-scripting necessary, we chan achieve everything using just what the base game
+effect while being worn. You do not need previous Morrowind modding experience, 
+but you should be familiar with the game itself. There will be no
+scripting necessary, we can achieve everything using just what the base game
 offers out of the box. Before continuing make sure that OpenMW is properly
 installed and playable.
 
@@ -13,7 +13,7 @@ installed and playable.
 Adding the ring to the game's records
 *************************************
 
-In this first section we will define what our new ring is, what it looks like
+In this first section we will define what our new ring is, what it looks like,
 and what it does. Getting it to work is the first step before we go further.
 
 
@@ -24,30 +24,30 @@ We will start by launching OpenMW CS, the location of the program depends on
 your operating system. You will be presented with a dialogue with three
 options: create a new game, create a new addon, edit a content file.
 
-.. figure:: ./_static/images/chapter-1/opening-dialogue.png
+.. figure:: _static/images/chapter-1/opening-dialogue.png
    :alt: Opening dialogue with three option and setting button (the wrench)
 
 The first option is for creating an entirely new game, that's not what we want.
-We want to edit an existing game, so choose the second one. When you save your
+We want to edit an existing game, so choose the second option. When you save your
 addon you can use the third option to open it again.
 
-You will be presented with another window where you get to chose the content to
-edit and the name of your project. We have to chose at least a base game, and
+You will be presented with another window where you get to choose the content to
+edit and the name of your project. Then we have to select at least the base game and
 optionally a number of other addons we want to depend on. The name of the
 project is arbitrary, it will be used to identify the addon later in the OpenMW
 launcher.
 
-.. figure:: ./_static/images/chapter-1/new-project.png
+.. figure:: _static/images/chapter-1/new-project.png
    :alt: Creation dialogue for a new project, pick content modules and name
 
 Choose Morrowind as your content file and enter `Ring of Night Vision` as the
-name. We could also chose further content files as dependencies if we wanted
+name. We could also choose further content files as dependencies if we wanted
 to, but for this mod the base game is enough.
 
 Once the addon has been created you will be presented with a table. If you see
 a blank window rather than a table choose *World* → *Objects* from the menu.
 
-.. figure:: ./_static/images/chapter-1/objects.png
+.. figure:: _static/images/chapter-1/objects.png
    :alt: The table showing all objet records in the game.
 
 Let's talk about the interface for a second. Every window in OpenMW CS has
@@ -67,7 +67,7 @@ of the table are the attributes of each object.
 Morrowind uses something called a *relational database* for game data. If you
 are not familiar with the term, it means that every type of thing can be
 expressed as a *table*: there is a table for objects, a table for enchantments,
-a table for icons, one for meshes, and so on. Properties of an entry must be
+a table for icons, one for meshes and so on. Properties of an entry must be
 simple values, like numbers or text strings. If we want a more complicated
 property we need to reference an entry from another table. There are a few
 exceptions to this though, some tables do have subtables. The effects of
@@ -83,7 +83,7 @@ We need to enter an *ID* (short for *identifier*) and pick the type. The
 identifier is a unique name by which the ring can later be identified; I have
 chosen `ring_night_vision`. For the type choose *Clothing*.
 
-.. figure:: ./_static/images/chapter-1/add-record.png
+.. figure:: _static/images/chapter-1/add-record.png
    :alt: Enter the ID and type of the new ring
 
 The table should jump right to our newly created record, if not read further
@@ -95,13 +95,13 @@ holding Shift to edit it (this is a configurable shortcut), but there is a
 better way: right-click the row of our new record and chose *Edit Record*, a
 new panel will open.
 
-We can right-click the row of our new record and chose *Edit Record*, a
+We can right-click the row of our new record and select *Edit Record*, a
 new panel will open. Alternatively we can also define a configurable shortcut
 instead of using the context menu; the default is double-clicking while
 holding down the shift key.
 
 
-.. figure:: ./_static/images/chapter-1/edit-record.png
+.. figure:: _static/images/chapter-1/edit-record.png
    :alt: Edit the properties of the record in a separate panel
 
 You can set the name, weight and coin value as you like, I chose `Ring of Night
diff --git a/docs/source/reference/index.rst b/docs/source/reference/index.rst
new file mode 100644
index 000000000..500936059
--- /dev/null
+++ b/docs/source/reference/index.rst
@@ -0,0 +1,7 @@
+Reference Material
+==================
+
+.. toctree::
+    :maxdepth: 2
+
+    modding/index
\ No newline at end of file
diff --git a/docs/source/reference/modding/convert_bump_mapped_mods.rst b/docs/source/reference/modding/convert_bump_mapped_mods.rst
new file mode 100644
index 000000000..791e77353
--- /dev/null
+++ b/docs/source/reference/modding/convert_bump_mapped_mods.rst
@@ -0,0 +1,202 @@
+====================================
+Normal maps from Morrowind to OpenMW
+====================================
+
+- `General introduction to normal map conversion`_
+    - `Normal Mapping in OpenMW`_
+    - `Activating normal mapping shaders in OpenMW`_
+    - `Normal mapping in Morrowind with Morrowind Code Patch`_
+    - `Normal mapping in Morrowind with MGE XE`_
+- `Converting PeterBitt's Scamp Replacer`_ (Mod made for the MGE XE PBR prototype)
+    - `Tutorial - MGE`_
+- `Converting Lougian's Hlaalu Bump mapped`_ (MCP's fake bump map function, part 1: *without* custom models)
+    - `Tutorial - MCP, Part 1`_
+- `Converting Apel's Various Things - Sacks`_ (MCP's fake bump map function, part 2: *with* custom models)
+    - `Tutorial - MCP, Part 2`_
+
+General introduction to normal map conversion
+------------------------------------------------
+
+:Authors: Joakim (Lysol) Berg
+:Updated: 2016-11-11
+
+This page has general information and tutorials on how normal mapping works in OpenMW and how you can make mods using the old fake normal mapping technique (such as `Netch Bump mapped`_ and `Hlaalu Bump mapped`_, and maybe the most (in)famous one to give shiny rocks in OpenMW, the mod `On the Rocks`_!, featured in MGSO and Morrowind Rebirth) work in OpenMW. 
+
+*Note:* The conversion made in the `Converting Apel's Various Things - Sacks`_-part of this tutorial require the use of the application NifSkope. There are binaries available for Windows, but not for Mac or Linux. Reports say that NifSkope versions 1.X will compile on Linux as long as you have Qt packages installed, while the later 2.X versions will not compile.
+
+*Another note:* I will use the terms bump mapping and normal mapping simultaneously. Normal mapping is one form of bump mapping. In other words, normal mapping is bump mapping, but bump mapping isn't necessarily normal mapping. There are several techniques for bump mapping, and normal mapping is the most common one today.
+
+So let's get on with it.
+
+Normal Mapping in OpenMW
+************************
+
+Normal mapping in OpenMW works in a very simple way: The engine just looks for a texture with a *_n.dds* suffix, and you're done.
+
+So to expand on this a bit, let's take a look at how a model seeks for textures.
+
+Let us assume we have the model *example.nif*. In this model file, there should be a tag (NiSourceTexture) that states what texture it should use and where to find it. Typically, it will point to something like *exampletexture_01.dds*. This texture is supposed to be located directly in the Textures folder since it does not state anything else. If the model is a custom made one, modders tend to group their textures in separate folders, just to easily keep track of them. It might be something like *./Textures/moddername/exampletexture_02.dds*.
+
+When OpenMW finally adds normal mapping, it simply takes the NiSourceTexture file path, e.g., *exampletexture_01.dds*, and looks for a *exampletexture_01_n.dds*. If it can't find this file, no normal mapping is added. If it *does* find this file, the model will use this texture as a normal map. Simple.
+
+Activating normal mapping shaders in OpenMW
+*******************************************
+
+Before normal (and specular and parallax) maps will show up in OpenMW, you'll need to activate them in the settings.cfg_-file. Add these rows where it would make sense:
+
+::
+
+    [Shaders]
+    auto use object normal maps = true
+    auto use terrain normal maps = true
+
+And while we're at it, why not activate specular maps too just for the sake of it?
+
+::
+
+    auto use object specular maps = true
+    auto use terrain specular maps = true
+
+Lastly, if you want really nice lights in OpenMW, add these rows:
+
+::
+
+    force shaders = true
+    clamp lighting = false
+
+See OpenMW's wiki page about `texture modding`_ to read further about this.
+
+Normal mapping in Morrowind with Morrowind Code Patch
+*****************************************************
+
+**Conversion difficulty:**
+*Varies. Sometimes quick and easy, sometimes time-consuming and hard.*
+
+You might have bumped (pun intended) on a few bump-mapped texture packs for Morrowind that require the Morrowind Code Patch (MCP). You might even be thinking: Why doesn't OpenMW just support these instead of reinventing the wheel? I know it sounds strange, but it will make sense. Here's how MCP handles normal maps:
+
+Morrowind does not recognize normal maps (they weren't really a "thing" yet in 2002), so even if you have a normal map, Morrowind will not load and display it. MCP has a clever way to solve this issue, by using something Morrowind *does* support, namely environment maps. You could add a tag for an environment map and then add a normal map as the environment map, but you'd end up with a shiny ugly model in the game. MCP solves this by turning down the brightness of the environment maps, making the model look *kind of* as if it had a normal map applied to it. I say kind of because it does not really look as good as normal mapping usually does. It was a hacky way to do it, but it was the only way at the time, and therefore the best way.
+
+The biggest problem with this is not that it doesn't look as good as it could – no, the biggest problem in my opinion is that it requires you to state the file paths for your normal map textures *in the models*! For buildings, which often use several textures for one single model file, it could take *ages* to do this, and you had to do it for dozens of model files too. You also had to ship your texture pack with model files, making your mod bigger in file size.
+
+These are basically the reasons why OpenMW does not support fake bump maps like MCP does. It is just a really bad way to enhance your models, all the more when you have the possibility to do it in a better way.
+
+Normal mapping in Morrowind with MGE XE
+***************************************
+
+**Conversion difficulty:**
+*Easy*
+
+The most recent feature on this topic is that the Morrowind Graphics Extender (MGE) finally started to support real normal mapping in an experimental version available here: `MGE XE`_ (you can't use MGE with OpenMW!). Not only this but it also adds full support for physically based rendering (PBR), making it one step ahead of OpenMW in terms of texturing techniques. However, OpenMW will probably have this feature in the future too – and let's hope that OpenMW and MGE will handle PBR in a similar fashion in the future so that mods can be used for both MGE and OpenMW without any hassle.
+
+I haven't researched that much on the MGE variant yet but it does support real implementation of normal mapping, making it really easy to convert mods made for MGE into OpenMW (I'm only talking about the normal map textures though). There's some kind of text file if I understood it correctly that MGE uses to find the normal map. OpenMW does not need this, you just have to make sure the normal map has the same name as the diffuse texture but with the correct suffix after.
+
+Now, on to the tutorials.
+
+Converting PeterBitt's Scamp Replacer
+-------------------------------------
+**Mod made for the MGE XE PBR prototype**
+
+:Authors: Joakim (Lysol) Berg
+:Updated: 2016-11-11
+
+So, let's say you've found out that PeterBitt_ makes awesome models and textures featuring physically based rendering (PBR) and normal maps. Let's say that you tried to run his `PBR Scamp Replacer`_ in OpenMW and that you were greatly disappointed when the normal map didn't seem to work. Lastly, let's say you came here, looking for some answers. Am I right? Great. Because you've come to the right place!
+
+*A quick note before we begin*: Please note that you can only use the normal map texture and not the rest of the materials, since PBR isn't implemented in OpenMW yet. Sometimes PBR textures can look dull without all of the texture files, so have that in mind.
+
+Tutorial - MGE
+**************
+
+In this tutorial, I will use PeterBitt's `PBR Scamp Replacer`_ as an example, but any mod featuring PBR that requires the PBR version of MGE will do, provided it also includes a normal map (which it probably does).
+
+So, follow these steps:
+
+#. Go to the Nexus page for PeterBitt's `PBR Scamp Replacer`_
+#. Go to the *files* tab and download the main file and the "PBR materials" file.
+#. Extract the main file as if you'd install a normal mod (**Pro tip**: Install using OpenMW's `Multiple data folders`_ function!)
+#. Now, open the PBR materials file:
+    - Go to ``./Materials/PB/``.
+    - Select the ``tx_Scamp_normals.dds`` file, which is, obviously, the normal map texture.
+    - Extract this file to the place you extracted the main file to, but in the subdirectory ``./Textures/PB/``.
+#. Rename your newly extracted file (``tx_Scamp_normals.dds``) to ``tx_Scamp_n.dds`` (which is exactly the same name as the diffuse texture file, except for the added *_n* suffix before the filename extention).
+#. You're actually done!
+
+So as you might notice, converting these mods is very simple and takes just a couple of minutes. It's more or less just a matter of renaming and moving a few files.
+
+I totally recommend you to also try this on PeterBitt's Nix Hound replacer and Flash3113's various replacers. It should be the same principle to get those to work.
+
+And let's hope that some one implements PBR shaders to OpenMW too, so that we can use all the material files of these mods in the future.
+
+Converting Lougian's Hlaalu Bump mapped
+---------------------------------------
+**Mod made for MCP's fake bump function, without custom models**
+
+:Authors: Joakim (Lysol) Berg
+:Updated: 2016-11-11
+
+Converting textures made for the Morrowind Code Patch (MCP) fake bump mapping can be really easy or a real pain, depending on a few circumstances. In this tutorial, we will look at a very easy, although in some cases a bit time-consuming, example.
+
+Tutorial - MCP, Part 1
+**********************
+
+We will be converting a quite popular texture replacer of the Hlaalu architecture, namely Lougian's `Hlaalu Bump mapped`_. Since this is just a texture pack and not a model replacer, we can convert the mod in a few minutes by just renaming a few dozen files and by *not* extracting the included model (``.nif``) files when installing the mod.
+
+#. Download Lougian's `Hlaalu Bump mapped`_.
+#. Install the mod by extracting the ``./Textures`` folder to a data folder the way you usually install mods (**Pro tip**: Install using OpenMW's `Multiple data folders`_ function!).
+    - Again, yes, *only* the ``./Textures`` folder. Do *not* extract the Meshes folder. They are only there to make the MCP hack work, which is not of any interest to us.
+#. Go to your new texture folder. If you installed the mod like I recommended, you won't have any trouble finding the files. If you instead placed all your files in Morrowinds main Data Files folder (sigh), you need to check with the mod's .rar file to see what files you should look for. Because you'll be scrolling through a lot of files.
+#. Find all the textures related to the texture pack in the Textures folder and take note of all the ones that ends with a *_nm.dds*.
+#. The *_nm.dds* files are normal map files. OpenMW's standard format is to have the normal maps with a *_n.dds* instead. Rename all the normal map textures to only have a *_n.dds* instead of the *_nm.dds*.
+    - As a nice bonus to this tutorial, this pack actually included one specularity texture too. We should use it of course. It's the one called "``tx_glass_amber_02_reflection.dds``". For OpenMW to recognize this file and use it as a specular map, you need to change the *_reflection.dds* part to *_spec.dds*, resulting in the name ``tx_glass_amber_01_spec.dds``.
+#. That should be it. Really simple, but I do know that it takes a few minutes to rename all those files.
+
+Now – if the mod you want to change includes custom made models it gets a bit more complicated I'm afraid. But that is for the next tutorial.
+
+Converting Apel's Various Things - Sacks
+----------------------------------------
+**Mod made for MCP's fake bump function, with custom models**
+
+:Authors: Joakim (Lysol) Berg
+:Updated: 2016-11-09
+
+In part one of this tutorial, we converted a mod that only included modified Morrowind model (``.nif``) files so that the normal maps could be loaded in Morrowind with MCP. We ignored those model files since they are not needed with OpenMW. In this tutorial however, we will convert a mod that includes new, custom made models. In other words, we cannot just ignore those files this time.
+
+Before we begin, you need to know that unless you want to build the NifSkope application from source yourself, you will be needing a Windows OS to do this part, since the application only has binaries available for Windows.
+
+Tutorial - MCP, Part 2
+**********************
+
+The sacks included in Apel's `Various Things - Sacks`_ come in two versions – Without bump mapping, and with bump mapping. Since we want the glory of normal mapping in our OpenMW setup, we will go with the bump-mapped version.
+
+#. Start by downloading Apel's `Various Things - Sacks`_ from Nexus.
+#. Once downloaded, install it the way you'd normally install your mods (**Pro tip**: Install using OpenMW's `Multiple data folders`_ function!).
+#. Now, if you ran the mod right away, your sacks will be made out of lead_. This is because the normal map is loaded as an environment map which MCP fixes so that it looks less shiny. We don't use MCP, so therefore, it looks kind of like the shack was made out of lead.
+#. We need to fix this by removing some tags in the model files. You need to download NifSkope_ for this, which, again, only have binaries available for Windows.
+#. Go the place where you installed the mod and go to ``./Meshes/o/`` to find the model files.
+    - If you installed the mod like I suggested, finding the files will be easy as a pie, but if you installed it by dropping everything into your main Morrowind Data Files folder, then you'll have to scroll a lot to find them. Check the mod's zip file for the file names of the models if this is the case. The same thing applies to when fixing the textures.
+#. Open up each of the models in NifSkope and look for these certain blocks_:
+    - NiTextureEffect
+    - NiSourceTexture with the value that appears to be a normal map file, in this mod, they have the suffix *_nm.dds*.
+#. Remove all these tags by selecting them one at a time and press right click>Block>Remove.
+#. Repeat this on all the affected models.
+#. If you launch OpenMW now, you'll `no longer have shiny models`_. But one thing is missing. Can you see it? It's actually hard to spot on still pictures, but we have no normal maps here.
+#. Now, go back to the root of where you installed the mod. Now go to ``./Textures/`` and you'll find the texture files in question. 
+#. OpenMW detects normal maps if they have the same name as the base diffuse texture, but with a *_n.dds* suffix. In this mod, the normal maps has a suffix of *_nm.dds*. Change all the files that ends with *_nm.dds* to instead end with *_n.dds*.
+#. Finally, `we are done`_!
+
+Since these models have one or two textures applied to them, the fix was not that time-consuming. It gets worse when you have to fix a model that uses loads of textures. The principle is the same, it just requires more manual work which is annoying and takes time.
+
+.. _`Netch Bump mapped`: http://www.nexusmods.com/morrowind/mods/42851/?
+.. _`Hlaalu Bump mapped`: http://www.nexusmods.com/morrowind/mods/42396/?
+.. _`On the Rocks`: http://mw.modhistory.com/download-44-14107
+.. _`texture modding`: https://wiki.openmw.org/index.php?title=TextureModding
+.. _`MGE XE`: http://www.nexusmods.com/morrowind/mods/26348/?
+.. _PeterBitt: http://www.nexusmods.com/morrowind/users/4381248/?
+.. _`PBR Scamp Replacer`: http://www.nexusmods.com/morrowind/mods/44314/?
+.. _settings.cfg: https://wiki.openmw.org/index.php?title=Settings
+.. _`Multiple data folders`: https://wiki.openmw.org/index.php?title=Mod_installation
+.. _`Various Things - Sacks`: http://www.nexusmods.com/morrowind/mods/42558/?
+.. _Lead: http://imgur.com/bwpcYlc
+.. _NifSkope: http://niftools.sourceforge.net/wiki/NifSkope
+.. _Blocks: http://imgur.com/VmQC0WG
+.. _`no longer have shiny models`: http://imgur.com/vu1k7n1
+.. _`we are done`: http://imgur.com/yyZxlTw
diff --git a/docs/source/reference/modding/differences.rst b/docs/source/reference/modding/differences.rst
new file mode 100644
index 000000000..e7cac15d0
--- /dev/null
+++ b/docs/source/reference/modding/differences.rst
@@ -0,0 +1,58 @@
+Modding OpenMW vs Morrowind
+#################################
+
+A brief overview of the differences between the two engines.
+============================================================
+
+OpenMW is designed to be able to use all the normal Morrowind mod files such as ESM/ESP plugins, texture replacers, mesh replacers, etc.
+
+.. warning::
+	All external programs and libraries that depend on ``morrowind.exe`` cannot function with OpenMW. This means you should assume mods dependent on Morrowind Graphics Extender, Morrowind Code Patch, Morrowind Script Extender, etc, will *not* work correctly, nor will the tools themselves.
+
+Multiple Data Folders
+---------------------
+
+The largest difference between OpenMW and Morrowind in terms of data structure is OpenMW's support of multiple data folders. This has many advantages, especially when it comes to unistalling mods and preventing unintentional overwrites of files.
+
+.. warning::
+	Most mods can still be installed into the root OpenMW data folder, but this is not recommended.
+
+To install mods via this new feature:
+
+#.	Open ``openmw.cfg`` with your preffered text editor. It is located as described in :doc:`paths` and *not* in your OpenMW root directory.
+#.	Find or search for ``data=``. This is located very near the bottom of the file.
+#.	Add a new line below this line and make a new entry of the format ``data="path/to/your/mod"``
+#.	Make as many of these entries as you need for each mod folder you want to include.
+#.	Save ``openmw.cfg``
+
+.. note::
+	All mod folders must adhere to the same file structure as ``~/Morrowind/Data Files/``.
+
+.. TODO create a PATHS ReST file that I can reference instead of the Wiki.
+
+To uninstall these mods simply delete that mod's respective ``data=`` entry.
+The mods are loaded in the order of these entries, with the top being overwritten by mods added towards the bottom.
+
+.. note::
+	Mods that depend on ESM/ESP plugins can be rearranged within the OpenMW Launcher, but mesh/texture replacer mods can only be reordered by moving their ``data=`` entry.
+
+OpenMW Launcher
+---------------
+
+The launcher included with OpenMW is similar to the original Morrowind Launcher. Go to the Data Files tab to enable and disable plugins. You can also drag list items to modify the load order. Content lists can be created at the bottom by clicking the New Content List button, creating a list name, then setting up a new modlist. This is helpful for different player profiles and testing out different load orders.
+
+.. TODO use a substitution image for the New Content List button.
+
+Settings.cfg
+------------
+
+The ``settings.cfg`` file is essentially the same as the INI files for Morrowind. It is located in the same directory as ``openmw.cfg``. This is where many video, audio, GUI, input, etc. settings can be modified. Some are available in-game, but many are only available in this configuration file. Please see https://wiki.openmw.org/index.php?title=Settings for the complete listing.
+
+.. TODO Create a proper ReST document tree for all the settings rather than Wiki.
+
+Open Source Resources Support
+-----------------------------
+
+While OpenMW supports all of the original files that Morrowind supported, we've expanded support to many open source file formats. These are summarized below:
+
+<this will be a table of the type of file, the morrowind supported file, and the OpenMW supported file formats>
diff --git a/docs/source/reference/modding/font.rst b/docs/source/reference/modding/font.rst
new file mode 100644
index 000000000..5f01b12d9
--- /dev/null
+++ b/docs/source/reference/modding/font.rst
@@ -0,0 +1,77 @@
+Fonts
+#####
+
+Morrowind .fnt fonts
+--------------------
+
+Morrowind uses a custom ``.fnt`` file format. It is not compatible with the Windows Font File ``.fnt`` format, nor compatible with ``.fnt`` formats from any other Bethesda games. To our knowledge, the format is undocumented and no tools for viewing or editing these fonts exist.
+
+OpenMW can load this format and convert it on the fly into something usable (see font loader `source code <https://github.com/OpenMW/openmw/blob/master/components/fontloader/fontloader.cpp#L210>`_). In OpenMW 0.32, an --export-fonts command line option was added to write the converted font (a PNG image and an XML file describing the position of each glyph in the image) to the current directory.
+
+TrueType fonts
+--------------
+
+Unlike vanilla Morrowind, OpenMW directly supports TrueType (``.ttf``) fonts. This is the recommended way to create new fonts.
+
+-	To replace the primary "Magic Cards" font:
+
+	#.	Download `Pelagiad <http://isaskar.github.io/Pelagiad/>`_ by Isak Larborn (aka Isaskar).
+	#.	Install the ``openmw_font.xml`` file into ``resources/mygui/openmw_font.xml`` in your OpenMW installation.
+	#.	Copy ``Pelagiad.ttf`` into ``resources/mygui/`` as well.
+	#.	If desired, you can now delete the original ``Magic_Cards.*`` files from your Data Files/Fonts directory.
+-	You can also replace the Daedric font:
+
+	#.	Download `Ayembedt <https://github.com/georgd/OpenMW-Fonts>`_ by Georg Duffner.
+	#.	Install ``OMWAyembedt.otf`` into ``/resources/mygui/`` folder in your OpenMW installation.
+	#.	Add the following lines to openmw_font.xml::
+
+			<Resource type="ResourceTrueTypeFont" name="Daedric">
+				<Property key="Source" value="OMWAyembedt.otf"/>
+				<Property key="Size" value="24"/>
+				<Property key="Resolution" value="50"/>
+				<Property key="Antialias" value="false"/>
+				<Property key="TabWidth" value="8"/>
+				<Property key="OffsetHeight" value="0"/>
+				<Codes>
+					<Code range="32"/>
+					<Code range="65 90"/>
+					<Code range="97 122"/>
+				</Codes>
+			</Resource>
+
+	#.	This font is missing a few glyphs (mostly punctuation), but is complete in the primary glyphs. If desired, you can now delete the original ``daedric.*`` files from your Data Files/Fonts directory.
+
+-	Another replacement for the Daedric font is `Oblivion <http://www.uesp.net/wiki/File:Obliviontt.zip>`_ by Dongle.
+
+	#.	Install the ``Oblivion.ttf`` file resources/mygui/.
+	#.	The openmw_fonts.xml entry is::
+
+			<Resource type="ResourceTrueTypeFont" name="Daedric">
+				<Property key="Source" value="Oblivion.ttf"/>
+				<Property key="Size" value="30"/>
+				<Property key="Resolution" value="50"/>
+				<Property key="Antialias" value="false"/>
+				<Property key="TabWidth" value="8"/>
+				<Property key="OffsetHeight" value="0"/>
+				<Codes>
+					<Code range="32 34"/>
+					<Code range="39"/>
+					<Code range="44 46"/>
+					<Code range="48 59"/>
+					<Code range="63"/>
+					<Code range="65 90"/>
+					<Code range="97 122"/>
+					<Code range="172 173"/>
+					<Code range="255"/>
+					<Code range="376"/>
+					<Code range="894"/>
+					<Code range="8211 8212"/>
+					<Code range="8216 8217"/>
+					<Code range="8220 8221"/>
+				</Codes>
+			</Resource>
+
+Bitmap fonts
+------------
+
+Morrowind ``.fnt`` files are essentially a bitmap font, but using them is discouraged because of no Unicode support. MyGUI has its own format for bitmap fonts. An example can be seen by using the --export-fonts command line option (see above), which converts Morrowind ``.fnt`` to a MyGUI bitmap font. This is the recommended format to use if you wish to edit Morrowind's bitmap font or create a new bitmap font.
\ No newline at end of file
diff --git a/docs/source/reference/modding/foreword.rst b/docs/source/reference/modding/foreword.rst
new file mode 100644
index 000000000..cf72b2aa3
--- /dev/null
+++ b/docs/source/reference/modding/foreword.rst
@@ -0,0 +1,4 @@
+Foreword
+########
+
+OpenMW is a complete game engine built to be content agnostic. The majority of this guide is applicable to any non-Morrowind project using its engine. That being said, it was designed with the extensive modding community of Morrowind in mind. Therefore, if you are already familiar with modding in Morrowind, you will likely be able to start modding in OpenMW with little to no instruction. We do recommend you at least refer to :doc:`differences` to find out about what's different between OpenMW and the original Morrowind engine. For everyone else, or just a good refresher, read on!
\ No newline at end of file
diff --git a/docs/source/reference/modding/index.rst b/docs/source/reference/modding/index.rst
new file mode 100644
index 000000000..d2dd90850
--- /dev/null
+++ b/docs/source/reference/modding/index.rst
@@ -0,0 +1,26 @@
+OpenMW Modding Reference
+########################
+
+The following document is the complete reference guide to modifying, or
+modding, your OpenMW setup. It does not cover content creation itself,
+only how to alter or add to your OpenMW gameplay experience. To learn more
+about creating new content for OpenMW, please refer to
+:doc:`/manuals/openmw-cs/index`.
+
+.. warning::
+    OpenMW is still software in development. This manual does not cover any
+    of its shortcomings. It is written as if everything was working as
+    intended. Please report any software problems as bugs in the software,
+    not errors in the manual.
+
+.. toctree::
+    :caption: Table of Contents
+    :maxdepth: 2
+
+    foreword
+    differences
+    mod-install
+    settings/index
+    font
+    convert_bump_mapped_mods
+    paths
diff --git a/docs/source/reference/modding/mod-install.rst b/docs/source/reference/modding/mod-install.rst
new file mode 100644
index 000000000..a72678173
--- /dev/null
+++ b/docs/source/reference/modding/mod-install.rst
@@ -0,0 +1,43 @@
+How To Install and Use Mods
+###########################
+
+The following is a detailed guide on how to install and enable mods in OpenMW using best practices.
+
+Install
+-------
+
+#.	Your mod probably comes in some kind of archive, such as ``.zip``, ``.rar``, ``.7z``, or something along those lines. Unpack this archive into its own folder.
+#.	Ensure the structure of this folder is correct.
+
+	#.	Locate the plugin files, ``.esp`` or ``.omwaddon``. The folder containing the plugin files we will call your *data folder*
+	#.	Check that all resource folders (``Meshes``, ``Textures``, etc.) containing additional resource files (the actual meshes, textures, etc.) are in the *data folder*.
+	
+	.. note::
+		There may be multiple levels of folders, but the location of the plugins must be the same as the resource folders.
+
+#.	Open your ``openmw.cfg`` file in your preferred plain text editor. It is located as described in :doc:`paths` and *not* in your OpenMW root directory.
+#.	Find or search for ``data=``. This is located very near the bottom of the file. If you are using Morrowind, this first entry should already point to your Morrowind data directory, ``Data Files``; otherwise it will point to your game file, ``.omwgame``.
+#.	Create a new line underneath and type: ``data="path/to/your/data folder"`` Remember, the *data folder* is where your mod's plugin files are. The double quotes around this path name are *required*.
+
+.. note::
+	Some text editors, such as TextEdit on Mac, will autocorrect your double quotes to typographical "curly" quotes instead of leaving them as the propper neutral vertical quotes ``""``.
+
+#.	Save your ``openmw.cfg`` file.
+
+You have now installed your mod. Any simple replacer mods that only contain resource files such as meshes or textures will now automatically be loaded in the order of their ``data=*`` entry. This is important to note because replacer mods that replace the same resource will overwrite previous ones as you go down the list.
+
+Enable
+------
+
+Any mods that have plugin files must be enabled to work. Master game files and plugin files can only be enabled if they have been properly installed within a *data folder* as described above.
+
+#.	Open the OpenMW Launcher.
+#.	Click on the Data Files tab.
+#.	In the Content List box, select the content list you wish to modify in the dropdown menu, or make a new one by:
+
+	#.	Click the New Content List button and enter the name of your content list, then click OK. New lists are useful for keeping track of the mods used for different characters or for different games if you play more than one game using OpenMW.
+	#.	In the Content box, select your game file (``.esm`` or ``.omwgame``) from the dropdown menu.
+	
+#.	Now you must activate the plugins you wish to use by checking the box next to their entry in the Content box list.
+#.	Load order can be changed simply by dragging the entries around within the list. Mods are loaded from the top down, so if one plugin depends on another, it must be lower on the list.
+#.	Click Play to run OpenMW with your game and enabled mods!
diff --git a/docs/source/reference/modding/paths.rst b/docs/source/reference/modding/paths.rst
new file mode 100644
index 000000000..23e33190d
--- /dev/null
+++ b/docs/source/reference/modding/paths.rst
@@ -0,0 +1,28 @@
+Paths
+#####
+
+The following describes the locations for the various OpenMW file paths for different types of files on different operating systems.
+
+.. note::
+	Actual location depends on your computer's setup. Username, harddrive, and language may vary.
+
+Configuration files and log files
+---------------------------------
+
+:Linux:		``$HOME/.config/openmw``
+:Mac:		``$HOME/Library/Preferences/openmw``
+:Windows:	``C:\Users\Username\Documents\my games\openmw``
+
+Savegames
+---------
+
+:Linux:		``$HOME/.local/share/openmw/saves``
+:Mac:		``$HOME/Library/Application Support/openmw/saves``
+:Windows:	``C:\Users\Username\Documents\my games\openmw\saves``
+
+Screenshots
+-----------
+
+:Linux:		``$HOME/.local/share/openmw``
+:Mac:		``$HOME/Library/Application Support/openmw``
+:Windows:	``C:\Users\Username\Documents\my games\openmw``
diff --git a/docs/source/reference/modding/settings/GUI.rst b/docs/source/reference/modding/settings/GUI.rst
new file mode 100644
index 000000000..0c39cf172
--- /dev/null
+++ b/docs/source/reference/modding/settings/GUI.rst
@@ -0,0 +1,104 @@
+GUI Settings
+############
+
+scaling factor
+--------------
+
+:Type:		floating point
+:Range:		> 0.0
+:Default:	1.0
+
+This setting scales the GUI interface windows. The value must be greater than 0.0. A value of 1.0 results in the normal scale. Values much larger than 2.0 may result in user interface components being inaccessible. Until a gamepad interface is created, increasing this setting is helpful for simulating the larger interface used in console games.
+
+The default value is 1.0. This setting can only be configured by editing the settings configuration file.
+
+menu transparency
+-----------------
+
+:Type:		floating point
+:Range:		0.0 (transparent) to 1.0 (opaque)
+:Default:	0.84
+
+This setting controls the transparency of the GUI windows. The value should be between 0.0 (transparent) and 1.0 (opaque).
+The default value is 0.84. This setting can be adjusted in game with the Menu Transparency slider in the Prefs panel of the Options menu.
+
+tooltip delay
+-------------
+
+:Type:		floating point
+:Range:		> 0.0
+:Default:	0.0
+
+This value determines the number of seconds between when you begin hovering over an item and when its tooltip appears. This setting only affects the tooltip delay for objects under the crosshair in GUI mode windows. There does not appear to be a setting to control the tool tip delay in outside of GUI mode.
+
+The tooltip displays context sensitive information on the selected GUI element, such as weight, value, damage, armor rating, magical effects, and detailed description.
+
+The default value is 0.0. This setting can be adjusted between 0.0 and 1.0 in game with the Menu Help Delay slider in the Prefs panel of the Options menu.
+
+stretch menu background
+-----------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Stretch or shrink the main menu screen, loading splash screens, introductory movie, and cut scenes to fill the specified video resolution, distorting their aspect ratio. The Bethesda provided assets have a 4:3 aspect ratio, but other assets are permitted to have other aspect ratios. If this setting is false, the assets will be centered in their correct aspect ratio, with black bars filling the remainder of the screen.
+
+The default value is false. This setting can only be configured by editing the settings configuration file.
+
+subtitles
+---------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Enable or disable subtitles for NPC spoken dialog (and some sound effects). Subtitles will appear in a tool tip box in the lower center of the screen.
+
+The default value is false. This setting can be toggled in game with the Subtitles button in the Prefs panel of Options menu.
+
+hit fader
+---------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+This setting enables or disables the "red flash" overlay that provides a visual clue when the character has taken damage.
+
+If this setting is disabled, the player will "bleed" like NPCs do.
+
+The default value is true. This setting can only be configured by editing the settings configuration file.
+
+werewolf overlay
+----------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+Enable or disable the werewolf overlay.
+
+The default value is true. This setting can only be configured by editing the settings configuration file.
+
+color background owned
+----------------------
+
+:Type:		RGBA floating point
+:Range:		0.0 to 1.0
+:Default:	0.15 0.0 0.0 1.0
+
+The following two settings determine the background color of the tool tip and the crosshair when hovering over an item owned by an NPC. The color definitions are composed of four floating point values between 0.0 and 1.0 inclusive, representing the red, green, blue and alpha channels. The alpha value is currently ignored. The crosshair color will have no effect if the crosshair setting in the HUD section is disabled.
+
+The default value is "0.15 0.0 0.0 1.0", which is a dark red color. This setting can only be configured by editing the settings configuration file. This setting has no effect if the show owned setting in the Game Settings Section is false.
+
+color crosshair owned
+---------------------
+
+:Type:		RGBA floating point
+:Range:		0.0 to 1.0
+:Default:	1.0 0.15 0.15 1.0
+
+This setting sets the color of the crosshair when hovering over an item owned by an NPC. The value is composed of four floating point values representing the red, green, blue and alpha channels. The alpha value is currently ignored.
+
+The default value is "1.0 0.15 0.15 1.0" which is a bright red color. This setting can only be configured by editing the settings configuration file. This setting has no effect if the crosshair setting in the HUD Settings Section is false. This setting has no effect if the show owned setting in the Game Settings Section is false.
diff --git a/docs/source/reference/modding/settings/HUD.rst b/docs/source/reference/modding/settings/HUD.rst
new file mode 100644
index 000000000..8ee5267dd
--- /dev/null
+++ b/docs/source/reference/modding/settings/HUD.rst
@@ -0,0 +1,13 @@
+HUD Settings
+############
+
+crosshair
+---------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+This setting determines whether the crosshair or reticle is displayed. Some players perceive that disabling the crosshair provides a more immersive experience. Another common use is to disable the crosshair for screen shots. Enabling the crosshair provides more immediate feedback about which object is currently the focus of actions.
+
+The default value is true. This setting can be toggled with the Crosshair button in the Prefs panel of the Options menu.
diff --git a/docs/source/reference/modding/settings/camera.rst b/docs/source/reference/modding/settings/camera.rst
new file mode 100644
index 000000000..c9b69add6
--- /dev/null
+++ b/docs/source/reference/modding/settings/camera.rst
@@ -0,0 +1,86 @@
+Camera Settings
+###############
+
+near clip
+---------
+
+:Type:		floating point
+:Range:		> 0
+:Default:	1.0
+
+This setting controls the distance to the near clipping plane. The value must be greater than zero. Values greater than approximately 18.0 will occasionally clip objects in the world in front of the character. Values greater than approximately 8.0 will clip the character's hands in first person view and/or the back of their head in third person view.
+
+The default value is 1.0. This setting can only be configured by editing the settings configuration file. The value must be greater than 0.0, but it's unclear if the engine enforces this limitation.
+
+small feature culling
+---------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+This setting determines whether objects that render to a few pixels or smaller will be culled (not drawn). It generally improves performance to enable this feature, and by definition the culled objects will be very small on screen. The size in pixels for an object to be considered 'small' is controlled by a separate setting.
+
+The default value is true. This setting can only be configured by editing the settings configuration file.
+
+small feature culling pixel size
+--------------------------------
+
+:Type:		floating point
+:Range:		> 0
+:Default:	2.0
+
+Controls the cutoff in pixels for the 'small feature culling' setting which will have no effect if 'small feature culling' is disabled.
+
+This setting can only be configured by editing the settings configuration file.
+
+viewing distance
+----------------
+
+:Type:		floating point
+:Range:		> 0
+:Default:	6666.0
+
+This value controls the maximum visible distance (also called the far clipping plane). Larger values significantly improve rendering in exterior spaces, but also increase the amount of rendered geometry and significantly reduce the frame rate. This value interacts with the exterior cell load distance setting in that it's probably undesired for this value to provide visibility into cells that have not yet been loaded. When cells are visible before loading, the geometry will "pop-in" suddenly, creating a jarring visual effect. To prevent this effect, this value must be less than::
+
+	(8192 * exterior cell load distance - 1024) * 0.93
+
+The constant 8192 is the size of a cell, and 1024 is the threshold distance for loading a new cell. Additionally, the field of view setting also interacts with this setting because the view frustrum end is a plane, so you can see further at the edges of the screen than you should be able to. This can be observed in game by looking at distant objects and rotating the camera so the objects are near the edge of the screen. As a result, this setting should further be reduced by a factor that depends on the field of view setting. In the default configuration this reduction is 7%, hence the factor of 0.93 above. Using this factor, approximate values recommended for other exterior cell load distance settings are:
+
+======= ========
+ Cells	Viewing
+ 		Distance
+=======	========
+2		14285
+3		21903
+4		29522
+5		35924
+=======	========
+
+Reductions of up to 25% or more can be required to completely eliminate pop-in for wide fields of view and long viewing distances near the edges of the screen, but such situations are unusual and probably not worth the performance penalty introduced by loading geometry obscured by fog in the center of the screen. See RenderingManager::configureFog for the relevant source code.
+
+Enabling the distant land setting is an alternative to increasing exterior cell load distance. Note that the distant land setting does not include rendering of distant static objects, so the resulting visual effect is not the same.
+
+The default value is 6666.0. This setting can be adjusted in game from the ridiculously low value of 2000.0 to a maximum of 6666.0, using the View Distance slider in the Detail tab of the Video panel of the Options menu.
+
+field of view
+-------------
+
+:Type:		floating point
+:Range:		0-360
+:Default:	55.0
+
+Sets the camera field of view in degrees. Recommended values range from 30 degrees to 110 degrees. Small values provide a very narrow field of view that creates a "zoomed in" effect, while large values cause distortion at the edges of the screen. The "field of view" setting interacts with aspect ratio of your video resolution in that more square aspect ratios (e.g. 4:3) need a wider field of view to more resemble the same field of view on a widescreen (e.g. 16:9) monitor.
+
+The default value is 55.0. This setting can be changed in game using the Field of View slider from the Video tab of the Video panel of the Options menu.
+
+first person field of view
+--------------------------
+
+:Type:		floating point
+:Range:		0-360
+:Default:	55.0
+
+This setting controls the field of view for first person meshes such as the player's hands and held objects. It is not recommended to change this value from its default value because the Bethesda provided Morrowind assets do not adapt well to large values, while small values can result in the hands not being visible.
+
+The default value is 55.0. This setting can only be configured by editing the settings configuration file.
diff --git a/docs/source/reference/modding/settings/cells.rst b/docs/source/reference/modding/settings/cells.rst
new file mode 100644
index 000000000..66baedbee
--- /dev/null
+++ b/docs/source/reference/modding/settings/cells.rst
@@ -0,0 +1,128 @@
+Cells Settings
+##############
+
+exterior cell load distance
+---------------------------
+
+:Type:		integer
+:Range:		>= 1
+:Default:	1
+
+This setting determines the number of exterior cells adjacent to the character that will be loaded for rendering. Values greater than one may significantly affect loading times when exiting interior spaces or loading additional exterior cells. Caution is advised when increasing this setting.
+
+This setting interacts with viewing distance and field of view settings.
+
+It is generally very wasteful for this value to load geometry than will almost never be visible due to viewing distance and fog. For low frame rate screen shots of scenic vistas, this setting should be set high, and viewing distances adjusted accordingly.
+
+The default value is 1. This value must be greater than or equal to 1. This setting can only be configured by editing the settings configuration file.
+
+
+preload enabled
+---------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+Controls whether textures and objects will be pre-loaded in background threads. This setting being enabled should result in a reduced amount of loading screens, no impact on frame rate and a varying amount of additional RAM usage, depending on how the preloader was configured (see the below settings). The default preloading settings with vanilla game files should only use negligible amounts of RAM, however, when using high-res texture and model replacers it may be necessary to tweak these settings to prevent the game from running out of memory.
+
+The effects of (pre-)loading can be observed on the in-game statistics panel brought up with the 'F4' key.
+
+All settings starting with 'preload' in this section will have no effect if preloading is disabled, and can only be configured by editing the settings configuration file.
+
+
+preload num threads
+-------------------
+
+:Type:		integer
+:Range:		>=1
+:Default:	1
+
+Controls the number of worker threads used for preloading operations. In addition to the preloading threads, OpenMW uses a main thread, a sound streaming thread, and a graphics thread. Therefore, the default setting of one preloading thread will result in a total of 4 threads used which should work well with quad-core CPUs. If you have additional cores to spare, consider increasing the number of preloading threads to 2 or 3 for a boost in preloading performance. Faster preloading will reduce the chance that a cell could not be completely loaded before the player moves into it, and hence reduce the chance of seeing loading screens or frame drops. This may be especially relevant when the player moves at high speed and/or a large number of cells are loaded in via 'exterior cell load distance'.
+
+A value of 4 or higher is not recommended. With 4 or more threads, improvements will start to diminish due to file reading and synchronization bottlenecks.
+
+preload exterior grid
+---------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+Controls whether adjacent cells are preloaded when the player moves close to an exterior cell border.
+
+preload fast travel
+-------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Controls whether fast travel destinations are preloaded when the player moves close to a travel service. Because the game can not predict the destination that the player will choose, all possible destinations will be preloaded. This setting is disabled by default due to the adverse effect on memory usage caused by the preloading of all possible destinations.
+
+preload doors
+-------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+Controls whether locations behind a door are preloaded when the player moves close to the door.
+
+preload distance
+----------------
+
+:Type:		floating point
+:Range:		>0
+:Default:	1000
+
+Controls the distance in in-game units that is considered the player being 'close' to a preloading trigger. Used by all the preloading mechanisms i.e. 'preload exterior grid', 'preload fast travel' and 'preload doors'.
+
+For measurement purposes, the distance to an object in-game can be observed by opening the console, clicking on the object and typing 'getdistance player'.
+
+preload instances
+-----------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+Controls whether or not objects are also pre-instanced on top of being pre-loaded. Instancing happens when the same object is placed more than once in the cell, and to be sure that any modifications to one instance do not affect the other, the game will create independent copies (instances) of the object. If this setting is enabled, the creation of instances will be done in the preloading thread; otherwise, instancing will only happen in the main thread once the cell is actually loaded.
+
+Enabling this setting should reduce the chance of frame drops when transitioning into a preloaded cell, but will also result in some additional memory usage.
+
+preload cell cache min
+----------------------
+
+:Type:		integer
+:Range:		>0
+:Default:	12
+
+The minimum number of preloaded cells that will be kept in the cache. Once the number of preloaded cells in the cache exceeds this setting, the game may start to expire preloaded cells, based on the 'preload cell expiry delay' setting, starting with the oldest cell. When a preloaded cell expires, all the assets that were loaded for it will also expire and will have to be loaded again the next time the cell is requested for preloading.
+
+preload cell cache max
+----------------------
+
+:Type:		integer
+:Range:		>0
+:Default:	20
+
+The maximum number of cells that will ever be in pre-loaded state simultaneously. This setting is intended to put a cap on the amount of memory that could potentially be used by preload state.
+
+preload cell expiry delay
+-------------------------
+
+:Type:		floating point
+:Range:		>=0
+:Default:	5
+
+The amount of time (in seconds) that a preloaded cell will stay in cache after it is no longer referenced or required, for example, after the player has moved away from a door without entering it.
+
+cache expiry delay
+------------------
+
+:Type:		floating point
+:Range:		>=0
+:Default:	5
+
+The amount of time (in seconds) that a preloaded texture or object will stay in cache after it is no longer referenced or required, for example, when all cells containing this texture have been unloaded.
diff --git a/docs/source/reference/modding/settings/game.rst b/docs/source/reference/modding/settings/game.rst
new file mode 100644
index 000000000..1eaa22db4
--- /dev/null
+++ b/docs/source/reference/modding/settings/game.rst
@@ -0,0 +1,46 @@
+Game Settings
+#############
+
+show owned
+----------
+
+:Type:		integer
+:Range:		0, 1, 2, 3
+:Default:	0
+
+Enable visual clues for items owned by NPCs when the crosshair is on the object. If the setting is 0, no clues are provided which is the default Morrowind behavior. If the setting is 1, the background of the tool tip for the object is highlight in the color specified by the color background owned setting in the GUI Settings Section. If the setting is 2, the crosshair is the color of the color crosshair owned setting in the GUI Settings section. If the setting is 3, both the tool tip background and the crosshair are colored. The crosshair is not visible if crosshair is false.
+
+The default value is 0 (no clues). This setting can only be configured by editing the settings configuration file.
+
+best attack
+-----------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+If this setting is true, the player character will always use the most powerful attack when striking with a weapon (chop, slash or thrust). If this setting is false, the type of attack is determined by the direction that the character is moving at the time the attack begins.
+
+The default value is false. This setting can be toggled with the Always Use Best Attack button in the Prefs panel of the Options menu.
+
+difficulty
+----------
+
+:Type:		integer
+:Range:		-500 to 500
+:Default:	0
+
+This setting adjusts the difficulty of the game and is intended to be in the range -100 to 100 inclusive. Given the default game setting for fDifficultyMult of 5.0, a value of -100 results in the player taking 80% of the usual damage, doing 6 times the normal damage. A value of 100 results in the player taking 6 times as much damage, but inflicting only 80% of the usual damage. Values less than -500 will result in the player receiving no damage, and values greater than 500 will result in the player inflicting no damage.
+
+The default value is 0. This setting can be controlled in game with the Difficulty slider in the Prefs panel of the Options menu.
+
+show effect duration
+--------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Show the remaining duration of magic effects and lights if this setting is true. The remaining duration is displayed in the tooltip by hovering over the magical effect.
+
+The default value is false. This setting can only be configured by editing the settings configuration file.
diff --git a/docs/source/reference/modding/settings/general.rst b/docs/source/reference/modding/settings/general.rst
new file mode 100644
index 000000000..e71e82977
--- /dev/null
+++ b/docs/source/reference/modding/settings/general.rst
@@ -0,0 +1,35 @@
+General Settings
+################
+
+anisotropy
+----------
+
+:Type:		integer
+:Range:		0 to 16
+:Default:	4
+
+Set the maximum anisotropic filtering on textures. Anisotropic filtering is a method of enhancing the image quality of textures on surfaces that are at oblique viewing angles with respect to the camera. Valid values range from 0 to 16. Modern video cards can often perform 8 or 16 anisotropic filtering with a minimal performance impact. This effect of this setting can be seen in the Video panel of the Options menu by finding a location with straight lines (striped rugs and Balmora cobblestones work well) radiating into the distance, and adjusting the anisotropy slider.
+
+The default value is 4. This setting can be changed in game using the Anisotropy slider in the Detail tab of the Video panel of the Options menu.
+
+screenshot format
+-----------------
+
+:Type:		string
+:Range:		jpg, png, tga
+:Default:	png
+
+Specify the format for screen shots taken by pressing the screen shot key (bound to F12 by default). This setting should be the file extension commonly associated with the desired format. The formats supported will be determined at compilation, but "jpg", "png", and "tga" should be allowed.
+
+The default value is "png". This setting can only be configured by editing the settings configuration file.
+
+texture filtering
+-----------------
+
+:Type:		string
+:Range:		bilinear, trilinear
+:Default:	trilinear
+
+Set the isotropic texture filtering mode to bilinear or trilinear. Bilinear filtering is a texture filtering method used to smooth textures when displayed larger or smaller than they actually are. Bilinear filtering is reasonably accurate until the scaling of the texture gets below half or above double the original size of the texture. Trilinear filtering is an extension of the bilinear texture filtering method, which also performs linear interpolation between mipmaps. Both methods use mipmaps in OpenMW, and the corresponding OpenGL modes are LINEAR_MIPMAP_NEAREST and LINEAR_MIPMAP_LINEAR. Trilinear filtering produces better texturing at a minimal cost on modern video cards.
+
+The default value is trilinear. This setting can be changed in game using the Texture filtering pull down in the Detail tab of the Video panel of the Options menu.
\ No newline at end of file
diff --git a/docs/source/reference/modding/settings/index.rst b/docs/source/reference/modding/settings/index.rst
new file mode 100644
index 000000000..345c29dda
--- /dev/null
+++ b/docs/source/reference/modding/settings/index.rst
@@ -0,0 +1,28 @@
+###############################
+Advanced Settings Configuration
+###############################
+
+This part of the guide will cover how to make modifications to the more arcane settings in OpenMW, most of which are not available from in-game menus, to optimize or customize your OpenMW experience. If you are familiar with ``.ini`` tweaks in Morrowind or the other games, this will be quite similar. All settings described in this section are changed in ``settings.cfg``, located in your OpenMW user directory. See :doc:`paths` for this location.
+
+Although this guide attempts to be comprehensive and up to date, you will always be able to find the full list of settings available and their default values in ``settings-default.cfg`` in your main OpenMW installation directory. The ranges I have included with each setting are the physically possible ranges, not recommendations.
+
+.. warning::
+	As the title suggests, these are advanced settings. If digging around plain text files and manually editing settings sounds scary to you, you may want to stear clear of altering these files. That being said, this guide should be plenty clear enough that you can find the setting you want to change and safely edit it.
+
+.. toctree::
+   :caption: Table of Contents
+   :maxdepth: 2
+
+   camera
+   cells
+   map
+   GUI
+   HUD
+   game
+   general
+   input
+   saves
+   sound
+   video
+   water
+   windows
diff --git a/docs/source/reference/modding/settings/input.rst b/docs/source/reference/modding/settings/input.rst
new file mode 100644
index 000000000..5d0f8f662
--- /dev/null
+++ b/docs/source/reference/modding/settings/input.rst
@@ -0,0 +1,83 @@
+Input Settings
+##############
+
+grab cursor
+-----------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+OpenMW will capture control of the cursor if this setting is true.
+
+In "look mode", OpenMW will center the cursor regardless of the value of this setting (since the cursor/crosshair is always centered in the OpenMW window). However, in GUI mode, this setting determines the behavior when the cursor is moved outside the OpenMW window. If true, the cursor movement stops at the edge of the window preventing access to other applications. If false, the cursor is allowed to move freely on the desktop.
+
+This setting does not apply to the screen where escape has been pressed, where the cursor is never captured. Regardless of this setting "Alt-Tab" or some other operating system dependent key sequence can be used to allow the operating system to regain control of the mouse cursor. This setting interacts with the minimize on focus loss setting by affecting what counts as a focus loss. Specifically on a two-screen configuration it may be more convenient to access the second screen with setting disabled.
+
+Note for developers: it's desirable to have this setting disabled when running the game in a debugger, to prevent the mouse cursor from becoming unusable when the game pauses on a breakpoint.
+
+The default value is true. This setting can only be configured by editing the settings configuration file.
+
+toggle sneak
+------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+This setting causes the behavior of the sneak key (bound to Ctrl by default) to toggle sneaking on and off rather than requiring the key to be held down while sneaking. Players that spend significant time sneaking may find the character easier to control with this option enabled.
+
+The default value is false. This setting can only be configured by editing the settings configuration file.
+
+always run
+----------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+If this setting is true, the character is running by default, otherwise the character is walking by default. The shift key will temporarily invert this setting, and the caps lock key will invert this setting while it's "locked". This setting is updated every time you exit the game, based on whether the caps lock key was on or off at the time you exited.
+
+The default value is false. This settings can be toggled in game by pressing the CapsLock key and exiting.
+
+allow third person zoom
+-----------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Allow zooming in and out using the middle mouse wheel in third person view. This feature may not work correctly if the mouse wheel is bound to other actions, and may be triggered accidentally in some cases, so is disabled by default. This setting can only be configured by editing the settings configuration file.
+
+camera sensitivity
+------------------
+
+:Type:		floating point
+:Range:		> 0
+:Default:	1.0
+
+This setting controls the overall camera/mouse sensitivity when not in GUI mode. The default sensitivity is 1.0, with smaller values requiring more mouse movement, and larger values requiring less. This setting is multiplicative in magnitude. This setting does not affect mouse speed in GUI mode, which is instead controlled by your operating system mouse speed setting.
+
+The default value is 1.0. This setting can be changed with the Camera Sensitivity slider in the Controls panel of the Options menu.
+
+camera y multiplier
+-------------------
+
+:Type:		floating point
+:Range:		> 0
+:Default:	1.0
+
+This setting controls the vertical camera/mouse sensitivity relative to the horizontal sensitivity (see camera sensitivity above). It is multiplicative with the previous setting, meaning that it should remain set at 1.0 unless the player desires to have different sensitivities in the two axes.
+
+The default value is 1.0. This setting can only be configured by editing the settings configuration file.
+
+invert y axis
+-------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Invert the vertical axis while not in GUI mode. If this setting is true, moving the mouse away from the player will look down, while moving it towards the player will look up. This setting does not affect cursor movement in GUI mode.
+
+The default value is false. This setting can be toggled in game with the Invert Y Axis button in the Controls panel of the Options menu.
diff --git a/docs/source/reference/modding/settings/map.rst b/docs/source/reference/modding/settings/map.rst
new file mode 100644
index 000000000..f3e0a1c53
--- /dev/null
+++ b/docs/source/reference/modding/settings/map.rst
@@ -0,0 +1,53 @@
+Map Settings
+############
+
+global map size
+---------------
+
+:Type:		integer
+:Range:		>= 1
+:Default:	18
+
+This setting adjusts the scale of the world map in the GUI mode map window. The value is the width in pixels of each cell in the map, so larger values result in larger more detailed world maps, while smaller values result in smaller less detailed world maps. However, the native resolution of the map source material appears to be 9 pixels per unexplored cell and approximately 18 pixels per explored cell, so values larger than 36 don't produce much additional detail. Similarly, the size of place markers is currently fixed at 12 pixels, so values smaller than this result in overlapping place markers. Values from 12 to 36 are recommended. For reference, Vvardenfell is approximately 41x36 cells.
+
+Warning: Changing this setting affects saved games. The currently explored area is stored as an image in the save file that's overlayed on the default world map in game. When you increase the resolution of the map, the overlay of earlier saved games will be scaled up on load, and appear blurry. When you visit the cell again, the overlay for that cell is regenerated at the new resolution, so the blurry areas can be corrected by revisiting all the cells you've already visited.
+
+The default value for this setting is 18. This setting can not be configured except by editing the settings configuration file.
+
+local map hud widget size
+-------------------------
+
+:Type:		integer
+:Range:		>= 1
+:Default:	256
+
+This setting controls the zoom level for the HUD map widget (the map in the lower right corner of the window). A value of 64 results in the HUD map widget displaying one entire exterior cell. Since the GUI mode map displays 3x3 cells, a value of approximately 21 displays the same area as the GUI mode map. Larger values increase the level of zoom, while smaller values are wasteful since there's no map data to display beyond the 3x3 cell grid.
+
+Note that the actual size of the widget is always the same on the screen unless the scaling factor setting in the "GUI" section is changed. Increasing both the scaling factor of the GUI and this setting does result in a higher resolution HUD map, but unfortunately with a scaled direction pointer on top of it.
+
+The default value for this setting is 256. This setting can not be configured except by editing the settings configuration file.
+
+local map resolution
+--------------------
+
+:Type:		integer
+:Range:		>= 1
+:Default:	256
+
+This setting controls the resolution of the GUI mode local map window. Larger values generally increase the visible detail in map. If this setting is half the local map widget size or smaller, the map will generally be be fairly blurry. Setting both options to the same value results in a map with good detail. Values that exceed the local map widget size setting by more than a factor of two are unlikely to provide much of an improvement in detail since they're subsequently scaled back to the approximately the map widget size before display. The video resolution settings interacts with this setting in that regard.
+
+.. warning::
+	Increasing this setting can increase cell load times, because the map is rendered on demand each time you enter a new cell. Large values may exceed video card limits or exhaust VRAM.
+
+The default value for this setting is 256. This setting can not be configured except by editing the settings configuration file.
+
+local map widget size
+---------------------
+
+:Type:		integer
+:Range:		>= 1
+:Default:	512
+
+This setting controls the canvas size of the GUI mode local map window. Larger values result in a larger physical map size on screen, and typically require more panning to see all available portions of the map. This larger size also enables an overall greater level of detail if the local map resolution setting is also increased.
+
+The default value for this setting is 512. This setting can not be configured except by editing the settings configuration file.
diff --git a/docs/source/reference/modding/settings/saves.rst b/docs/source/reference/modding/settings/saves.rst
new file mode 100644
index 000000000..de0c06558
--- /dev/null
+++ b/docs/source/reference/modding/settings/saves.rst
@@ -0,0 +1,35 @@
+Saves Settings
+##############
+
+character
+---------
+
+:Type:		string
+:Range:		
+:Default:	""
+
+This setting contains the default character name for loading saved games.
+
+The default value is the empty string, which results in no character being selected by default. This setting is automatically updated from the Load menu when a different character is selected.
+
+autosave
+--------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+This setting determines whether the game will be automatically saved when the character rests.
+
+The default value is true. This setting can be toggled in game with the Auto-Save when Rest button in the Prefs panel of the Options menu.
+
+timeplayed
+----------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+This setting determines whether the amount of the time the player has spent playing will be displayed for each saved game in the Load menu.
+
+The default value is false. This setting can only be configured by editing the settings configuration file.
diff --git a/docs/source/reference/modding/settings/sound.rst b/docs/source/reference/modding/settings/sound.rst
new file mode 100644
index 000000000..dec4bb3a2
--- /dev/null
+++ b/docs/source/reference/modding/settings/sound.rst
@@ -0,0 +1,113 @@
+Sound Settings
+##############
+
+device
+------
+
+:Type:		string
+:Range:		
+:Default:	""
+
+This setting determines which audio device to use. A blank or missing setting means to use the default device, which should usually be sufficient, but if you need to explicitly specify a device use this setting.
+
+The names of detected devices can be found in the openmw.log file in your configuration directory.
+
+The default value is the empty string. This setting can only be configured by editing the settings configuration file.
+
+master volume
+-------------
+
+:Type:		floating point
+:Range:		0.0 to 1.0
+:Default:	1.0
+
+This setting controls the overall volume. The master volume is multiplied with all other volume settings to determine the final volume.
+
+The default value is 1.0. Valid values range from 0.0 (silent) to 1.0 (maximum volume). This setting can be changed in game using the Master slider from the Audio panel of the Options menu.
+
+footsteps volume
+----------------
+
+:Type:		floating point
+:Range:		0.0 to 1.0
+:Default:	0.2
+
+This setting controls the volume of footsteps from the character and other actors.
+
+The default value is 0.2. Valid values range from 0.0 (silent) to 1.0 (maximum volume). This setting can be changed in game using the Footsteps slider from the Audio panel of the Options menu.
+
+music volume
+------------
+
+:Type:		floating point
+:Range:		0.0 to 1.0
+:Default:	0.5
+
+This setting controls the volume for music tracks.
+
+The default value is 0.5. Valid values range from 0.0 (silent) to 1.0 (maximum volume). This setting can be changed in game using the Music slider from the Audio panel of the Options menu.
+
+sfx volume
+----------
+
+:Type:		floating point
+:Range:		0.0 to 1.0
+:Default:	1.0
+
+This setting controls the volume for special sound effects such as combat noises.
+
+The default value is 1.0. Valid values range from 0.0 (silent) to 1.0 (maximum volume). This setting can be changed in game using the Effects slider from the Audio panel of the Options menu.
+
+voice volume
+------------
+
+:Type:		floating point
+:Range:		0.0 to 1.0
+:Default:	0.8
+
+This setting controls the volume for spoken dialog from NPCs.
+
+The default value is 0.8. Valid values range from 0.0 (silent) to 1.0 (maximum volume). This setting can be changed in game using the Voice slider from the Audio panel of the Options menu.
+
+buffer cache min
+----------------
+
+:Type:		integer
+:Range:		> 0
+:Default:	14
+
+This setting determines the minimum size of the sound buffer cache in megabytes. When the cache reaches the size specified by the buffer cache max setting, old buffers will be unloaded until it's using no more memory than specified by this setting. This setting must be less than or equal to the buffer cache max setting.
+
+The default value is 14. This setting can only be configured by editing the settings configuration file.
+
+buffer cache max
+----------------
+
+:Type:		integer
+:Range:		> 0
+:Default:	16
+
+This setting determines the maximum size of the sound buffer cache in megabytes. When the cache reaches this size, old buffers will be unloaded until it reaches the size specified by the buffer cache min setting. This setting must be greater than or equal to the buffer cache min setting.
+
+The default value is 16. This setting can only be configured by editing the settings configuration file.
+
+hrtf enable
+-----------
+
+:Type:		integer
+:Range:		-1, 0, 1
+:Default:	-1
+
+This setting determines whether to enable head-related transfer function (HRTF) audio processing. HRTF audio processing creates the perception of sounds occurring in a three dimensional space when wearing headphones. Enabling HRTF may also require an OpenAL Soft version greater than 1.17.0, and possibly some operating system configuration. A value of 0 disables HRTF processing, while a value of 1 explicitly enables HRTF processing.
+The default value is -1, which should enable the feature automatically for most users when possible. This setting can only be configured by editing the settings configuration file.
+
+hrtf
+----
+
+:Type:		string
+:Range:		
+:Default:	""
+
+This setting specifies which HRTF profile to use when HRTF is enabled. Blank means use the default. This setting has no effect if HRTF is not enabled based on the hrtf enable setting. Allowed values for this field are enumerated in openmw.log file is an HRTF enabled ausio system is installed.
+
+The default value is the empty string, which uses the default profile. This setting can only be configured by editing the settings configuration file.
diff --git a/docs/source/reference/modding/settings/video.rst b/docs/source/reference/modding/settings/video.rst
new file mode 100644
index 000000000..b724611ad
--- /dev/null
+++ b/docs/source/reference/modding/settings/video.rst
@@ -0,0 +1,135 @@
+Video Settings
+##############
+
+resolution x
+------------
+
+:Type:		integer
+:Range:		> 0
+:Default:	800
+
+This setting determines the horizontal resolution of the OpenMW game window. Larger values produce more detailed images within the constraints of your graphics hardware but also significantly reduce the frame rate.
+
+The default value is 800. The window resolution can be selected from a menu of common screen sizes in the Video tab of the Video Panel of the Options menu, or in the Graphics tab of the OpenMW Launcher. The horizontal resolution can also be set to a custom value in the Graphics tab of the OpenMW Launcher.
+
+resolution y
+------------
+
+:Type:		integer
+:Range:		> 0
+:Default:	600
+
+This setting determines the vertical resolution of the OpenMW game window. Larger values produce more detailed images within the constraints of your graphics hardware but also significantly reduce the frame rate.
+
+The default value is 600. The window resolution can be selected from a menu of common screen sizes in the Video tab of the Video Panel of the Options menu, or in the Graphics tab of the OpenMW Launcher. The vertical resolution can also be set to a custom value in the Graphics tab of the OpenMW Launcher.
+
+fullscreen
+----------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+This setting determines whether the entire screen is used for the specified resolution.
+
+The default value is false. This setting can be toggled in game using the Fullscreen button in the Video tab of the Video panel in the Options menu. It can also be toggled with the Full Screen check box in the Graphics tab of the OpenMW Launcher.
+
+screen
+------
+
+:Type:		integer
+:Range:		>= 0
+:Default:	0
+
+This setting determines which screen the game will open on in multi-monitor configurations. This setting is particularly important when the fullscreen setting is true, since this is the only way to control which screen is used, but it can also be used to control which screen a normal window or a borderless window opens on as well. The screens are numbered in increasing order, beginning with 0.
+
+The default value is 0. This setting can be selected from a pull down menu in the Graphics tab of the OpenMW Launcher, but cannot be changed during game play.
+
+minimize on focus loss
+----------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Minimize the OpenMW window if it loses cursor focus. This setting is primarily useful for single screen configurations, so that the OpenMW screen in full screen mode can be minimized when the operating system regains control of the mouse and keyboard. On multiple screen configurations, disabling this option makes it easier to switch between screens while playing OpenMW.
+
+Note that a minimized game window consumes less system resources and produces less heat, since the game does not need to render in minimized state. It is therefore advisable to minimize the game during pauses (either via use of this setting, or by minimizing the window manually).
+
+This setting has no effect if the fullscreen setting is false.
+
+Developer note: corresponds to SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS.
+
+The default value is true. This setting can only be configured by editing the settings configuration file.
+
+window border
+-------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+This setting determines whether there's an operating system border drawn around the OpenMW window. If this setting is true, the window can be moved and resized with the operating system window controls. If this setting is false, the window has no operating system border.
+
+This setting has no effect if the fullscreen setting is true.
+
+The default value is true. This setting can be toggled in game using the Window Border button in the Video tab of the Video panel in the Options menu. It can also be toggled with the Window Border check box in the OpenMW Launcher.
+
+antialiasing
+------------
+
+:Type:		integer
+:Range:		0, 2, 4, 8, 16
+:Default:	0
+
+This setting controls anti-aliasing. Anti-aliasing is a technique designed to improve the appearance of polygon edges, so they do not appear to be "jagged". Anti-aliasing can smooth these edges at the cost of a minor reduction in the frame rate. A value of 0 disables anti-aliasing. Other powers of two (e.g. 2, 4, 8, 16) are supported according to the capabilities of your graphics hardware. Higher values do a better job of smoothing out the image but have a greater impact on frame rate.
+
+This setting can be configured from a list of valid choices in the Graphics panel of the OpenMW Launcher, but cannot be changed during game play - due to a technical limitation that may be addressed in a future version of OpenMW.
+
+vsync
+-----
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+This setting determines whether frame draws are synchronized with the vertical refresh rate of your monitor. Enabling this setting can reduce screen tearing, a visual defect caused by updating the image buffer in the middle of a screen draw. Enabling this option typically implies limiting the framerate to 60 frames per second, but may also introduce additional delays caused by having to wait until the appropriate time (the vertical blanking interval) to draw a frame.
+
+The default value is false. This setting can be adjusted in game using the VSync button in the Video tab of the Video panel in the Options menu. It can also be changed by toggling the Vertical Sync check box in the Graphics tab of the OpenMW Launcher.
+
+framerate limit
+---------------
+
+:Type:		floating point
+:Range:		>= 0.0
+:Default:	0.0
+
+This setting determines the maximum frame rate in frames per second. If this setting is 0.0, the frame rate is unlimited.
+
+There are several reasons to consider capping your frame rate, especially if you're already experiencing a relatively high frame rate (greater than 60 frames per second). Lower frame rates will consume less power and generate less heat and noise. Frame rates above 60 frames per second rarely produce perceptible improvements in visual quality, but may improve input responsiveness. Capping the frame rate may in some situations reduce the perception of choppiness (highly variable frame rates during game play) by lowering the peak frame rates.
+
+This setting interacts with the vsync setting in the Video section in the sense that enabling vertical sync limits the frame rate to the refresh rate of your monitor (often 60 frames per second). Choosing to limit the frame rate using this setting instead of vsync may reduce input lag due to the game not having to wait for the vertical blanking interval.
+
+The default value is 0.0. This setting can only be configured by editing the settings configuration file.
+
+contrast
+--------
+
+:Type:		floating point
+:Range:		> 0.0
+:Default:	1.0
+
+This setting controls the contrast correction for all video in the game.
+
+The default value is 1.0. This setting can only be configured by editing the settings configuration file. This setting does not currently work under Linux.
+
+gamma
+-----
+
+:Type:		floating point
+:Range:		> 0.0
+:Default:	1.0
+
+This setting controls the gamma correction for all video in the game. Gamma is an exponent that makes colors brighter if greater than 1.0 and darker if less than 1.0.
+
+The default value is 1.0. This setting can be changed in the Detail tab of the Video panel of the Options menu. This setting does not currently work under Linux, and the in-game setting in the Options menu has been disabled.
diff --git a/docs/source/reference/modding/settings/water.rst b/docs/source/reference/modding/settings/water.rst
new file mode 100644
index 000000000..b2d04a416
--- /dev/null
+++ b/docs/source/reference/modding/settings/water.rst
@@ -0,0 +1,58 @@
+Water Settings
+##############
+
+.. note::
+	The settings for the water shader are difficult to describe, but can be seen immediately in the Water tab of the Video panel in the Options menu. Changes there will be saved to these settings. It is suggested to stand on the shore of a moderately broad body of water with trees or other objects on the far shore to test reflection textures, underwater plants in shallow water near by to test refraction textures, and some deep water visible from your location to test deep water visibility.
+
+shader
+------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+This setting enables or disables the water shader, which results in much more realistic looking water surfaces, including reflected objects and a more detailed wavy surface.
+
+The default value is false. This setting can be toggled with the Shader button in the Water tab of the Video panel of the Options menu.
+
+rtt size
+--------
+
+:Type:		integer
+:Range:		> 0
+:Default:	512
+
+The setting determines the size of the texture used for reflection and refraction (if enabled). For reflection, the texture size determines the detail of reflected images on the surface of the water. For refraction, the texture size determines the detail of the objects on the other side of the plane of water (which have a wavy appearance caused by the refraction). RTT is an acronym for Render to Texture which allows rendering of the scene to be saved as a texture.
+Higher values produces better visuals and result in a marginally lower frame rate depending on your graphics hardware.
+
+In the Water tab of the Video panel of the Options menu, the choices are Low (512), Medium (1024) and High (2048). This setting has no effect if the shader setting is false. It is recommended to use values that are a power of two because this results in more efficient use of video hardware.
+
+This setting has no effect if the shader setting is false.
+
+refraction
+----------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+This setting enables the refraction rendering feature of the water shader. Refraction causes deep water to be more opaque and objects seen through the plane of the water to have a wavy appearance. Enabling this feature results in better visuals, and a marginally lower frame rate depending on your graphics hardware.
+
+This setting has no effect if the shader setting is false.
+
+The default setting is false. This setting can be toggled with the Refraction button in the Water tab of the Video panel of the Options menu.
+
+small feature culling pixel size
+--------------------------------
+
+:Type:		floating point
+:Range:		> 0
+:Default:	20.0
+
+Controls the cutoff in pixels for small feature culling - see the 'Camera' section for more details, however this setting in the 'Water' section applies specifically to objects rendered in water reflection and refraction textures.
+
+The setting 'rtt size' interacts with this setting because it controls how large a pixel on the water texture (technically called a texel) is in pixels on the screen.
+
+This setting will have no effect if the shader setting is false, or the 'small feature culling' (in the 'Camera' section) is disabled.
+
+This setting can only be configured by editing the settings configuration file.
diff --git a/docs/source/reference/modding/settings/windows.rst b/docs/source/reference/modding/settings/windows.rst
new file mode 100644
index 000000000..8860de983
--- /dev/null
+++ b/docs/source/reference/modding/settings/windows.rst
@@ -0,0 +1,149 @@
+Windows Settings
+################
+
+:Type:	floating point
+:Range:	0.0 to 1.0
+
+This section controls the location and size of each window in GUI mode. Each setting is a floating point number representing a *fraction* of the resolution x or resolution y setting in the Video Settings Section. The X and Y values locate the top left corner of the window, while the W value determines the width of the window and the H value determines the height of the window.
+
+Unlike the documentation for most sections which lists the exact setting name, this page instead lists the names of the windows. For example, to configure the alchemy window, the actual settings would be::
+
+	alchemy x = 0.25
+	alchemy y = 0.25
+	alchemy h = 0.5
+	alchemy w = 0.5
+
+Each window in the GUI mode remembers it's previous location when exiting the game. By far the easiest way to configure these settings is to simply move the windows around in game. Hand editing the configuration file might result in some fine tuning for alignment, but the settings will be overwritten if a window is moved.
+
+.. note::
+	To scale the windows, making the widgets proportionally larger, see the scaling factor setting instead.
+
+stats
+-----
+
+:Default:	x = 0.0
+			y = 0.0
+			h = 0.375
+			w = 0.4275
+
+The stats window, displaying level, race, class, skills and stats. Activated by clicking on any of the three bars in the lower left corner of the HUD.
+
+spells
+------
+
+:Default:	x = 0.625
+			y = 0.5725
+			h = 0.375
+			w = 0.4275
+
+The spells window, displaying powers, spells, and magical items. Activated by clicking on the spells widget (third from left) in the bottom left corner of the HUD.
+
+map
+---
+
+:Default:	x = 0.625
+			y = 0.0
+			h = 0.375
+			w = 0.5725
+
+The local and world map window. Activated by clicking on the map widget in the bottom right corner of the HUD.
+
+dialogue
+--------
+
+:Default:	x = 0.095
+			y = 0.095
+			h = 0.810
+			w = 0.810
+
+The dialog window, for talking with NPCs. Activated by clicking on a NPC.
+
+alchemy
+-------
+
+:Default:	x = 0.25
+			y = 0.25
+			h = 0.5
+			w = 0.5
+
+The alchemy window, for crafting potions. Activated by dragging an alchemy tool on to the rag doll. Unlike most other windows, this window hides all other windows when opened.
+
+console
+-------
+
+:Default:	x = 0.0
+			y = 0.0
+			h = 1.0
+			w = 0.5
+
+The console command window. Activated by pressing the tilde (~) key.
+
+inventory
+---------
+
+:Default:	x = 0.0
+			y = 0.4275
+			h = 0.6225
+			w = 0.5725
+
+The inventory window, displaying the paper doll and possessions, when activated by clicking on the inventory widget (second from left) in the bottom left corner of the HUD.
+
+inventory container
+-------------------
+
+:Default:	x = 0.0
+			y = 0.4275
+			h = 0.6225
+			w = 0.5725
+
+The player's inventory window while searching a container, showing the contents of the character's inventory. Activated by clicking on a container. The same window is used for searching dead bodies, and pickpocketing people.
+
+inventory barter
+----------------
+
+:Default:	x = 0.0
+			y = 0.4275
+			h = 0.6225
+			w = 0.5725
+
+The player's inventory window while bartering. It displays goods owned by the character while bartering. Activated by clicking on the Barter choice in the dialog window for an NPC.
+
+inventory companion
+-------------------
+
+:Default:	x = 0.0
+			y = 0.4275
+			h = 0.6225
+			w = 0.5725
+
+The player's inventory window while interacting with a companion. The companion windows were added in the Tribunal expansion, but are available everywhere in the OpenMW engine.
+
+container
+---------
+
+:Default:	x = 0.25
+			y = 0.0
+			h = 0.75
+			w = 0.375
+
+The container window, showing the contents of the container. Activated by clicking on a container. The same window is used for searching dead bodies, and pickpocketing people.
+
+barter
+------
+
+:Default:	x = 0.25
+			y = 0.0
+			h = 0.75
+			w = 0.375
+
+The NPC bartering window, displaying goods owned by the shopkeeper while bartering. Activated by clicking on the Barter choice in the dialog window for an NPC.
+
+companion
+---------
+
+:Default:	x = 0.25
+			y = 0.0
+			h = 0.75
+			w = 0.375
+
+The NPC's inventory window while interacting with a companion. The companion windows were added in the Tribunal expansion, but are available everywhere in the OpenMW engine.
\ No newline at end of file
diff --git a/docs/source/source/index.rst b/docs/source/source/index.rst
new file mode 100644
index 000000000..b58bf2b37
--- /dev/null
+++ b/docs/source/source/index.rst
@@ -0,0 +1,8 @@
+Project Source Documentation
+============================
+
+.. toctree::
+    :maxdepth: 2
+
+    openmw/index
+    opencs/index
\ No newline at end of file
diff --git a/docs/source/source/opencs/index.rst b/docs/source/source/opencs/index.rst
new file mode 100644
index 000000000..b648bc49c
--- /dev/null
+++ b/docs/source/source/opencs/index.rst
@@ -0,0 +1,11 @@
+OpenMW-CS Source Documentation
+##############################
+
+.. toctree::
+    :maxdepth: 2
+
+    model/index
+    view/index
+
+.. autodoxygenfile:: editor.hpp
+    :project: opencs
\ No newline at end of file
diff --git a/docs/source/source/opencs/model/index.rst b/docs/source/source/opencs/model/index.rst
new file mode 100644
index 000000000..38ca0c31c
--- /dev/null
+++ b/docs/source/source/opencs/model/index.rst
@@ -0,0 +1,358 @@
+./opencs/model
+##############
+
+doc
+---
+    .. autodoxygenfile:: model/doc/blacklist.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/doc/document.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/doc/documentmanager.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/doc/loader.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/doc/messages.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/doc/operationholder.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/doc/operation.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/doc/runner.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/doc/saving.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/doc/savingstages.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/doc/savingstate.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/doc/stage.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/doc/state.hpp
+        :project: opencs
+
+filter
+------
+    .. autodoxygenfile:: model/filter/andnode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/filter/booleannode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/filter/leafnode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/filter/narynode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/filter/node.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/filter/notnode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/filter/ornode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/filter/parser.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/filter/textnode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/filter/unarynode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/filter/valuenode.hpp
+        :project: opencs
+
+prefs
+-----
+    .. autodoxygenfile:: model/prefs/boolsetting.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/prefs/category.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/prefs/coloursetting.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/prefs/doublesetting.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/prefs/enumsetting.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/prefs/intsetting.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/prefs/modifiersetting.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/prefs/setting.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/prefs/shortcuteventhandler.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/prefs/shortcut.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/prefs/shortcutmanager.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/prefs/shortcutsetting.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/prefs/state.hpp
+        :project: opencs
+
+tools
+-----
+    .. autodoxygenfile:: model/tools/birthsigncheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/bodypartcheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/classcheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/factioncheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/gmstcheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/journalcheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/magiceffectcheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/mandatoryid.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/mergeoperation.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/mergestages.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/mergestate.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/pathgridcheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/racecheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/referenceablecheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/referencecheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/regioncheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/reportmodel.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/scriptcheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/search.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/searchoperation.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/searchstage.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/skillcheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/soundcheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/soundgencheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/spellcheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/startscriptcheck.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/tools.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/tools/topicinfocheck.hpp
+        :project: opencs
+
+world
+-----
+    .. autodoxygenfile:: model/world/cellcoordinates.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/cell.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/cellselection.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/collectionbase.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/collection.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/columnbase.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/columnimp.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/columns.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/commanddispatcher.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/commandmacro.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/commands.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/data.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/defaultgmsts.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/idcollection.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/idcompletionmanager.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/idtablebase.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/idtable.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/idtableproxymodel.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/idtree.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/infocollection.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/info.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/infoselectwrapper.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/infotableproxymodel.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/land.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/landtexture.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/metadata.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/nestedcoladapterimp.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/nestedcollection.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/nestedcolumnadapter.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/nestedidcollection.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/nestedinfocollection.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/nestedtableproxymodel.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/nestedtablewrapper.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/pathgrid.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/record.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/refcollection.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/ref.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/refidadapter.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/refidadapterimp.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/refidcollection.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/refiddata.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/regionmap.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/resources.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/resourcesmanager.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/resourcetable.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/scope.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/scriptcontext.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/subcellcollection.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/tablemimedata.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: model/world/universalid.hpp
+        :project: opencs
+
diff --git a/docs/source/source/opencs/view/index.rst b/docs/source/source/opencs/view/index.rst
new file mode 100644
index 000000000..54d00ccc0
--- /dev/null
+++ b/docs/source/source/opencs/view/index.rst
@@ -0,0 +1,340 @@
+./opencs/view
+#############
+
+doc
+---
+    .. autodoxygenfile:: view/doc/adjusterwidget.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/filedialog.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/filewidget.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/globaldebugprofilemenu.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/loader.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/newgame.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/operation.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/operations.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/runlogsubview.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/sizehint.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/startup.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/subviewfactory.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/subviewfactoryimp.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/subview.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/view.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/doc/viewmanager.hpp
+        :project: opencs
+
+filter
+------
+    .. autodoxygenfile:: view/filter/editwidget.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/filter/filterbox.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/filter/recordfilterbox.hpp
+        :project: opencs
+
+prefs
+-----
+    .. autodoxygenfile:: view/prefs/dialogue.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/prefs/keybindingpage.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/prefs/pagebase.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/prefs/page.hpp
+        :project: opencs
+
+render
+------
+    .. autodoxygenfile:: view/render/cameracontroller.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/cellarrow.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/cellborder.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/cell.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/cellmarker.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/cellwater.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/editmode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/instancemode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/instancemovemode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/instanceselectionmode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/lightingbright.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/lightingday.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/lighting.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/lightingnight.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/mask.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/object.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/orbitcameramode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/pagedworldspacewidget.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/pathgrid.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/pathgridmode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/pathgridselectionmode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/previewwidget.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/scenewidget.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/selectionmode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/tagbase.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/terrainstorage.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/unpagedworldspacewidget.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/render/worldspacewidget.hpp
+        :project: opencs
+
+tools
+-----
+    .. autodoxygenfile:: view/tools/merge.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/tools/reportsubview.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/tools/reporttable.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/tools/searchbox.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/tools/searchsubview.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/tools/subviews.hpp
+        :project: opencs
+
+widget
+------
+    .. autodoxygenfile:: view/widget/coloreditor.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/widget/colorpickerpopup.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/widget/completerpopup.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/widget/droplineedit.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/widget/modebutton.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/widget/pushbutton.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/widget/scenetoolbar.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/widget/scenetool.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/widget/scenetoolmode.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/widget/scenetoolrun.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/widget/scenetooltoggle2.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/widget/scenetooltoggle.hpp
+        :project: opencs
+
+world
+-----
+    .. autodoxygenfile:: view/world/cellcreator.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/colordelegate.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/creator.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/datadisplaydelegate.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/dialoguecreator.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/dialoguespinbox.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/dialoguesubview.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/dragdroputils.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/dragrecordtable.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/enumdelegate.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/extendedcommandconfigurator.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/genericcreator.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/globalcreator.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/idcompletiondelegate.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/idtypedelegate.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/idvalidator.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/infocreator.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/nestedtable.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/pathgridcreator.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/previewsubview.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/recordbuttonbar.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/recordstatusdelegate.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/referenceablecreator.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/referencecreator.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/regionmap.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/regionmapsubview.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/scenesubview.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/scriptedit.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/scripterrortable.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/scripthighlighter.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/scriptsubview.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/startscriptcreator.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/subviews.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/tablebottombox.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/tableeditidaction.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/table.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/tablesubview.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/util.hpp
+        :project: opencs
+
+    .. autodoxygenfile:: view/world/vartypedelegate.hpp
+        :project: opencs
diff --git a/docs/source/source/openmw/index.rst b/docs/source/source/openmw/index.rst
new file mode 100644
index 000000000..5367995de
--- /dev/null
+++ b/docs/source/source/openmw/index.rst
@@ -0,0 +1,24 @@
+OpenMW Source Documentation
+###########################
+
+.. toctree::
+    :maxdepth: 2
+
+    mwbase
+    mwclass
+    mwdialogue
+    mwgui
+    mwinput
+    mwmechanics
+    mwphysics
+    mwrender
+    mwscript
+    mwsound
+    mwstate
+    mwworld
+
+.. autodoxygenfile:: engine.hpp
+    :project: openmw
+
+.. autodoxygenfile:: doc.hpp
+    :project: openmw
\ No newline at end of file
diff --git a/docs/source/source/openmw/mwbase.rst b/docs/source/source/openmw/mwbase.rst
new file mode 100644
index 000000000..8fd7ffc1e
--- /dev/null
+++ b/docs/source/source/openmw/mwbase.rst
@@ -0,0 +1,32 @@
+./mwbase
+########
+
+.. autodoxygenfile:: mwbase/dialoguemanager.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwbase/environment.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwbase/inputmanager.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwbase/journal.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwbase/mechanicsmanager.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwbase/scriptmanager.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwbase/soundmanager.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwbase/statemanager.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwbase/windowmanager.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwbase/world.hpp
+  :project: openmw
diff --git a/docs/source/source/openmw/mwclass.rst b/docs/source/source/openmw/mwclass.rst
new file mode 100644
index 000000000..3365d2582
--- /dev/null
+++ b/docs/source/source/openmw/mwclass.rst
@@ -0,0 +1,68 @@
+./mwclass
+#########
+
+.. autodoxygenfile:: mwclass/activator.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/actor.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/apparatus.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/armor.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/bodypart.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/book.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/classes.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/clothing.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/container.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/creature.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/creaturelevlist.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/ingredient.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/itemlevlist.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/light.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/lockpick.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/misc.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/npc.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/potion.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/probe.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/repair.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/static.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwclass/weapon.hpp
+  :project: openmw
\ No newline at end of file
diff --git a/docs/source/source/openmw/mwdialogue.rst b/docs/source/source/openmw/mwdialogue.rst
new file mode 100644
index 000000000..1f3522f2c
--- /dev/null
+++ b/docs/source/source/openmw/mwdialogue.rst
@@ -0,0 +1,32 @@
+./mwdialogue
+############
+
+.. autodoxygenfile:: mwdialogue/dialoguemanagerimp.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwdialogue/filter.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwdialogue/hypertextparser.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwdialogue/journalentry.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwdialogue/journalimp.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwdialogue/keywordsearch.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwdialogue/quest.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwdialogue/scripttest.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwdialogue/selectwrapper.hpp
+  :project: openmw
+
+.. autodoxygenfile:: mwdialogue/topic.hpp
+  :project: openmw
diff --git a/docs/source/source/openmw/mwgui.rst b/docs/source/source/openmw/mwgui.rst
new file mode 100644
index 000000000..0e3726832
--- /dev/null
+++ b/docs/source/source/openmw/mwgui.rst
@@ -0,0 +1,227 @@
+./mwgui
+#######
+
+.. autodoxygenfile:: mwgui/alchemywindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/backgroundimage.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/birth.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/bookpage.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/bookwindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/charactercreation.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/class.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/companionitemmodel.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/companionwindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/confirmationdialog.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/console.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/container.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/containeritemmodel.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/controllers.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/countdialog.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/cursor.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/debugwindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/dialogue.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/draganddrop.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/enchantingdialog.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/exposedwindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/formatting.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/hud.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/inventoryitemmodel.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/inventorywindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/itemchargeview.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/itemmodel.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/itemselection.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/itemview.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/itemwidget.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/jailscreen.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/journalbooks.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/journalviewmodel.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/journalwindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/layout.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/levelupdialog.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/loadingscreen.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/mainmenu.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/mapwindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/merchantrepair.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/messagebox.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/mode.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/pickpocketitemmodel.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/quickkeysmenu.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/race.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/recharge.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/referenceinterface.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/repair.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/review.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/savegamedialog.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/screenfader.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/scrollwindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/settingswindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/sortfilteritemmodel.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/soulgemdialog.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/spellbuyingwindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/spellcreationdialog.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/spellicons.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/spellmodel.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/spellview.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/spellwindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/statswindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/textinput.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/timeadvancer.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/tooltips.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/tradeitemmodel.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/tradewindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/trainingwindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/travelwindow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/videowidget.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/waitdialog.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/widgets.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/windowbase.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/windowmanagerimp.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwgui/windowpinnablebase.hpp
+    :project: openmw
diff --git a/docs/source/source/openmw/mwinput.rst b/docs/source/source/openmw/mwinput.rst
new file mode 100644
index 000000000..b24d8dfdb
--- /dev/null
+++ b/docs/source/source/openmw/mwinput.rst
@@ -0,0 +1,5 @@
+./mwinput
+#########
+
+.. autodoxygenfile:: mwinput/inputmanagerimp.hpp
+    :project: openmw
\ No newline at end of file
diff --git a/docs/source/source/openmw/mwmechanics.rst b/docs/source/source/openmw/mwmechanics.rst
new file mode 100644
index 000000000..3427b712a
--- /dev/null
+++ b/docs/source/source/openmw/mwmechanics.rst
@@ -0,0 +1,137 @@
+./mwmechanics
+#############
+
+.. autodoxygenfile:: mwmechanics/activespells.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/actor.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/actors.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/actorutil.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/aiactivate.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/aiavoiddoor.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/aicombataction.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/aicombat.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/aiescort.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/aiface.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/aifollow.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/aipackage.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/aipursue.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/aisequence.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/aistate.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/aitravel.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/aiwander.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/alchemy.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/autocalcspell.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/character.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/combat.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/coordinateconverter.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/creaturestats.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/difficultyscaling.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/disease.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/drawstate.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/enchanting.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/levelledlist.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/magiceffects.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/mechanicsmanagerimp.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/movement.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/npcstats.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/objects.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/obstacle.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/pathfinding.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/pathgrid.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/pickpocket.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/repair.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/security.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/spellcasting.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/spells.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/stat.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/steering.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/summoning.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwmechanics/trading.hpp
+    :project: openmw
diff --git a/docs/source/source/openmw/mwphysics.rst b/docs/source/source/openmw/mwphysics.rst
new file mode 100644
index 000000000..6eebab4d9
--- /dev/null
+++ b/docs/source/source/openmw/mwphysics.rst
@@ -0,0 +1,15 @@
+./mwphysics
+###########
+
+.. autodoxygenfile:: mwphysics/actor.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwphysics/collisiontype.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwphysics/convert.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwphysics/physicssystem.hpp
+    :project: openmw
+
diff --git a/docs/source/source/openmw/mwrender.rst b/docs/source/source/openmw/mwrender.rst
new file mode 100644
index 000000000..d284f6586
--- /dev/null
+++ b/docs/source/source/openmw/mwrender.rst
@@ -0,0 +1,77 @@
+./mwrender
+##########
+
+.. autodoxygenfile:: mwrender/actoranimation.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/animation.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/bulletdebugdraw.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/camera.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/cell.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/characterpreview.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/creatureanimation.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/effectmanager.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/globalmap.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/localmap.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/npcanimation.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/objects.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/pathgrid.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/renderbin.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/renderinginterface.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/renderingmanager.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/rendermode.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/ripplesimulation.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/rotatecontroller.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/sky.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/terrainstorage.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/util.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/vismask.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/water.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwrender/weaponanimation.hpp
+    :project: openmw
diff --git a/docs/source/source/openmw/mwscript.rst b/docs/source/source/openmw/mwscript.rst
new file mode 100644
index 000000000..8db8f40e2
--- /dev/null
+++ b/docs/source/source/openmw/mwscript.rst
@@ -0,0 +1,65 @@
+./mwscript
+##########
+
+.. autodoxygenfile:: mwscript/aiextensions.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/animationextensions.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/cellextensions.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/compilercontext.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/consoleextensions.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/containerextensions.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/controlextensions.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/dialogueextensions.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/extensions.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/globalscripts.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/guiextensions.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/interpretercontext.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/locals.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/miscextensions.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/ref.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/scriptmanagerimp.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/skyextensions.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/soundextensions.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/statsextensions.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/transformationextensions.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwscript/userextensions.hpp
+    :project: openmw
diff --git a/docs/source/source/openmw/mwsound.rst b/docs/source/source/openmw/mwsound.rst
new file mode 100644
index 000000000..d4fcb0e6b
--- /dev/null
+++ b/docs/source/source/openmw/mwsound.rst
@@ -0,0 +1,29 @@
+./mwsound
+#########
+
+.. autodoxygenfile:: mwsound/ffmpeg_decoder.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwsound/loudness.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwsound/movieaudiofactory.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwsound/openal_output.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwsound/sound_buffer.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwsound/sound_decoder.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwsound/sound.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwsound/soundmanagerimp.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwsound/sound_output.hpp
+    :project: openmw
diff --git a/docs/source/source/openmw/mwstate.rst b/docs/source/source/openmw/mwstate.rst
new file mode 100644
index 000000000..2618c6ff0
--- /dev/null
+++ b/docs/source/source/openmw/mwstate.rst
@@ -0,0 +1,11 @@
+./mwstate
+#########
+
+.. autodoxygenfile:: mwstate/character.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwstate/charactermanager.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwstate/statemanagerimp.hpp
+    :project: openmw
diff --git a/docs/source/source/openmw/mwworld.rst b/docs/source/source/openmw/mwworld.rst
new file mode 100644
index 000000000..21026b3e2
--- /dev/null
+++ b/docs/source/source/openmw/mwworld.rst
@@ -0,0 +1,132 @@
+./mwworld
+#########
+
+.. autodoxygenfile:: mwworld/actionalchemy.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/actionapply.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/actiondoor.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/actioneat.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/actionequip.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/action.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/actionopen.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/actionread.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/actionrepair.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/actionsoulgem.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/actiontake.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/actiontalk.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/actionteleport.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/actiontrap.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/cellpreloader.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/cellref.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/cellreflist.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/cells.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/cellstore.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/cellvisitors.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/class.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/containerstore.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/contentloader.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/customdata.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/esmloader.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/esmstore.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/failedaction.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/globals.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/inventorystore.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/livecellref.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/localscripts.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/manualref.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/nullaction.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/player.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/projectilemanager.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/ptr.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/recordcmp.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/refdata.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/scene.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/store.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/timestamp.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/weather.hpp
+    :project: openmw
+
+.. autodoxygenfile:: mwworld/worldimp.hpp
+    :project: openmw
+
diff --git a/docs/source/tutorial-style-guide.txt b/docs/source/tutorial-style-guide.txt
new file mode 100644
index 000000000..b37992057
--- /dev/null
+++ b/docs/source/tutorial-style-guide.txt
@@ -0,0 +1,53 @@
+####################
+Tutorial Style Guide
+####################
+
+Please contact Ravenwing about any questions relating to this guide.
+
+Foreword
+--------
+
+I shall try to be as brief as possible without sacrificing clarity, just as you should be when writing documentation. The SCOPE of this guide is limited to all non-source code documentation.
+
+References
+----------
+
+-Syntax: reStructuredText (ReST): http://docutils.sourceforge.net/rst.html
+-Parser: Sphinx: http://www.sphinx-doc.org/en/stable/
+-British and English Spelling: https://www.spellzone.com/pages/british-american.cfm
+
+Language
+--------
+
+British English
+Sorry, I'm American and I'll probably have a million relapses, but this seems to have been decided and uniformity is key!
+
+Text Wrapping
+-------------
+
+DO NOT manually decide where each line ends! Enable text wrapping in your text editor! (usually under View) Even Notepad allows automatic text wrapping, so use it. If you program, you may be used to keeping your lines under 80 characters wide and manually pressing enter, but don't. This is because we are writing mostly prose. When someone has to come in and edit portions of text that puts all this out of alignment, it takes FOREVER to readjust everything. Plus, indentation is very important in ReST, and you may forget to indent properly.
+
+Indentations
+------------
+
+This isn't as important, especially since Sphinx converts tabs to spaces, but I find it much easier to keep large blocks of things aligned if you just tab. If you can edit your tab width, please set it to 4 spaces.
+
+Spaces
+------
+
+Use only one space after each sentence. Some people were taught two spaces, but this is a carry-over from typewriters. Even though your text editor is probably using monospaced characters like a typewriter, the formats Sphinx is converting into will make all the adjustments they need to be beautifully legible.
+
+Commas
+------
+
+Oxford comma. Use it. I know this goes against using British English, but this is technical writing. You cannot assume our audience will know from context if the last two items in a list are grouped or not.
+I also prefer parentheticals to commas around gerund phrases.
+
+Files and Extensions
+--------------------
+
+When referring to a filename or filepath use the double back quotes as for inline literals. (e.g. ``morrowind.exe``)
+When referring to a file extension by itself, use ``.lowerCaseExtension``. (e.g. ``.esm``)
+
+If referring to a folder or file by a general name, use *emphasis*
+If referring to a folder by its actual name, even without the path, use ``inline literal``
\ No newline at end of file
diff --git a/extern/LuaBridge/LuaBridge.h b/extern/LuaBridge/LuaBridge.h
new file mode 100644
index 000000000..1928e9a1f
--- /dev/null
+++ b/extern/LuaBridge/LuaBridge.h
@@ -0,0 +1,142 @@
+//------------------------------------------------------------------------------
+/*
+  https://github.com/vinniefalco/LuaBridge
+  
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+  Copyright 2007, Nathan Reed
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef LUABRIDGE_LUABRIDGE_HEADER
+#define LUABRIDGE_LUABRIDGE_HEADER
+
+// All #include dependencies are listed here
+// instead of in the individual header files.
+//
+#include <cassert>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <typeinfo>
+
+#define LUABRIDGE_MAJOR_VERSION 2
+#define LUABRIDGE_MINOR_VERSION 0
+#define LUABRIDGE_VERSION 200
+
+namespace luabridge
+{
+
+// Forward declaration
+//
+template <class T>
+struct Stack;
+
+#include "detail/LuaHelpers.h"
+
+#include "detail/TypeTraits.h"
+#include "detail/TypeList.h"
+#include "detail/FuncTraits.h"
+#include "detail/Constructor.h"
+#include "detail/Stack.h"
+#include "detail/ClassInfo.h"
+
+class LuaRef;
+
+#include "detail/LuaException.h"
+#include "detail/LuaRef.h"
+#include "detail/Iterator.h"
+
+//------------------------------------------------------------------------------
+/**
+    security options.
+*/
+class Security
+{
+public:
+  static bool hideMetatables ()
+  {
+    return getSettings().hideMetatables;
+  }
+
+  static void setHideMetatables (bool shouldHide)
+  {
+    getSettings().hideMetatables = shouldHide;
+  }
+
+private:
+  struct Settings
+  {
+    Settings () : hideMetatables (true)
+    {
+    }
+
+    bool hideMetatables;
+  };
+
+  static Settings& getSettings ()
+  {
+    static Settings settings;
+    return settings;
+  }
+};
+
+#include "detail/Userdata.h"
+#include "detail/CFunctions.h"
+#include "detail/Namespace.h"
+
+//------------------------------------------------------------------------------
+/**
+    Push an object onto the Lua stack.
+*/
+template <class T>
+inline void push (lua_State* L, T t)
+{
+  Stack <T>::push (L, t);
+}
+
+//------------------------------------------------------------------------------
+/**
+  Set a global value in the lua_State.
+
+  @note This works on any type specialized by `Stack`, including `LuaRef` and
+        its table proxies.
+*/
+template <class T>
+inline void setGlobal (lua_State* L, T t, char const* name)
+{
+  push (L, t);
+  lua_setglobal (L, name);
+}
+
+//------------------------------------------------------------------------------
+/**
+  Change whether or not metatables are hidden (on by default).
+*/
+inline void setHideMetatables (bool shouldHide)
+{
+  Security::setHideMetatables (shouldHide);
+}
+
+}
+
+#endif
diff --git a/extern/LuaBridge/Manual.html b/extern/LuaBridge/Manual.html
new file mode 100644
index 000000000..e2a7d0dfd
--- /dev/null
+++ b/extern/LuaBridge/Manual.html
@@ -0,0 +1,1794 @@
+<!doctype html>
+<html>
+<head>
+<title>LuaBridge 2.0 Reference Manual</title>
+<META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1">
+
+<!--=========================================================================-->
+<style TYPE="text/css">
+
+body {
+  color: #000000 ;
+  background-color: #FFFFFF ;
+  font-family: Helvetica, Arial, sans-serif ;
+  text-align: justify ;
+  margin-right: 30px ;
+  margin-left: 30px ;
+}
+
+h1, h2, h3, h4 {
+  font-family: Verdana, Geneva, sans-serif ;
+  font-weight: normal ;
+  font-style: normal ;
+}
+
+h1 {
+  padding-top: 0.4em ;
+  padding-bottom: 0.4em ;
+  padding-left: 24px ;
+  margin-left: -24px ;
+  background-color: #ffe668 ;
+  border-radius: 8px ;
+}
+
+h2 {
+  padding-top: 0.4em ;
+  padding-bottom: 0.4em ;
+  padding-left: 1em ;
+  padding-right: 1em ;
+  background-color: #ffe668 ;
+  border-radius: 8px ;
+}
+
+h3 {
+  padding-left: 0.5em ;
+  border-left: solid #ffe668 1em ;
+}
+
+a:link {
+  color: #8d5c00 ;
+  background-color: inherit ;
+  text-decoration: none ;
+}
+
+a:visited {
+  color: #b17b26;
+  background-color: inherit ;
+  text-decoration: none ;
+}
+
+a:link:hover, a:visited:hover {
+  color: #8d5c00 ;
+  background-color: #ffe668 ;
+}
+
+a:link:active, a:visited:active {
+  color: inherit;
+}
+
+hr {
+  border: 0 ;
+  height: 1px ;
+  color: #a0a0a0 ;
+  background-color: #a0a0a0 ;
+}
+
+:target {
+  background-color: #F8F8F8 ;
+  padding-top: 2px ;
+  padding-bottom: 2px ;
+  padding-left: 8px;
+  padding-right: 8px;
+  border: solid #a0a0a0 2px ;
+}
+
+.footer {
+  color: gray ;
+  font-size: small ;
+}
+
+ul {
+  list-style-type: none ;
+  list-style-position: outside ;
+}
+
+ul.bullets {
+  list-style-type: disc ;
+} 
+
+img {
+  border: 0;
+}
+
+table {
+  margin-left: 2em;
+}
+
+pre, code {
+  font-size: 12pt ;
+}
+
+pre {
+  margin-left: 2em;
+}
+
+pre.split {
+  padding-left: 2em;
+  display: table-cell ;
+  white-space: pre-wrap ;
+  vertical-align: text-top ;
+  padding-right: 2em;
+}
+
+pre.split + pre.split {
+  border-left: 1px solid #ccc;
+}
+
+</style>
+
+</head>
+
+<!--=========================================================================-->
+
+<body>
+
+<header>
+<hr>
+<h1>LuaBridge 2.0 Reference Manual</h1>
+<hr>
+</header>
+
+<small>
+Official repository is located at
+<a href="https://github.com/vinniefalco/LuaBridge">https://github.com/vinniefalco/LuaBridge</a>.
+<br>
+Copyright &copy; 2012 Vinnie Falco. Freely available under the terms of the
+<A HREF="http://www.opensource.org/licenses/mit-license.html">MIT License</A>.
+</small>
+
+<nav>
+<H2>Contents</H2>
+<UL id="toc" style="padding: 0">
+<LI><A href="#s1">1 - Introduction</A>
+<UL>
+  <LI><A href="#s1.1">1.1 - Design</A>
+  <LI><A href="#s1.2">1.2 - Repository</A>
+  <LI><A href="#s1.3">1.3 - License and Credits</A>
+</UL>
+<P>
+<LI><A href="#s2">2 - Accessing C++ from Lua</A>
+<UL>
+  <LI><A href="#s2.1">2.1 - Namespaces</A>
+  <LI><A href="#s2.2">2.2 - Data, Properties, Functions, and CFunctions</A>
+  <LI><A href="#s2.3">2.3 - Class Objects</A>
+  <LI><A href="#s2.4">2.4 - Property Member Proxies</A>
+  <LI><A href="#s2.5">2.5 - Constructors</A>
+  <LI><A href="#s2.6">2.6 - Lua Stack</A>
+  <LI><A href="#s2.7">2.7 - lua_State</A>
+</UL>
+<p>
+<LI><A href="#s3">3 - Passing Objects</A>
+<UL>
+  <LI><A href="#s3.1">3.1 - C++ Lifetime</A>
+  <LI><A href="#s3.2">3.2 - Lua Lifetime</A>
+  <LI><A href="#s3.3">3.3 - Pointers, References, and Pass by Value</A>
+  <LI><A href="#s3.4">3.4 - Shared Lifetime</A>
+  <UL>
+    <LI><A href="#s3.4.1">3.4.1 - Class RefCountedObjectPtr</A>
+    <LI><A href="#s3.4.2">3.4.2 - Class RefCountedPtr</A>
+    <LI><A href="#s3.4.3">3.4.3 - User-defined Containers</A>
+    <LI><A href="#s3.4.4">3.4.4 - Container Constructors</A>
+  </UL>
+  <LI><A href="#s3.5">3.5 - Mixing Lifetimes</A>
+  <LI><A href="#s3.6">3.6 - Convenience Functions</A>
+</UL>
+<P>
+<LI><A href="#s4">4 - Accessing Lua from C++</A>
+<UL>
+  <LI><A href="#s4.1">4.1 - Class LuaRef</A>
+  <UL>
+    <LI><A href="#s4.1.1">4.1.1 - Type Conversions</A>
+    <LI><A href="#s4.1.2">4.1.2 - Visual Studio 2010, 2012</A>
+  </UL>
+  <LI><A href="#s4.2">4.2 - Table Proxies</A>
+  <LI><A href="#s4.3">4.3 - Calling Lua</A>
+  <UL>
+    <LI><A href="#s4.3.1">4.3.1 - Class LuaException</A>
+  </UL>
+</uL>
+<P>
+<LI><A href="#s5">5 - Security</A>
+</UL>
+</nav>
+
+<!--========================================================================-->
+
+<section>
+
+<h1>1 - <span id="s1">Introduction</span></h1>
+
+<p>
+<a href="https://github.com/vinniefalco/LuaBridge">LuaBridge</a> is a
+lightweight and dependency-free library for mapping data, functions, and
+classes back and forth between C++ and <a href="http://wwww.lua.org">Lua</a>,
+a powerful, fast, lightweight, embeddable scripting language. LuaBridge has
+been tested and works with Lua revisions starting from 5.1.5, although it
+should work in any version of Lua from 5.1.0 and later. It also works
+transparently with <a href="http://luajit.org/">LuaJIT</a>.
+</p>
+
+<p>
+LuaBridge offers the following features:
+</p>
+
+<ul class="bullets" title="Features">
+<li><a href="http://www.opensource.org/licenses/mit-license.html">MIT Licensed</a>, no usage restrictions!</li>
+<li>Headers-only: No Makefile, no .cpp files, just one <code>#include</code>!</li>
+<li>Simple, light, and nothing else needed (like Boost).</li>
+<li>No macros, settings, or configuration scripts needed.</li>
+<li>Supports different object lifetime management models.</li>
+<li>Convenient, type-safe access to the Lua stack.</li>
+<li>Automatic function parameter type binding.</li>
+<li>Easy access to Lua objects like tables and functions.</li>
+<li>Written in a clear and easy to debug style.</li>
+<li>Does not require C++11.</li>
+</ul>
+
+<p>
+LuaBridge is distributed as a a collection of header files. You simply add
+one line, <code>#include "LuaBridge/LuaBridge.h"</code> where you want to
+pass functions, classes, and variables back and forth between C++ and Lua.
+There are no additional source files, no compilation settings, and no
+Makefiles or IDE-specific project files. LuaBridge is easy to integrate.
+</p>
+
+<p>
+C++ concepts like variables and classes are made available to Lua through a
+process called <em>registration</em>. Because Lua is weakly typed, the resulting
+structure is not rigid. The API is based on C++ template metaprogramming. It
+contains template code to automatically generate at compile-time the various
+Lua C API calls necessary to export your program's classes and functions to
+the Lua environment.
+</p>
+
+<p>
+To expose Lua objects to C++, a class called <code>LuaRef</code> is provided.
+The implementation allows C++ code to access Lua objects such as numbers
+or strings, but more importantly to access things like tables and their
+values. Using this class makes idioms like calling Lua functions simple
+and clean.
+</p>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>1.1 - <span id="s1.1">Design</span></h2>
+
+<p>
+LuaBridge tries to be efficient as possible when creating the "glue" that
+exposes C++ data and functions to Lua. At the same time, the code was
+written with the intention that it is all as simple and clear as possible,
+without resorting to obscure C++ idioms, ugly preprocessor macros, or
+configuration settings. Furthermore, it is designed to be "header-only",
+making it very easy to integrate into your projects.
+</p>
+
+<p>
+Because LuaBridge was written with simplicity in mind there are some features
+that are not available. Although it comes close to the highest possible
+performance, LuaBridge is not quite the fastest,
+<a href="http://code.google.com/p/oolua/">OOLua</a> slightly outperforms
+LuaBridge in some tests. LuaBridge also does not try to implement every
+possible feature,
+<a href="http://www.rasterbar.com/products/luabind.html">LuaBind</a>
+explores every corner of the C++ language (but it requires Boost).
+</p>
+
+<p>
+LuaBridge does not support:
+</p>
+
+<ul class="bullets">
+<li>Enumerated constants
+<li>More than 8 parameters on a function or method (although this can be
+    increased by adding more <code>TypeListValues</code> specializations).
+<li>Overloaded functions, methods, or constructors.
+<li>Global variables (variables must be wrapped in a named scope).
+<li>Automatic conversion between STL container types and Lua tables.
+<li>Inheriting Lua classes from C++ classes.
+<li>Passing nil to a C++ function that expects a pointer or reference.
+<li>Standard containers like <code>std::shared_ptr</code>.
+</ul>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>1.2 - <span id="s1.2">Repository</span></h2>
+
+<p>
+The official repository is located at
+<a href="https://github.com/vinniefalco/LuaBridge">https://github.com/vinniefalco/LuaBridge</a>.
+The branches are organized as follows:
+</p>
+
+<table>
+<tr>
+  <td><b>master</b></td>
+  <td>Tagged, stable release versions.</td>
+</tr>
+<tr>
+  <td><b>release</b></td>
+  <td>A temporarily created branch that holds a release candidate for review.</td>
+</tr>
+<tr>
+  <td><b>develop</b></td>
+  <td>Contains work in progress, possibly unfinished or with bugs.</td>
+</tr>
+</table>
+
+<p>
+These repositories are also available:
+</p>
+
+<table>
+<tr>
+  <td><b><a href="https://github.com/vinniefalco/LuaBridgeUnitTests">LuaBridgeUnitTests</a></b></td>
+  <td>A stand alone command line application to exercise LuaBridge functionality.</td>
+</tr>
+<tr>
+  <td><b><a href="https://github.com/vinniefalco/LuaBridgeDemo">LuaBridgeUnitDemo</a></b></td>
+  <td>A stand alone GUI application that provides an interactive console.</td>
+</tr>
+</table>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>1.3 - <span id="s1.3">License and Credits</span></h2>
+
+<p>
+LuaBridge is published under the terms of the
+<a href="http://www.opensource.org/licenses/mit-license.html">MIT License</a>:
+</p>
+
+<pre>
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+</pre>
+
+<p>
+The original version of LuaBridge was written by Nathan Reed. The project
+has been taken over by Vinnie Falco, who added new functionality and wrote
+the new documentation. Vinnie also incorporated <code>LuaRef</code> and
+other Lua to C++ binding contributions from Nigel Atkinson.
+</p>
+
+<p>
+For questions, comments, or bug reports feel free to open a Github issue
+or contact Vinnie Falco directly at the email address indicated below.
+</p>
+
+<ul>
+<li>Copyright 2012, Vinnie Falco <a href="mailto:vinnie.falco@gmail.com">&lt;vinnie.falco@gmail.com&gt;</a>
+<li>Copyright 2008, Nigel Atkinson <a href="mailto:suprapilot+LuaCode@gmail.com">&lt;suprapilot+LuaCode@gmail.com&gt;</a>
+<li>Copyright 2007, Nathan Reed
+<li>Portions from The Loki Library: Copyright 2001 by Andrei Alexandrescu
+</ul>
+
+<p>
+Older versions of LuaBridge up to and including 0.2 (available separately) are
+distributed under the BSD 3-Clause License. See the corresponding license file
+in those versions (distributed separately) for more details.
+</p>
+
+</section>
+
+<!--========================================================================-->
+
+</section>
+
+<section>
+
+<h1>2 - <span id="s2">Accessing C++ from Lua</span></h1>
+
+<p>
+In order to expose C++ data and functions to Lua, each piece of exported
+information must be <em>registered</em>. There are five types of objects that
+LuaBridge can register:
+</p>
+
+<table>
+<tr>
+  <td><b>Namespaces</b>&nbsp;&nbsp;</td>
+  <td>A Lua table that contains other registrations.</td>
+</tr>
+<tr>
+  <td><b>Data</b>&nbsp;&nbsp;</td>
+  <td>Global or static variables, data members, and static data members.</td>
+</tr>
+<tr>
+  <td><b>Functions&nbsp;&nbsp;</b></td>
+  <td>Regular functions, member functions, and static member functions.</td>
+</tr>
+<tr>
+  <td><b>CFunctions&nbsp;&nbsp;</b></td>
+  <td>A regular function, member function, or static member function that
+      uses the <code>lua_CFunction</code> calling convention.</td>
+</tr>
+<tr>
+  <td><b>Properties&nbsp;&nbsp;</b></td>
+  <td>Global properties, property members, and static property members.
+      These appear like data to Lua, but are implemented in C++ using
+      functions to get and set the values.</td>
+  </tr>
+</table>
+
+<p>
+Both data and properties can be marked as <em>read-only</em> at the time of
+registration. This is different from <code>const</code>; the values of these
+objects can be modified on the C++ side, but Lua scripts cannot change them.
+Code samples that follow are in C++ or Lua, depending on context. For brevity
+of exposition code samples in C++ assume the traditional variable
+<code>lua_State* L</code> is defined, and that a <code>using namespace luabridge</code>
+using-directive is in effect.
+</p>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>2.1 - <span id="s2.1">Namespaces</span></h2>
+
+<p>
+All LuaBridge registrations take place in a <em>namespace</em>. When we refer
+to a <em>namespace</em> we are always talking about a namespace in the Lua
+sense, which is implemented using tables. The namespace need not correspond
+to a C++ namespace; in fact no C++ namespaces need to exist at all unless you
+want them to. LuaBridge namespaces are visible only to Lua scripts; they are
+used as a logical grouping tool. To obtain access to the global namespace
+we write:
+</p>
+
+<pre>
+getGlobalNamespace (L);
+</pre>
+
+<p>
+This returns an object on which further registrations can be performed. The
+subsequent registrations will go into the global namespace, a practice which
+is not recommended. Instead, we can add our own namespace by writing:
+</p>
+
+<pre>
+getGlobalNamespace (L)
+  .beginNamespace ("test");
+</pre>
+
+<p>
+This creates a table in <code>_G</code> called "test". Since we have not
+performed any registrations, this table will be empty except for some
+bookkeeping key/value pairs. LuaBridge reserves all identifiers that start
+with a double underscore. So <code>__test</code> would be an invalid name
+(although LuaBridge will silently accept it). Functions like
+<code>beginNamespace</code> return the corresponding object on which we can
+make more registrations. Given:
+</p>
+
+<pre>
+getGlobalNamespace (L)
+  .beginNamespace ("test")
+    .beginNamespace ("detail")
+    .endNamespace ()
+    .beginNamespace ("utility")
+    .endNamespace ()
+  .endNamespace ();
+</pre>
+
+<p>
+The results are accessible to Lua as <code>test</code>, <code>test.detail</code>,
+and <code>test.utility</code>. Here we introduce the <code>endNamespace</code>
+function; it returns an object representing the original enclosing namespace.
+All LuaBridge functions which  create registrations return an object upon which
+subsequent registrations can be made, allowing for an unlimited number of
+registrations to be chained together using the dot operator. Adding two objects
+with the same name, in the same namespace, results in undefined behavior
+(although LuaBridge will silently accept it).
+</p>
+
+<p>
+A namespace can be re-opened later to add more functions. This lets you split
+up the registration between different source files. These are equivalent:
+</p>
+
+<pre>
+getGlobalNamespace (L)
+  .beginNamespace ("test")
+    .addFunction ("foo", foo)
+  .endNamespace ();
+
+getGlobalNamespace (L)
+  .beginNamespace ("test")
+    .addFunction ("bar", bar)
+  .endNamespace ();
+</pre>
+
+<p>
+and
+</p>
+
+<pre>
+getGlobalNamespace (L)
+  .beginNamespace ("test")
+    .addFunction ("foo", foo)
+    .addFunction ("bar", bar)
+  .endNamespace ();
+</pre>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>2.2 - <span id="s2.2">Data, Properties, Functions, and CFunctions</span></h2>
+
+<p>
+These are registered into a namespace using <code>addVariable</code>,
+<code>addProperty</code>, <code>addFunction</code>, and <code>addCFunction</code>.
+When registered functions are called by scripts, LuaBridge automatically takes
+care of the conversion of arguments into the appropriate data type when doing
+so is possible. This automated system works for the function's return value,
+and up to 8 parameters although more can be added by extending the templates.
+Pointers, references, and objects of class type as parameters are treated
+specially, and explained later. If we have:
+</p>
+
+<pre>
+int globalVar;
+static float staticVar;
+
+std::string stringProperty;
+std::string getString () { return stringProperty; }
+void setString (std::string s) { stringProperty = s; }
+
+int foo () { return 42; }
+void bar (char const*) { }
+int cFunc (lua_State* L) { return 0; }
+</pre>
+
+<p>
+These are registered with:
+</p>
+
+<pre>
+getGlobalNamespace (L)
+  .beginNamespace ("test")
+    .addVariable ("var1", &amp;globalVar)
+    .addVariable ("var2", &amp;staticVar, false)     // read-only
+    .addProperty ("prop1", getString, setString)
+    .addProperty ("prop2", getString)            // read only
+    .addFunction ("foo", foo)
+    .addFunction ("bar", bar)
+    .addCFunction ("cfunc", cFunc)
+  .endNamespace ();
+</pre>
+
+<p>
+Variables can be marked <em>read-only</em> by passing <code>false</code> in
+the second optional parameter. If the parameter is omitted, <em>true</em> is
+used making the variable read/write. Properties are marked read-only by
+omitting the set function. After the registrations above, the following Lua
+identifiers are valid:
+</p>
+
+<pre>
+test        -- a namespace
+test.var1   -- a lua_Number variable
+test.var2   -- a read-only lua_Number variable
+test.prop1  -- a lua_String property
+test.prop2  -- a read-only lua_String property
+test.foo    -- a function returning a lua_Number
+test.bar    -- a function taking a lua_String as a parameter
+test.cfunc  -- a function with a variable argument list and multi-return
+</pre>
+
+<p>
+Note that <code>test.prop1</code> and `test.prop2` both refer to the
+same value. However, since <code>test.prop2</code> is read-only, assignment
+attempts will generate a run-time error. These Lua statements have the stated effects:
+</p>
+
+<pre>
+test.var1 = 5         -- okay
+test.var2 = 6         -- error: var2 is not writable
+test.prop1 = "Hello"  -- okay
+test.prop1 = 68       -- okay, Lua converts the number to a string.
+test.prop2 = "bar"    -- error: prop2 is not writable
+
+test.foo ()           -- calls foo and discards the return value
+test.var1 = foo ()    -- calls foo and stores the result in var1
+test.bar ("Employee") -- calls bar with a string
+test.bar (test)       -- error: bar expects a string not a table
+</pre>
+
+<p>
+LuaBridge does not support overloaded functions nor is it likely to in the
+future. Since Lua is dynamically typed, any system that tries to resolve a set
+of parameters passed from a script will face considerable ambiguity when
+trying to choose an appropriately matching C++ function signature.
+</p>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>2.3 - <span id="s2.3">Class Objects</span></h2>
+
+<p>
+A class registration is opened using either <code>beginClass</code> or
+<code>deriveClass</code> and ended using <code>endClass</code>. Once
+registered, a class can later be re-opened for more registrations using
+<code>beginClass</code>. However, <code>deriveClass</code> should only be
+used once. To add more registrations to an already registered derived class,
+use <code>beginClass</code> on it. These declarations:
+</p>
+
+<pre>
+struct A {
+  static int staticData;
+  static float staticProperty;
+    
+  static float getStaticProperty () { return staticProperty; }
+  static void setStaticProperty (float f) { staticProperty = f; }
+  static void staticFunc () { }
+
+  static int staticCFunc () { return 0; }
+
+  std::string dataMember;
+
+  char dataProperty;
+  char getProperty () const { return dataProperty; }
+  void setProperty (char v) { dataProperty = v; }
+
+  void func1 () { }
+  virtual void virtualFunc () { }
+
+  int cfunc (lua_State* L) { return 0; }
+};
+
+struct B : public A {
+  double dataMember2;
+
+  void func1 () { }
+  void func2 () { }
+  void virtualFunc () { }
+};
+
+int A::staticData;
+float A::staticProperty;
+</pre>
+
+<p>
+are registered using:
+</p>
+
+<pre>
+getGlobalNamespace (L)
+  .beginNamespace ("test")
+    .beginClass &lt;A&gt; ("A")
+      .addStaticData ("staticData", &amp;A::staticData)
+      .addStaticProperty ("staticProperty", &amp;A::staticProperty)
+      .addStaticFunction ("staticFunc", &amp;A::staticFunc)
+      .addStaticCFunction ("staticCFunc", &amp;A::staticCFunc)
+      .addData ("data", &amp;A::dataMember)
+      .addProperty ("prop", &amp;A::getProperty, &amp;A::setProperty)
+      .addFunction ("func1", &amp;A::func1)
+      .addFunction ("virtualFunc", &amp;A::virtualFunc)
+      .addCFunction ("cfunc", &amp;A::cfunc)
+    .endClass ()
+    .deriveClass &lt;B, A&gt; ("B")
+      .addData ("data", &amp;B::dataMember2)
+      .addFunction ("func1", &amp;B::func1)
+      .addFunction ("func2", &amp;B::func2)
+    .endClass ()
+  .endNameSpace ();
+</pre>
+
+<p>
+Method registration works just like function registration.  Virtual methods
+work normally; no special syntax is needed. const methods are detected and
+const-correctness is enforced, so if a function returns a const object (or
+a container holding to a const object) to Lua, that reference to the object
+will be considered const and only const methods can be called on it.
+Destructors are registered automatically for each class.
+</p>
+
+<p>
+As with regular variables and properties, class data and properties can be
+marked read-only by passing false in the second parameter, or omitting the set
+set function respectively. The `deriveClass` takes two template arguments: the
+class to be registered, and its base class.  Inherited methods do not have to
+be re-declared and will function normally in Lua. If a class has a base class
+that is **not** registered with Lua, there is no need to declare it as a
+subclass.
+</p>
+
+<p>
+Remember that in Lua, the colon operator '<code>:</code>' is used for
+method call syntax:
+</p>
+
+<pre>
+local a = A ()
+
+a.func1 () -- Does nothing
+a:func1 () -- Works
+</pre>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>2.4 - <span id="s2.4">Property Member Proxies</span></h2>
+
+<p>
+Sometimes when registering a class which comes from a third party library, the
+data is not exposed in a way that can be expressed as a pointer to member,
+there are no get or set functions, or the get and set functons do not have the
+right function signature. Since the class declaration is closed for changes,
+LuaBridge allows for a <em>property member proxy</em>. This is a pair of get
+and set flat functions which take as their first parameter a pointer to
+the object. This is easily understood with the following example:
+</p>
+
+<pre>
+// Third party declaration, can't be changed
+struct Vec 
+{
+  float coord [3];
+};
+</pre>
+
+<p>
+Taking the address of an array element, e.g. <code>&amp;Vec::coord [0]</code>
+results in an error instead of a pointer-to-member. The class is closed for
+modifications, but we want to export Vec objects to Lua using the familiar
+object notation. To do this, first we add a "helper" class:
+</p>
+
+<pre>
+struct VecHelper
+{
+  template &lt;unsigned index&gt;
+  static float get (Vec const* vec)
+  {
+    return vec->coord [index];
+  }
+
+  template &lt;unsigned index&gt;
+  static void set (Vec* vec, float value)
+  {
+    vec->coord [index] = value;
+  }
+};
+</pre>
+
+<p>
+This helper class is only used to provide property member proxies.
+<code>Vec</code> continues to be used in the C++ code as it was before.
+Now we can register the <code>Vec</code> class with property member proxies for
+<code>x</code>, <code>y</code>, and <code>z</code>:
+</p>
+
+<pre>
+getGlobalNamespace (L)
+  .beginNamespace ("test")
+    .beginClass &lt;Vec&gt; ("Vec")
+      .addProperty ("x", &amp;VecHelper::get &lt;0&gt;, &amp;VecHelper::set &lt;0&gt;)
+      .addProperty ("y", &amp;VecHelper::get &lt;1&gt;, &amp;VecHelper::set &lt;1&gt;)
+      .addProperty ("z", &amp;VecHelper::get &lt;2&gt;, &amp;VecHelper::set &lt;2&gt;)
+    .endClass ()
+  .endNamespace ();
+</pre>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>2.5 - <span id="s2.5">Constructors</span></h2>
+
+<p>
+A single constructor may be added for a class using <code>addConstructor</code>.
+LuaBridge cannot automatically determine the number and types of constructor
+parameters like it can for functions and methods, so you must provide them.
+This is done by specifying the signature of the desired constructor function
+as the first template parameter to <code>addConstructor</code>. The parameter
+types will be extracted from this (the return type is ignored).  For example,
+these statements register constructors for the given classes:
+</p>
+
+<pre>
+struct A {
+  A ();
+};
+
+struct B {
+  explicit B (char const* s, int nChars);
+};
+
+getGlobalNamespace (L)
+  .beginNamespace ("test")
+    .beginClass &lt;A&gt; ("A")
+      .addConstructor &lt;void (*) (void)&gt; ()
+    .endClass ()
+    .beginClass &lt;B&gt; ("B")
+      .addConstructor &lt;void (*) (char const*, int)&gt; ()
+    .endClass ()
+  .endNamespace ();
+</pre>
+
+<p>
+Constructors added in this fashion are called from Lua using the fully
+qualified name of the class. This Lua code will create instances of
+<code>A</code> and <code>B</code>.
+</p>
+
+<pre>
+a = test.A ()           -- Create a new A.
+b = test.B ("hello", 5) -- Create a new B.
+b = test.B ()           -- Error: expected string in argument 1
+</pre>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>2.6 - <span id="s2.6">Lua Stack</span></h2>
+
+<p>
+In the Lua C API, all operations on the <code>lua_State</code> are performed
+through the Lua stack. In order to pass values back and forth between C++
+and Lua, LuaBridge uses specializations of this template class concept:
+</p>
+
+<pre>
+template &lt;class T&gt;
+struct Stack
+{
+  static void push (lua_State* L, T t);
+  static T get (lua_State* L, int index);
+};
+</pre>
+
+<p>
+When a specialization of <code>Stack</code> exists for a given type
+<code>T</code> we say that the <code>T</code> is <em>convertible</em>.
+Throughout this document and the LuaBridge API, these types can be used
+anywhere a convertible type is expected.
+</p>
+
+<p>
+The Stack template class specializations are used automatically for variables,
+properties, data members, property members, function arguments and return
+values. These basic types are supported:
+</p>
+
+<ul class="bullets">
+<li><code>bool</code>
+<li><code>char</code>, converted to a string of length one.
+<li><code>char const*</code> and <code>std::string</code> strings.
+<li>Integers, <code>float</code>, and <code>double</code>,
+    converted to <code>Lua_number</code>.
+</ul>
+
+<p>
+User-defined types which are convertible to one of the basic types are
+possible, simply provide a <code>Stack&lt;&gt;</code> specialization in the
+<code>luabridge</code> namespace for your user-defined type, modeled after
+the existing types. For example, here is a specialization for a
+<code>juce::String</code>:
+</p>
+
+<pre>
+template &lt;&gt;
+struct Stack &lt;juce::String&gt;
+{
+  static void push (lua_State* L, juce::String s)
+  {
+    lua_pushstring (L, s.toUTF8 ());
+  }
+
+  static juce::String get (lua_State* L, int index)
+  {
+    return juce::String (luaL_checkstring (L, index));
+  }
+};
+</pre>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>2.7 - <span id="s2.7">lua_State</span></h2>
+
+<p>
+Sometimes it is convenient from within a bound function or member function
+to gain access to the `lua_State*` normally available to a `lua_CFunction`.
+With LuaBridge, all you need to do is add a `lua_State*` as the last
+parameter of your bound function:
+</p>
+
+<pre>
+void useState (lua_State* L);
+
+getGlobalNamespace (L).addFunction ("useState", &amp;useState);
+</pre>
+
+<p>
+You can still include regular arguments while receiving the state:
+</p>
+
+<pre>
+void useStateAndArgs (int i, std::string s, lua_State* L);
+
+getGlobalNamespace (L).addFunction ("useStateAndArgs", &amp;useStateAndArgs);
+</pre>
+
+<p>
+When the script calls <code>useStateAndArgs</code>, it passes only the integer
+and string parameters. LuaBridge takes care of inserting the <code>lua_State*</code>
+into the argument list for the corresponding C++ function. This will work
+correctly even for the state created by coroutines. Undefined behavior results
+if the <code>lua_State*</code> is not the last parameter.
+</p>
+
+</section>
+
+<!--========================================================================-->
+
+</section>
+
+<section>
+
+<h1>3 - <span id="s3">Passing Objects</span></h1>
+
+<p>
+An object of a registered class <code>T</code> may be passed to Lua as:
+</p>
+
+<table>
+<tr>
+  <td><b><code>T</code></b></td>
+  <td>Passed by value (a copy), with <em>Lua lifetime</em>.</td>
+</tr>
+<tr>
+  <td><b><code>T const</code></b></td>
+  <td>Passed by value (a copy), with <em>Lua lifetime</em>.</td>
+</tr>
+<tr>
+  <td><b><code>T*</code></b></td>
+  <td>Passed by reference, with <em>C++ lifetime</em>.</td>
+</tr>
+<tr>
+  <td><b><code>T&amp;</code></b></td>
+  <td>Passed by reference, with <em>C++ lifetime</em>.</td>
+</tr>
+<tr>
+  <td><b><code>T const*</code></b></td>
+  <td>Passed by const reference, with <em>C++ lifetime</em>.</td>
+</tr>
+<tr>
+  <td><b><code>T const&amp;</code></b></td>
+  <td>Passed by const reference, with <em>C++ lifetime</em>.</td>
+</tr>
+</table>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>3.1 - <span id="s3.1">C++ Lifetime</span></h2>
+
+<p>
+The creation and deletion of objects with <em>C++ lifetime</em> is controlled by
+the C++ code. Lua does nothing when it garbage collects a reference to such an
+object. Specifically, the object's destructor is not called (since C++ owns
+it). Care must be taken to ensure that objects with C++ lifetime are not
+deleted while still being referenced by a <code>lua_State*</code>, or else
+undefined behavior results. In the previous examples, an instance of <code>A</code>
+can be passed to Lua with C++ lifetime, like this:
+</p>
+
+<pre>
+A a;
+
+push (L, &amp;a);             // pointer to 'a', C++ lifetime
+lua_setglobal (L, "a");
+
+push (L, (A const*)&amp;a);   // pointer to 'a const', C++ lifetime
+lua_setglobal (L, "ac");
+
+push &lt;A const*> (L, &amp;a);  // equivalent to push (L, (A const*)&amp;a)
+lua_setglobal (L, "ac2");
+
+push (L, new A);          // compiles, but will leak memory
+lua_setglobal (L, "ap");
+</pre>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>3.2 - <span id="s3.2">Lua Lifetime</span></h2>
+
+<p>
+When an object of a registered class is passed by value to Lua, it will have
+<em>Lua lifetime</em>. A copy of the passed object is constructed inside the
+userdata. When Lua has no more references to the object, it becomes eligible
+for garbage collection. When the userdata is collected, the destructor for
+the class will be called on the object. Care must be taken to ensure that
+objects with Lua lifetime are not accessed by C++ after they are garbage
+collected, or else undefined behavior results. An instance of <code>B</code>
+can be passed to Lua with Lua lifetime this way:
+</p>
+
+<pre>
+B b;
+
+push (L, b);                    // Copy of b passed, Lua lifetime.
+lua_setglobal (L, "b");
+</pre>
+
+<p>
+Given the previous code segments, these Lua statements are applicable:
+</p>
+
+<pre>
+print (test.A.staticData)       -- Prints the static data member.
+print (test.A.staticProperty)   -- Prints the static property member.
+test.A.staticFunc ()            -- Calls the static method.
+
+print (a.data)                  -- Prints the data member.
+print (a.prop)                  -- Prints the property member.
+a:func1 ()                      -- Calls A::func1 ().
+test.A.func1 (a)                -- Equivalent to a:func1 ().
+test.A.func1 ("hello")          -- Error: "hello" is not a class A.
+a:virtualFunc ()                -- Calls A::virtualFunc ().
+
+print (b.data)                  -- Prints B::dataMember.
+print (b.prop)                  -- Prints inherited property member.
+b:func1 ()                      -- Calls B::func1 ().
+b:func2 ()                      -- Calls B::func2 ().
+test.B.func2 (a)                -- Error: a is not a class B.
+test.A.func1 (b)                -- Calls A::func1 ().
+b:virtualFunc ()                -- Calls B::virtualFunc ().
+test.B.virtualFunc (b)          -- Calls B::virtualFunc ().
+test.A.virtualFunc (b)          -- Calls B::virtualFunc ().
+test.B.virtualFunc (a)          -- Error: a is not a class B.
+
+a = nil; collectgarbage ()      -- 'a' still exists in C++.
+b = nil; collectgarbage ()      -- Lua calls ~B() on the copy of b.
+</pre>
+
+<p>
+When Lua script creates an object of class type using a registered
+constructor, the resulting value will have Lua lifetime. After Lua no longer
+references the object, it becomes eligible for garbage collection. You can
+still pass these to C++, either by reference or by value. If passed by
+reference, the usual warnings apply about accessing the reference later,
+after it has been garbage collected.
+</p>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>3.3 - <span id="s3.3">Pointers, References, and Pass by Value</span></h2>
+
+<p>
+When C++ objects are passed from Lua back to C++ as arguments to functions,
+or set as data members, LuaBridge does its best to automate the conversion.
+Using the previous definitions, the following functions may be registered
+to Lua:
+</p>
+
+<pre>
+void func0 (A a);
+void func1 (A* a);
+void func2 (A const* a);
+void func3 (A&amp; a);
+void func4 (A const&amp; a);
+</pre>
+
+<p>
+Executing this Lua code will have the prescribed effect:
+</p>
+
+<pre>
+func0 (a)   -- Passes a copy of a, using A's copy constructor.
+func1 (a)   -- Passes a pointer to a.
+func2 (a)   -- Passes a pointer to a const a.
+func3 (a)   -- Passes a reference to a.
+func4 (a)   -- Passes a reference to a const a.
+</pre>
+
+<p>
+In the example above, all functions can read the data members and property
+members of <code>a</code>, or call const member functions of <code>a</code>.
+Only <code>func0</code>, <code>func1</code>, and <code>func3</code> can
+modify the data members and data properties, or call non-const member
+functions of <code>a</code>.
+</p>
+
+<p>
+The usual C++ inheritance and pointer assignment rules apply. Given:
+</p>
+
+<pre>
+void func5 (B b);
+void func6 (B* b);
+</pre>
+
+<p>
+These Lua statements hold:
+</p>
+
+<pre>
+func5 (b)   - Passes a copy of b, using B's copy constructor.
+func6 (b)   - Passes a pointer to b.
+func6 (a)   - Error: Pointer to B expected.
+func1 (b)   - Okay, b is a subclass of a.
+</pre>
+
+<p>
+When a pointer or pointer to const is passed to Lua and the pointer is null
+(zero), LuaBridge will pass Lua a `nil` instead. When Lua passes a
+<code>nil</code> to C++ where a pointer is expected, a null (zero) is passed
+instead. Attempting to pass a null pointer to a C++ function expecting a
+reference results in <code>lua_error</code> being called.
+</p>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>3.4 - <span id="s3.4">Shared Lifetime</span></h2>
+
+<p>
+LuaBridge supports a <em>shared lifetime</em> model: dynamically allocated
+and reference counted objects whose ownership is shared by both Lua and C++.
+The object remains in existence until there are no remaining C++ or Lua
+references, and Lua performs its usual garbage collection cycle. A container
+is recognized by a specialization of the <code>ContainerTraits</code>
+template class. LuaBridge will automatically recognize when a data type is
+a container when the correspoding specialization is present. Two styles of
+containers come with LuaBridge, including the necessary specializations.
+</p>
+
+<!--========================================================================-->
+
+<section>
+
+<h3>3.4.1 - <span id="s3.4.1">Class RefCountedObjectPtr</span></h3>
+
+<p>
+This is an intrusive style container. Your existing class declaration must be
+changed to be also derived from <code>RefCountedObject</code>. Given
+<code>class T</code>, derived from <code>RefCountedObject</code>, the container
+<code>RefCountedObjectPtr &lt;T&gt;</code>` may be used. In order for
+reference counts to be maintained properly, all C++ code must store a
+container instead of the pointer. This is similar in style to
+<code>std::shared_ptr</code> although there are slight differences. For
+example:
+</p>
+
+<pre>
+// A is reference counted.
+struct A : public RefCountedObject
+{
+  void foo () { }
+};
+
+struct B
+{
+  RefCountedObjectPtr &lt;A&gt; a; // holds a reference to A
+};
+
+void bar (RefCountedObjectPtr &lt;A&gt; a)
+{
+  a->foo ();
+}
+</pre>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h3>3.4.2 - <span id="s3.4.2">Class RefCountedPtr</span></h3>
+
+<p>
+This is a non intrusive reference counted pointer. The reference counts are
+kept in a global hash table, which does incur a small performance penalty.
+However, it does not require changing any already existing class declarations.
+This is especially useful when the classes to be registered come from a third
+party library and cannot be modified. To use it, simply wrap all pointers
+to class objects with the container instead:
+</p>
+
+<pre>
+struct A
+{
+  void foo () { }
+};
+
+struct B
+{
+  RefCountedPtr &lt;A&gt; a;
+};
+
+RefCountedPtr &lt;A&gt; createA ()
+{
+  return new A;
+}
+
+void bar (RefCountedPtr &lt;A&gt; a)
+{
+  a->foo ();
+}
+
+void callFoo ()
+{
+  bar (createA ());
+
+  // The created A will be destroyed
+  // when we leave this scope
+}
+</pre>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h3>3.4.3 - <span id="s3.4.3">User-defined Containers</span></h3>
+
+<p>
+If you have your own container, you must provide a specialization of
+<code>ContainerTraits</code> in the <code>luabridge</code> namespace for your
+type before it will be recognized by LuaBridge (or else the code will not
+compile):
+</p>
+
+<pre>
+template &lt;class T&gt;
+struct ContainerTraits &lt;CustomContainer &lt;T&gt; &gt;
+{
+  typedef typename T Type;
+
+  static T* get (CustomContainer &lt;T&gt; const&amp; c)
+  {
+    return c.getPointerToObject ();
+  }
+};
+</pre>
+
+<p>
+Standard containers like <code>std::shared_ptr</code> or
+<code>boost::shared_ptr</code> <b>will not work</b>. This is because of type
+erasure; when the object goes from C++ to Lua and back to C++, there is no
+way to associate the object with the original container. The new container is
+constructed from a pointer to the object instead of an existing container.
+The result is undefined behavior since there are now two sets of reference
+counts.
+</p>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h3>3.4.4 - <span id="s3.4.4">Container Constructors</span></h3>
+
+<p>
+When a constructor is registered for a class, there is an additional
+optional second template parameter describing the type of container to use.
+If this parameter is specified, calls to the constructor will create the
+object dynamically, via operator new, and place it a container of that
+type. The container must have been previously specialized in
+<code>ContainerTraits</code>, or else a compile error will result. This code
+will register two objects, each using a constructor that creates an object
+with Lua lifetime using the specified container:
+</p>
+
+<pre>
+class C : public RefCountedObject
+{
+  C () { }
+};
+
+class D
+{
+  D () { }
+};
+
+getGlobalNamespace (L)
+  .beginNamespace ("test")
+    .beginClass &lt;C&gt; ("C")
+      .addConstructor &lt;void (*) (void), RefCountedObjectPtr &lt;C&gt; &gt; ()
+    .endClass ()
+    .beginClass &lt;D&gt; ("D")
+      .addConstructor &lt;void (*) (void), RefCountedPtr &lt;D&gt; &gt; ()
+    .endClass ();
+  .endNamespace ()
+</pre>
+
+</section>
+
+<!--========================================================================-->
+
+</section>
+
+<section>
+
+<h2>3.5 - <span id="s3.5">Mixing Lifetimes</span></h2>
+
+<p>
+Mixing object lifetime models is entirely possible, subject to the usual
+caveats of holding references to objects which could get deleted. For
+example, C++ can be called from Lua with a pointer to an object of class
+type; the function can modify the object or call non-const data members.
+These modifications are visible to Lua (since they both refer to the same
+object). An object store in a container can be passed to a function expecting
+a pointer. These conversion work seamlessly.
+<p>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>3.6 - <span id="s3.6">Convenience Functions</span></h2>
+
+<p>
+The <code>setGlobal</code> function can be used to assign any convertible
+value into a global variable. 
+</p>
+
+</section>
+
+<!--========================================================================-->
+
+</section>
+
+<section>
+
+<h1>4 - <span id="s4">Accessing Lua from C++</span></h1>
+
+<p>
+Because Lua is a <em>dynamically typed language</em>, special consideration
+is required to map values in Lua to C++. The following sections describe the
+classes and functions used for representing Lua types. Only the essential
+operations are explained; To gain understanding of all available functions,
+please refer to the documentation comments in the corresponding source files.
+</p>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>4.1 - <span id="s4.1">Class LuaRef</span></h2>
+
+<p>
+The <code>LuaRef</code> class is a container which references any Lua type.
+It can hold anything which a Lua variable can hold: <strong>nil</strong>,
+number, boolean, string, table, function, thread, userdata, and
+lightuserdata. Because <code>LuaRef</code> uses the <code>Stack</code>
+template specializations to do its work, classes, functions, and data
+exported to Lua through namespace registrations can also be stored (these
+are instances of userdata). In general, a <code>LuaRef</code> can represent
+any <em>convertible</em> C++ type as well as all Lua types.
+</p>
+
+<p>
+A <code>LuaRef</code> variable constructed with no parameters produces a
+reference to <strong>nil</strong>:
+</p>
+
+<pre>
+LuaRef v (L); // References nil
+</pre>
+
+<p>
+To construct a <code>LuaRef</code> to a specific value, the two parameter
+constructor is used:
+</p>
+
+<pre>
+LuaRef v1 (L, 1);                   // A LUA_TNUMBER
+LuaRef v2 (L, 1.1);                 // Also a LUA_TNUMBER
+LuaRef v3 (L, true);                // A LUA_TBOOLEAN
+LuaRef v4 (L, "string");            // A LUA_TSTRING
+</pre>
+
+<p>
+The functions <code>newTable</code> and <code>getGlobal</code> create
+references to new empty table and an existing value in the global table
+respectively:
+</p>
+
+<pre>
+LuaRef v1 = newTable (L);           // Create a new table
+LuaRef v2 = getGlobal (L, "print")  // Reference to _G ["print"]
+</pre>
+
+<p>
+A <code>LuaRef</code> can hold classes <em>registered</em> using LuaBridge:
+</p>
+
+<pre>
+class A;
+//...
+LuaRef v (L, new A); // A LuaBridge userdata holding a pointer to A
+</pre>
+
+<p>
+Any convertible type may be assigned to an already-existing <code>LuaRef</code>:
+</p>
+
+<pre>
+LuaRef v (L);         // Nil
+v = newTable (L);     // An empty table
+v = "string"          // A string. The prevous value becomes
+                      // eligible for garbage collection.
+</pre>
+
+<p>
+A <code>LuaRef</code> is itself a convertible type, and the convertible
+type <code>Nil</code> can be used to represent a Lua <strong>nil</strong>.
+</p>
+
+<pre>
+LuaRef v1 (L, "x");   // assign "x"
+LuaRef v2 (L, "y");   // assign "y"
+v2 = v1;              // v2 becomes "x"
+v1 = "z";             // v1 becomes "z", v2 is unchanged
+v1 = newTable (L);    // An empty table
+v2 = v1;              // v2 references the same table as v1
+v1 = Nil ();          // v1 becomes nil, table is still
+                      // referenced by v2.
+</pre>
+
+<p>
+Values stored in a <code>LuaRef</code> object obey the same rules as
+variables in Lua: tables, functions, threads, and full userdata values are
+<em>objects</em>. The <code>LuaRef</code> does not actually <em>contain</em>
+these values, only <em>references</em> to them. Assignment, parameter
+passing, and function returns always manipulate references to such values;
+these operations do not imply any kind of copy.
+</p>
+
+<!--========================================================================-->
+
+<section>
+
+<h3>4.1.1 - <span id="s4.1.1">Type Conversions</span></h3>
+
+<p>
+A universal C++ conversion operator is provided for implicit conversions
+which allow a <code>LuaRef</code> to be used where any convertible type is
+expected. These operations will all compile:
+</p>
+
+<pre>
+void passInt (int);
+void passBool (bool);
+void passString (std::string);
+void passObject (A*);
+
+LuaRef v (L);
+//...
+passInt (v);        // implicit conversion to int
+passBool (v);       // implicit conversion to bool
+passString (v);     // implicit conversion to string
+passObject (v);     // must hold a registered LuaBridge class or a
+                    // lua_error() will be called.
+</pre>
+
+<p>
+Since Lua types are dynamic, the conversion is performed at run time using
+traditional functions like <code>lua_toboolean</code> or
+<code>lua_tostring</code>. In some cases, the type information may be
+incorrect especially when passing objects of registered class types.
+When performing these conversions, LuaBridge may raise a Lua error by
+directly or indirectly calling <code>lua_error</code> To be bullet-proof,
+such code must either be wrapped in a <code>lua_pcall</code>, or you must
+install a Lua <em>panic function</em> that throws an exception which you
+can catch.
+</p>
+
+<p>
+When an explicit conversion is required (such as when writing templates),
+use the <code>cast</code> template function or an explicit C++ style cast.
+</p>
+
+<pre>
+void passString (std::string);
+
+LuaRef v (L);
+
+// The following are all equivalent:
+
+passString (std::string (v));
+passString ((std::string)v);
+passString (static_cast &lt;std::string&gt; (v));
+passString (v.cast &lt;std::string&gt; ());
+</pre>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h3>4.1.2 - <span id="s4.1.2">Visual Studio 2010, 2012</span></h3>
+
+<p>
+There is a defect with all versions of Visual Studio up to and including
+Visual Studio 2012 which prevents the implicit conversion operator from
+being applied when it is used as an operand in a boolean operator:
+</p>
+
+<pre>
+LuaRef v1 (L);
+LuaRef v2 (L);
+
+if (v1 || v2) { } // Compile error in Visual Studio
+
+// Work-arounds:
+if (v1.cast &lt;bool&gt; () || v2.cast &lt;bool&gt; ()) { }
+if (bool (v1) || bool (v2)) { }
+</pre>
+
+</section>
+
+<!--========================================================================-->
+
+</section>
+
+<section>
+
+<h2>4.2 - <span id="s4.2">Table Proxies</span></h2>
+
+<p>
+As tables are the sole data structuring mechanism in Lua, the
+<code>LuaRef</code> class provides robust facilities for accessing and
+manipulating table elements using a simple, precise syntax. Any convertible
+type may be used as a key or value. Applying the array indexing operator
+<code>[]</code> to a <code>LuaRef</code> returns a special temporary object
+called a <em>table proxy</em> which supports all the operations which can
+be performed on a <code>LuaRef</code>. In addition, assignments made to
+table proxies change the underlying table. Because table proxies are
+compiler-created temporary objects, you don't work with them directly. A
+LuaBridge table proxy should not be confused with the Lua proxy table
+technique described in the book "Programming in Lua"; the LuaBridge table
+proxy is simply an intermediate C++ class object that works behind the
+scenes to make table manipulation syntax conform to C++ idioms. These
+operations all invoke table proxies:
+</p>
+
+<pre>
+LuaRef v (L);
+v = newTable (L);
+
+v ["name"] = "John Doe";      // string key, string value
+v [1] = 200;                  // integer key, integer value
+v [2] = newTable (L);         // integer key, LuaRef value
+v [3] = v [1];                // assign 200 to integer index 3
+v [1] = 100;                  // v[1] is 100, v[3] is still 200
+v [3] = v [2];                // v[2] and v[3] reference the same table
+v [2] = Nil ();               // Removes the value with key = 2. The table
+                              //   is still referenced by v[3].
+</pre>
+
+</section>
+
+<!--========================================================================-->
+
+<section>
+
+<h2>4.3 - <span id="s4.3">Calling Lua</span></h2>
+
+<p>
+Table proxies and <code>LuaRef</code> objects provide a convenient syntax
+for invoking <code>lua_pcall</code> on suitable referenced object. This
+includes C functions, Lua functions, or Lua objects with an appropriate
+<code>__call</code> metamethod set. The provided implementation supports
+up to eight parameters (although more can be supported by adding new
+functions). Any convertible C++ type can be passed as a parameter in its
+native format. The return value of the function call is provided as a
+<code>LuaRef</code>, which may be <strong>nil</strong>.
+</p>
+
+<pre class="split">
+LuaRef same = getGlobal (L, "same");
+
+// These all evaluate to true
+same (1,1);
+!same (1,2);
+same ("text", "text");
+!same (1, "text");
+same (1, 1, 2); // third param ignored
+</pre>
+
+<pre class="split">
+function same (arg1, arg)
+  return arg1 == arg2
+end
+</pre>
+
+<p>
+Table proxies support all of the Lua call notation that <code>LuaRef</code>
+supports, making these statements possible:
+</p>
+
+<pre class="split">
+LuaRef v = getGlobal (L, "t");
+
+t[1]();
+t[2]("a", "b");
+t[2](t[1]); // Call t[3] with the value in t[2]
+t[4]=t[3]();   // Call t[3] and store the result in t[4].
+
+t [t[5]()] = "wow"; // Store "wow" at the key returned by
+                    //   the call to t[5]
+</pre>
+
+<pre class="split">
+t = {}
+t[1] = function () print ("hello") end
+t[2] = function (u, v) print (u, v) end
+t[3] = "foo"
+</pre>
+
+<!--========================================================================-->
+
+<h3>4.3.1 - <span id="s4.3.1">Class LuaException</span></h3>
+
+<section >
+
+<p>
+When <code>LuaRef</code> is used to call into Lua using the <code>()</code>
+operator it issues a protected call using <code>lua_pcall</code>. LuaBridge
+uses the C++ exception handling mechanism, throwing a <code>LuaException</code>
+object:
+</p>
+
+<pre class="split">
+LuaRef f (L) = getGlobal (L, "fail");
+
+try {
+  f ();
+}
+catch (LuaException const&amp; e) {
+  std::cerr &amp;&amp; e.what ();
+}
+</pre>
+
+<pre class="split">
+function fail ()
+  error ("A problem occurred")
+end
+</pre>
+
+</section>
+
+<!--========================================================================-->
+
+</section>
+
+<!--========================================================================-->
+
+</section>
+
+<section>
+
+<h1>5 - <span id="s5">Security</span></h1>
+
+<p>
+The metatables and userdata that LuaBridge creates in the `lua_State*` are
+protected using a security system, to eliminate the possibility of undefined
+behavior resulting from scripted manipulation of the environment. The
+security system has these components:
+</p>
+
+<ul class="bullets">
+<li>
+Class and const class tables use the <em>table proxy</em> technique. The
+corresponding metatables have <code>__index</code> and <code>__newindex</code>
+metamethods, so these class tables are immutable from Lua.
+<li>
+Metatables have <code>__metatable</code> set to a boolean value. Scripts
+cannot obtain the metatable from a LuaBridge object.
+<li>
+Classes are mapped to metatables through the registry, which Lua scripts
+cannot access. The global environment does not expose metatables
+<li>
+Metatables created by LuaBridge are tagged with a lightuserdata key which
+is unique in the process. Other libraries cannot forge a LuaBridge
+metatable.
+</ul>
+
+<p>
+This security system can be easily bypassed if scripts are given access to
+the debug library (or functionality similar to it, i.e. a raw `getmetatable`).
+The security system can also be defeated by C code in the host, either by
+revealing the unique lightuserdata key to another module or by putting a
+LuaBridge metatable in a place that can be accessed by scripts.
+</p>
+
+<p>
+When a class member function is called, or class property member accessed,
+the `this` pointer is type-checked. This is because member functions exposed
+to Lua are just plain functions that usually get called with the Lua colon
+notation, which passes the object in question as the first parameter. Lua's
+dynamic typing makes this type-checking mandatory to prevent undefined
+behavior resulting from improper use.
+</p>
+
+<p>
+If a type check error occurs, LuaBridge uses the <code>lua_error</code>
+mechanism to trigger a failure. A host program can always recover from
+an error through the use of <code>lua_pcall</code>; proper usage of
+LuaBridge will never result in undefined behavior.
+</p>
+
+</section>
+
+<!--========================================================================-->
+
+</body>
+</html>
+
diff --git a/extern/LuaBridge/RefCountedObject.h b/extern/LuaBridge/RefCountedObject.h
new file mode 100644
index 000000000..807b4606c
--- /dev/null
+++ b/extern/LuaBridge/RefCountedObject.h
@@ -0,0 +1,363 @@
+//==============================================================================
+/*
+  https://github.com/vinniefalco/LuaBridge
+
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+  Copyright 2004-11 by Raw Material Software Ltd.
+
+  This is a derivative work used by permission from part of
+  JUCE, available at http://www.rawaterialsoftware.com
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+
+  This file incorporates work covered by the following copyright and
+  permission notice:  
+
+    This file is part of the JUCE library - "Jules' Utility Class Extensions"
+    Copyright 2004-11 by Raw Material Software Ltd.
+*/
+//==============================================================================
+
+#ifndef LUABRIDGE_REFCOUNTEDOBJECT_HEADER
+#define LUABRIDGE_REFCOUNTEDOBJECT_HEADER
+
+//#define LUABRIDGE_COMPILER_SUPPORTS_MOVE_SEMANTICS 1
+
+#include <cassert>
+
+//==============================================================================
+/**
+  Adds reference-counting to an object.
+
+  To add reference-counting to a class, derive it from this class, and
+  use the RefCountedObjectPtr class to point to it.
+
+  e.g. @code
+  class MyClass : public RefCountedObjectType
+  {
+      void foo();
+
+      // This is a neat way of declaring a typedef for a pointer class,
+      // rather than typing out the full templated name each time..
+      typedef RefCountedObjectPtr<MyClass> Ptr;
+  };
+
+  MyClass::Ptr p = new MyClass();
+  MyClass::Ptr p2 = p;
+  p = 0;
+  p2->foo();
+  @endcode
+
+  Once a new RefCountedObjectType has been assigned to a pointer, be
+  careful not to delete the object manually.
+*/
+template <class CounterType>
+class RefCountedObjectType
+{
+public:
+  //==============================================================================
+  /** Increments the object's reference count.
+
+      This is done automatically by the smart pointer, but is public just
+      in case it's needed for nefarious purposes.
+  */
+  inline void incReferenceCount() const
+  {
+    ++refCount;
+  }
+
+  /** Decreases the object's reference count.
+
+      If the count gets to zero, the object will be deleted.
+  */
+  inline void decReferenceCount() const
+  {
+    assert (getReferenceCount() > 0);
+
+    if (--refCount == 0)
+      delete this;
+  }
+
+  /** Returns the object's current reference count. */
+  inline int getReferenceCount() const
+  {
+    return static_cast <int> (refCount);
+  }
+
+protected:
+  //==============================================================================
+  /** Creates the reference-counted object (with an initial ref count of zero). */
+  RefCountedObjectType() : refCount ()
+  {
+  }
+
+  /** Destructor. */
+  virtual ~RefCountedObjectType()
+  {
+    // it's dangerous to delete an object that's still referenced by something else!
+    assert (getReferenceCount() == 0);
+  }
+
+private:
+  //==============================================================================
+  CounterType mutable refCount;
+};
+
+//==============================================================================
+
+/** Non thread-safe reference counted object.
+
+    This creates a RefCountedObjectType that uses a non-atomic integer
+    as the counter.
+*/
+typedef RefCountedObjectType <int> RefCountedObject;
+
+//==============================================================================
+/**
+    A smart-pointer class which points to a reference-counted object.
+
+    The template parameter specifies the class of the object you want to point
+    to - the easiest way to make a class reference-countable is to simply make
+    it inherit from RefCountedObjectType, but if you need to, you could roll
+    your own reference-countable class by implementing a pair of methods called
+    incReferenceCount() and decReferenceCount().
+
+    When using this class, you'll probably want to create a typedef to
+    abbreviate the full templated name - e.g.
+
+    @code
+    
+    typedef RefCountedObjectPtr <MyClass> MyClassPtr;
+    
+    @endcode
+*/
+template <class ReferenceCountedObjectClass>
+class RefCountedObjectPtr
+{
+public:
+  /** The class being referenced by this pointer. */
+  typedef ReferenceCountedObjectClass ReferencedType;
+
+  //==============================================================================
+  /** Creates a pointer to a null object. */
+  inline RefCountedObjectPtr() : referencedObject (0)
+  {
+  }
+
+  /** Creates a pointer to an object.
+
+      This will increment the object's reference-count if it is non-null.
+  */
+  inline RefCountedObjectPtr (ReferenceCountedObjectClass* const refCountedObject)
+      : referencedObject (refCountedObject)
+  {
+    if (refCountedObject != 0)
+        refCountedObject->incReferenceCount();
+  }
+
+  /** Copies another pointer.
+      This will increment the object's reference-count (if it is non-null).
+  */
+  inline RefCountedObjectPtr (const RefCountedObjectPtr& other)
+      : referencedObject (other.referencedObject)
+  {
+    if (referencedObject != 0)
+        referencedObject->incReferenceCount();
+  }
+
+#if LUABRIDGE_COMPILER_SUPPORTS_MOVE_SEMANTICS
+  /** Takes-over the object from another pointer. */
+  inline RefCountedObjectPtr (RefCountedObjectPtr&& other)
+      : referencedObject (other.referencedObject)
+  {
+    other.referencedObject = 0;
+  }
+#endif
+
+  /** Copies another pointer.
+      This will increment the object's reference-count (if it is non-null).
+  */
+  template <class DerivedClass>
+  inline RefCountedObjectPtr (const RefCountedObjectPtr<DerivedClass>& other)
+      : referencedObject (static_cast <ReferenceCountedObjectClass*> (other.getObject()))
+  {
+    if (referencedObject != 0)
+      referencedObject->incReferenceCount();
+  }
+
+  /** Changes this pointer to point at a different object.
+
+      The reference count of the old object is decremented, and it might be
+      deleted if it hits zero. The new object's count is incremented.
+  */
+  RefCountedObjectPtr& operator= (const RefCountedObjectPtr& other)
+  {
+    return operator= (other.referencedObject);
+  }
+
+  /** Changes this pointer to point at a different object.
+
+      The reference count of the old object is decremented, and it might be
+      deleted if it hits zero. The new object's count is incremented.
+  */
+  template <class DerivedClass>
+  RefCountedObjectPtr& operator= (const RefCountedObjectPtr<DerivedClass>& other)
+  {
+    return operator= (static_cast <ReferenceCountedObjectClass*> (other.getObject()));
+  }
+
+#if LUABRIDGE_COMPILER_SUPPORTS_MOVE_SEMANTICS
+  /** Takes-over the object from another pointer. */
+  RefCountedObjectPtr& operator= (RefCountedObjectPtr&& other)
+  {
+    std::swap (referencedObject, other.referencedObject);
+    return *this;
+  }
+#endif
+
+  /** Changes this pointer to point at a different object.
+
+      The reference count of the old object is decremented, and it might be
+      deleted if it hits zero. The new object's count is incremented.
+  */
+  RefCountedObjectPtr& operator= (ReferenceCountedObjectClass* const newObject)
+  {
+    if (referencedObject != newObject)
+    {
+      if (newObject != 0)
+        newObject->incReferenceCount();
+
+      ReferenceCountedObjectClass* const oldObject = referencedObject;
+      referencedObject = newObject;
+
+      if (oldObject != 0)
+        oldObject->decReferenceCount();
+    }
+
+    return *this;
+  }
+
+  /** Destructor.
+
+      This will decrement the object's reference-count, and may delete it if it
+      gets to zero.
+  */
+  inline ~RefCountedObjectPtr()
+  {
+    if (referencedObject != 0)
+      referencedObject->decReferenceCount();
+  }
+
+  /** Returns the object that this pointer references.
+      The pointer returned may be zero, of course.
+  */
+  inline operator ReferenceCountedObjectClass*() const
+  {
+    return referencedObject;
+  }
+
+  // the -> operator is called on the referenced object
+  inline ReferenceCountedObjectClass* operator->() const
+  {
+    return referencedObject;
+  }
+
+  /** Returns the object that this pointer references.
+      The pointer returned may be zero, of course.
+  */
+  inline ReferenceCountedObjectClass* getObject() const
+  {
+    return referencedObject;
+  }
+
+private:
+  //==============================================================================
+  ReferenceCountedObjectClass* referencedObject;
+};
+
+/** Compares two ReferenceCountedObjectPointers. */
+template <class ReferenceCountedObjectClass>
+bool operator== (const RefCountedObjectPtr<ReferenceCountedObjectClass>& object1, ReferenceCountedObjectClass* const object2)
+{
+    return object1.getObject() == object2;
+}
+
+/** Compares two ReferenceCountedObjectPointers. */
+template <class ReferenceCountedObjectClass>
+bool operator== (const RefCountedObjectPtr<ReferenceCountedObjectClass>& object1, const RefCountedObjectPtr<ReferenceCountedObjectClass>& object2)
+{
+    return object1.getObject() == object2.getObject();
+}
+
+/** Compares two ReferenceCountedObjectPointers. */
+template <class ReferenceCountedObjectClass>
+bool operator== (ReferenceCountedObjectClass* object1, RefCountedObjectPtr<ReferenceCountedObjectClass>& object2)
+{
+    return object1 == object2.getObject();
+}
+
+/** Compares two ReferenceCountedObjectPointers. */
+template <class ReferenceCountedObjectClass>
+bool operator!= (const RefCountedObjectPtr<ReferenceCountedObjectClass>& object1, const ReferenceCountedObjectClass* object2)
+{
+    return object1.getObject() != object2;
+}
+
+/** Compares two ReferenceCountedObjectPointers. */
+template <class ReferenceCountedObjectClass>
+bool operator!= (const RefCountedObjectPtr<ReferenceCountedObjectClass>& object1, RefCountedObjectPtr<ReferenceCountedObjectClass>& object2)
+{
+    return object1.getObject() != object2.getObject();
+}
+
+/** Compares two ReferenceCountedObjectPointers. */
+template <class ReferenceCountedObjectClass>
+bool operator!= (ReferenceCountedObjectClass* object1, RefCountedObjectPtr<ReferenceCountedObjectClass>& object2)
+{
+    return object1 != object2.getObject();
+}
+
+//==============================================================================
+
+namespace luabridge
+{
+
+// forward declaration
+template <class T>
+struct ContainerTraits;
+
+template <class T>
+struct ContainerTraits <RefCountedObjectPtr <T> >
+{
+  typedef T Type;
+
+  static T* get (RefCountedObjectPtr <T> const& c)
+  {
+    return c.getObject ();
+  }
+};
+
+}
+
+//==============================================================================
+
+#endif
+
diff --git a/extern/LuaBridge/RefCountedPtr.h b/extern/LuaBridge/RefCountedPtr.h
new file mode 100644
index 000000000..7c27ca4dc
--- /dev/null
+++ b/extern/LuaBridge/RefCountedPtr.h
@@ -0,0 +1,251 @@
+//==============================================================================
+/*
+  https://github.com/vinniefalco/LuaBridge
+  
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+  Copyright 2007, Nathan Reed
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef LUABRIDGE_REFCOUNTEDPTR_HEADER
+#define LUABRIDGE_REFCOUNTEDPTR_HEADER
+
+#ifdef _MSC_VER
+# include <hash_map>
+#else
+# include <stdint.h>
+# include <ext/hash_map>
+#endif
+
+//==============================================================================
+/**
+  Support for our RefCountedPtr.
+*/
+struct RefCountedPtrBase
+{
+  // Declaration of container for the refcounts
+#ifdef _MSC_VER
+  typedef stdext::hash_map <const void *, int> RefCountsType;
+#else
+  struct ptr_hash
+  {
+    size_t operator () (const void * const v) const
+    {
+      static __gnu_cxx::hash<unsigned int> H;
+      return H(uintptr_t(v));
+    }
+  };
+  typedef __gnu_cxx::hash_map<const void *, int, ptr_hash> RefCountsType;
+#endif
+
+protected:
+  inline RefCountsType& getRefCounts ()
+  {
+    static RefCountsType refcounts;
+    return refcounts ;
+  }
+};
+
+//==============================================================================
+/**
+  A reference counted smart pointer.
+
+  The api is compatible with boost::RefCountedPtr and std::RefCountedPtr, in the
+  sense that it implements a strict subset of the functionality.
+
+  This implementation uses a hash table to look up the reference count
+  associated with a particular pointer.
+
+  @tparam T The class type.
+
+  @todo Decompose RefCountedPtr using a policy. At a minimum, the underlying
+        reference count should be policy based (to support atomic operations)
+        and the delete behavior should be policy based (to support custom
+        disposal methods).
+
+  @todo Provide an intrusive version of RefCountedPtr.
+*/
+template <class T>
+class RefCountedPtr : private RefCountedPtrBase
+{
+public:
+  template <typename Other>
+  struct rebind
+  {
+    typedef RefCountedPtr <Other> other;
+  };
+
+  /** Construct as nullptr or from existing pointer to T.
+
+      @param p The optional, existing pointer to assign from.
+  */
+  RefCountedPtr (T* p = 0) : m_p (p)
+  {
+    ++getRefCounts () [m_p];
+  }
+
+  /** Construct from another RefCountedPtr.
+
+      @param rhs The RefCountedPtr to assign from.
+  */
+  RefCountedPtr (RefCountedPtr <T> const& rhs) : m_p (rhs.get())
+  {
+    ++getRefCounts () [m_p];
+  }
+
+  /** Construct from a RefCountedPtr of a different type.
+
+      @invariant A pointer to U must be convertible to a pointer to T.
+
+      @param  rhs The RefCountedPtr to assign from.
+      @tparam U   The other object type.
+  */
+  template <typename U>
+  RefCountedPtr (RefCountedPtr <U> const& rhs) : m_p (static_cast <T*> (rhs.get()))
+  {
+    ++getRefCounts () [m_p];
+  }
+
+  /** Release the object.
+
+      If there are no more references then the object is deleted.
+  */
+  ~RefCountedPtr ()
+  {
+    reset();
+  }
+
+  /** Assign from another RefCountedPtr.
+
+      @param  rhs The RefCountedPtr to assign from.
+      @return     A reference to the RefCountedPtr.
+  */
+  RefCountedPtr <T>& operator= (RefCountedPtr <T> const& rhs)
+  {
+    if (m_p != rhs.m_p)
+    {
+      reset ();
+      m_p = rhs.m_p;
+      ++getRefCounts () [m_p];
+    }
+    return *this;
+  }
+
+  /** Assign from another RefCountedPtr of a different type.
+
+      @note A pointer to U must be convertible to a pointer to T.
+
+      @tparam U   The other object type.
+      @param  rhs The other RefCountedPtr to assign from.
+      @return     A reference to the RefCountedPtr.
+  */
+  template <typename U>
+  RefCountedPtr <T>& operator= (RefCountedPtr <U> const& rhs)
+  {
+    reset ();
+    m_p = static_cast <T*> (rhs.get());
+    ++getRefCounts () [m_p];
+    return *this;
+  }
+
+  /** Retrieve the raw pointer.
+
+      @return A pointer to the object.
+  */
+  T* get () const
+  {
+    return m_p;
+  }
+
+  /** Retrieve the raw pointer.
+
+      @return A pointer to the object.
+  */
+  T* operator* () const
+  {
+    return m_p;
+  }
+
+  /** Retrieve the raw pointer.
+
+      @return A pointer to the object.
+  */
+  T* operator-> () const
+  {
+    return m_p;
+  }
+
+  /** Determine the number of references.
+
+      @note This is not thread-safe.
+
+      @return The number of active references.
+  */
+  long use_count () const
+  {
+    return getRefCounts () [m_p];
+  }
+
+  /** Release the pointer.
+
+      The reference count is decremented. If the reference count reaches
+      zero, the object is deleted.
+  */
+  void reset ()
+  {
+    if (m_p != 0)
+    {
+      if (--getRefCounts () [m_p] <= 0)
+        delete m_p;
+
+      m_p = 0;
+    }
+  }
+
+private:
+  T* m_p;
+};
+
+//==============================================================================
+
+namespace luabridge
+{
+
+// forward declaration
+template <class T>
+struct ContainerTraits;
+
+template <class T>
+struct ContainerTraits <RefCountedPtr <T> >
+{
+  typedef T Type;
+
+  static T* get (RefCountedPtr <T> const& c)
+  {
+    return c.get ();
+  }
+};
+
+}
+
+#endif
diff --git a/extern/LuaBridge/detail/CFunctions.h b/extern/LuaBridge/detail/CFunctions.h
new file mode 100644
index 000000000..0497b6bb4
--- /dev/null
+++ b/extern/LuaBridge/detail/CFunctions.h
@@ -0,0 +1,442 @@
+//------------------------------------------------------------------------------
+/*
+  https://github.com/vinniefalco/LuaBridge
+  
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+//==============================================================================
+
+// We use a structure so we can define everything in the header.
+//
+struct CFunc
+{
+  //----------------------------------------------------------------------------
+  /**
+      __index metamethod for a namespace or class static members.
+
+      This handles:
+        Retrieving functions and class static methods, stored in the metatable.
+        Reading global and class static data, stored in the __propget table.
+        Reading global and class properties, stored in the __propget table.
+  */
+  static int indexMetaMethod (lua_State* L)
+  {
+    int result = 0;
+    lua_getmetatable (L, 1);                // push metatable of arg1
+    for (;;)
+    {
+      lua_pushvalue (L, 2);                 // push key arg2
+      lua_rawget (L, -2);                   // lookup key in metatable
+      if (lua_isnil (L, -1))                // not found
+      {
+        lua_pop (L, 1);                     // discard nil
+        rawgetfield (L, -1, "__propget");   // lookup __propget in metatable
+        lua_pushvalue (L, 2);               // push key arg2
+        lua_rawget (L, -2);                 // lookup key in __propget
+        lua_remove (L, -2);                 // discard __propget
+        if (lua_iscfunction (L, -1))
+        {
+          lua_remove (L, -2);               // discard metatable
+          lua_pushvalue (L, 1);             // push arg1
+          lua_call (L, 1, 1);               // call cfunction
+          result = 1;
+          break;
+        }
+        else
+        {
+          assert (lua_isnil (L, -1));
+          lua_pop (L, 1);                   // discard nil and fall through
+        }
+      }
+      else
+      {
+        assert (lua_istable (L, -1) || lua_iscfunction (L, -1));
+        lua_remove (L, -2);
+        result = 1;
+        break;
+      }
+
+      rawgetfield (L, -1, "__parent");
+      if (lua_istable (L, -1))
+      {
+        // Remove metatable and repeat the search in __parent.
+        lua_remove (L, -2);
+      }
+      else
+      {
+        // Discard metatable and return nil.
+        assert (lua_isnil (L, -1));
+        lua_remove (L, -2);
+        result = 1;
+        break;
+      }
+    }
+
+    return result;
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      __newindex metamethod for a namespace or class static members.
+
+      The __propset table stores proxy functions for assignment to:
+        Global and class static data.
+        Global and class properties.
+  */
+  static int newindexMetaMethod (lua_State* L)
+  {
+    int result = 0;
+    lua_getmetatable (L, 1);                // push metatable of arg1
+    for (;;)
+    {
+      rawgetfield (L, -1, "__propset");     // lookup __propset in metatable
+      assert (lua_istable (L, -1));
+      lua_pushvalue (L, 2);                 // push key arg2
+      lua_rawget (L, -2);                   // lookup key in __propset
+      lua_remove (L, -2);                   // discard __propset
+      if (lua_iscfunction (L, -1))          // ensure value is a cfunction
+      {
+        lua_remove (L, -2);                 // discard metatable
+        lua_pushvalue (L, 3);               // push new value arg3
+        lua_call (L, 1, 0);                 // call cfunction
+        result = 0;
+        break;
+      }
+      else
+      {
+        assert (lua_isnil (L, -1));
+        lua_pop (L, 1);
+      }
+
+      rawgetfield (L, -1, "__parent");
+      if (lua_istable (L, -1))
+      {
+        // Remove metatable and repeat the search in __parent.
+        lua_remove (L, -2);
+      }
+      else
+      {
+        assert (lua_isnil (L, -1));
+        lua_pop (L, 2);
+        result = luaL_error (L,"no writable variable '%s'", lua_tostring (L, 2));
+      }
+    }
+
+    return result;
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      lua_CFunction to report an error writing to a read-only value.
+
+      The name of the variable is in the first upvalue.
+  */
+  static int readOnlyError (lua_State* L)
+  {
+    std::string s;
+    
+    s = s + "'" + lua_tostring (L, lua_upvalueindex (1)) + "' is read-only";
+
+    return luaL_error (L, s.c_str ());
+  }
+  
+  //----------------------------------------------------------------------------
+  /**
+      lua_CFunction to get a variable.
+
+      This is used for global variables or class static data members.
+
+      The pointer to the data is in the first upvalue.
+  */
+  template <class T>
+  static int getVariable (lua_State* L)
+  {
+    assert (lua_islightuserdata (L, lua_upvalueindex (1)));
+    T const* ptr = static_cast <T const*> (lua_touserdata (L, lua_upvalueindex (1)));
+    assert (ptr != 0);
+    Stack <T>::push (L, *ptr);
+    return 1;
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      lua_CFunction to set a variable.
+
+      This is used for global variables or class static data members.
+
+      The pointer to the data is in the first upvalue.
+  */
+  template <class T>
+  static int setVariable (lua_State* L)
+  {
+    assert (lua_islightuserdata (L, lua_upvalueindex (1)));
+    T* ptr = static_cast <T*> (lua_touserdata (L, lua_upvalueindex (1)));
+    assert (ptr != 0);
+    *ptr = Stack <T>::get (L, 1);
+    return 0;
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      lua_CFunction to call a function with a return value.
+
+      This is used for global functions, global properties, class static methods,
+      and class static properties.
+
+      The function pointer is in the first upvalue.
+  */
+  template <class FnPtr,
+            class ReturnType = typename FuncTraits <FnPtr>::ReturnType>
+  struct Call
+  {
+    typedef typename FuncTraits <FnPtr>::Params Params;
+    static int f (lua_State* L)
+    {
+      assert (isfulluserdata (L, lua_upvalueindex (1)));
+      FnPtr const& fnptr = *static_cast <FnPtr const*> (lua_touserdata (L, lua_upvalueindex (1)));
+      assert (fnptr != 0);
+      ArgList <Params> args (L);
+      Stack <typename FuncTraits <FnPtr>::ReturnType>::push (L, FuncTraits <FnPtr>::call (fnptr, args));
+      return 1;
+    }
+  };
+
+  //----------------------------------------------------------------------------
+  /**
+      lua_CFunction to call a function with no return value.
+
+      This is used for global functions, global properties, class static methods,
+      and class static properties.
+
+      The function pointer is in the first upvalue.
+  */
+  template <class FnPtr>
+  struct Call <FnPtr, void>
+  {
+    typedef typename FuncTraits <FnPtr>::Params Params;
+    static int f (lua_State* L)
+    {
+      assert (isfulluserdata (L, lua_upvalueindex (1)));
+      FnPtr const& fnptr = *static_cast <FnPtr const*> (lua_touserdata (L, lua_upvalueindex (1)));
+      assert (fnptr != 0);
+      ArgList <Params> args (L);
+      FuncTraits <FnPtr>::call (fnptr, args);
+      return 0;
+    }
+  };
+
+  //----------------------------------------------------------------------------
+  /**
+      lua_CFunction to call a class member function with a return value.
+
+      The member function pointer is in the first upvalue.
+      The class userdata object is at the top of the Lua stack.
+  */
+  template <class MemFnPtr,
+            class ReturnType = typename FuncTraits <MemFnPtr>::ReturnType>
+  struct CallMember
+  {
+    typedef typename FuncTraits <MemFnPtr>::ClassType T;
+    typedef typename FuncTraits <MemFnPtr>::Params Params;
+
+    static int f (lua_State* L)
+    {
+      assert (isfulluserdata (L, lua_upvalueindex (1)));
+      T* const t = Userdata::get <T> (L, 1, false);
+      MemFnPtr const& fnptr = *static_cast <MemFnPtr const*> (lua_touserdata (L, lua_upvalueindex (1)));
+      assert (fnptr != 0);
+      ArgList <Params, 2> args (L);
+      Stack <ReturnType>::push (L, FuncTraits <MemFnPtr>::call (t, fnptr, args));
+      return 1;
+    }
+  };
+
+  template <class MemFnPtr,
+            class ReturnType = typename FuncTraits <MemFnPtr>::ReturnType>
+  struct CallConstMember
+  {
+    typedef typename FuncTraits <MemFnPtr>::ClassType T;
+    typedef typename FuncTraits <MemFnPtr>::Params Params;
+
+    static int f (lua_State* L)
+    {
+      assert (isfulluserdata (L, lua_upvalueindex (1)));
+      T const* const t = Userdata::get <T> (L, 1, true);
+      MemFnPtr const& fnptr = *static_cast <MemFnPtr const*> (lua_touserdata (L, lua_upvalueindex (1)));
+      assert (fnptr != 0);
+      ArgList <Params, 2> args(L);
+      Stack <ReturnType>::push (L, FuncTraits <MemFnPtr>::call (t, fnptr, args));
+      return 1;
+    }
+  };
+
+  //----------------------------------------------------------------------------
+  /**
+      lua_CFunction to call a class member function with no return value.
+
+      The member function pointer is in the first upvalue.
+      The class userdata object is at the top of the Lua stack.
+  */
+  template <class MemFnPtr>
+  struct CallMember <MemFnPtr, void>
+  {
+    typedef typename FuncTraits <MemFnPtr>::ClassType T;
+    typedef typename FuncTraits <MemFnPtr>::Params Params;
+
+    static int f (lua_State* L)
+    {
+      assert (isfulluserdata (L, lua_upvalueindex (1)));
+      T* const t = Userdata::get <T> (L, 1, false);
+      MemFnPtr const& fnptr = *static_cast <MemFnPtr const*> (lua_touserdata (L, lua_upvalueindex (1)));
+      assert (fnptr != 0);
+      ArgList <Params, 2> args (L);
+      FuncTraits <MemFnPtr>::call (t, fnptr, args);
+      return 0;
+    }
+  };
+
+  template <class MemFnPtr>
+  struct CallConstMember <MemFnPtr, void>
+  {
+    typedef typename FuncTraits <MemFnPtr>::ClassType T;
+    typedef typename FuncTraits <MemFnPtr>::Params Params;
+
+    static int f (lua_State* L)
+    {
+      assert (isfulluserdata (L, lua_upvalueindex (1)));
+      T const* const t = Userdata::get <T> (L, 1, true);
+      MemFnPtr const& fnptr = *static_cast <MemFnPtr const*> (lua_touserdata (L, lua_upvalueindex (1)));
+      assert (fnptr != 0);
+      ArgList <Params, 2> args (L);
+      FuncTraits <MemFnPtr>::call (t, fnptr, args);
+      return 0;
+    }
+  };
+
+  //--------------------------------------------------------------------------
+  /**
+      lua_CFunction to call a class member lua_CFunction.
+
+      The member function pointer is in the first upvalue.
+      The class userdata object is at the top of the Lua stack.
+  */
+  template <class T>
+  struct CallMemberCFunction
+  {
+    static int f (lua_State* L)
+    {
+      assert (isfulluserdata (L, lua_upvalueindex (1)));
+      typedef int (T::*MFP)(lua_State* L);
+      T* const t = Userdata::get <T> (L, 1, false);
+      MFP const& fnptr = *static_cast <MFP const*> (lua_touserdata (L, lua_upvalueindex (1)));
+      assert (fnptr != 0);
+      return (t->*fnptr) (L);
+    }
+  };
+
+  template <class T>
+  struct CallConstMemberCFunction
+  {
+    static int f (lua_State* L)
+    {
+      assert (isfulluserdata (L, lua_upvalueindex (1)));
+      typedef int (T::*MFP)(lua_State* L);
+      T const* const t = Userdata::get <T> (L, 1, true);
+      MFP const& fnptr = *static_cast <MFP const*> (lua_touserdata (L, lua_upvalueindex (1)));
+      assert (fnptr != 0);
+      return (t->*fnptr) (L);
+    }
+  };
+
+  //--------------------------------------------------------------------------
+
+  // SFINAE Helpers
+
+  template <class MemFnPtr, bool isConst>
+  struct CallMemberFunctionHelper
+  {
+    static void add (lua_State* L, char const* name, MemFnPtr mf)
+    {
+      new (lua_newuserdata (L, sizeof (MemFnPtr))) MemFnPtr (mf);
+      lua_pushcclosure (L, &CallConstMember <MemFnPtr>::f, 1);
+      lua_pushvalue (L, -1);
+      rawsetfield (L, -5, name); // const table
+      rawsetfield (L, -3, name); // class table
+    }
+  };
+
+  template <class MemFnPtr>
+  struct CallMemberFunctionHelper <MemFnPtr, false>
+  {
+    static void add (lua_State* L, char const* name, MemFnPtr mf)
+    {
+      new (lua_newuserdata (L, sizeof (MemFnPtr))) MemFnPtr (mf);
+      lua_pushcclosure (L, &CallMember <MemFnPtr>::f, 1);
+      rawsetfield (L, -3, name); // class table
+    }
+  };
+
+  //--------------------------------------------------------------------------
+  /**
+      __gc metamethod for a class.
+  */
+  template <class C>
+  static int gcMetaMethod (lua_State* L)
+  {
+    Userdata* const ud = Userdata::getExact <C> (L, 1);
+    ud->~Userdata ();
+    return 0;
+  }
+
+  //--------------------------------------------------------------------------
+  /**
+      lua_CFunction to get a class data member.
+
+      The pointer-to-member is in the first upvalue.
+      The class userdata object is at the top of the Lua stack.
+  */
+  template <class C, typename T>
+  static int getProperty (lua_State* L)
+  {
+    C const* const c = Userdata::get <C> (L, 1, true);
+    T C::** mp = static_cast <T C::**> (lua_touserdata (L, lua_upvalueindex (1)));
+    Stack <T>::push (L, c->**mp);
+    return 1;
+  }
+
+  //--------------------------------------------------------------------------
+  /**
+      lua_CFunction to set a class data member.
+
+      The pointer-to-member is in the first upvalue.
+      The class userdata object is at the top of the Lua stack.
+  */
+  template <class C, typename T>
+  static int setProperty (lua_State* L)
+  {
+    C* const c = Userdata::get <C> (L, 1, false);
+    T C::** mp = static_cast <T C::**> (lua_touserdata (L, lua_upvalueindex (1)));
+    c->**mp = Stack <T>::get (L, 2);
+    return 0;
+  }
+};
diff --git a/extern/LuaBridge/detail/ClassInfo.h b/extern/LuaBridge/detail/ClassInfo.h
new file mode 100644
index 000000000..8d5806947
--- /dev/null
+++ b/extern/LuaBridge/detail/ClassInfo.h
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+/*
+  https://github.com/vinniefalco/LuaBridge
+  
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+//==============================================================================
+
+/** Unique Lua registry keys for a class.
+
+    Each registered class inserts three keys into the registry, whose
+    values are the corresponding static, class, and const metatables. This
+    allows a quick and reliable lookup for a metatable from a template type.
+*/
+template <class T>
+class ClassInfo
+{
+public:
+  /** Get the key for the static table.
+
+      The static table holds the static data members, static properties, and
+      static member functions for a class.
+  */
+  static void const* getStaticKey ()
+  {
+    static char value;
+    return &value;
+  }
+
+  /** Get the key for the class table.
+
+      The class table holds the data members, properties, and member functions
+      of a class. Read-only data and properties, and const member functions are
+      also placed here (to save a lookup in the const table).
+  */
+  static void const* getClassKey ()
+  {
+    static char value;
+    return &value;
+  }
+
+  /** Get the key for the const table.
+
+      The const table holds read-only data members and properties, and const
+      member functions of a class.
+  */
+  static void const* getConstKey ()
+  {
+    static char value;
+    return &value;
+  }
+};
+
diff --git a/extern/LuaBridge/detail/Constructor.h b/extern/LuaBridge/detail/Constructor.h
new file mode 100644
index 000000000..7b2dad059
--- /dev/null
+++ b/extern/LuaBridge/detail/Constructor.h
@@ -0,0 +1,204 @@
+//------------------------------------------------------------------------------
+/*
+  https://github.com/vinniefalco/LuaBridge
+  
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+  Copyright 2007, Nathan Reed
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef LUABRIDGE_CONSTRUCTOR_HEADER
+#define LUABRIDGE_CONSTRUCTOR_HEADER
+
+/*
+* Constructor generators.  These templates allow you to call operator new and
+* pass the contents of a type/value list to the Constructor.  Like the
+* function pointer containers, these are only defined up to 8 parameters.
+*/
+
+/** Constructor generators.
+
+    These templates call operator new with the contents of a type/value
+    list passed to the Constructor with up to 8 parameters. Two versions
+    of call() are provided. One performs a regular new, the other performs
+    a placement new.
+*/
+template <class T, typename List>
+struct Constructor {};
+
+template <class T>
+struct Constructor <T, None>
+{
+  static T* call (TypeListValues <None> const&)
+  {
+    return new T;
+  }
+  static T* call (void* mem, TypeListValues <None> const&)
+  {
+    return new (mem) T;
+  }
+};
+
+template <class T, class P1>
+struct Constructor <T, TypeList <P1> >
+{
+  static T* call (const TypeListValues<TypeList <P1> > &tvl)
+  {
+    return new T(tvl.hd);
+  }
+  static T* call (void* mem, const TypeListValues<TypeList <P1> > &tvl)
+  {
+    return new (mem) T(tvl.hd);
+  }
+};
+
+template <class T, class P1, class P2>
+struct Constructor <T, TypeList <P1, TypeList <P2> > >
+{
+  static T* call (const TypeListValues<TypeList <P1, TypeList <P2> > > &tvl)
+  {
+    return new T(tvl.hd, tvl.tl.hd);
+  }
+  static T* call (void* mem, const TypeListValues<TypeList <P1, TypeList <P2> > > &tvl)
+  {
+    return new (mem) T(tvl.hd, tvl.tl.hd);
+  }
+};
+
+template <class T, class P1, class P2, class P3>
+struct Constructor <T, TypeList <P1, TypeList <P2, TypeList <P3> > > >
+{
+  static T* call (const TypeListValues<TypeList <P1, TypeList <P2,
+    TypeList <P3> > > > &tvl)
+  {
+    return new T(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd);
+  }
+  static T* call (void* mem, const TypeListValues<TypeList <P1, TypeList <P2,
+    TypeList <P3> > > > &tvl)
+  {
+    return new (mem) T(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd);
+  }
+};
+
+template <class T, class P1, class P2, class P3, class P4>
+struct Constructor <T, TypeList <P1, TypeList <P2, TypeList <P3,
+  TypeList <P4> > > > >
+{
+  static T* call (const TypeListValues<TypeList <P1, TypeList <P2,
+    TypeList <P3, TypeList <P4> > > > > &tvl)
+  {
+    return new T(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd);
+  }
+  static T* call (void* mem, const TypeListValues<TypeList <P1, TypeList <P2,
+    TypeList <P3, TypeList <P4> > > > > &tvl)
+  {
+    return new (mem) T(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class P1, class P2, class P3, class P4,
+  class P5>
+struct Constructor <T, TypeList <P1, TypeList <P2, TypeList <P3,
+  TypeList <P4, TypeList <P5> > > > > >
+{
+  static T* call (const TypeListValues<TypeList <P1, TypeList <P2,
+    TypeList <P3, TypeList <P4, TypeList <P5> > > > > > &tvl)
+  {
+    return new T(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd,
+      tvl.tl.tl.tl.tl.hd);
+  }
+  static T* call (void* mem, const TypeListValues<TypeList <P1, TypeList <P2,
+    TypeList <P3, TypeList <P4, TypeList <P5> > > > > > &tvl)
+  {
+    return new (mem) T(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd,
+      tvl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class P1, class P2, class P3, class P4,
+  class P5, class P6>
+struct Constructor <T, TypeList <P1, TypeList <P2, TypeList <P3,
+  TypeList <P4, TypeList <P5, TypeList <P6> > > > > > >
+{
+  static T* call (const TypeListValues<TypeList <P1, TypeList <P2,
+    TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6> > > > > > > &tvl)
+  {
+    return new T(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd,
+      tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd);
+  }
+  static T* call (void* mem, const TypeListValues<TypeList <P1, TypeList <P2,
+    TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6> > > > > > > &tvl)
+  {
+    return new (mem) T(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd,
+      tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class P1, class P2, class P3, class P4,
+  class P5, class P6, class P7>
+struct Constructor <T, TypeList <P1, TypeList <P2, TypeList <P3,
+  TypeList <P4, TypeList <P5, TypeList <P6, TypeList <P7> > > > > > > >
+{
+  static T* call (const TypeListValues<TypeList <P1, TypeList <P2,
+    TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6,
+    TypeList <P7> > > > > > > > &tvl)
+  {
+    return new T(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd,
+      tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd,
+      tvl.tl.tl.tl.tl.tl.tl.hd);
+  }
+  static T* call (void* mem, const TypeListValues<TypeList <P1, TypeList <P2,
+    TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6,
+    TypeList <P7> > > > > > > > &tvl)
+  {
+    return new (mem) T(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd,
+      tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd,
+      tvl.tl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class P1, class P2, class P3, class P4,
+  class P5, class P6, class P7, class P8>
+struct Constructor <T, TypeList <P1, TypeList <P2, TypeList <P3,
+  TypeList <P4, TypeList <P5, TypeList <P6, TypeList <P7, 
+  TypeList <P8> > > > > > > > >
+{
+  static T* call (const TypeListValues<TypeList <P1, TypeList <P2,
+    TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6,
+    TypeList <P7, TypeList <P8> > > > > > > > > &tvl)
+  {
+    return new T(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd,
+      tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd,
+      tvl.tl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.tl.hd);
+  }
+  static T* call (void* mem, const TypeListValues<TypeList <P1, TypeList <P2,
+    TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6,
+    TypeList <P7, TypeList <P8> > > > > > > > > &tvl)
+  {
+    return new (mem) T(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd,
+      tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd,
+      tvl.tl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+#endif
diff --git a/extern/LuaBridge/detail/FuncTraits.h b/extern/LuaBridge/detail/FuncTraits.h
new file mode 100644
index 000000000..7eccb6183
--- /dev/null
+++ b/extern/LuaBridge/detail/FuncTraits.h
@@ -0,0 +1,852 @@
+//------------------------------------------------------------------------------
+/*
+  https://github.com/vinniefalco/LuaBridge
+  
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+//==============================================================================
+
+/**
+  Since the throw specification is part of a function signature, the FuncTraits
+  family of templates needs to be specialized for both types. The
+  LUABRIDGE_THROWSPEC macro controls whether we use the 'throw ()' form, or
+  'noexcept' (if C++11 is available) to distinguish the functions.
+*/
+#if defined (__APPLE_CPP__) || defined(__APPLE_CC__) || defined(__clang__) || defined(__GNUC__) || \
+    (defined (_MSC_VER) && (_MSC_VER >= 1700))
+// Do not define LUABRIDGE_THROWSPEC since the Xcode and gcc  compilers do not
+// distinguish the throw specification in the function signature.
+#else
+// Visual Studio 10 and earlier pay too much mind to useless throw() spec.
+//
+# define LUABRIDGE_THROWSPEC throw()
+#endif
+
+//==============================================================================
+/**
+    Traits for function pointers.
+
+    There are three types of functions: global, non-const member, and const
+    member. These templates determine the type of function, which class type it
+    belongs to if it is a class member, the const-ness if it is a member
+    function, and the type information for the return value and argument list.
+
+    Expansions are provided for functions with up to 8 parameters. This can be
+    manually extended, or expanded to an arbitrary amount using C++11 features.
+*/
+template <class MemFn, class D = MemFn>
+struct FuncTraits
+{
+};
+
+/* Ordinary function pointers. */
+
+template <class R, class D>
+struct FuncTraits <R (*) (), D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef None Params;
+  static R call (D fp, TypeListValues <Params>)
+  {
+    return fp ();
+  }
+};
+
+template <class R, class P1, class D>
+struct FuncTraits <R (*) (P1), D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1> Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd);
+  }
+};
+
+template <class R, class P1, class P2, class D>
+struct FuncTraits <R (*) (P1, P2), D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2> > Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd, tvl.tl.hd);
+  }
+};
+
+template <class R, class P1, class P2, class P3, class D>
+struct FuncTraits <R (*) (P1, P2, P3), D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3> > > Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd, tvl.tl.hd, tvl.tl.tl.hd);
+  }
+};
+
+template <class R, class P1, class P2, class P3, class P4, class D>
+struct FuncTraits <R (*) (P1, P2, P3, P4), D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4> > > > Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd);
+  }
+};
+
+template <class R, class P1, class P2, class P3, class P4, class P5, class D>
+struct FuncTraits <R (*) (P1, P2, P3, P4, P5), D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5> > > > > Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class R, class P1, class P2, class P3, class P4, class P5, class P6, class D>
+struct FuncTraits <R (*) (P1, P2, P3, P4, P5, P6), D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5,  TypeList <P6> > > > > > Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class R, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class D>
+struct FuncTraits <R (*) (P1, P2, P3, P4, P5, P6, P7), D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6, TypeList <P7> > > > > > > Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class R, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class D>
+struct FuncTraits <R (*) (P1, P2, P3, P4, P5, P6, P7, P8), D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6, TypeList <P7, TypeList <P8> > > > > > > > Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+/* Non-const member function pointers. */
+
+template <class T, class R, class D>
+struct FuncTraits <R (T::*) (), D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef None Params;
+  static R call (T* obj, D fp, TypeListValues <Params>)
+  {
+    return (obj->*fp)();
+  }
+};
+
+template <class T, class R, class P1, class D>
+struct FuncTraits <R (T::*) (P1), D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1> Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class D>
+struct FuncTraits <R (T::*) (P1, P2), D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2> > Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3), D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3> > > Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4), D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4> > > > Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5), D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5> > > > > Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class P6, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5, P6), D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6> > > > > > Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5, P6, P7), D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6, TypeList <P7> > > > > > > Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5, P6, P7, P8), D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6, TypeList <P7, TypeList <P8> > > > > > > > Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+/* Const member function pointers. */
+
+template <class T, class R, class D>
+struct FuncTraits <R (T::*) () const, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef None Params;
+  static R call (T const* obj, D fp, TypeListValues <Params>)
+  {
+    return (obj->*fp)();
+  }
+};
+
+template <class T, class R, class P1, class D>
+struct FuncTraits <R (T::*) (P1) const, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1> Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class D>
+struct FuncTraits <R (T::*) (P1, P2) const, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2> > Params;
+  static R call (T const* obj, R (T::*fp) (P1, P2) const,
+    TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3) const, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3> > > Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4) const, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4> > > > Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5) const, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5> > > > > Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class P6, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5, P6) const, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6> > > > > > Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5, P6, P7) const, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6, TypeList <P7> > > > > > > Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5, P6, P7, P8) const, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6, TypeList <P7, TypeList <P8> > > > > > > > Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+#if defined (LUABRIDGE_THROWSPEC)
+
+/* Ordinary function pointers. */
+
+template <class R, class D>
+struct FuncTraits <R (*) () LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef None Params;
+  static R call (D fp, TypeListValues <Params> const&)
+  {
+    return fp ();
+  }
+};
+
+template <class R, class P1, class D>
+struct FuncTraits <R (*) (P1) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1> Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd);
+  }
+};
+
+template <class R, class P1, class P2, class D>
+struct FuncTraits <R (*) (P1, P2) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2> > Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd, tvl.tl.hd);
+  }
+};
+
+template <class R, class P1, class P2, class P3, class D>
+struct FuncTraits <R (*) (P1, P2, P3) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3> > > Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd, tvl.tl.hd, tvl.tl.tl.hd);
+  }
+};
+
+template <class R, class P1, class P2, class P3, class P4, class D>
+struct FuncTraits <R (*) (P1, P2, P3, P4) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4> > > > Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd);
+  }
+};
+
+template <class R, class P1, class P2, class P3, class P4, class P5, class D>
+struct FuncTraits <R (*) (P1, P2, P3, P4, P5) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5> > > > > Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class R, class P1, class P2, class P3, class P4, class P5, class P6, class D>
+struct FuncTraits <R (*) (P1, P2, P3, P4, P5, P6) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5,  TypeList <P6> > > > > > Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class R, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class D>
+struct FuncTraits <R (*) (P1, P2, P3, P4, P5, P6, P7) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6, TypeList <P7> > > > > > > Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class R, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class D>
+struct FuncTraits <R (*) (P1, P2, P3, P4, P5, P6, P7, P8) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = false;
+  typedef D DeclType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6, TypeList <P7, TypeList <P8> > > > > > > > Params;
+  static R call (D fp, TypeListValues <Params> tvl)
+  {
+    return fp (tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+/* Non-const member function pointers with THROWSPEC. */
+
+template <class T, class R, class D>
+struct FuncTraits <R (T::*) () LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef None Params;
+  static R call (T* obj, D fp, TypeListValues <Params> const&)
+  {
+    return (obj->*fp)();
+  }
+};
+
+template <class T, class R, class P1, class D>
+struct FuncTraits <R (T::*) (P1) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1> Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class D>
+struct FuncTraits <R (T::*) (P1, P2) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2> > Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3> > > Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4> > > > Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5> > > > > Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class P6, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5, P6) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6> > > > > > Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5, P6, P7) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6, TypeList <P7> > > > > > > Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5, P6, P7, P8) LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = false;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6, TypeList <P7, TypeList <P8> > > > > > > > Params;
+  static R call (T* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+/* Const member function pointers with THROWSPEC. */
+
+template <class T, class R, class D>
+struct FuncTraits <R (T::*) () const LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef None Params;
+  static R call (T const* obj, D fp, TypeListValues <Params>)
+  {
+    return (obj->*fp)();
+  }
+};
+
+template <class T, class R, class P1, class D>
+struct FuncTraits <R (T::*) (P1) const LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1> Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class D>
+struct FuncTraits <R (T::*) (P1, P2) const LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2> > Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3) const LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3> > > Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4) const LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4> > > > Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5) const LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5> > > > > Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd,
+      tvl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class P6, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5, P6) const LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6> > > > > > Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5, P6, P7) const LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6, TypeList <P7> > > > > > > Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+template <class T, class R, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class D>
+struct FuncTraits <R (T::*) (P1, P2, P3, P4, P5, P6, P7, P8) const LUABRIDGE_THROWSPEC, D>
+{
+  static bool const isMemberFunction = true;
+  static bool const isConstMemberFunction = true;
+  typedef D DeclType;
+  typedef T ClassType;
+  typedef R ReturnType;
+  typedef TypeList <P1, TypeList <P2, TypeList <P3, TypeList <P4, TypeList <P5, TypeList <P6, TypeList <P7, TypeList <P8> > > > > > > > Params;
+  static R call (T const* obj, D fp, TypeListValues <Params> tvl)
+  {
+    return (obj->*fp)(tvl.hd, tvl.tl.hd, tvl.tl.tl.hd, tvl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.hd, tvl.tl.tl.tl.tl.tl.tl.tl.hd);
+  }
+};
+
+#endif
diff --git a/extern/LuaBridge/detail/Iterator.h b/extern/LuaBridge/detail/Iterator.h
new file mode 100644
index 000000000..d883fb398
--- /dev/null
+++ b/extern/LuaBridge/detail/Iterator.h
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+/*
+  https://github.com/vinniefalco/LuaBridge
+  
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+//==============================================================================
+
+/** Allows table iteration.
+*/
+class Iterator
+{
+private:
+  lua_State* m_L;
+  LuaRef m_table;
+  LuaRef m_key;
+  LuaRef m_value;
+
+  void next ()
+  {
+    m_table.push(m_L);
+    m_key.push (m_L);
+    if (lua_next (m_L, -2))
+    {
+      m_value.pop (m_L);
+      m_key.pop (m_L);
+    }
+    else
+    {
+      m_key = Nil();
+      m_value = Nil();
+    }
+    lua_pop(m_L, 1);
+  }
+
+public:
+  explicit Iterator (LuaRef table)
+    : m_L (table.state ())
+    , m_table (table)
+    , m_key (table.state ()) // m_key is nil
+    , m_value (table.state ()) // m_value is nil
+  {
+    next (); // get the first (key, value) pair from table
+  }
+
+  lua_State* state () const
+  {
+    return m_L;
+  }
+
+  LuaRef operator* () const
+  {
+    return m_value;
+  }
+
+  LuaRef operator-> () const
+  {
+    return m_value;
+  }
+
+  Iterator& operator++ ()
+  {
+    if (isNil())
+    {
+      // if the iterator reaches the end, do nothing
+      return *this;
+    }
+    else
+    {
+      next();
+      return *this;
+    }
+  }
+
+  inline bool isNil () const
+  {
+    return m_key.isNil ();
+  }
+
+  inline LuaRef key () const
+  {
+    return m_key;
+  }
+
+  inline LuaRef value () const
+  {
+    return m_value;
+  }
+
+private:
+  // Don't use postfix increment, it is less efficient
+  Iterator operator++ (int);
+};
+
diff --git a/extern/LuaBridge/detail/LuaException.h b/extern/LuaBridge/detail/LuaException.h
new file mode 100644
index 000000000..a0944961c
--- /dev/null
+++ b/extern/LuaBridge/detail/LuaException.h
@@ -0,0 +1,113 @@
+//------------------------------------------------------------------------------
+/*
+  https://github.com/vinniefalco/LuaBridge
+  
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+  Copyright 2008, Nigel Atkinson <suprapilot+LuaCode@gmail.com>
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+//==============================================================================
+
+class LuaException : public std::exception 
+{
+private:
+  lua_State* m_L;
+  std::string m_what;
+
+public:
+  //----------------------------------------------------------------------------
+  /**
+      Construct a LuaException after a lua_pcall().
+  */
+  LuaException (lua_State* L, int /*code*/)
+    : m_L (L)
+  {
+    whatFromStack ();
+  }
+
+  //----------------------------------------------------------------------------
+
+  LuaException (lua_State *L,
+                char const*,
+                char const*,
+                long)
+    : m_L (L)
+  {
+    whatFromStack ();
+  }
+
+  //----------------------------------------------------------------------------
+
+  ~LuaException() throw ()
+  {
+  }
+
+  //----------------------------------------------------------------------------
+
+  char const* what() const throw ()
+  {
+    return m_what.c_str();
+  }
+
+  //============================================================================
+  /**
+      Throw an exception.
+
+      This centralizes all the exceptions thrown, so that we can set
+      breakpoints before the stack is unwound, or otherwise customize the
+      behavior.
+  */
+  template <class Exception>
+  static void Throw (Exception e)
+  {
+    throw e;
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Wrapper for lua_pcall that throws.
+  */
+  static void pcall (lua_State* L, int nargs = 0, int nresults = 0, int msgh = 0)
+  {
+    int code = lua_pcall (L, nargs, nresults, msgh);
+
+    if (code != LUABRIDGE_LUA_OK)
+      Throw (LuaException (L, code));
+  }
+
+  //----------------------------------------------------------------------------
+
+protected:
+  void whatFromStack ()
+  {
+    if (lua_gettop (m_L) > 0)
+    {
+      char const* s = lua_tostring (m_L, -1);
+      m_what = s ? s : "";
+    }
+    else
+    {
+      // stack is empty
+      m_what = "missing error";
+    }
+  }
+};
diff --git a/extern/LuaBridge/detail/LuaHelpers.h b/extern/LuaBridge/detail/LuaHelpers.h
new file mode 100644
index 000000000..7bc84eb16
--- /dev/null
+++ b/extern/LuaBridge/detail/LuaHelpers.h
@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+/*
+  https://github.com/vinniefalco/LuaBridge
+  
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+  Copyright 2007, Nathan Reed
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+//==============================================================================
+
+// These are for Lua versions prior to 5.2.0.
+//
+#if LUA_VERSION_NUM < 502
+inline int lua_absindex (lua_State* L, int idx)
+{
+  if (idx > LUA_REGISTRYINDEX && idx < 0)
+    return lua_gettop (L) + idx + 1;
+  else
+    return idx;
+}
+
+inline void lua_rawgetp (lua_State* L, int idx, void const* p)
+{
+  idx = lua_absindex (L, idx);
+  lua_pushlightuserdata (L, const_cast <void*> (p));
+  lua_rawget (L,idx);
+}
+
+inline void lua_rawsetp (lua_State* L, int idx, void const* p)
+{
+  idx = lua_absindex (L, idx);
+  lua_pushlightuserdata (L, const_cast <void*> (p));
+  // put key behind value
+  lua_insert (L, -2);
+  lua_rawset (L, idx);
+}
+
+#define LUA_OPEQ 1
+#define LUA_OPLT 2
+#define LUA_OPLE 3
+
+inline int lua_compare (lua_State* L, int idx1, int idx2, int op)
+{
+  switch (op)
+  {
+  case LUA_OPEQ:
+    return lua_equal (L, idx1, idx2);
+    break;
+
+  case LUA_OPLT:
+    return lua_lessthan (L, idx1, idx2);
+    break;
+
+  case LUA_OPLE:
+    return lua_equal (L, idx1, idx2) || lua_lessthan (L, idx1, idx2);
+    break;
+
+  default:
+    return 0;
+  };
+}
+
+inline int get_length (lua_State* L, int idx)
+{
+  return int (lua_objlen (L, idx));
+}
+
+#else
+inline int get_length (lua_State* L, int idx)
+{
+  lua_len (L, idx);
+  int len = int (luaL_checknumber (L, -1));
+  lua_pop (L, 1);
+  return len;
+}
+
+#endif
+
+#ifndef LUA_OK
+# define LUABRIDGE_LUA_OK 0
+#else
+# define LUABRIDGE_LUA_OK LUA_OK
+#endif
+
+/** Get a table value, bypassing metamethods.
+*/  
+inline void rawgetfield (lua_State* L, int index, char const* key)
+{
+  assert (lua_istable (L, index));
+  index = lua_absindex (L, index);
+  lua_pushstring (L, key);
+  lua_rawget (L, index);
+}
+
+/** Set a table value, bypassing metamethods.
+*/  
+inline void rawsetfield (lua_State* L, int index, char const* key)
+{
+  assert (lua_istable (L, index));
+  index = lua_absindex (L, index);
+  lua_pushstring (L, key);
+  lua_insert (L, -2);
+  lua_rawset (L, index);
+}
+
+/** Returns true if the value is a full userdata (not light).
+*/
+inline bool isfulluserdata (lua_State* L, int index)
+{
+  return lua_isuserdata (L, index) && !lua_islightuserdata (L, index);
+}
+
+/** Test lua_State objects for global equality.
+
+    This can determine if two different lua_State objects really point
+    to the same global state, such as when using coroutines.
+
+    @note This is used for assertions.
+*/
+inline bool equalstates (lua_State* L1, lua_State* L2)
+{
+  return lua_topointer (L1, LUA_REGISTRYINDEX) ==
+         lua_topointer (L2, LUA_REGISTRYINDEX);
+}
diff --git a/extern/LuaBridge/detail/LuaRef.h b/extern/LuaBridge/detail/LuaRef.h
new file mode 100644
index 000000000..e726bcafe
--- /dev/null
+++ b/extern/LuaBridge/detail/LuaRef.h
@@ -0,0 +1,1215 @@
+//------------------------------------------------------------------------------
+/*
+  https://github.com/vinniefalco/LuaBridge
+  
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+  Copyright 2008, Nigel Atkinson <suprapilot+LuaCode@gmail.com>
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+//==============================================================================
+
+//------------------------------------------------------------------------------
+/**
+    Type tag for representing LUA_TNIL.
+
+    Construct one of these using `Nil()` to represent a Lua nil. This is faster
+    than creating a reference in the registry to nil. Example:
+
+        LuaRef t (LuaRef::createTable (L));
+        ...
+        t ["k"] = Nil(); // assign nil
+*/
+struct Nil
+{
+};
+
+//------------------------------------------------------------------------------
+/**
+    Lightweight reference to a Lua object.
+
+    The reference is maintained for the lifetime of the C++ object.
+*/
+class LuaRef
+{
+private:
+  class Proxy;
+  friend struct Stack <Proxy>;
+
+  //----------------------------------------------------------------------------
+  /**
+      Pop the Lua stack.
+
+      Pops the specified number of stack items on destruction. We use this
+      when returning objects, to avoid an explicit temporary variable, since
+      the destructor executes after the return statement. For example:
+
+          template <class U>
+          U cast (lua_State* L)
+          {
+            StackPop p (L, 1);
+            ...
+            return U (); // dtor called after this line
+          }
+
+      @note The `StackPop` object must always be a named local variable.
+  */
+  class StackPop
+  {
+  public:
+    /** Create a StackPop object.
+
+        @param count The number of stack entries to pop on destruction.
+    */
+    StackPop (lua_State* L, int count)
+      : m_L (L)
+      , m_count (count)
+    {
+    }
+
+    ~StackPop ()
+    {
+      lua_pop (m_L, m_count);
+    }
+
+  private:
+    lua_State* m_L;
+    int m_count;
+  };
+
+  //----------------------------------------------------------------------------
+  /**
+      A proxy for representing table values.
+  */
+  class Proxy
+  {
+  private:
+    lua_State* m_L;
+    int m_tableRef;
+    int m_keyRef;
+
+  public:
+    //--------------------------------------------------------------------------
+    /**
+        Construct a Proxy from a table value.
+
+        The table is in the registry, and the key is at the top of the stack.
+        The key is popped off the stack.
+    */
+    Proxy (lua_State* L, int tableRef)
+      : m_L (L)
+      , m_tableRef (tableRef)
+      , m_keyRef (luaL_ref (L, LUA_REGISTRYINDEX))
+    {
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Create a Proxy via copy constructor.
+
+        It is best to avoid code paths that invoke this, because it creates
+        an extra temporary Lua reference. Typically this is done by passing
+        the Proxy parameter as a `const` reference.
+    */
+    Proxy (Proxy const& other)
+      : m_L (other.m_L)
+      , m_tableRef (other.m_tableRef)
+    {
+      // If this assert goes off it means code is taking this path,
+      // which is better avoided.
+      //
+      assert (0);
+
+      lua_rawgeti (m_L, LUA_REGISTRYINDEX, other.m_keyRef);
+      m_keyRef = luaL_ref (m_L, LUA_REGISTRYINDEX);
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Destroy the proxy.
+
+        This does not destroy the table value.
+    */
+    ~Proxy ()
+    {
+      luaL_unref (m_L, LUA_REGISTRYINDEX, m_keyRef);
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Return a reference to the table value.
+    */
+    int createRef () const
+    {
+      push (m_L);
+      return luaL_ref (m_L, LUA_REGISTRYINDEX);
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Assign a new value to this table key.
+
+        This may invoke metamethods.
+    */
+    template <class T>
+    Proxy& operator= (T v)
+    {
+      StackPop p (m_L, 1);
+      lua_rawgeti (m_L, LUA_REGISTRYINDEX, m_tableRef);
+      lua_rawgeti (m_L, LUA_REGISTRYINDEX, m_keyRef);
+      Stack <T>::push (m_L, v);
+      lua_rawset (m_L, -3);
+      return *this;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Assign a new value to this table key.
+
+        The assignment is raw, no metamethods are invoked.
+    */
+    template <class T>
+    Proxy& rawset (T v)
+    {
+      StackPop p (m_L, 1);
+      lua_rawgeti (m_L, LUA_REGISTRYINDEX, m_tableRef);
+      lua_rawgeti (m_L, LUA_REGISTRYINDEX, m_keyRef);
+      Stack <T>::push (m_L, v);
+      lua_settable (m_L, -3);
+      return *this;
+    }
+
+    //==========================================================================
+    //
+    // This group of member functions mirrors the member functions in LuaRef.
+
+    /** Retrieve the lua_State associated with the table value.
+    */
+    lua_State* state () const
+    {
+      return m_L;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Push the value onto the Lua stack.
+    */
+    void push (lua_State* L) const
+    {
+      assert (equalstates (L, m_L));
+      lua_rawgeti (L, LUA_REGISTRYINDEX, m_tableRef);
+      lua_rawgeti (L, LUA_REGISTRYINDEX, m_keyRef);
+      lua_gettable (L, -2);
+      lua_remove (L, -2); // remove the table
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Determine the object type.
+
+        The return values are the same as for `lua_type`.
+    */
+    int type () const
+    {
+      int result;
+      push (m_L);
+      result = lua_type (m_L, -1);
+      lua_pop (m_L, 1);
+      return result;
+    }
+
+    inline bool isNil () const { return type () == LUA_TNIL; }
+    inline bool isNumber () const { return type () == LUA_TNUMBER; }
+    inline bool isString () const { return type () == LUA_TSTRING; }
+    inline bool isTable () const { return type () == LUA_TTABLE; }
+    inline bool isFunction () const { return type () == LUA_TFUNCTION; }
+    inline bool isUserdata () const { return type () == LUA_TUSERDATA; }
+    inline bool isThread () const { return type () == LUA_TTHREAD; }
+    inline bool isLightUserdata () const { return type () == LUA_TLIGHTUSERDATA; }
+
+    //--------------------------------------------------------------------------
+    /**
+        Perform an explicit conversion.
+    */
+    template <class T>
+    T cast () const
+    {
+      StackPop p (m_L, 1);
+      push (m_L);
+
+      // lua_gettop is used because Userdata::getClass() doesn't handle
+      // negative stack indexes.
+      //
+      return Stack <T>::get (m_L, lua_gettop (m_L));
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Universal implicit conversion operator.
+
+        NOTE: Visual Studio 2010 and 2012 have a bug where this function
+              is not used. See:
+
+        http://social.msdn.microsoft.com/Forums/en-US/vcgeneral/thread/e30b2664-a92d-445c-9db2-e8e0fbde2014
+        https://connect.microsoft.com/VisualStudio/feedback/details/771509/correct-code-doesnt-compile
+
+            // This code snippet fails to compile in vs2010,vs2012
+            struct S {
+              template <class T> inline operator T () const { return T (); }
+            };
+            int main () {
+              S () || false;
+              return 0;
+            }
+    */
+    template <class T>
+    inline operator T () const
+    {
+      return cast <T> ();
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Universal comparison operators.
+    */
+    /** @{ */
+    template <class T>
+    bool operator== (T rhs) const
+    {
+      StackPop p (m_L, 2);
+      push (m_L);
+      Stack <T>::push (m_L, rhs);
+      return lua_compare (m_L, -2, -1, LUA_OPEQ) == 1;
+    }
+
+    template <class T>
+    bool operator< (T rhs) const
+    {
+      StackPop p (m_L, 2);
+      push (m_L);
+      Stack <T>::push (m_L, rhs);
+      return lua_compare (m_L, -2, -1, LUA_OPLT) == 1;
+    }
+
+    template <class T>
+    bool operator<= (T rhs) const
+    {
+      StackPop p (m_L, 2);
+      push (m_L);
+      Stack <T>::push (m_L, rhs);
+      return lua_compare (m_L, -2, -1, LUA_OPLE) == 1;
+    }
+
+    template <class T>
+    bool operator> (T rhs) const
+    {
+      StackPop p (m_L, 2);
+      push (m_L);
+      Stack <T>::push (m_L, rhs);
+      return lua_compare (m_L, -1, -2, LUA_OPLT) == 1;
+    }
+
+    template <class T>
+    bool operator>= (T rhs) const
+    {
+      StackPop p (m_L, 2);
+      push (m_L);
+      Stack <T>::push (m_L, rhs);
+      return lua_compare (m_L, -1, -2, LUA_OPLE) == 1;
+    }
+
+    template <class T>
+    bool rawequal (T rhs) const
+    {
+      StackPop p (m_L, 2);
+      push (m_L);
+      Stack <T>::push (m_L, rhs);
+      return lua_rawequal (m_L, -1, -2) == 1;
+    }
+    /** @} */
+
+    //--------------------------------------------------------------------------
+    /**
+        Access a table value using a key.
+
+        This invokes metamethods.
+    */
+    template <class T>
+    Proxy operator[] (T key) const
+    {
+      return LuaRef (*this) [key];
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Access a table value using a key.
+
+        The operation is raw, metamethods are not invoked. The result is
+        passed by value and may not be modified.
+    */
+    template <class T>
+    LuaRef rawget (T key) const
+    {
+      StackPop (m_L, 1);
+      push (m_L);
+      Stack <T>::push (m_L, key);
+      lua_rawget (m_L, -2);
+      return LuaRef (m_L, FromStack ());
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Append a value to the table.
+
+        If the table is a sequence this will add another element to it.
+    */
+    template <class T>
+    void append (T v) const
+    {
+      push (m_L);
+      Stack <T>::push (m_L, v);
+      luaL_ref (m_L, -2);
+      lua_pop (m_L, 1);
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Call the length operator.
+
+        This is identical to applying the Lua # operator.
+    */
+    int length () const
+    {
+      StackPop p (m_L, 1);
+      push (m_L);
+      return get_length (m_L, -1);
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Call Lua code.
+
+        These overloads allow Lua code to be called with up to 8 parameters.
+        The return value is provided as a LuaRef (which may be LUA_REFNIL).
+        If an error occurs, a LuaException is thrown.
+    */
+    /** @{ */
+    LuaRef const operator() () const
+    {
+      push (m_L);
+      LuaException::pcall (m_L, 0, 1);
+      return LuaRef (m_L, FromStack ());
+    }
+
+    template <class P1>
+    LuaRef const operator() (P1 p1) const
+    {
+      push (m_L);
+      Stack <P1>::push (m_L, p1);
+      LuaException::pcall (m_L, 1, 1);
+      return LuaRef (m_L, FromStack ());
+    }
+
+    template <class P1, class P2>
+    LuaRef const operator() (P1 p1, P2 p2) const
+    {
+      push (m_L);
+      Stack <P1>::push (m_L, p1);
+      Stack <P2>::push (m_L, p2);
+      LuaException::pcall (m_L, 2, 1);
+      return LuaRef (m_L, FromStack ());
+    }
+
+    template <class P1, class P2, class P3>
+    LuaRef const operator() (P1 p1, P2 p2, P3 p3) const
+    {
+      push (m_L);
+      Stack <P1>::push (m_L, p1);
+      Stack <P2>::push (m_L, p2);
+      Stack <P3>::push (m_L, p3);
+      LuaException::pcall (m_L, 3, 1);
+      return LuaRef (m_L, FromStack ());
+    }
+
+    template <class P1, class P2, class P3, class P4>
+    LuaRef const operator() (P1 p1, P2 p2, P3 p3, P4 p4) const
+    {
+      push (m_L);
+      Stack <P1>::push (m_L, p1);
+      Stack <P2>::push (m_L, p2);
+      Stack <P3>::push (m_L, p3);
+      Stack <P4>::push (m_L, p4);
+      LuaException::pcall (m_L, 4, 1);
+      return LuaRef (m_L, FromStack ());
+    }
+
+    template <class P1, class P2, class P3, class P4, class P5>
+    LuaRef const operator() (P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) const
+    {
+      push (m_L);
+      Stack <P1>::push (m_L, p1);
+      Stack <P2>::push (m_L, p2);
+      Stack <P3>::push (m_L, p3);
+      Stack <P4>::push (m_L, p4);
+      Stack <P5>::push (m_L, p5);
+      LuaException::pcall (m_L, 5, 1);
+      return LuaRef (m_L, FromStack ());
+    }
+
+    template <class P1, class P2, class P3, class P4, class P5, class P6>
+    LuaRef const operator() (P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) const
+    {
+      push (m_L);
+      Stack <P1>::push (m_L, p1);
+      Stack <P2>::push (m_L, p2);
+      Stack <P3>::push (m_L, p3);
+      Stack <P4>::push (m_L, p4);
+      Stack <P5>::push (m_L, p5);
+      Stack <P6>::push (m_L, p6);
+      LuaException::pcall (m_L, 6, 1);
+      return LuaRef (m_L, FromStack ());
+    }
+
+    template <class P1, class P2, class P3, class P4, class P5, class P6, class P7>
+    LuaRef const operator() (P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7) const
+    {
+      push (m_L);
+      Stack <P1>::push (m_L, p1);
+      Stack <P2>::push (m_L, p2);
+      Stack <P3>::push (m_L, p3);
+      Stack <P4>::push (m_L, p4);
+      Stack <P5>::push (m_L, p5);
+      Stack <P6>::push (m_L, p6);
+      Stack <P7>::push (m_L, p7);
+      LuaException::pcall (m_L, 7, 1);
+      return LuaRef (m_L, FromStack ());
+    }
+
+    template <class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8>
+    LuaRef const operator() (P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8) const
+    {
+      push (m_L);
+      Stack <P1>::push (m_L, p1);
+      Stack <P2>::push (m_L, p2);
+      Stack <P3>::push (m_L, p3);
+      Stack <P4>::push (m_L, p4);
+      Stack <P5>::push (m_L, p5);
+      Stack <P6>::push (m_L, p6);
+      Stack <P7>::push (m_L, p7);
+      Stack <P8>::push (m_L, p8);
+      LuaException::pcall (m_L, 8, 1);
+      return LuaRef (m_L, FromStack ());
+    }
+    /** @} */
+
+    //==========================================================================
+  };
+
+private:
+  friend struct Stack <LuaRef>;
+
+  //----------------------------------------------------------------------------
+  /**
+      Type tag for stack construction.
+  */
+  struct FromStack { };
+
+  //----------------------------------------------------------------------------
+  /**
+      Create a reference to an object at the top of the Lua stack and pop it.
+
+      This constructor is private and not invoked directly.
+      Instead, use the `fromStack` function.
+
+      @note The object is popped.
+  */
+  LuaRef (lua_State* L, FromStack)
+    : m_L (L)
+  {
+    m_ref = luaL_ref (m_L, LUA_REGISTRYINDEX);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Create a reference to an object on the Lua stack.
+
+      This constructor is private and not invoked directly.
+      Instead, use the `fromStack` function.
+
+      @note The object is not popped.
+  */
+  LuaRef (lua_State* L, int index, FromStack)
+    : m_L (L)
+  {
+    lua_pushvalue (m_L, index);
+    m_ref = luaL_ref (m_L, LUA_REGISTRYINDEX);
+  }
+
+  //----------------------------------------------------------------------------
+
+  // This type of construction is disallowed, since we don't have a `lua_State`.
+  //
+  template <class T>
+  LuaRef (T)
+  {
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Create a reference to this ref.
+
+      This is used internally.
+  */
+  int createRef () const
+  {
+    if (m_ref != LUA_REFNIL)
+    {
+      push (m_L);
+      return luaL_ref (m_L, LUA_REGISTRYINDEX);
+    }
+    else
+    {
+      return LUA_REFNIL;
+    }
+  }
+
+public:
+  //----------------------------------------------------------------------------
+  /**
+      Create a nil reference.
+
+      The LuaRef may be assigned later.
+  */
+  LuaRef (lua_State* L)
+    : m_L (L)
+    , m_ref (LUA_REFNIL)
+  {
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Create a reference to a value.
+  */
+  template <class T>
+  LuaRef (lua_State* L, T v)
+    : m_L (L)
+  {
+    Stack <T>::push (m_L, v);
+    m_ref = luaL_ref (m_L, LUA_REGISTRYINDEX);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Create a reference to a table value.
+  */
+  LuaRef (Proxy const& v)
+    : m_L (v.state ())
+    , m_ref (v.createRef ())
+  {
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Create a new reference to an existing reference.
+  */
+  LuaRef (LuaRef const& other)
+    : m_L (other.m_L)
+    , m_ref (other.createRef ())
+  {
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Destroy a reference.
+
+      The corresponding Lua registry reference will be released.
+
+      @note If the state refers to a thread, it is the responsibility of the
+            caller to ensure that the thread still exists when the LuaRef
+            is destroyed.
+  */
+  ~LuaRef ()
+  {
+    luaL_unref (m_L, LUA_REGISTRYINDEX, m_ref);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Return a LuaRef from a stack item.
+
+      The stack item is not popped.
+  */
+  static LuaRef fromStack (lua_State* L, int index)
+  {
+    lua_pushvalue (L, index);
+    return LuaRef (L, FromStack ());
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Create a new empty table and return a reference to it.
+
+      It is also possible to use the free function `newTable`.
+
+      @see ::getGlobal
+  */
+  static LuaRef newTable (lua_State* L)
+  {
+    lua_newtable (L);
+    return LuaRef (L, FromStack ());
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Return a reference to a named global.
+
+      It is also possible to use the free function `getGlobal`.
+
+      @see ::getGlobal
+  */
+  static LuaRef getGlobal (lua_State *L, char const* name)
+  {
+    lua_getglobal (L, name);
+    return LuaRef (L, FromStack ());
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Assign a different value to this LuaRef.
+  */
+  template <class T>
+  LuaRef& operator= (T rhs)
+  {
+    luaL_unref (m_L, LUA_REGISTRYINDEX, m_ref);
+    Stack <T>::push (m_L, rhs);
+    m_ref = luaL_ref (m_L, LUA_REGISTRYINDEX);
+    return *this;
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Assign another LuaRef to this LuaRef.
+  */
+  LuaRef& operator= (LuaRef const& rhs)
+  {
+    luaL_unref (m_L, LUA_REGISTRYINDEX, m_ref);
+    rhs.push (m_L);
+    m_L = rhs.state ();
+    m_ref = luaL_ref (m_L, LUA_REGISTRYINDEX);
+    return *this;
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      converts to a string using luas tostring function
+  */
+  std::string tostring() const
+  {
+    lua_getglobal (m_L, "tostring");
+    push (m_L);
+    lua_call (m_L, 1, 1);
+    const char* str = lua_tostring(m_L, 1);
+    lua_pop(m_L, 1);
+    return std::string(str);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Print a text description of the value to a stream.
+
+      This is used for diagnostics.
+  */
+  void print (std::ostream& os) const
+  {
+    switch (type ())
+    {
+    case LUA_TNIL:
+      os << "nil";
+      break;
+
+    case LUA_TNUMBER:
+      os << cast <lua_Number> ();
+      break;
+
+    case LUA_TBOOLEAN:
+      os << (cast <bool> () ? "true" : "false");
+      break;
+
+    case LUA_TSTRING:
+      os << '"' << cast <std::string> () << '"';
+      break;
+
+    case LUA_TTABLE:
+      os << "table: " << tostring();
+      break;
+
+    case LUA_TFUNCTION:
+      os << "function: " << tostring();
+      break;
+
+    case LUA_TUSERDATA:
+      os << "userdata: " << tostring();
+      break;
+
+    case LUA_TTHREAD:
+      os << "thread: " << tostring();
+      break;
+
+    case LUA_TLIGHTUSERDATA:
+      os << "lightuserdata: " << tostring();
+      break;
+
+    default:
+      os << "unknown";
+      break;
+    }
+  }
+
+  //============================================================================
+  //
+  // This group of member functions is mirrored in Proxy
+  //
+
+  /** Retrieve the lua_State associated with the reference.
+  */
+  lua_State* state () const
+  {
+    return m_L;
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Place the object onto the Lua stack.
+  */
+  void push (lua_State* L) const
+  {
+    assert (equalstates (L, m_L));
+    lua_rawgeti (L, LUA_REGISTRYINDEX, m_ref);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Pop the top of Lua stack and assign the ref to m_ref
+  */
+  void pop (lua_State* L)
+  {
+    assert (equalstates (L, m_L));
+    luaL_unref (m_L, LUA_REGISTRYINDEX, m_ref);
+    m_ref = luaL_ref (m_L, LUA_REGISTRYINDEX);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Determine the object type.
+
+      The return values are the same as for `lua_type`.
+  */
+  /** @{ */
+  int type () const
+  {
+    int result;
+    if (m_ref != LUA_REFNIL)
+    {
+      push (m_L);
+      result = lua_type (m_L, -1);
+      lua_pop (m_L, 1);
+    }
+    else
+    {
+      result = LUA_TNIL;
+    }
+
+    return result;
+  }
+
+  // should never happen
+  //inline bool isNone () const { return m_ref == LUA_NOREF; }
+
+  inline bool isNil () const { return type () == LUA_TNIL; }
+  inline bool isNumber () const { return type () == LUA_TNUMBER; }
+  inline bool isString () const { return type () == LUA_TSTRING; }
+  inline bool isTable () const { return type () == LUA_TTABLE; }
+  inline bool isFunction () const { return type () == LUA_TFUNCTION; }
+  inline bool isUserdata () const { return type () == LUA_TUSERDATA; }
+  inline bool isThread () const { return type () == LUA_TTHREAD; }
+  inline bool isLightUserdata () const { return type () == LUA_TLIGHTUSERDATA; }
+  /** @} */
+
+  //----------------------------------------------------------------------------
+  /**
+      Perform an explicit conversion.
+  */
+  template <class T>
+  T cast () const
+  {
+    StackPop p (m_L, 1);
+    push (m_L);
+
+    // lua_gettop is used because Userdata::getClass() doesn't handle
+    // negative stack indexes.
+    //
+    return Stack <T>::get (m_L, lua_gettop (m_L));
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Universal implicit conversion operator.
+
+      NOTE: Visual Studio 2010 and 2012 have a bug where this function
+            is not used. See:
+
+      http://social.msdn.microsoft.com/Forums/en-US/vcgeneral/thread/e30b2664-a92d-445c-9db2-e8e0fbde2014
+      https://connect.microsoft.com/VisualStudio/feedback/details/771509/correct-code-doesnt-compile
+
+          // This code snippet fails to compile in vs2010,vs2012
+          struct S {
+            template <class T> inline operator T () const { return T (); }
+          };
+          int main () {
+            S () || false;
+            return 0;
+          }
+  */
+  template <class T>
+  inline operator T () const
+  {
+    return cast <T> ();
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Universal comparison operators.
+  */
+  /** @{ */
+  template <class T>
+  bool operator== (T rhs) const
+  {
+    StackPop p (m_L, 2);
+    push (m_L);
+    Stack <T>::push (m_L, rhs);
+    return lua_compare (m_L, -2, -1, LUA_OPEQ) == 1;
+  }
+
+  template <class T>
+  bool operator< (T rhs) const
+  {
+    StackPop p (m_L, 2);
+    push (m_L);
+    Stack <T>::push (m_L, rhs);
+    return lua_compare (m_L, -2, -1, LUA_OPLT) == 1;
+  }
+
+  template <class T>
+  bool operator<= (T rhs) const
+  {
+    StackPop p (m_L, 2);
+    push (m_L);
+    Stack <T>::push (m_L, rhs);
+    return lua_compare (m_L, -2, -1, LUA_OPLE) == 1;
+  }
+
+  template <class T>
+  bool operator> (T rhs) const
+  {
+    StackPop p (m_L, 2);
+    push (m_L);
+    Stack <T>::push (m_L, rhs);
+    return lua_compare (m_L, -1, -2, LUA_OPLT) == 1;
+  }
+
+  template <class T>
+  bool operator>= (T rhs) const
+  {
+    StackPop p (m_L, 2);
+    push (m_L);
+    Stack <T>::push (m_L, rhs);
+    return lua_compare (m_L, -1, -2, LUA_OPLE) == 1;
+  }
+
+  template <class T>
+  bool rawequal (T rhs) const
+  {
+    StackPop p (m_L, 2);
+    push (m_L);
+    Stack <T>::push (m_L, rhs);
+    return lua_rawequal (m_L, -1, -2) == 1;
+  }
+  /** @} */
+
+  //----------------------------------------------------------------------------
+  /**
+      Append a value to the table.
+
+      If the table is a sequence this will add another element to it.
+  */
+  template <class T>
+  void append (T v) const
+  {
+    push (m_L);
+    Stack <T>::push (m_L, v);
+    luaL_ref (m_L, -2);
+    lua_pop (m_L, 1);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Call the length operator.
+
+      This is identical to applying the Lua # operator.
+  */
+  int length () const
+  {
+    StackPop p (m_L, 1);
+    push (m_L);
+    return get_length (m_L, -1);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Access a table value using a key.
+
+      This invokes metamethods.
+  */
+  template <class T>
+  Proxy operator[] (T key) const
+  {
+    Stack <T>::push (m_L, key);
+    return Proxy (m_L, m_ref);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Call Lua code.
+
+      These overloads allow Lua code to be called with up to 8 parameters.
+      The return value is provided as a LuaRef (which may be LUA_REFNIL).
+      If an error occurs, a LuaException is thrown.
+  */
+  /** @{ */
+  LuaRef const operator() () const
+  {
+    push (m_L);
+    LuaException::pcall (m_L, 0, 1);
+    return LuaRef (m_L, FromStack ());
+  }
+
+  template <class P1>
+  LuaRef const operator() (P1 p1) const
+  {
+    push (m_L);
+    Stack <P1>::push (m_L, p1);
+    LuaException::pcall (m_L, 1, 1);
+    return LuaRef (m_L, FromStack ());
+  }
+
+  template <class P1, class P2>
+  LuaRef const operator() (P1 p1, P2 p2) const
+  {
+    push (m_L);
+    Stack <P1>::push (m_L, p1);
+    Stack <P2>::push (m_L, p2);
+    LuaException::pcall (m_L, 2, 1);
+    return LuaRef (m_L, FromStack ());
+  }
+
+  template <class P1, class P2, class P3>
+  LuaRef const operator() (P1 p1, P2 p2, P3 p3) const
+  {
+    push (m_L);
+    Stack <P1>::push (m_L, p1);
+    Stack <P2>::push (m_L, p2);
+    Stack <P3>::push (m_L, p3);
+    LuaException::pcall (m_L, 3, 1);
+    return LuaRef (m_L, FromStack ());
+  }
+
+  template <class P1, class P2, class P3, class P4>
+  LuaRef const operator() (P1 p1, P2 p2, P3 p3, P4 p4) const
+  {
+    push (m_L);
+    Stack <P1>::push (m_L, p1);
+    Stack <P2>::push (m_L, p2);
+    Stack <P3>::push (m_L, p3);
+    Stack <P4>::push (m_L, p4);
+    LuaException::pcall (m_L, 4, 1);
+    return LuaRef (m_L, FromStack ());
+  }
+
+  template <class P1, class P2, class P3, class P4, class P5>
+  LuaRef const operator() (P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) const
+  {
+    push (m_L);
+    Stack <P1>::push (m_L, p1);
+    Stack <P2>::push (m_L, p2);
+    Stack <P3>::push (m_L, p3);
+    Stack <P4>::push (m_L, p4);
+    Stack <P5>::push (m_L, p5);
+    LuaException::pcall (m_L, 5, 1);
+    return LuaRef (m_L, FromStack ());
+  }
+
+  template <class P1, class P2, class P3, class P4, class P5, class P6>
+  LuaRef const operator() (P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) const
+  {
+    push (m_L);
+    Stack <P1>::push (m_L, p1);
+    Stack <P2>::push (m_L, p2);
+    Stack <P3>::push (m_L, p3);
+    Stack <P4>::push (m_L, p4);
+    Stack <P5>::push (m_L, p5);
+    Stack <P6>::push (m_L, p6);
+    LuaException::pcall (m_L, 6, 1);
+    return LuaRef (m_L, FromStack ());
+  }
+
+  template <class P1, class P2, class P3, class P4, class P5, class P6, class P7>
+  LuaRef const operator() (P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7) const
+  {
+    push (m_L);
+    Stack <P1>::push (m_L, p1);
+    Stack <P2>::push (m_L, p2);
+    Stack <P3>::push (m_L, p3);
+    Stack <P4>::push (m_L, p4);
+    Stack <P5>::push (m_L, p5);
+    Stack <P6>::push (m_L, p6);
+    Stack <P7>::push (m_L, p7);
+    LuaException::pcall (m_L, 7, 1);
+    return LuaRef (m_L, FromStack ());
+  }
+
+  template <class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8>
+  LuaRef const operator() (P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8) const
+  {
+    push (m_L);
+    Stack <P1>::push (m_L, p1);
+    Stack <P2>::push (m_L, p2);
+    Stack <P3>::push (m_L, p3);
+    Stack <P4>::push (m_L, p4);
+    Stack <P5>::push (m_L, p5);
+    Stack <P6>::push (m_L, p6);
+    Stack <P7>::push (m_L, p7);
+    Stack <P8>::push (m_L, p8);
+    LuaException::pcall (m_L, 8, 1);
+    return LuaRef (m_L, FromStack ());
+  }
+  /** @} */
+
+  //============================================================================
+
+private:
+  lua_State* m_L;
+  int m_ref;
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for Nil
+*/
+template <>
+struct Stack <Nil>
+{
+public:
+  static inline void push (lua_State* L, Nil)
+  {
+    lua_pushnil (L);
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for LuaRef.
+*/
+template <>
+struct Stack <LuaRef>
+{
+public:
+  // The value is const& to prevent a copy construction.
+  //
+  static inline void push (lua_State* L, LuaRef const& v)
+  {
+    v.push (L);
+  }
+
+  static inline LuaRef get (lua_State* L, int index)
+  {
+    return LuaRef (L, index, LuaRef::FromStack ());
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for Proxy.
+*/
+template <>
+struct Stack <LuaRef::Proxy>
+{
+public:
+  // The value is const& to prevent a copy construction.
+  //
+  static inline void push (lua_State* L, LuaRef::Proxy const& v)
+  {
+    v.push (L);
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Create a reference to a new, empty table.
+
+    This is a syntactic abbreviation for LuaRef::newTable().
+*/
+inline LuaRef newTable (lua_State* L)
+{
+  return LuaRef::newTable (L);
+}
+
+//------------------------------------------------------------------------------
+/**
+    Create a reference to a value in the global table.
+
+    This is a syntactic abbreviation for LuaRef::getGlobal().
+*/
+inline LuaRef getGlobal (lua_State *L, char const* name)
+{
+  return LuaRef::getGlobal (L, name);
+}
+
+//------------------------------------------------------------------------------
+/**
+    Write a LuaRef to a stream.
+
+    This allows LuaRef and table proxies to work with streams.
+*/
+inline std::ostream& operator<< (std::ostream& os, LuaRef const& ref)
+{
+  ref.print (os);
+  return os;
+}
+
+//------------------------------------------------------------------------------
+
+// more C++-like cast syntax
+//
+template<class T>
+inline T LuaRef_cast(LuaRef const& lr)
+{
+  return lr.cast<T>();
+}
diff --git a/extern/LuaBridge/detail/Namespace.h b/extern/LuaBridge/detail/Namespace.h
new file mode 100644
index 000000000..ff22e6b09
--- /dev/null
+++ b/extern/LuaBridge/detail/Namespace.h
@@ -0,0 +1,1136 @@
+//------------------------------------------------------------------------------
+/*
+  https://github.com/vinniefalco/LuaBridge
+  
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+  Copyright 2007, Nathan Reed
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+//==============================================================================
+
+/** Provides C++ to Lua registration capabilities.
+
+    This class is not instantiated directly, call `getGlobalNamespace` to start
+    the registration process.
+*/
+class Namespace
+{
+private:
+  Namespace& operator= (Namespace const& other);
+
+  lua_State* const L;
+  int mutable m_stackSize;
+
+private:
+  //============================================================================
+  /**
+    Error reporting.
+
+    VF: This function looks handy, why aren't we using it?
+  */
+#if 0
+  static int luaError (lua_State* L, std::string message)
+  {
+    assert (lua_isstring (L, lua_upvalueindex (1)));
+    std::string s;
+
+    // Get information on the caller's caller to format the message,
+    // so the error appears to originate from the Lua source.
+    lua_Debug ar;
+    int result = lua_getstack (L, 2, &ar);
+    if (result != 0)
+    {
+      lua_getinfo (L, "Sl", &ar);
+      s = ar.short_src;
+      if (ar.currentline != -1)
+      {
+        // poor mans int to string to avoid <strstrream>.
+        lua_pushnumber (L, ar.currentline);
+        s = s + ":" + lua_tostring (L, -1) + ": ";
+        lua_pop (L, 1);
+      }
+    }
+
+    s = s + message;
+
+    return luaL_error (L, s.c_str ());
+  }
+#endif
+
+  //----------------------------------------------------------------------------
+  /**
+    Pop the Lua stack.
+  */
+  void pop (int n) const
+  {
+    if (m_stackSize >= n && lua_gettop (L) >= n)
+    {
+      lua_pop (L, n);
+      m_stackSize -= n;
+    }
+    else
+    {
+      throw std::logic_error ("invalid stack");
+    }
+  }
+
+private:
+  /**
+    Factored base to reduce template instantiations.
+  */
+  class ClassBase
+  {
+  private:
+    ClassBase& operator= (ClassBase const& other);
+
+  protected:
+    friend class Namespace;
+
+    lua_State* const L;
+    int mutable m_stackSize;
+
+  protected:
+    //--------------------------------------------------------------------------
+    /**
+      __index metamethod for a class.
+
+      This implements member functions, data members, and property members.
+      Functions are stored in the metatable and const metatable. Data members
+      and property members are in the __propget table.
+
+      If the key is not found, the search proceeds up the hierarchy of base
+      classes.
+    */
+    static int indexMetaMethod (lua_State* L)
+    {
+      int result = 0;
+
+      assert (lua_isuserdata (L, 1));               // warn on security bypass
+      lua_getmetatable (L, 1);                      // get metatable for object
+      for (;;)
+      {
+        lua_pushvalue (L, 2);                       // push key arg2
+        lua_rawget (L, -2);                         // lookup key in metatable
+        if (lua_iscfunction (L, -1))                // ensure its a cfunction
+        {
+          lua_remove (L, -2);                       // remove metatable
+          result = 1;
+          break;
+        }
+        else if (lua_isnil (L, -1))
+        {
+          lua_pop (L, 1);
+        }
+        else
+        {
+          lua_pop (L, 2);
+          throw std::logic_error ("not a cfunction");
+        }
+
+        rawgetfield (L, -1, "__propget");           // get __propget table
+        if (lua_istable (L, -1))                    // ensure it is a table
+        {
+          lua_pushvalue (L, 2);                     // push key arg2
+          lua_rawget (L, -2);                       // lookup key in __propget
+          lua_remove (L, -2);                       // remove __propget
+          if (lua_iscfunction (L, -1))              // ensure its a cfunction
+          {
+            lua_remove (L, -2);                     // remove metatable
+            lua_pushvalue (L, 1);                   // push class arg1
+            lua_call (L, 1, 1);
+            result = 1;
+            break;
+          }
+          else if (lua_isnil (L, -1))
+          {
+            lua_pop (L, 1);
+          }
+          else
+          {
+            lua_pop (L, 2);
+
+            // We only put cfunctions into __propget.
+            throw std::logic_error ("not a cfunction");
+          }
+        }
+        else
+        {
+          lua_pop (L, 2);
+
+          // __propget is missing, or not a table.
+          throw std::logic_error ("missing __propget table");
+        }
+
+        // Repeat the lookup in the __parent metafield,
+        // or return nil if the field doesn't exist.
+        rawgetfield (L, -1, "__parent");
+        if (lua_istable (L, -1))
+        {
+          // Remove metatable and repeat the search in __parent.
+          lua_remove (L, -2);
+        }
+        else if (lua_isnil (L, -1))
+        {
+          result = 1;
+          break;
+        }
+        else
+        {
+          lua_pop (L, 2);
+
+          throw std::logic_error ("__parent is not a table");
+        }
+      }
+
+      return result;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      __newindex metamethod for classes.
+
+      This supports writable variables and properties on class objects. The
+      corresponding object is passed in the first parameter to the set function.
+    */
+    static int newindexMetaMethod (lua_State* L)
+    {
+      int result = 0;
+
+      lua_getmetatable (L, 1);
+
+      for (;;)
+      {
+        // Check __propset
+        rawgetfield (L, -1, "__propset");
+        if (!lua_isnil (L, -1))
+        {
+          lua_pushvalue (L, 2);
+          lua_rawget (L, -2);
+          if (!lua_isnil (L, -1))
+          {
+            // found it, call the setFunction.
+            assert (lua_isfunction (L, -1));
+            lua_pushvalue (L, 1);
+            lua_pushvalue (L, 3);
+            lua_call (L, 2, 0);
+            result = 0;
+            break;
+          }
+          lua_pop (L, 1);
+        }
+        lua_pop (L, 1);
+
+        // Repeat the lookup in the __parent metafield.
+        rawgetfield (L, -1, "__parent");
+        if (lua_isnil (L, -1))
+        {
+          // Either the property or __parent must exist.
+          result = luaL_error (L,
+            "no member named '%s'", lua_tostring (L, 2));
+        }
+        lua_remove (L, -2);
+      }
+
+      return result;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      Create the const table.
+    */
+    void createConstTable (char const* name)
+    {
+      lua_newtable (L);
+      lua_pushvalue (L, -1);
+      lua_setmetatable (L, -2);
+      lua_pushboolean (L, 1);
+      lua_rawsetp (L, -2, getIdentityKey ());
+      lua_pushstring (L, (std::string ("const ") + name).c_str ());
+      rawsetfield (L, -2, "__type");
+      lua_pushcfunction (L, &indexMetaMethod);
+      rawsetfield (L, -2, "__index");
+      lua_pushcfunction (L, &newindexMetaMethod);
+      rawsetfield (L, -2, "__newindex");
+      lua_newtable (L);
+      rawsetfield (L, -2, "__propget");
+      
+      if (Security::hideMetatables ())
+      {
+        lua_pushnil (L);
+        rawsetfield (L, -2, "__metatable");
+      }
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      Create the class table.
+
+      The Lua stack should have the const table on top.
+    */
+    void createClassTable (char const* name)
+    {
+      lua_newtable (L);
+      lua_pushvalue (L, -1);
+      lua_setmetatable (L, -2);
+      lua_pushboolean (L, 1);
+      lua_rawsetp (L, -2, getIdentityKey ());
+      lua_pushstring (L, name);
+      rawsetfield (L, -2, "__type");
+      lua_pushcfunction (L, &indexMetaMethod);
+      rawsetfield (L, -2, "__index");
+      lua_pushcfunction (L, &newindexMetaMethod);
+      rawsetfield (L, -2, "__newindex");
+      lua_newtable (L);
+      rawsetfield (L, -2, "__propget");
+      lua_newtable (L);
+      rawsetfield (L, -2, "__propset");
+
+      lua_pushvalue (L, -2);
+      rawsetfield (L, -2, "__const"); // point to const table
+
+      lua_pushvalue (L, -1);
+      rawsetfield (L, -3, "__class"); // point const table to class table
+
+      if (Security::hideMetatables ())
+      {
+        lua_pushnil (L);
+        rawsetfield (L, -2, "__metatable");
+      }
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      Create the static table.
+
+      The Lua stack should have:
+        -1 class table
+        -2 const table
+        -3 enclosing namespace
+    */
+    void createStaticTable (char const* name)
+    {
+      lua_newtable (L);
+      lua_newtable (L);
+      lua_pushvalue (L, -1);
+      lua_setmetatable (L, -3);
+      lua_insert (L, -2);
+      rawsetfield (L, -5, name);
+
+#if 0
+      lua_pushlightuserdata (L, this);
+      lua_pushcclosure (L, &tostringMetaMethod, 1);
+      rawsetfield (L, -2, "__tostring");
+#endif
+      lua_pushcfunction (L, &CFunc::indexMetaMethod);
+      rawsetfield (L, -2, "__index");
+      lua_pushcfunction (L, &CFunc::newindexMetaMethod);
+      rawsetfield (L, -2, "__newindex");
+      lua_newtable (L);
+      rawsetfield (L, -2, "__propget");
+      lua_newtable (L);
+      rawsetfield (L, -2, "__propset");
+
+      lua_pushvalue (L, -2);
+      rawsetfield (L, -2, "__class"); // point to class table
+
+      if (Security::hideMetatables ())
+      {
+        lua_pushnil (L);
+        rawsetfield (L, -2, "__metatable");
+      }
+    }
+
+    //==========================================================================
+    /**
+      lua_CFunction to construct a class object wrapped in a container.
+    */
+    template <class Params, class C>
+    static int ctorContainerProxy (lua_State* L)
+    {
+      typedef typename ContainerTraits <C>::Type T;
+      ArgList <Params, 2> args (L);
+      T* const p = Constructor <T, Params>::call (args);
+      UserdataSharedHelper <C, false>::push (L, p);
+      return 1;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      lua_CFunction to construct a class object in-place in the userdata.
+    */
+    template <class Params, class T>
+    static int ctorPlacementProxy (lua_State* L)
+    {
+      ArgList <Params, 2> args (L);
+      Constructor <T, Params>::call (UserdataValue <T>::place (L), args);
+      return 1;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      Pop the Lua stack.
+    */
+    void pop (int n) const
+    {
+      if (m_stackSize >= n && lua_gettop (L) >= n)
+      {
+        lua_pop (L, n);
+        m_stackSize -= n;
+      }
+      else
+      {
+        throw std::logic_error ("invalid stack");
+      }
+    }
+
+  public:
+    //--------------------------------------------------------------------------
+    explicit ClassBase (lua_State* L_)
+      : L (L_)
+      , m_stackSize (0)
+    {
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      Copy Constructor.
+    */
+    ClassBase (ClassBase const& other)
+      : L (other.L)
+      , m_stackSize (0)
+    {
+      m_stackSize = other.m_stackSize;
+      other.m_stackSize = 0;
+    }
+
+    ~ClassBase ()
+    {
+      pop (m_stackSize);
+    }
+  };
+
+  //============================================================================
+  //
+  // Class
+  //
+  //============================================================================
+  /**
+    Provides a class registration in a lua_State.
+
+    After contstruction the Lua stack holds these objects:
+      -1 static table
+      -2 class table
+      -3 const table
+      -4 (enclosing namespace)
+  */
+  template <class T>
+  class Class : public ClassBase
+  {
+  public:
+    //==========================================================================
+    /**
+      Register a new class or add to an existing class registration.
+    */
+    Class (char const* name, Namespace const* parent) : ClassBase (parent->L)
+    {
+      m_stackSize = parent->m_stackSize + 3;
+      parent->m_stackSize = 0;
+
+      assert (lua_istable (L, -1));
+      rawgetfield (L, -1, name);
+      
+      if (lua_isnil (L, -1))
+      {
+        lua_pop (L, 1);
+
+        createConstTable (name);
+        lua_pushcfunction (L, &CFunc::gcMetaMethod <T>);
+        rawsetfield (L, -2, "__gc");
+
+        createClassTable (name);
+        lua_pushcfunction (L, &CFunc::gcMetaMethod <T>);
+        rawsetfield (L, -2, "__gc");
+
+        createStaticTable (name);
+
+        // Map T back to its tables.
+        lua_pushvalue (L, -1);
+        lua_rawsetp (L, LUA_REGISTRYINDEX, ClassInfo <T>::getStaticKey ());
+        lua_pushvalue (L, -2);
+        lua_rawsetp (L, LUA_REGISTRYINDEX, ClassInfo <T>::getClassKey ());
+        lua_pushvalue (L, -3);
+        lua_rawsetp (L, LUA_REGISTRYINDEX, ClassInfo <T>::getConstKey ());
+      }
+      else
+      {
+        rawgetfield (L, -1, "__class");
+        rawgetfield (L, -1, "__const");
+
+        // Reverse the top 3 stack elements
+        lua_insert (L, -3);
+        lua_insert (L, -2);
+      }
+    }
+
+    //==========================================================================
+    /**
+      Derive a new class.
+    */
+    Class (char const* name, Namespace const* parent, void const* const staticKey)
+      : ClassBase (parent->L)
+    {
+      m_stackSize = parent->m_stackSize + 3;
+      parent->m_stackSize = 0;
+
+      assert (lua_istable (L, -1));
+
+      createConstTable (name);
+      lua_pushcfunction (L, &CFunc::gcMetaMethod <T>);
+      rawsetfield (L, -2, "__gc");
+
+      createClassTable (name);
+      lua_pushcfunction (L, &CFunc::gcMetaMethod <T>);
+      rawsetfield (L, -2, "__gc");
+
+      createStaticTable (name);
+
+      lua_rawgetp (L, LUA_REGISTRYINDEX, staticKey);
+      assert (lua_istable (L, -1));
+      rawgetfield (L, -1, "__class");
+      assert (lua_istable (L, -1));
+      rawgetfield (L, -1, "__const");
+      assert (lua_istable (L, -1));
+
+      rawsetfield (L, -6, "__parent");
+      rawsetfield (L, -4, "__parent");
+      rawsetfield (L, -2, "__parent");
+
+      lua_pushvalue (L, -1);
+      lua_rawsetp (L, LUA_REGISTRYINDEX, ClassInfo <T>::getStaticKey ());
+      lua_pushvalue (L, -2);
+      lua_rawsetp (L, LUA_REGISTRYINDEX, ClassInfo <T>::getClassKey ());
+      lua_pushvalue (L, -3);
+      lua_rawsetp (L, LUA_REGISTRYINDEX, ClassInfo <T>::getConstKey ());
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      Continue registration in the enclosing namespace.
+    */
+    Namespace endClass ()
+    {
+      return Namespace (this);
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      Add or replace a static data member.
+    */
+    template <class U>
+    Class <T>& addStaticData (char const* name, U* pu, bool isWritable = true)
+    {
+      assert (lua_istable (L, -1));
+
+      rawgetfield (L, -1, "__propget");
+      assert (lua_istable (L, -1));
+      lua_pushlightuserdata (L, pu);
+      lua_pushcclosure (L, &CFunc::getVariable <U>, 1);
+      rawsetfield (L, -2, name);
+      lua_pop (L, 1);
+
+      rawgetfield (L, -1, "__propset");
+      assert (lua_istable (L, -1));
+      if (isWritable)
+      {
+        lua_pushlightuserdata (L, pu);
+        lua_pushcclosure (L, &CFunc::setVariable <U>, 1);
+      }
+      else
+      {
+        lua_pushstring (L, name);
+        lua_pushcclosure (L, &CFunc::readOnlyError, 1);
+      }
+      rawsetfield (L, -2, name);
+      lua_pop (L, 1);
+
+      return *this;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      Add or replace a static property member.
+
+      If the set function is null, the property is read-only.
+    */
+    template <class U>
+    Class <T>& addStaticProperty (char const* name, U (*get)(), void (*set)(U) = 0)
+    {
+      typedef U (*get_t)();
+      typedef void (*set_t)(U);
+      
+      assert (lua_istable (L, -1));
+
+      rawgetfield (L, -1, "__propget");
+      assert (lua_istable (L, -1));
+      new (lua_newuserdata (L, sizeof (get))) get_t (get);
+      lua_pushcclosure (L, &CFunc::Call <U (*) (void)>::f, 1);
+      rawsetfield (L, -2, name);
+      lua_pop (L, 1);
+
+      rawgetfield (L, -1, "__propset");
+      assert (lua_istable (L, -1));
+      if (set != 0)
+      {
+        new (lua_newuserdata (L, sizeof (set))) set_t (set);
+        lua_pushcclosure (L, &CFunc::Call <void (*) (U)>::f, 1);
+      }
+      else
+      {
+        lua_pushstring (L, name);
+        lua_pushcclosure (L, &CFunc::readOnlyError, 1);
+      }
+      rawsetfield (L, -2, name);
+      lua_pop (L, 1);
+
+      return *this;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      Add or replace a static member function.
+    */
+    template <class FP>
+    Class <T>& addStaticFunction (char const* name, FP const fp)
+    {
+      new (lua_newuserdata (L, sizeof (fp))) FP (fp);
+      lua_pushcclosure (L, &CFunc::Call <FP>::f, 1);
+      rawsetfield (L, -2, name);
+
+      return *this;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      Add or replace a lua_CFunction.
+    */
+    Class <T>& addStaticCFunction (char const* name, int (*const fp)(lua_State*))
+    {
+      lua_pushcfunction (L, fp);
+      rawsetfield (L, -2, name);
+      return *this;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      Add or replace a data member.
+    */
+    template <class U>
+    Class <T>& addData (char const* name, const U T::* mp, bool isWritable = true)
+    {
+      typedef const U T::*mp_t;
+
+      // Add to __propget in class and const tables.
+      {
+        rawgetfield (L, -2, "__propget");
+        rawgetfield (L, -4, "__propget");
+        new (lua_newuserdata (L, sizeof (mp_t))) mp_t (mp);
+        lua_pushcclosure (L, &CFunc::getProperty <T,U>, 1);
+        lua_pushvalue (L, -1);
+        rawsetfield (L, -4, name);
+        rawsetfield (L, -2, name);
+        lua_pop (L, 2);
+      }
+
+      if (isWritable)
+      {
+        // Add to __propset in class table.
+        rawgetfield (L, -2, "__propset");
+        assert (lua_istable (L, -1));
+        new (lua_newuserdata (L, sizeof (mp_t))) mp_t (mp);
+        lua_pushcclosure (L, &CFunc::setProperty <T,U>, 1);
+        rawsetfield (L, -2, name);
+        lua_pop (L, 1);
+      }
+
+      return *this;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      Add or replace a property member.
+    */
+    template <class TG, class TS>
+    Class <T>& addProperty (char const* name, TG (T::* get) () const, void (T::* set) (TS))
+    {
+      // Add to __propget in class and const tables.
+      {
+        rawgetfield (L, -2, "__propget");
+        rawgetfield (L, -4, "__propget");
+        typedef TG (T::*get_t) () const;
+        new (lua_newuserdata (L, sizeof (get_t))) get_t (get);
+        lua_pushcclosure (L, &CFunc::CallConstMember <get_t>::f, 1);
+        lua_pushvalue (L, -1);
+        rawsetfield (L, -4, name);
+        rawsetfield (L, -2, name);
+        lua_pop (L, 2);
+      }
+
+      {
+        // Add to __propset in class table.
+        rawgetfield (L, -2, "__propset");
+        assert (lua_istable (L, -1));
+        typedef void (T::* set_t) (TS);
+        new (lua_newuserdata (L, sizeof (set_t))) set_t (set);
+        lua_pushcclosure (L, &CFunc::CallMember <set_t>::f, 1);
+        rawsetfield (L, -2, name);
+        lua_pop (L, 1);
+      }
+
+      return *this;
+    }
+
+    // read-only
+    template <class TG>
+    Class <T>& addProperty (char const* name, TG (T::* get) () const)
+    {
+      // Add to __propget in class and const tables.
+      rawgetfield (L, -2, "__propget");
+      rawgetfield (L, -4, "__propget");
+      typedef TG (T::*get_t) () const;
+      new (lua_newuserdata (L, sizeof (get_t))) get_t (get);
+      lua_pushcclosure (L, &CFunc::CallConstMember <get_t>::f, 1);
+      lua_pushvalue (L, -1);
+      rawsetfield (L, -4, name);
+      rawsetfield (L, -2, name);
+      lua_pop (L, 2);
+
+      return *this;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      Add or replace a property member, by proxy.
+
+      When a class is closed for modification and does not provide (or cannot
+      provide) the function signatures necessary to implement get or set for
+      a property, this will allow non-member functions act as proxies.
+
+      Both the get and the set functions require a T const* and T* in the first
+      argument respectively.
+    */
+    template <class TG, class TS>
+    Class <T>& addProperty (char const* name, TG (*get) (T const*), void (*set) (T*, TS))
+    {
+      // Add to __propget in class and const tables.
+      {
+        rawgetfield (L, -2, "__propget");
+        rawgetfield (L, -4, "__propget");
+        typedef TG (*get_t) (T const*);
+        new (lua_newuserdata (L, sizeof (get_t))) get_t (get);
+        lua_pushcclosure (L, &CFunc::Call <get_t>::f, 1);
+        lua_pushvalue (L, -1);
+        rawsetfield (L, -4, name);
+        rawsetfield (L, -2, name);
+        lua_pop (L, 2);
+      }
+
+      if (set != 0)
+      {
+        // Add to __propset in class table.
+        rawgetfield (L, -2, "__propset");
+        assert (lua_istable (L, -1));
+        typedef void (*set_t) (T*, TS);
+        new (lua_newuserdata (L, sizeof (set_t))) set_t (set);
+        lua_pushcclosure (L, &CFunc::Call <set_t>::f, 1);
+        rawsetfield (L, -2, name);
+        lua_pop (L, 1);
+      }
+
+      return *this;
+    }
+
+    // read-only
+    template <class TG, class TS>
+    Class <T>& addProperty (char const* name, TG (*get) (T const*))
+    {
+      // Add to __propget in class and const tables.
+      rawgetfield (L, -2, "__propget");
+      rawgetfield (L, -4, "__propget");
+      typedef TG (*get_t) (T const*);
+      new (lua_newuserdata (L, sizeof (get_t))) get_t (get);
+      lua_pushcclosure (L, &CFunc::Call <get_t>::f, 1);
+      lua_pushvalue (L, -1);
+      rawsetfield (L, -4, name);
+      rawsetfield (L, -2, name);
+      lua_pop (L, 2);
+
+      return *this;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Add or replace a member function.
+    */
+    template <class MemFn>
+    Class <T>& addFunction (char const* name, MemFn mf)
+    {
+      CFunc::CallMemberFunctionHelper <MemFn, FuncTraits <MemFn>::isConstMemberFunction>::add (L, name, mf);
+      return *this;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Add or replace a member lua_CFunction.
+    */
+    Class <T>& addCFunction (char const* name, int (T::*mfp)(lua_State*))
+    {
+      typedef int (T::*MFP)(lua_State*);
+      assert (lua_istable (L, -1));
+      new (lua_newuserdata (L, sizeof (mfp))) MFP (mfp);
+      lua_pushcclosure (L, &CFunc::CallMemberCFunction <T>::f, 1);
+      rawsetfield (L, -3, name); // class table
+
+      return *this;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+        Add or replace a const member lua_CFunction.
+    */
+    Class <T>& addCFunction (char const* name, int (T::*mfp)(lua_State*) const)
+    {
+      typedef int (T::*MFP)(lua_State*) const;
+      assert (lua_istable (L, -1));
+      new (lua_newuserdata (L, sizeof (mfp))) MFP (mfp);
+      lua_pushcclosure (L, &CFunc::CallConstMemberCFunction <T>::f, 1);
+      lua_pushvalue (L, -1);
+      rawsetfield (L, -5, name); // const table
+      rawsetfield (L, -3, name); // class table
+
+      return *this;
+    }
+
+    //--------------------------------------------------------------------------
+    /**
+      Add or replace a primary Constructor.
+
+      The primary Constructor is invoked when calling the class type table
+      like a function.
+
+      The template parameter should be a function pointer type that matches
+      the desired Constructor (since you can't take the address of a Constructor
+      and pass it as an argument).
+    */
+    template <class MemFn, class C>
+    Class <T>& addConstructor ()
+    {
+      lua_pushcclosure (L,
+        &ctorContainerProxy <typename FuncTraits <MemFn>::Params, C>, 0);
+      rawsetfield(L, -2, "__call");
+
+      return *this;
+    }
+
+    template <class MemFn>
+    Class <T>& addConstructor ()
+    {
+      lua_pushcclosure (L,
+        &ctorPlacementProxy <typename FuncTraits <MemFn>::Params, T>, 0);
+      rawsetfield(L, -2, "__call");
+
+      return *this;
+    }
+  };
+
+private:
+  //----------------------------------------------------------------------------
+  /**
+      Open the global namespace for registrations.
+  */
+  explicit Namespace (lua_State* L_)
+    : L (L_)
+    , m_stackSize (0)
+  {
+    lua_getglobal (L, "_G");
+    ++m_stackSize;
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Open a namespace for registrations.
+
+      The namespace is created if it doesn't already exist.
+      The parent namespace is at the top of the Lua stack.
+  */
+  Namespace (char const* name, Namespace const* parent)
+    : L (parent->L)
+    , m_stackSize (0)
+  {
+    m_stackSize = parent->m_stackSize + 1;
+    parent->m_stackSize = 0;
+
+    assert (lua_istable (L, -1));
+    rawgetfield (L, -1, name);
+    if (lua_isnil (L, -1))
+    {
+      lua_pop (L, 1);
+
+      lua_newtable (L);
+      lua_pushvalue (L, -1);
+      lua_setmetatable (L, -2);
+      lua_pushcfunction (L, &CFunc::indexMetaMethod);
+      rawsetfield (L, -2, "__index");
+      lua_pushcfunction (L, &CFunc::newindexMetaMethod);
+      rawsetfield (L, -2, "__newindex");
+      lua_newtable (L);
+      rawsetfield (L, -2, "__propget");
+      lua_newtable (L);
+      rawsetfield (L, -2, "__propset");
+      lua_pushvalue (L, -1);
+      rawsetfield (L, -3, name);
+#if 0
+      lua_pushcfunction (L, &tostringMetaMethod);
+      rawsetfield (L, -2, "__tostring");
+#endif
+    }
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Creates a continued registration from a child namespace.
+  */
+  explicit Namespace (Namespace const* child)
+    : L (child->L)
+    , m_stackSize (0)
+  {
+    m_stackSize = child->m_stackSize - 1;
+    child->m_stackSize = 1;
+    child->pop (1);
+
+    // It is not necessary or valid to call
+    // endNamespace() for the global namespace!
+    //
+    assert (m_stackSize != 0);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Creates a continued registration from a child class.
+  */
+  explicit Namespace (ClassBase const* child)
+    : L (child->L)
+    , m_stackSize (0)
+  {
+    m_stackSize = child->m_stackSize - 3;
+    child->m_stackSize = 3;
+    child->pop (3);
+  }
+
+public:
+  //----------------------------------------------------------------------------
+  /**
+      Copy Constructor.
+
+      Ownership of the stack is transferred to the new object. This happens
+      when the compiler emits temporaries to hold these objects while chaining
+      registrations across namespaces.
+  */
+  Namespace (Namespace const& other) : L (other.L)
+  {
+    m_stackSize = other.m_stackSize;
+    other.m_stackSize = 0;
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Closes this namespace registration.
+  */
+  ~Namespace ()
+  {
+    pop (m_stackSize);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Open the global namespace.
+  */
+  static Namespace getGlobalNamespace (lua_State* L)
+  {
+    return Namespace (L);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Open a new or existing namespace for registrations.
+  */
+  Namespace beginNamespace (char const* name)
+  {
+    return Namespace (name, this);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Continue namespace registration in the parent.
+
+      Do not use this on the global namespace.
+  */
+  Namespace endNamespace ()
+  {
+    return Namespace (this);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Add or replace a variable.
+  */
+  template <class T>
+  Namespace& addVariable (char const* name, T* pt, bool isWritable = true)
+  {
+    assert (lua_istable (L, -1));
+
+    rawgetfield (L, -1, "__propget");
+    assert (lua_istable (L, -1));
+    lua_pushlightuserdata (L, pt);
+    lua_pushcclosure (L, &CFunc::getVariable <T>, 1);
+    rawsetfield (L, -2, name);
+    lua_pop (L, 1);
+
+    rawgetfield (L, -1, "__propset");
+    assert (lua_istable (L, -1));
+    if (isWritable)
+    {
+      lua_pushlightuserdata (L, pt);
+      lua_pushcclosure (L, &CFunc::setVariable <T>, 1);
+    }
+    else
+    {
+      lua_pushstring (L, name);
+      lua_pushcclosure (L, &CFunc::readOnlyError, 1);
+    }
+    rawsetfield (L, -2, name);
+    lua_pop (L, 1);
+
+    return *this;
+  }
+  
+  //----------------------------------------------------------------------------
+  /**
+      Add or replace a property.
+
+      If the set function is omitted or null, the property is read-only.
+  */
+  template <class TG, class TS>
+  Namespace& addProperty (char const* name, TG (*get) (), void (*set)(TS) = 0)
+  {
+    assert (lua_istable (L, -1));
+
+    rawgetfield (L, -1, "__propget");
+    assert (lua_istable (L, -1));
+    typedef TG (*get_t) ();
+    new (lua_newuserdata (L, sizeof (get_t))) get_t (get);
+    lua_pushcclosure (L, &CFunc::Call <TG (*) (void)>::f, 1);
+    rawsetfield (L, -2, name);
+    lua_pop (L, 1);
+
+    rawgetfield (L, -1, "__propset");
+    assert (lua_istable (L, -1));
+    if (set != 0)
+    {
+      typedef void (*set_t) (TS);
+      new (lua_newuserdata (L, sizeof (set_t))) set_t (set);
+      lua_pushcclosure (L, &CFunc::Call <void (*) (TS)>::f, 1);
+    }
+    else
+    {
+      lua_pushstring (L, name);
+      lua_pushcclosure (L, &CFunc::readOnlyError, 1);
+    }
+    rawsetfield (L, -2, name);
+    lua_pop (L, 1);
+
+    return *this;
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Add or replace a free function.
+  */
+  template <class FP>
+  Namespace& addFunction (char const* name, FP const fp)
+  {
+    assert (lua_istable (L, -1));
+
+    new (lua_newuserdata (L, sizeof (fp))) FP (fp);
+    lua_pushcclosure (L, &CFunc::Call <FP>::f, 1);
+    rawsetfield (L, -2, name);
+
+    return *this;
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Add or replace a lua_CFunction.
+  */
+  Namespace& addCFunction (char const* name, int (*const fp)(lua_State*))
+  {
+    lua_pushcfunction (L, fp);
+    rawsetfield (L, -2, name);
+
+    return *this;
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Open a new or existing class for registrations.
+  */
+  template <class T>
+  Class <T> beginClass (char const* name)
+  {
+    return Class <T> (name, this);
+  }
+
+  //----------------------------------------------------------------------------
+  /**
+      Derive a new class for registrations.
+
+      To continue registrations for the class later, use beginClass().
+      Do not call deriveClass() again.
+  */
+  template <class T, class U>
+  Class <T> deriveClass (char const* name)
+  {
+    return Class <T> (name, this, ClassInfo <U>::getStaticKey ());
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Retrieve the global namespace.
+
+    It is recommended to put your namespace inside the global namespace, and
+    then add your classes and functions to it, rather than adding many classes
+    and functions directly to the global namespace.
+*/
+inline Namespace getGlobalNamespace (lua_State* L)
+{
+  return Namespace::getGlobalNamespace (L);
+}
diff --git a/extern/LuaBridge/detail/Stack.h b/extern/LuaBridge/detail/Stack.h
new file mode 100644
index 000000000..d10fa8a2c
--- /dev/null
+++ b/extern/LuaBridge/detail/Stack.h
@@ -0,0 +1,469 @@
+//------------------------------------------------------------------------------
+/*
+  https://github.com/vinniefalco/LuaBridge
+
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+  Copyright 2007, Nathan Reed
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+//==============================================================================
+
+//------------------------------------------------------------------------------
+/**
+    Receive the lua_State* as an argument.
+*/
+template <>
+struct Stack <lua_State*>
+{
+  static lua_State* get (lua_State* L, int)
+  {
+    return L;
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Push a lua_CFunction.
+*/
+template <>
+struct Stack <lua_CFunction>
+{
+  static void push (lua_State* L, lua_CFunction f)
+  {
+    lua_pushcfunction (L, f);
+  }
+
+  static lua_CFunction get (lua_State* L, int index)
+  {
+    return lua_tocfunction (L, index);
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for `int`.
+*/
+template <>
+struct Stack <int>
+{
+  static inline void push (lua_State* L, int value)
+  {
+    lua_pushinteger (L, static_cast <lua_Integer> (value));
+  }
+  
+  static inline int get (lua_State* L, int index)
+  {
+    return static_cast <int> (luaL_checkinteger (L, index));
+  }
+};
+
+template <>
+struct Stack <int const&>
+{
+  static inline void push (lua_State* L, int value)
+  {
+    lua_pushnumber (L, static_cast <lua_Number> (value));
+  }
+  
+  static inline int get (lua_State* L, int index)
+  {
+    return static_cast <int > (luaL_checknumber (L, index));
+  }
+};
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for `unsigned int`.
+*/
+template <>
+struct Stack <unsigned int>
+{
+  static inline void push (lua_State* L, unsigned int value)
+  {
+    lua_pushinteger (L, static_cast <lua_Integer> (value));
+  }
+  
+  static inline unsigned int get (lua_State* L, int index)
+  {
+    return static_cast <unsigned int> (luaL_checkinteger (L, index));
+  }
+};
+
+template <>
+struct Stack <unsigned int const&>
+{
+  static inline void push (lua_State* L, unsigned int value)
+  {
+    lua_pushnumber (L, static_cast <lua_Number> (value));
+  }
+  
+  static inline unsigned int get (lua_State* L, int index)
+  {
+    return static_cast <unsigned int > (luaL_checknumber (L, index));
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for `unsigned char`.
+*/
+template <>
+struct Stack <unsigned char>
+{
+  static inline void push (lua_State* L, unsigned char value)
+  {
+    lua_pushinteger (L, static_cast <lua_Integer> (value));
+  }
+  
+  static inline unsigned char get (lua_State* L, int index)
+  {
+    return static_cast <unsigned char> (luaL_checkinteger (L, index));
+  }
+};
+
+template <>
+struct Stack <unsigned char const&>
+{
+  static inline void push (lua_State* L, unsigned char value)
+  {
+    lua_pushnumber (L, static_cast <lua_Number> (value));
+  }
+  
+  static inline unsigned char get (lua_State* L, int index)
+  {
+    return static_cast <unsigned char> (luaL_checknumber (L, index));
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for `short`.
+*/
+template <>
+struct Stack <short>
+{
+  static inline void push (lua_State* L, short value)
+  {
+    lua_pushinteger (L, static_cast <lua_Integer> (value));
+  }
+  
+  static inline short get (lua_State* L, int index)
+  {
+    return static_cast <short> (luaL_checkinteger (L, index));
+  }
+};
+
+template <>
+struct Stack <short const&>
+{
+  static inline void push (lua_State* L, short value)
+  {
+    lua_pushnumber (L, static_cast <lua_Number> (value));
+  }
+  
+  static inline short get (lua_State* L, int index)
+  {
+    return static_cast <short> (luaL_checknumber (L, index));
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for `unsigned short`.
+*/
+template <>
+struct Stack <unsigned short>
+{
+  static inline void push (lua_State* L, unsigned short value)
+  {
+    lua_pushinteger (L, static_cast <lua_Integer> (value));
+  }
+  
+  static inline unsigned short get (lua_State* L, int index)
+  {
+    return static_cast <unsigned short> (luaL_checkinteger (L, index));
+  }
+};
+
+template <>
+struct Stack <unsigned short const&>
+{
+  static inline void push (lua_State* L, unsigned short value)
+  {
+    lua_pushnumber (L, static_cast <lua_Number> (value));
+  }
+  
+  static inline unsigned short get (lua_State* L, int index)
+  {
+    return static_cast <unsigned short> (luaL_checknumber (L, index));
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for `long`.
+*/
+template <>
+struct Stack <long>
+{
+  static inline void push (lua_State* L, long value)
+  {
+    lua_pushinteger (L, static_cast <lua_Integer> (value));
+  }
+  
+  static inline long get (lua_State* L, int index)
+  {
+    return static_cast <long> (luaL_checkinteger (L, index));
+  }
+};
+
+template <>
+struct Stack <long const&>
+{
+  static inline void push (lua_State* L, long value)
+  {
+    lua_pushnumber (L, static_cast <lua_Number> (value));
+  }
+  
+  static inline long get (lua_State* L, int index)
+  {
+    return static_cast <long> (luaL_checknumber (L, index));
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for `unsigned long`.
+*/
+template <>
+struct Stack <unsigned long>
+{
+  static inline void push (lua_State* L, unsigned long value)
+  {
+    lua_pushinteger (L, static_cast <lua_Integer> (value));
+  }
+  
+  static inline unsigned long get (lua_State* L, int index)
+  {
+    return static_cast <unsigned long> (luaL_checkinteger (L, index));
+  }
+};
+
+template <>
+struct Stack <unsigned long const&>
+{
+  static inline void push (lua_State* L, unsigned long value)
+  {
+    lua_pushnumber (L, static_cast <lua_Number> (value));
+  }
+  
+  static inline unsigned long get (lua_State* L, int index)
+  {
+    return static_cast <unsigned long> (luaL_checknumber (L, index));
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for `float`.
+*/
+template <>
+struct Stack <float>
+{
+  static inline void push (lua_State* L, float value)
+  {
+    lua_pushnumber (L, static_cast <lua_Number> (value));
+  }
+  
+  static inline float get (lua_State* L, int index)
+  {
+    return static_cast <float> (luaL_checknumber (L, index));
+  }
+};
+
+template <>
+struct Stack <float const&>
+{
+  static inline void push (lua_State* L, float value)
+  {
+    lua_pushnumber (L, static_cast <lua_Number> (value));
+  }
+  
+  static inline float get (lua_State* L, int index)
+  {
+    return static_cast <float> (luaL_checknumber (L, index));
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for `double`.
+*/
+template <> struct Stack <double>
+{
+  static inline void push (lua_State* L, double value)
+  {
+    lua_pushnumber (L, static_cast <lua_Number> (value));
+  }
+  
+  static inline double get (lua_State* L, int index)
+  {
+    return static_cast <double> (luaL_checknumber (L, index));
+  }
+};
+
+template <> struct Stack <double const&>
+{
+  static inline void push (lua_State* L, double value)
+  {
+    lua_pushnumber (L, static_cast <lua_Number> (value));
+  }
+  
+  static inline double get (lua_State* L, int index)
+  {
+    return static_cast <double> (luaL_checknumber (L, index));
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for `bool`.
+*/
+template <>
+struct Stack <bool> {
+  static inline void push (lua_State* L, bool value)
+  {
+    lua_pushboolean (L, value ? 1 : 0);
+  }
+  
+  static inline bool get (lua_State* L, int index)
+  {
+    return lua_toboolean (L, index) ? true : false;
+  }
+};
+
+template <>
+struct Stack <bool const&> {
+  static inline void push (lua_State* L, bool value)
+  {
+    lua_pushboolean (L, value ? 1 : 0);
+  }
+  
+  static inline bool get (lua_State* L, int index)
+  {
+    return lua_toboolean (L, index) ? true : false;
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for `char`.
+*/
+template <>
+struct Stack <char>
+{
+  static inline void push (lua_State* L, char value)
+  {
+    char str [2] = { value, 0 };
+    lua_pushstring (L, str);
+  }
+  
+  static inline char get (lua_State* L, int index)
+  {
+    return luaL_checkstring (L, index) [0];
+  }
+};
+
+template <>
+struct Stack <char const&>
+{
+  static inline void push (lua_State* L, char value)
+  {
+    char str [2] = { value, 0 };
+    lua_pushstring (L, str);
+  }
+  
+  static inline char get (lua_State* L, int index)
+  {
+    return luaL_checkstring (L, index) [0];
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for `float`.
+*/
+template <>
+struct Stack <char const*>
+{
+  static inline void push (lua_State* L, char const* str)
+  {
+    if (str != 0)
+      lua_pushstring (L, str);
+    else
+      lua_pushnil (L);
+  }
+
+  static inline char const* get (lua_State* L, int index)
+  {
+    return lua_isnil (L, index) ? 0 : luaL_checkstring (L, index);
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for `std::string`.
+*/
+template <>
+struct Stack <std::string>
+{
+  static inline void push (lua_State* L, std::string const& str)
+  {
+    lua_pushlstring (L, str.c_str (), str.size());
+  }
+
+  static inline std::string get (lua_State* L, int index)
+  {
+    size_t len;
+    const char *str = luaL_checklstring(L, index, &len);
+    return std::string (str, len);
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+    Stack specialization for `std::string const&`.
+*/
+template <>
+struct Stack <std::string const&>
+{
+  static inline void push (lua_State* L, std::string const& str)
+  {
+    lua_pushlstring (L, str.c_str(), str.size());
+  }
+
+  static inline std::string get (lua_State* L, int index)
+  {
+    size_t len;
+    const char *str = luaL_checklstring(L, index, &len);
+    return std::string (str, len);
+  }
+};
diff --git a/extern/LuaBridge/detail/TypeList.h b/extern/LuaBridge/detail/TypeList.h
new file mode 100644
index 000000000..21f850e89
--- /dev/null
+++ b/extern/LuaBridge/detail/TypeList.h
@@ -0,0 +1,174 @@
+//------------------------------------------------------------------------------
+/*
+  https://github.com/vinniefalco/LuaBridge
+  
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+  Copyright 2007, Nathan Reed
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+
+  This file incorporates work covered by the following copyright and
+  permission notice:  
+
+    The Loki Library
+    Copyright (c) 2001 by Andrei Alexandrescu
+    This code accompanies the book:
+    Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design 
+        Patterns Applied". Copyright (c) 2001. Addison-Wesley.
+    Permission to use, copy, modify, distribute and sell this software for any 
+        purpose is hereby granted without fee, provided that the above copyright 
+        notice appear in all copies and that both that copyright notice and this 
+        permission notice appear in supporting documentation.
+    The author or Addison-Welsey Longman make no representations about the 
+        suitability of this software for any purpose. It is provided "as is" 
+        without express or implied warranty.
+*/
+//==============================================================================
+
+/**
+  None type means void parameters or return value.
+*/
+typedef void None;
+
+template <typename Head, typename Tail = None>
+struct TypeList
+{
+};
+
+/**
+  A TypeList with actual values.
+*/
+template <typename List>
+struct TypeListValues
+{
+  static std::string const tostring (bool)
+  {
+    return "";
+  }
+};
+
+/**
+  TypeListValues recursive template definition.
+*/
+template <typename Head, typename Tail>
+struct TypeListValues <TypeList <Head, Tail> >
+{
+  Head hd;
+  TypeListValues <Tail> tl;
+
+  TypeListValues (Head hd_, TypeListValues <Tail> const& tl_)
+    : hd (hd_), tl (tl_)
+  {
+  }
+
+  static std::string const tostring (bool comma = false)
+  {
+    std::string s;
+
+    if (comma)
+      s = ", ";
+
+    s = s + typeid (Head).name ();
+
+    return s + TypeListValues <Tail>::tostring (true);
+  }
+};
+
+// Specializations of type/value list for head types that are references and
+// const-references.  We need to handle these specially since we can't count
+// on the referenced object hanging around for the lifetime of the list.
+
+template <typename Head, typename Tail>
+struct TypeListValues <TypeList <Head&, Tail> >
+{
+  Head hd;
+  TypeListValues <Tail> tl;
+
+  TypeListValues (Head& hd_, TypeListValues <Tail> const& tl_)
+    : hd (hd_), tl (tl_)
+  {
+  }
+
+  static std::string const tostring (bool comma = false)
+  {
+    std::string s;
+
+    if (comma)
+      s = ", ";
+
+    s = s + typeid (Head).name () + "&";
+
+    return s + TypeListValues <Tail>::tostring (true);
+  }
+};
+
+template <typename Head, typename Tail>
+struct TypeListValues <TypeList <Head const&, Tail> >
+{
+  Head hd;
+  TypeListValues <Tail> tl;
+
+  TypeListValues (Head const& hd_, const TypeListValues <Tail>& tl_)
+    : hd (hd_), tl (tl_)
+  {
+  }
+
+  static std::string const tostring (bool comma = false)
+  {
+    std::string s;
+
+    if (comma)
+      s = ", ";
+
+    s = s + typeid (Head).name () + " const&";
+
+    return s + TypeListValues <Tail>::tostring (true);
+  }
+};
+
+//==============================================================================
+/**
+  Subclass of a TypeListValues constructable from the Lua stack.
+*/
+
+template <typename List, int Start = 1>
+struct ArgList
+{
+};
+
+template <int Start>
+struct ArgList <None, Start> : public TypeListValues <None>
+{
+  ArgList (lua_State*)
+  {
+  }
+};
+
+template <typename Head, typename Tail, int Start>
+struct ArgList <TypeList <Head, Tail>, Start>
+  : public TypeListValues <TypeList <Head, Tail> >
+{
+  ArgList (lua_State* L)
+    : TypeListValues <TypeList <Head, Tail> > (Stack <Head>::get (L, Start),
+                                            ArgList <Tail, Start + 1> (L))
+  {
+  }
+};
diff --git a/extern/LuaBridge/detail/TypeTraits.h b/extern/LuaBridge/detail/TypeTraits.h
new file mode 100644
index 000000000..5dd077194
--- /dev/null
+++ b/extern/LuaBridge/detail/TypeTraits.h
@@ -0,0 +1,125 @@
+//------------------------------------------------------------------------------
+/*
+  https://github.com/vinniefalco/LuaBridge
+  
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef LUABRIDGE_TYPEINFO_HEADER
+#define LUABRIDGE_TYPEINFO_HEADER
+
+//------------------------------------------------------------------------------
+/**
+    Container traits.
+
+    Unspecialized ContainerTraits has the isNotContainer typedef for SFINAE.
+    All user defined containers must supply an appropriate specialization for
+    ContinerTraits (without the typedef isNotContainer). The containers that
+    come with LuaBridge also come with the appropriate ContainerTraits
+    specialization. See the corresponding declaration for details.
+
+    A specialization of ContainerTraits for some generic type ContainerType
+    looks like this:
+
+        template <class T>
+        struct ContainerTraits <ContainerType <T> >
+        {
+          typedef typename T Type;
+
+          static T* get (ContainerType <T> const& c)
+          {
+            return c.get (); // Implementation-dependent on ContainerType
+          }
+        };
+*/
+template <class T>
+struct ContainerTraits
+{
+  typedef bool isNotContainer;
+};
+
+//------------------------------------------------------------------------------
+/**
+    Type traits.
+
+    Specializations return information about a type.
+*/
+struct TypeTraits
+{
+  /** Determine if type T is a container.
+
+      To be considered a container, there must be a specialization of
+      ContainerTraits with the required fields.
+  */
+  template <typename T>
+  class isContainer
+  {
+  private:
+    typedef char yes[1]; // sizeof (yes) == 1
+    typedef char no [2]; // sizeof (no)  == 2
+
+    template <typename C>
+    static no& test (typename C::isNotContainer*);
+ 
+    template <typename>
+    static yes& test (...);
+ 
+  public:
+    static const bool value = sizeof (test <ContainerTraits <T> >(0)) == sizeof (yes);
+  };
+
+  /** Determine if T is const qualified.
+  */
+  /** @{ */
+  template <class T>
+  struct isConst
+  {
+    static bool const value = false;
+  };
+
+  template <class T>
+  struct isConst <T const>
+  {
+    static bool const value = true;
+  };
+  /** @} */
+
+  /** Remove the const qualifier from T.
+  */
+  /** @{ */
+  template <class T>
+  struct removeConst
+  {
+    typedef T Type;
+  };
+
+  template <class T>
+  struct removeConst <T const>
+  {
+    typedef T Type;
+  };
+  /**@}*/
+};
+
+#endif
diff --git a/extern/LuaBridge/detail/Userdata.h b/extern/LuaBridge/detail/Userdata.h
new file mode 100644
index 000000000..19451bd7d
--- /dev/null
+++ b/extern/LuaBridge/detail/Userdata.h
@@ -0,0 +1,817 @@
+//------------------------------------------------------------------------------
+/*
+  https://github.com/vinniefalco/LuaBridge
+  
+  Copyright 2012, Vinnie Falco <vinnie.falco@gmail.com>
+
+  License: The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+//==============================================================================
+
+//==============================================================================
+/**
+  Return the identity pointer for our lightuserdata tokens.
+
+  LuaBridge metatables are tagged with a security "token." The token is a
+  lightuserdata created from the identity pointer, used as a key in the
+  metatable. The value is a boolean = true, although any value could have been
+  used.
+
+  Because of Lua's dynamic typing and our improvised system of imposing C++
+  class structure, there is the possibility that executing scripts may
+  knowingly or unknowingly cause invalid data to get passed to the C functions
+  created by LuaBridge. In particular, our security model addresses the
+  following:
+
+  Notes:
+    1. Scripts cannot create a userdata (ignoring the debug lib).
+    2. Scripts cannot create a lightuserdata (ignoring the debug lib).
+    3. Scripts cannot set the metatable on a userdata.
+    4. Our identity key is a unique pointer in the process.
+    5. Our metatables have a lightuserdata identity key / value pair.
+    6. Our metatables have "__metatable" set to a boolean = false.
+    7. Our lightuserdata is unique.
+*/
+inline void* getIdentityKey ()
+{
+  static char value;
+  return &value;
+}
+
+/**
+  Interface to a class pointer retrievable from a userdata.
+*/
+class Userdata
+{
+protected:
+  void* m_p; // subclasses must set this
+
+  //--------------------------------------------------------------------------
+  /**
+    Get an untyped pointer to the contained class.
+  */
+  inline void* const getPointer ()
+  {
+    return m_p;
+  }
+
+private:
+  //--------------------------------------------------------------------------
+  /**
+    Validate and retrieve a Userdata on the stack.
+
+    The Userdata must exactly match the corresponding class table or
+    const table, or else a Lua error is raised. This is used for the
+    __gc metamethod.
+  */
+  static Userdata* getExactClass (lua_State* L,
+                                  int narg,
+                                  void const* classKey)
+  {
+    Userdata* ud = 0;
+    int const index = lua_absindex (L, narg);
+
+    bool mismatch = false;
+    char const* got = 0;
+
+    lua_rawgetp (L, LUA_REGISTRYINDEX, classKey);
+    assert (lua_istable (L, -1));
+
+    // Make sure we have a userdata.
+    if (!lua_isuserdata (L, index))
+      mismatch = true;
+
+    // Make sure it's metatable is ours.
+    if (!mismatch)
+    {
+      lua_getmetatable (L, index);
+      lua_rawgetp (L, -1, getIdentityKey ());
+      if (lua_isboolean (L, -1))
+      {
+        lua_pop (L, 1);
+      }
+      else
+      {
+        lua_pop (L, 2);
+        mismatch = true;
+      }      
+    }
+
+    if (!mismatch)
+    {
+      if (lua_rawequal (L, -1, -2))
+      {
+        // Matches class table.
+        lua_pop (L, 2);
+        ud = static_cast <Userdata*> (lua_touserdata (L, index));
+      }
+      else
+      {
+        rawgetfield (L, -2, "__const");
+        if (lua_rawequal (L, -1, -2))
+        {
+          // Matches const table
+          lua_pop (L, 3);
+          ud = static_cast <Userdata*> (lua_touserdata (L, index));
+        }
+        else
+        {
+          // Mismatch, but its one of ours so get a type name.
+          rawgetfield (L, -2, "__type");
+          lua_insert (L, -4);
+          lua_pop (L, 2);
+          got = lua_tostring (L, -2);
+          mismatch = true;
+        }
+      }
+    }
+
+    if (mismatch)
+    {
+      rawgetfield (L, -1, "__type");
+      assert (lua_type (L, -1) == LUA_TSTRING);
+      char const* const expected = lua_tostring (L, -1);
+
+      if (got == 0)
+        got = lua_typename (L, lua_type (L, index));
+
+      char const* const msg = lua_pushfstring (
+        L, "%s expected, got %s", expected, got);
+
+      if (narg > 0)
+        luaL_argerror (L, narg, msg);
+      else
+        lua_error (L);
+    }
+
+    return ud;
+  }
+
+  //--------------------------------------------------------------------------
+  /**
+    Validate and retrieve a Userdata on the stack.
+
+    The Userdata must be derived from or the same as the given base class,
+    identified by the key. If canBeConst is false, generates an error if
+    the resulting Userdata represents to a const object. We do the type check
+    first so that the error message is informative.
+  */
+  static Userdata* getClass (lua_State* L,
+                             int index,
+                             void const* baseClassKey,
+                             bool canBeConst)
+  {
+    assert (index > 0);
+    Userdata* ud = 0;
+
+    bool mismatch = false;
+    char const* got = 0;
+
+    lua_rawgetp (L, LUA_REGISTRYINDEX, baseClassKey);
+    assert (lua_istable (L, -1));
+
+    // Make sure we have a userdata.
+    if (lua_isuserdata (L, index))
+    {
+      // Make sure it's metatable is ours.
+      lua_getmetatable (L, index);
+      lua_rawgetp (L, -1, getIdentityKey ());
+      if (lua_isboolean (L, -1))
+      {
+        lua_pop (L, 1);
+
+        // If __const is present, object is NOT const.
+        rawgetfield (L, -1, "__const");
+        assert (lua_istable (L, -1) || lua_isnil (L, -1));
+        bool const isConst = lua_isnil (L, -1);
+        lua_pop (L, 1);
+
+        // Replace the class table with the const table if needed.
+        if (isConst)
+        {
+          rawgetfield (L, -2, "__const");
+          assert (lua_istable (L, -1));
+          lua_replace (L, -3);
+        }
+
+        for (;;)
+        {
+          if (lua_rawequal (L, -1, -2))
+          {
+            lua_pop (L, 2);
+
+            // Match, now check const-ness.
+            if (isConst && !canBeConst)
+            {
+              luaL_argerror (L, index, "cannot be const");
+            }
+            else
+            {
+              ud = static_cast <Userdata*> (lua_touserdata (L, index));
+              break;
+            }
+          }
+          else
+          {
+            // Replace current metatable with it's base class.
+            rawgetfield (L, -1, "__parent");
+/*
+ud
+class metatable
+ud metatable
+ud __parent (nil)
+*/
+
+            if (lua_isnil (L, -1))
+            {
+              lua_remove (L, -1);
+              // Mismatch, but its one of ours so get a type name.
+              rawgetfield (L, -1, "__type");
+              lua_insert (L, -3);
+              lua_pop (L, 1);
+              got = lua_tostring (L, -2);
+              mismatch = true;
+              break;
+            }
+            else
+            {
+              lua_remove (L, -2);
+            }
+          }
+        }
+      }
+      else
+      {
+        lua_pop (L, 2);
+        mismatch = true;
+      }      
+    }
+    else
+    {
+      mismatch = true;
+    }
+
+    if (mismatch)
+    {
+      assert (lua_type (L, -1) == LUA_TTABLE);
+      rawgetfield (L, -1, "__type");
+      assert (lua_type (L, -1) == LUA_TSTRING);
+      char const* const expected = lua_tostring (L, -1);
+
+      if (got == 0)
+        got = lua_typename (L, lua_type (L, index));
+
+      char const* const msg = lua_pushfstring (
+        L, "%s expected, got %s", expected, got);
+
+      luaL_argerror (L, index, msg);
+    }
+
+    return ud;
+  }
+
+public:
+  virtual ~Userdata () { }
+
+  //--------------------------------------------------------------------------
+  /**
+    Returns the Userdata* if the class on the Lua stack matches.
+
+    If the class does not match, a Lua error is raised.
+  */
+  template <class T>
+  static inline Userdata* getExact (lua_State* L, int index)
+  {
+    return getExactClass (L, index, ClassInfo <T>::getClassKey ());
+  }
+
+  //--------------------------------------------------------------------------
+  /**
+    Get a pointer to the class from the Lua stack.
+
+    If the object is not the class or a subclass, or it violates the
+    const-ness, a Lua error is raised.
+  */
+  template <class T>
+  static inline T* get (lua_State* L, int index, bool canBeConst)
+  {
+    if (lua_isnil (L, index))
+      return 0;
+    else
+      return static_cast <T*> (getClass (L, index,
+        ClassInfo <T>::getClassKey (), canBeConst)->getPointer ());
+  }
+};
+
+//----------------------------------------------------------------------------
+/**
+  Wraps a class object stored in a Lua userdata.
+
+  The lifetime of the object is managed by Lua. The object is constructed
+  inside the userdata using placement new.
+*/
+template <class T>
+class UserdataValue : public Userdata
+{
+private:
+  UserdataValue <T> (UserdataValue <T> const&);
+  UserdataValue <T> operator= (UserdataValue <T> const&);
+
+  char m_storage [sizeof (T)];
+
+  inline T* getObject ()
+  {
+    // If this fails to compile it means you forgot to provide
+    // a Container specialization for your container!
+    //
+    return reinterpret_cast <T*> (&m_storage [0]);
+  }
+
+private:
+  /**
+    Used for placement construction.
+  */
+  UserdataValue ()
+  {
+    m_p = getObject ();
+  }
+
+  ~UserdataValue ()
+  {
+    getObject ()->~T ();
+  }
+
+public:
+  /**
+    Push a T via placement new.
+
+    The caller is responsible for calling placement new using the
+    returned uninitialized storage.
+  */
+  static void* place (lua_State* const L)
+  {
+    UserdataValue <T>* const ud = new (
+      lua_newuserdata (L, sizeof (UserdataValue <T>))) UserdataValue <T> ();
+    lua_rawgetp (L, LUA_REGISTRYINDEX, ClassInfo <T>::getClassKey ());
+    // If this goes off it means you forgot to register the class!
+    assert (lua_istable (L, -1));
+    lua_setmetatable (L, -2);
+    return ud->getPointer ();
+  }
+
+  /**
+    Push T via copy construction from U.
+  */
+  template <class U>
+  static inline void push (lua_State* const L, U const& u)
+  {
+    new (place (L)) U (u);
+  }
+};
+
+//----------------------------------------------------------------------------
+/**
+  Wraps a pointer to a class object inside a Lua userdata.
+
+  The lifetime of the object is managed by C++.
+*/
+class UserdataPtr : public Userdata
+{
+private:
+  UserdataPtr (UserdataPtr const&);
+  UserdataPtr operator= (UserdataPtr const&);
+
+private:
+  /** Push non-const pointer to object using metatable key.
+  */
+  static void push (lua_State* L, void* const p, void const* const key)
+  {
+    if (p)
+    {
+      new (lua_newuserdata (L, sizeof (UserdataPtr))) UserdataPtr (p);
+      lua_rawgetp (L, LUA_REGISTRYINDEX, key);
+      // If this goes off it means you forgot to register the class!
+      assert (lua_istable (L, -1));
+      lua_setmetatable (L, -2);
+    }
+    else
+    {
+      lua_pushnil (L);
+    }
+  }
+
+  /** Push const pointer to object using metatable key.
+  */
+  static void push (lua_State* L, void const* const p, void const* const key)
+  {
+    if (p)
+    {
+      new (lua_newuserdata (L, sizeof (UserdataPtr)))
+        UserdataPtr (const_cast <void*> (p));
+      lua_rawgetp (L, LUA_REGISTRYINDEX, key);
+      // If this goes off it means you forgot to register the class!
+      assert (lua_istable (L, -1));
+      lua_setmetatable (L, -2);
+    }
+    else
+    {
+      lua_pushnil (L);
+    }
+  }
+
+  explicit UserdataPtr (void* const p)
+  {
+    m_p = p;
+
+    // Can't construct with a null pointer!
+    //
+    assert (m_p != 0);
+  }
+
+public:
+  /** Push non-const pointer to object.
+  */
+  template <class T>
+  static inline void push (lua_State* const L, T* const p)
+  {
+    if (p)
+      push (L, p, ClassInfo <T>::getClassKey ());
+    else
+      lua_pushnil (L);
+  }
+
+  /** Push const pointer to object.
+  */
+  template <class T>
+  static inline void push (lua_State* const L, T const* const p)
+  {
+    if (p)
+      push (L, p, ClassInfo <T>::getConstKey ());
+    else
+      lua_pushnil (L);
+  }
+};
+
+//============================================================================
+/**
+  Wraps a container thet references a class object.
+
+  The template argument C is the container type, ContainerTraits must be
+  specialized on C or else a compile error will result.
+*/
+template <class C>
+class UserdataShared : public Userdata
+{
+private:
+  UserdataShared (UserdataShared <C> const&);
+  UserdataShared <C>& operator= (UserdataShared <C> const&);
+
+  typedef typename TypeTraits::removeConst <
+    typename ContainerTraits <C>::Type>::Type T;
+
+  C m_c;
+
+private:
+  ~UserdataShared ()
+  {
+  }
+
+public:
+  /**
+    Construct from a container to the class or a derived class.
+  */
+  template <class U>
+  explicit UserdataShared (U const& u) : m_c (u)
+  {
+    m_p = const_cast <void*> (reinterpret_cast <void const*> (
+        (ContainerTraits <C>::get (m_c))));
+  }
+
+  /**
+    Construct from a pointer to the class or a derived class.
+  */
+  template <class U>
+  explicit UserdataShared (U* u) : m_c (u)
+  {
+    m_p = const_cast <void*> (reinterpret_cast <void const*> (
+        (ContainerTraits <C>::get (m_c))));
+  }
+};
+
+//----------------------------------------------------------------------------
+//
+// SFINAE helpers.
+//
+
+// non-const objects
+template <class C, bool makeObjectConst>
+struct UserdataSharedHelper
+{
+  typedef typename TypeTraits::removeConst <
+    typename ContainerTraits <C>::Type>::Type T;
+
+  static void push (lua_State* L, C const& c)
+  {
+    if (ContainerTraits <C>::get (c) != 0)
+    {
+      new (lua_newuserdata (L, sizeof (UserdataShared <C>))) UserdataShared <C> (c);
+      lua_rawgetp (L, LUA_REGISTRYINDEX, ClassInfo <T>::getClassKey ());
+      // If this goes off it means the class T is unregistered!
+      assert (lua_istable (L, -1));
+      lua_setmetatable (L, -2);
+    }
+    else
+    {
+      lua_pushnil (L);
+    }
+  }
+
+  static void push (lua_State* L, T* const t)
+  {
+    if (t)
+    {
+      new (lua_newuserdata (L, sizeof (UserdataShared <C>))) UserdataShared <C> (t);
+      lua_rawgetp (L, LUA_REGISTRYINDEX, ClassInfo <T>::getClassKey ());
+      // If this goes off it means the class T is unregistered!
+      assert (lua_istable (L, -1));
+      lua_setmetatable (L, -2);
+    }
+    else
+    {
+      lua_pushnil (L);
+    }
+  }
+};
+
+// const objects
+template <class C>
+struct UserdataSharedHelper <C, true>
+{
+  typedef typename TypeTraits::removeConst <
+    typename ContainerTraits <C>::Type>::Type T;
+
+  static void push (lua_State* L, C const& c)
+  {
+    if (ContainerTraits <C>::get (c) != 0)
+    {
+      new (lua_newuserdata (L, sizeof (UserdataShared <C>))) UserdataShared <C> (c);
+      lua_rawgetp (L, LUA_REGISTRYINDEX, ClassInfo <T>::getConstKey ());
+      // If this goes off it means the class T is unregistered!
+      assert (lua_istable (L, -1));
+      lua_setmetatable (L, -2);
+    }
+    else
+    {
+      lua_pushnil (L);
+    }
+  }
+
+  static void push (lua_State* L, T* const t)
+  {
+    if (t)
+    {
+      new (lua_newuserdata (L, sizeof (UserdataShared <C>))) UserdataShared <C> (t);
+      lua_rawgetp (L, LUA_REGISTRYINDEX, ClassInfo <T>::getConstKey ());
+      // If this goes off it means the class T is unregistered!
+      assert (lua_istable (L, -1));
+      lua_setmetatable (L, -2);
+    }
+    else
+    {
+      lua_pushnil (L);
+    }
+  }
+};
+
+/**
+  Pass by container.
+
+  The container controls the object lifetime. Typically this will be a
+  lifetime shared by C++ and Lua using a reference count. Because of type
+  erasure, containers like std::shared_ptr will not work. Containers must
+  either be of the intrusive variety, or in the style of the RefCountedPtr
+  type provided by LuaBridge (that uses a global hash table).
+*/
+template <class C, bool byContainer>
+struct StackHelper
+{
+  static inline void push (lua_State* L, C const& c)
+  {
+    UserdataSharedHelper <C,
+      TypeTraits::isConst <typename ContainerTraits <C>::Type>::value>::push (L, c);
+  }
+
+  typedef typename TypeTraits::removeConst <
+    typename ContainerTraits <C>::Type>::Type T;
+
+  static inline C get (lua_State* L, int index)
+  {
+    return Userdata::get <T> (L, index, true);
+  }
+};
+
+/**
+  Pass by value.
+
+  Lifetime is managed by Lua. A C++ function which accesses a pointer or
+  reference to an object outside the activation record in which it was
+  retrieved may result in undefined behavior if Lua garbage collected it.
+*/
+template <class T>
+struct StackHelper <T, false>
+{
+  static inline void push (lua_State* L, T const& t)
+  {
+    UserdataValue <T>::push (L, t);
+  }
+
+  static inline T const& get (lua_State* L, int index)
+  {
+    return *Userdata::get <T> (L, index, true);
+  }
+};
+
+//==============================================================================
+
+/**
+  Lua stack conversions for class objects passed by value.
+*/
+template <class T>
+struct Stack
+{
+public:
+  static inline void push (lua_State* L, T const& t)
+  {
+    StackHelper <T,
+      TypeTraits::isContainer <T>::value>::push (L, t);
+  }
+
+  static inline T get (lua_State* L, int index)
+  {
+    return StackHelper <T,
+      TypeTraits::isContainer <T>::value>::get (L, index);
+  }
+};
+
+//------------------------------------------------------------------------------
+/**
+  Lua stack conversions for pointers and references to class objects.
+
+  Lifetime is managed by C++. Lua code which remembers a reference to the
+  value may result in undefined behavior if C++ destroys the object. The
+  handling of the const and volatile qualifiers happens in UserdataPtr.
+*/
+
+// pointer
+template <class T>
+struct Stack <T*>
+{
+  static inline void push (lua_State* L, T* const p)
+  {
+    UserdataPtr::push (L, p);
+  }
+
+  static inline T* const get (lua_State* L, int index)
+  {
+    return Userdata::get <T> (L, index, false);
+  }
+};
+
+// Strips the const off the right side of *
+template <class T>
+struct Stack <T* const>
+{
+  static inline void push (lua_State* L, T* const p)
+  {
+    UserdataPtr::push (L, p);
+  }
+
+  static inline T* const get (lua_State* L, int index)
+  {
+    return Userdata::get <T> (L, index, false);
+  }
+};
+
+// pointer to const
+template <class T>
+struct Stack <T const*>
+{
+  static inline void push (lua_State* L, T const* const p)
+  {
+    UserdataPtr::push (L, p);
+  }
+
+  static inline T const* const get (lua_State* L, int index)
+  {
+    return Userdata::get <T> (L, index, true);
+  }
+};
+
+// Strips the const off the right side of *
+template <class T>
+struct Stack <T const* const>
+{
+  static inline void push (lua_State* L, T const* const p)
+  {
+    UserdataPtr::push (L, p);
+  }
+
+  static inline T const* const get (lua_State* L, int index)
+  {
+    return Userdata::get <T> (L, index, true);
+  }
+};
+
+// reference
+template <class T>
+struct Stack <T&>
+{
+  static inline void push (lua_State* L, T& t)
+  {
+    UserdataPtr::push (L, &t);
+  }
+
+  static T& get (lua_State* L, int index)
+  {
+    T* const t = Userdata::get <T> (L, index, false);
+    if (!t)
+      luaL_error (L, "nil passed to reference");
+    return *t;
+  }
+};
+
+template <class C, bool byContainer>
+struct RefStackHelper
+{
+  typedef C return_type;  
+	
+  static inline void push (lua_State* L, C const& t)
+  {
+    UserdataSharedHelper <C,
+      TypeTraits::isConst <typename ContainerTraits <C>::Type>::value>::push (L, t);
+  }
+
+  typedef typename TypeTraits::removeConst <
+    typename ContainerTraits <C>::Type>::Type T;
+
+  static return_type get (lua_State* L, int index)
+  {
+    return Userdata::get <T> (L, index, true);
+  }
+};
+
+template <class T>
+struct RefStackHelper <T, false>
+{
+  typedef T const& return_type;  
+	
+	static inline void push (lua_State* L, T const& t)
+	{
+	  UserdataPtr::push (L, &t);
+	}
+
+  static return_type get (lua_State* L, int index)
+  {
+    T const* const t = Userdata::get <T> (L, index, true);
+
+    if (!t)
+      luaL_error (L, "nil passed to reference");
+    return *t;
+  }
+    
+};
+
+// reference to const
+template <class T>
+struct Stack <T const&>
+{
+  typedef RefStackHelper <T, TypeTraits::isContainer <T>::value> helper_t;
+  
+  static inline void push (lua_State* L, T const& t)
+  {
+    helper_t::push (L, t);
+  }
+
+  static typename helper_t::return_type get (lua_State* L, int index)
+  {
+    return helper_t::get (L, index);
+  }
+};
diff --git a/extern/LuaBridge/detail/dump.h b/extern/LuaBridge/detail/dump.h
new file mode 100644
index 000000000..c06680357
--- /dev/null
+++ b/extern/LuaBridge/detail/dump.h
@@ -0,0 +1,28 @@
+#include <sstream>
+#include <string>
+
+std::string dumpLuaState(lua_State *L) {
+	std::stringstream ostr;
+	int i;
+	int top = lua_gettop(L);
+	ostr << "top=" << top << ":\n";
+	for (i = 1; i <= top; ++i) {
+		int t = lua_type(L, i);
+		switch(t) {
+		case LUA_TSTRING:
+			ostr << "  " << i << ": '" << lua_tostring(L, i) << "'\n";
+			break;
+		case LUA_TBOOLEAN:
+			ostr << "  " << i << ": " << 
+					(lua_toboolean(L, i) ? "true" : "false") << "\n";
+			break;
+		case LUA_TNUMBER:
+			ostr << "  " << i << ": " << lua_tonumber(L, i) << "\n";
+			break;
+		default:
+			ostr << "  " << i << ": TYPE=" << lua_typename(L, t) << "\n";
+			break;
+		}
+	}
+	return ostr.str();
+}
diff --git a/extern/breakpad b/extern/breakpad
new file mode 160000
index 000000000..e6d1c032b
--- /dev/null
+++ b/extern/breakpad
@@ -0,0 +1 @@
+Subproject commit e6d1c032baa222d8a8dc87813e9067199ec0266d
diff --git a/extern/oics/CMakeLists.txt b/extern/oics/CMakeLists.txt
index 52ffb42a2..00d77f52c 100644
--- a/extern/oics/CMakeLists.txt
+++ b/extern/oics/CMakeLists.txt
@@ -1,32 +1,21 @@
-set(OICS_LIBRARY "oics")
-
-# Sources
-
-set(OICS_SOURCE_FILES
-	ICSChannel.cpp
-	ICSControl.cpp
-	ICSInputControlSystem.cpp
-	ICSInputControlSystem_keyboard.cpp
-	ICSInputControlSystem_mouse.cpp
-	ICSInputControlSystem_joystick.cpp
-	ICSPrerequisites.h
-)
-
-set(TINYXML_SOURCE_FILES
-	tinyxml.cpp
-	tinyxmlparser.cpp
-	tinyxmlerror.cpp
-	tinystr.cpp	
+add_library(oics STATIC
+    ICSChannel.cpp
+    ICSControl.cpp
+    ICSInputControlSystem.cpp
+    ICSInputControlSystem_keyboard.cpp
+    ICSInputControlSystem_mouse.cpp
+    ICSInputControlSystem_joystick.cpp
+    ICSPrerequisites.h
 )
 
 if(USE_SYSTEM_TINYXML)
-    add_library(${OICS_LIBRARY} STATIC ${OICS_SOURCE_FILES})
-    target_link_libraries(${OICS_LIBRARY} ${TINYXML_LIBRARIES})
+    target_link_libraries(oics ${TinyXML_LIBRARIES})
 else()
-    add_library(${OICS_LIBRARY} STATIC
-    ${OICS_SOURCE_FILES}
-    ${TINYXML_SOURCE_FILES})
+    add_library(local_tinyxml STATIC
+        tinyxml.cpp
+        tinyxmlparser.cpp
+        tinyxmlerror.cpp
+        tinystr.cpp
+    )
+    target_link_libraries(oics local_tinyxml)
 endif()
-
-# Does this do anything?
-link_directories(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/extern/oics/tinyxml.cpp b/extern/oics/tinyxml.cpp
index 5d8eb475a..f1cdc8192 100644
--- a/extern/oics/tinyxml.cpp
+++ b/extern/oics/tinyxml.cpp
@@ -48,7 +48,7 @@ FILE* TiXmlFOpen( const char* filename, const char* mode )
 		memset(wname, 0, sizeof(*wname) * (len + 1));
 		wchar_t wmode[32] = { 0 };
 
-		MultiByteToWideChar(CP_UTF8, 0, filename, len, wname, len);
+		MultiByteToWideChar(CP_UTF8, 0, filename, static_cast<int>(len), wname, static_cast<int>(len));
 		MultiByteToWideChar(CP_UTF8, 0, mode, -1, wmode, sizeof(wmode) / sizeof(*wmode));
 
 		#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
diff --git a/extern/oics/tinyxml.h b/extern/oics/tinyxml.h
index 50ad417fe..7237825c5 100644
--- a/extern/oics/tinyxml.h
+++ b/extern/oics/tinyxml.h
@@ -577,7 +577,7 @@ public:
 	#endif
 
 	/** Add a new node related to this. Adds a child past the LastChild.
-		Returns a pointer to the new object or NULL if an error occured.
+		Returns a pointer to the new object or NULL if an error occurred.
 	*/
 	TiXmlNode* InsertEndChild( const TiXmlNode& addThis );
 
@@ -594,17 +594,17 @@ public:
 	TiXmlNode* LinkEndChild( TiXmlNode* addThis );
 
 	/** Add a new node related to this. Adds a child before the specified child.
-		Returns a pointer to the new object or NULL if an error occured.
+		Returns a pointer to the new object or NULL if an error occurred.
 	*/
 	TiXmlNode* InsertBeforeChild( TiXmlNode* beforeThis, const TiXmlNode& addThis );
 
 	/** Add a new node related to this. Adds a child after the specified child.
-		Returns a pointer to the new object or NULL if an error occured.
+		Returns a pointer to the new object or NULL if an error occurred.
 	*/
 	TiXmlNode* InsertAfterChild(  TiXmlNode* afterThis, const TiXmlNode& addThis );
 
 	/** Replace a child of this node.
-		Returns a pointer to the new object or NULL if an error occured.
+		Returns a pointer to the new object or NULL if an error occurred.
 	*/
 	TiXmlNode* ReplaceChild( TiXmlNode* replaceThis, const TiXmlNode& withThis );
 
@@ -1471,7 +1471,7 @@ public:
 		@sa SetTabSize, Row, Column
 	*/
 	int ErrorRow() const	{ return errorLocation.row+1; }
-	int ErrorCol() const	{ return errorLocation.col+1; }	///< The column where the error occured. See ErrorRow()
+	int ErrorCol() const	{ return errorLocation.col+1; }	///< The column where the error occurred. See ErrorRow()
 
 	/** SetTabSize() allows the error reporting functions (ErrorRow() and ErrorCol())
 		to report the correct values for row and column. It does not change the output
diff --git a/extern/osg-ffmpeg-videoplayer/CMakeLists.txt b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
index 6009f69de..5289cd3af 100644
--- a/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
+++ b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
@@ -10,8 +10,8 @@ set(OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES
     audiofactory.hpp
 )
 
-include_directories(${FFMPEG_INCLUDE_DIRS})
+include_directories(${FFmpeg_INCLUDE_DIRS})
 add_library(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES})
-target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFMPEG_LIBRARIES} ${Boost_THREAD_LIBRARY})
+target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFmpeg_LIBRARIES} ${Boost_THREAD_LIBRARY})
 
 link_directories(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
index f095d1617..096a17a64 100644
--- a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
+++ b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
@@ -1,5 +1,6 @@
 #include "audiodecoder.hpp"
 
+#include <stdexcept>
 
 extern "C"
 {
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 3c9279ea2..6779f2472 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -1,6 +1,7 @@
 #include "videostate.hpp"
 
 #include <iostream>
+#include <stdexcept>
 
 #include <osg/Texture2D>
 
@@ -102,14 +103,14 @@ void PacketQueue::put(AVPacket *pkt)
     this->last_pkt = pkt1;
     this->nb_packets++;
     this->size += pkt1->pkt.size;
-    this->cond.notify_one();
+    this->cond.signal();
 
     this->mutex.unlock();
 }
 
 int PacketQueue::get(AVPacket *pkt, VideoState *is)
 {
-    boost::unique_lock<boost::mutex> lock(this->mutex);
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(this->mutex);
     while(!is->mQuit)
     {
         AVPacketList *pkt1 = this->first_pkt;
@@ -129,7 +130,7 @@ int PacketQueue::get(AVPacket *pkt, VideoState *is)
 
         if(this->flushing)
             break;
-        this->cond.wait(lock);
+        this->cond.wait(&this->mutex);
     }
 
     return -1;
@@ -138,7 +139,7 @@ int PacketQueue::get(AVPacket *pkt, VideoState *is)
 void PacketQueue::flush()
 {
     this->flushing = true;
-    this->cond.notify_one();
+    this->cond.signal();
 }
 
 void PacketQueue::clear()
@@ -233,7 +234,7 @@ void VideoState::video_display(VideoPicture *vp)
 
 void VideoState::video_refresh()
 {
-    boost::mutex::scoped_lock lock(this->pictq_mutex);
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(this->pictq_mutex);
     if(this->pictq_size == 0)
         return;
 
@@ -245,7 +246,7 @@ void VideoState::video_refresh()
         this->pictq_rindex = (pictq_rindex+1) % VIDEO_PICTURE_ARRAY_SIZE;
         this->frame_last_pts = vp->pts;
         this->pictq_size--;
-        this->pictq_cond.notify_one();
+        this->pictq_cond.signal();
     }
     else
     {
@@ -275,7 +276,7 @@ void VideoState::video_refresh()
         // update queue for next picture
         this->pictq_size--;
         this->pictq_rindex = (this->pictq_rindex+1) % VIDEO_PICTURE_ARRAY_SIZE;
-        this->pictq_cond.notify_one();
+        this->pictq_cond.signal();
     }
 }
 
@@ -286,9 +287,9 @@ int VideoState::queue_picture(AVFrame *pFrame, double pts)
 
     /* wait until we have a new pic */
     {
-        boost::unique_lock<boost::mutex> lock(this->pictq_mutex);
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(this->pictq_mutex);
         while(this->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE && !this->mQuit)
-            this->pictq_cond.timed_wait(lock, boost::posix_time::milliseconds(1));
+            this->pictq_cond.wait(&this->pictq_mutex, 1);
     }
     if(this->mQuit)
         return -1;
@@ -371,168 +372,196 @@ static void our_free_buffer(void *opaque, uint8_t *data)
     av_free(data);
 }
 
-
-void VideoState::video_thread_loop(VideoState *self)
+class VideoThread : public OpenThreads::Thread
 {
-    AVPacket pkt1, *packet = &pkt1;
-    int frameFinished;
-    AVFrame *pFrame;
+public:
+    VideoThread(VideoState* self)
+        : mVideoState(self)
+    {
+        start();
+    }
+
+    virtual void run()
+    {
+        VideoState* self = mVideoState;
+        AVPacket pkt1, *packet = &pkt1;
+        int frameFinished;
+        AVFrame *pFrame;
 
-    pFrame = av_frame_alloc();
+        pFrame = av_frame_alloc();
 
-    self->rgbaFrame = av_frame_alloc();
-    avpicture_alloc((AVPicture*)self->rgbaFrame, AV_PIX_FMT_RGBA, (*self->video_st)->codec->width, (*self->video_st)->codec->height);
+        self->rgbaFrame = av_frame_alloc();
+        avpicture_alloc((AVPicture*)self->rgbaFrame, AV_PIX_FMT_RGBA, (*self->video_st)->codec->width, (*self->video_st)->codec->height);
 
-    while(self->videoq.get(packet, self) >= 0)
-    {
-        if(packet->data == flush_pkt.data)
+        while(self->videoq.get(packet, self) >= 0)
         {
-            avcodec_flush_buffers((*self->video_st)->codec);
+            if(packet->data == flush_pkt.data)
+            {
+                avcodec_flush_buffers((*self->video_st)->codec);
 
-            self->pictq_mutex.lock();
-            self->pictq_size = 0;
-            self->pictq_rindex = 0;
-            self->pictq_windex = 0;
-            self->pictq_mutex.unlock();
+                self->pictq_mutex.lock();
+                self->pictq_size = 0;
+                self->pictq_rindex = 0;
+                self->pictq_windex = 0;
+                self->pictq_mutex.unlock();
 
-            self->frame_last_pts = packet->pts * av_q2d((*self->video_st)->time_base);
-            global_video_pkt_pts = static_cast<int64_t>(self->frame_last_pts);
-            continue;
-        }
+                self->frame_last_pts = packet->pts * av_q2d((*self->video_st)->time_base);
+                global_video_pkt_pts = static_cast<int64_t>(self->frame_last_pts);
+                continue;
+            }
 
-        // Save global pts to be stored in pFrame
-        global_video_pkt_pts = packet->pts;
-        // Decode video frame
-        if(avcodec_decode_video2((*self->video_st)->codec, pFrame, &frameFinished, packet) < 0)
-            throw std::runtime_error("Error decoding video frame");
+            // Save global pts to be stored in pFrame
+            global_video_pkt_pts = packet->pts;
+            // Decode video frame
+            if(avcodec_decode_video2((*self->video_st)->codec, pFrame, &frameFinished, packet) < 0)
+                throw std::runtime_error("Error decoding video frame");
 
-        double pts = 0;
-        if(packet->dts != AV_NOPTS_VALUE)
-            pts = static_cast<double>(packet->dts);
-        else if(pFrame->opaque && *(int64_t*)pFrame->opaque != AV_NOPTS_VALUE)
-            pts = static_cast<double>(*(int64_t*)pFrame->opaque);
-        pts *= av_q2d((*self->video_st)->time_base);
+            double pts = 0;
+            if(packet->dts != AV_NOPTS_VALUE)
+                pts = static_cast<double>(packet->dts);
+            else if(pFrame->opaque && *(int64_t*)pFrame->opaque != AV_NOPTS_VALUE)
+                pts = static_cast<double>(*(int64_t*)pFrame->opaque);
+            pts *= av_q2d((*self->video_st)->time_base);
 
-        av_free_packet(packet);
+            av_free_packet(packet);
 
-        // Did we get a video frame?
-        if(frameFinished)
-        {
-            pts = self->synchronize_video(pFrame, pts);
-            if(self->queue_picture(pFrame, pts) < 0)
-                break;
+            // Did we get a video frame?
+            if(frameFinished)
+            {
+                pts = self->synchronize_video(pFrame, pts);
+                if(self->queue_picture(pFrame, pts) < 0)
+                    break;
+            }
         }
-    }
 
-    av_free(pFrame);
+        av_free(pFrame);
 
-    avpicture_free((AVPicture*)self->rgbaFrame);
-    av_free(self->rgbaFrame);
-}
+        avpicture_free((AVPicture*)self->rgbaFrame);
+        av_free(self->rgbaFrame);
+    }
+
+private:
+    VideoState* mVideoState;
+};
 
-void VideoState::decode_thread_loop(VideoState *self)
+class ParseThread : public OpenThreads::Thread
 {
-    AVFormatContext *pFormatCtx = self->format_ctx;
-    AVPacket pkt1, *packet = &pkt1;
+public:
+    ParseThread(VideoState* self)
+        : mVideoState(self)
+    {
+        start();
+    }
 
-    try
+    virtual void run()
     {
-        if(!self->video_st && !self->audio_st)
-            throw std::runtime_error("No streams to decode");
+        VideoState* self = mVideoState;
 
-        // main decode loop
-        while(!self->mQuit)
+        AVFormatContext *pFormatCtx = self->format_ctx;
+        AVPacket pkt1, *packet = &pkt1;
+
+        try
         {
-            if(self->mSeekRequested)
+            if(!self->video_st && !self->audio_st)
+                throw std::runtime_error("No streams to decode");
+
+            // main decode loop
+            while(!self->mQuit)
             {
-                uint64_t seek_target = self->mSeekPos;
-                int streamIndex = -1;
-
-                int videoStreamIndex = -1;;
-                int audioStreamIndex = -1;
-                if (self->video_st)
-                    videoStreamIndex = self->video_st - self->format_ctx->streams;
-                if (self->audio_st)
-                    audioStreamIndex = self->audio_st - self->format_ctx->streams;
-
-                if(videoStreamIndex >= 0)
-                    streamIndex = videoStreamIndex;
-                else if(audioStreamIndex >= 0)
-                    streamIndex = audioStreamIndex;
-
-                uint64_t timestamp = seek_target;
-
-                // QtCreator's highlighter doesn't like AV_TIME_BASE_Q's {} initializer for some reason
-                AVRational avTimeBaseQ = AVRational(); // = AV_TIME_BASE_Q;
-                avTimeBaseQ.num = 1;
-                avTimeBaseQ.den = AV_TIME_BASE;
-
-                if(streamIndex >= 0)
-                    timestamp = av_rescale_q(seek_target, avTimeBaseQ, self->format_ctx->streams[streamIndex]->time_base);
-
-                // AVSEEK_FLAG_BACKWARD appears to be needed, otherwise ffmpeg may seek to a keyframe *after* the given time
-                // we want to seek to any keyframe *before* the given time, so we can continue decoding as normal from there on
-                if(av_seek_frame(self->format_ctx, streamIndex, timestamp, AVSEEK_FLAG_BACKWARD) < 0)
-                    std::cerr << "Error seeking " << self->format_ctx->filename << std::endl;
-                else
+                if(self->mSeekRequested)
                 {
-                    // Clear the packet queues and put a special packet with the new clock time
-                    if(audioStreamIndex >= 0)
-                    {
-                        self->audioq.clear();
-                        flush_pkt.pts = av_rescale_q(seek_target, avTimeBaseQ,
-                            self->format_ctx->streams[audioStreamIndex]->time_base);
-                        self->audioq.put(&flush_pkt);
-                    }
+                    uint64_t seek_target = self->mSeekPos;
+                    int streamIndex = -1;
+
+                    int videoStreamIndex = -1;;
+                    int audioStreamIndex = -1;
+                    if (self->video_st)
+                        videoStreamIndex = self->video_st - self->format_ctx->streams;
+                    if (self->audio_st)
+                        audioStreamIndex = self->audio_st - self->format_ctx->streams;
+
                     if(videoStreamIndex >= 0)
+                        streamIndex = videoStreamIndex;
+                    else if(audioStreamIndex >= 0)
+                        streamIndex = audioStreamIndex;
+
+                    uint64_t timestamp = seek_target;
+
+                    // QtCreator's highlighter doesn't like AV_TIME_BASE_Q's {} initializer for some reason
+                    AVRational avTimeBaseQ = AVRational(); // = AV_TIME_BASE_Q;
+                    avTimeBaseQ.num = 1;
+                    avTimeBaseQ.den = AV_TIME_BASE;
+
+                    if(streamIndex >= 0)
+                        timestamp = av_rescale_q(seek_target, avTimeBaseQ, self->format_ctx->streams[streamIndex]->time_base);
+
+                    // AVSEEK_FLAG_BACKWARD appears to be needed, otherwise ffmpeg may seek to a keyframe *after* the given time
+                    // we want to seek to any keyframe *before* the given time, so we can continue decoding as normal from there on
+                    if(av_seek_frame(self->format_ctx, streamIndex, timestamp, AVSEEK_FLAG_BACKWARD) < 0)
+                        std::cerr << "Error seeking " << self->format_ctx->filename << std::endl;
+                    else
                     {
-                        self->videoq.clear();
-                        flush_pkt.pts = av_rescale_q(seek_target, avTimeBaseQ,
-                            self->format_ctx->streams[videoStreamIndex]->time_base);
-                        self->videoq.put(&flush_pkt);
+                        // Clear the packet queues and put a special packet with the new clock time
+                        if(audioStreamIndex >= 0)
+                        {
+                            self->audioq.clear();
+                            flush_pkt.pts = av_rescale_q(seek_target, avTimeBaseQ,
+                                self->format_ctx->streams[audioStreamIndex]->time_base);
+                            self->audioq.put(&flush_pkt);
+                        }
+                        if(videoStreamIndex >= 0)
+                        {
+                            self->videoq.clear();
+                            flush_pkt.pts = av_rescale_q(seek_target, avTimeBaseQ,
+                                self->format_ctx->streams[videoStreamIndex]->time_base);
+                            self->videoq.put(&flush_pkt);
+                        }
+                        self->pictq_mutex.lock();
+                        self->pictq_size = 0;
+                        self->pictq_rindex = 0;
+                        self->pictq_windex = 0;
+                        self->pictq_mutex.unlock();
+                        self->mExternalClock.set(seek_target);
                     }
-                    self->pictq_mutex.lock();
-                    self->pictq_size = 0;
-                    self->pictq_rindex = 0;
-                    self->pictq_windex = 0;
-                    self->pictq_mutex.unlock();
-                    self->mExternalClock.set(seek_target);
+                    self->mSeekRequested = false;
                 }
-                self->mSeekRequested = false;
-            }
 
 
-            if((self->audio_st && self->audioq.size > MAX_AUDIOQ_SIZE) ||
-               (self->video_st && self->videoq.size > MAX_VIDEOQ_SIZE))
-            {
-                boost::this_thread::sleep(boost::posix_time::milliseconds(10));
-                continue;
-            }
+                if((self->audio_st && self->audioq.size > MAX_AUDIOQ_SIZE) ||
+                   (self->video_st && self->videoq.size > MAX_VIDEOQ_SIZE))
+                {
+                    OpenThreads::Thread::microSleep(10 * 1000);
+                    continue;
+                }
 
-            if(av_read_frame(pFormatCtx, packet) < 0)
-            {
-                if (self->audioq.nb_packets == 0 && self->videoq.nb_packets == 0 && self->pictq_size == 0)
-                    self->mVideoEnded = true;
-                continue;
-            }
-            else
-                self->mVideoEnded = false;
+                if(av_read_frame(pFormatCtx, packet) < 0)
+                {
+                    if (self->audioq.nb_packets == 0 && self->videoq.nb_packets == 0 && self->pictq_size == 0)
+                        self->mVideoEnded = true;
+                    continue;
+                }
+                else
+                    self->mVideoEnded = false;
 
-            // Is this a packet from the video stream?
-            if(self->video_st && packet->stream_index == self->video_st-pFormatCtx->streams)
-                self->videoq.put(packet);
-            else if(self->audio_st && packet->stream_index == self->audio_st-pFormatCtx->streams)
-                self->audioq.put(packet);
-            else
-                av_free_packet(packet);
+                // Is this a packet from the video stream?
+                if(self->video_st && packet->stream_index == self->video_st-pFormatCtx->streams)
+                    self->videoq.put(packet);
+                else if(self->audio_st && packet->stream_index == self->audio_st-pFormatCtx->streams)
+                    self->audioq.put(packet);
+                else
+                    av_free_packet(packet);
+            }
         }
-    }
-    catch(std::exception& e) {
-        std::cerr << "An error occured playing the video: " << e.what () << std::endl;
+        catch(std::exception& e) {
+            std::cerr << "An error occurred playing the video: " << e.what () << std::endl;
+        }
+
+        self->mQuit = true;
     }
 
-    self->mQuit = true;
-}
+private:
+    VideoState* mVideoState;
+};
 
 
 bool VideoState::update()
@@ -587,7 +616,7 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
         this->video_st = pFormatCtx->streams + stream_index;
 
         codecCtx->get_buffer2 = our_get_buffer;
-        this->video_thread = boost::thread(video_thread_loop, this);
+        this->video_thread.reset(new VideoThread(this));
         break;
 
     default:
@@ -669,7 +698,7 @@ void VideoState::init(boost::shared_ptr<std::istream> inputstream, const std::st
     }
 
 
-    this->parse_thread = boost::thread(decode_thread_loop, this);
+    this->parse_thread.reset(new ParseThread(this));
 }
 
 void VideoState::deinit()
@@ -681,10 +710,16 @@ void VideoState::deinit()
 
     mAudioDecoder.reset();
 
-    if (this->parse_thread.joinable())
-        this->parse_thread.join();
-    if (this->video_thread.joinable())
-        this->video_thread.join();
+    if (this->parse_thread.get())
+    {
+        this->parse_thread->join();
+        this->parse_thread.reset();
+    }
+    if (this->video_thread.get())
+    {
+        this->video_thread->join();
+        this->video_thread.reset();
+    }
 
     if(this->audio_st)
         avcodec_close((*this->audio_st)->codec);
@@ -779,7 +814,7 @@ ExternalClock::ExternalClock()
 
 void ExternalClock::setPaused(bool paused)
 {
-    boost::mutex::scoped_lock lock(mMutex);
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
     if (mPaused == paused)
         return;
     if (paused)
@@ -793,7 +828,7 @@ void ExternalClock::setPaused(bool paused)
 
 uint64_t ExternalClock::get()
 {
-    boost::mutex::scoped_lock lock(mMutex);
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
     if (mPaused)
         return mPausedAt;
     else
@@ -802,7 +837,7 @@ uint64_t ExternalClock::get()
 
 void ExternalClock::set(uint64_t time)
 {
-    boost::mutex::scoped_lock lock(mMutex);
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
     mTimeBase = av_gettime() - time;
     mPausedAt = time;
 }
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.hpp b/extern/osg-ffmpeg-videoplayer/videostate.hpp
index 72a2aab18..2f0e8f30a 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.hpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.hpp
@@ -2,8 +2,14 @@
 #define VIDEOPLAYER_VIDEOSTATE_H
 
 #include <stdint.h>
+#include <vector>
+#include <memory>
 
-#include <boost/thread.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <OpenThreads/Thread>
+#include <OpenThreads/Mutex>
+#include <OpenThreads/Condition>
 
 #include <osg/ref_ptr>
 namespace osg
@@ -34,6 +40,8 @@ struct VideoState;
 
 class MovieAudioFactory;
 class MovieAudioDecoder;
+class VideoThread;
+class ParseThread;
 
 struct ExternalClock
 {
@@ -43,7 +51,7 @@ struct ExternalClock
     uint64_t mPausedAt;
     bool mPaused;
 
-    boost::mutex mMutex;
+    OpenThreads::Mutex mMutex;
 
     void setPaused(bool paused);
     uint64_t get();
@@ -62,8 +70,8 @@ struct PacketQueue {
     int nb_packets;
     int size;
 
-    boost::mutex mutex;
-    boost::condition_variable cond;
+    OpenThreads::Mutex mutex;
+    OpenThreads::Condition cond;
 
     void put(AVPacket *pkt);
     int get(AVPacket *pkt, VideoState *is);
@@ -141,11 +149,11 @@ struct VideoState {
     VideoPicture pictq[VIDEO_PICTURE_ARRAY_SIZE];
     AVFrame*     rgbaFrame; // used as buffer for the frame converted from its native format to RGBA
     int          pictq_size, pictq_rindex, pictq_windex;
-    boost::mutex pictq_mutex;
-    boost::condition_variable pictq_cond;
+    OpenThreads::Mutex pictq_mutex;
+    OpenThreads::Condition pictq_cond;
 
-    boost::thread parse_thread;
-    boost::thread video_thread;
+    std::auto_ptr<ParseThread> parse_thread;
+    std::auto_ptr<VideoThread> video_thread;
 
     volatile bool mSeekRequested;
     uint64_t mSeekPos;
diff --git a/extern/osgQt/CMakeLists.txt b/extern/osgQt/CMakeLists.txt
new file mode 100644
index 000000000..3bd08a390
--- /dev/null
+++ b/extern/osgQt/CMakeLists.txt
@@ -0,0 +1,20 @@
+set(OSGQT_LIBRARY "osgQt")
+
+# Sources
+
+set(OSGQT_SOURCE_FILES
+    GraphicsWindowQt.cpp
+)
+
+add_library(${OSGQT_LIBRARY} STATIC ${OSGQT_SOURCE_FILES})
+
+if (DESIRED_QT_VERSION MATCHES 4)
+    include(${QT_USE_FILE})
+    target_link_libraries(${OSGQT_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTOPENGL_LIBRARY})
+else()
+    qt5_use_modules(${OSGQT_LIBRARY} Core OpenGL)
+endif()
+
+link_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+set(EXTERN_OSGQT_LIBRARY ${OSGQT_LIBRARY} PARENT_SCOPE)
diff --git a/extern/osgQt/GraphicsWindowQt b/extern/osgQt/GraphicsWindowQt
new file mode 100644
index 000000000..1e34fc9db
--- /dev/null
+++ b/extern/osgQt/GraphicsWindowQt
@@ -0,0 +1,157 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 2009 Wang Rui
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSGVIEWER_GRAPHICSWINDOWQT
+#define OSGVIEWER_GRAPHICSWINDOWQT
+
+#include <QGLWidget>
+
+#include <osgViewer/GraphicsWindow>
+
+#include <QMutex>
+#include <QEvent>
+#include <QQueue>
+#include <QSet>
+#include <QGLWidget>
+
+class QInputEvent;
+class QGestureEvent;
+
+namespace osgViewer {
+    class ViewerBase;
+}
+
+namespace osgQt
+{
+
+// forward declarations
+class GraphicsWindowQt;
+
+class GLWidget : public QGLWidget
+{
+    typedef QGLWidget inherited;
+
+public:
+
+    GLWidget( QWidget* parent = NULL, const QGLWidget* shareWidget = NULL, Qt::WindowFlags f = 0);
+    GLWidget( QGLContext* context, QWidget* parent = NULL, const QGLWidget* shareWidget = NULL, Qt::WindowFlags f = 0);
+    GLWidget( const QGLFormat& format, QWidget* parent = NULL, const QGLWidget* shareWidget = NULL, Qt::WindowFlags f = 0);
+    virtual ~GLWidget();
+
+    inline void setGraphicsWindow( GraphicsWindowQt* gw ) { _gw = gw; }
+    inline GraphicsWindowQt* getGraphicsWindow() { return _gw; }
+    inline const GraphicsWindowQt* getGraphicsWindow() const { return _gw; }
+
+protected:
+
+    int getNumDeferredEvents()
+    {
+        QMutexLocker lock(&_deferredEventQueueMutex);
+        return _deferredEventQueue.count();
+    }
+    void enqueueDeferredEvent(QEvent::Type eventType, QEvent::Type removeEventType = QEvent::None)
+    {
+        QMutexLocker lock(&_deferredEventQueueMutex);
+
+        if (removeEventType != QEvent::None)
+        {
+            if (_deferredEventQueue.removeOne(removeEventType))
+                _eventCompressor.remove(eventType);
+        }
+
+        if (_eventCompressor.find(eventType) == _eventCompressor.end())
+        {
+            _deferredEventQueue.enqueue(eventType);
+            _eventCompressor.insert(eventType);
+        }
+    }
+    void processDeferredEvents();
+
+    friend class GraphicsWindowQt;
+    GraphicsWindowQt* _gw;
+
+    QMutex _deferredEventQueueMutex;
+    QQueue<QEvent::Type> _deferredEventQueue;
+    QSet<QEvent::Type> _eventCompressor;
+
+    qreal _devicePixelRatio;
+
+    virtual void resizeEvent( QResizeEvent* event );
+    virtual void moveEvent( QMoveEvent* event );
+    virtual void glDraw();
+    virtual bool event( QEvent* event );
+};
+
+class GraphicsWindowQt : public osgViewer::GraphicsWindow
+{
+public:
+    GraphicsWindowQt( osg::GraphicsContext::Traits* traits, QWidget* parent = NULL, const QGLWidget* shareWidget = NULL, Qt::WindowFlags f = 0 );
+    GraphicsWindowQt( GLWidget* widget );
+    virtual ~GraphicsWindowQt();
+
+    inline GLWidget* getGLWidget() { return _widget; }
+    inline const GLWidget* getGLWidget() const { return _widget; }
+
+    /// deprecated
+    inline GLWidget* getGraphWidget() { return _widget; }
+    /// deprecated
+    inline const GLWidget* getGraphWidget() const { return _widget; }
+
+    struct WindowData : public osg::Referenced
+    {
+        WindowData( GLWidget* widget = NULL, QWidget* parent = NULL ): _widget(widget), _parent(parent) {}
+        GLWidget* _widget;
+        QWidget* _parent;
+    };
+
+    bool init( QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f );
+
+    static QGLFormat traits2qglFormat( const osg::GraphicsContext::Traits* traits );
+    static void qglFormat2traits( const QGLFormat& format, osg::GraphicsContext::Traits* traits );
+    static osg::GraphicsContext::Traits* createTraits( const QGLWidget* widget );
+
+    virtual bool setWindowRectangleImplementation( int x, int y, int width, int height );
+    virtual void getWindowRectangle( int& x, int& y, int& width, int& height );
+    virtual bool setWindowDecorationImplementation( bool windowDecoration );
+    virtual bool getWindowDecoration() const;
+    virtual void grabFocus();
+    virtual void grabFocusIfPointerInWindow();
+    virtual void raiseWindow();
+    virtual void setWindowName( const std::string& name );
+    virtual std::string getWindowName();
+    virtual void useCursor( bool cursorOn );
+    virtual void setCursor( MouseCursor cursor );
+
+    virtual bool valid() const;
+    virtual bool realizeImplementation();
+    virtual bool isRealizedImplementation() const;
+    virtual void closeImplementation();
+    virtual bool makeCurrentImplementation();
+    virtual bool releaseContextImplementation();
+    virtual void swapBuffersImplementation();
+    virtual void runOperations();
+
+    virtual void requestWarpPointer( float x, float y );
+
+protected:
+
+    friend class GLWidget;
+    GLWidget* _widget;
+    bool _ownsWidget;
+    QCursor _currentCursor;
+    bool _realized;
+};
+
+}
+
+#endif
diff --git a/extern/osgQt/GraphicsWindowQt.cpp b/extern/osgQt/GraphicsWindowQt.cpp
new file mode 100644
index 000000000..9e5f6e55e
--- /dev/null
+++ b/extern/osgQt/GraphicsWindowQt.cpp
@@ -0,0 +1,617 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 2009 Wang Rui
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#include "GraphicsWindowQt"
+
+#include <osg/DeleteHandler>
+#include <osgViewer/ViewerBase>
+#include <QInputEvent>
+#include <QPointer>
+
+#if (QT_VERSION>=QT_VERSION_CHECK(4, 6, 0))
+# define USE_GESTURES
+# include <QGestureEvent>
+# include <QGesture>
+#endif
+
+using namespace osgQt;
+
+#if (QT_VERSION < QT_VERSION_CHECK(5, 2, 0))
+    #define GETDEVICEPIXELRATIO() 1.0
+#else
+    #define GETDEVICEPIXELRATIO() devicePixelRatio()
+#endif
+
+GLWidget::GLWidget( QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f)
+: QGLWidget(parent, shareWidget, f), _gw( NULL )
+{
+    _devicePixelRatio = GETDEVICEPIXELRATIO();
+}
+
+GLWidget::GLWidget( QGLContext* context, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f)
+: QGLWidget(context, parent, shareWidget, f), _gw( NULL )
+{
+    _devicePixelRatio = GETDEVICEPIXELRATIO();
+}
+
+GLWidget::GLWidget( const QGLFormat& format, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f)
+: QGLWidget(format, parent, shareWidget, f), _gw( NULL )
+{
+    _devicePixelRatio = GETDEVICEPIXELRATIO();
+}
+
+GLWidget::~GLWidget()
+{
+    // close GraphicsWindowQt and remove the reference to us
+    if( _gw )
+    {
+        _gw->close();
+        _gw->_widget = NULL;
+        _gw = NULL;
+    }
+}
+
+void GLWidget::processDeferredEvents()
+{
+    QQueue<QEvent::Type> deferredEventQueueCopy;
+    {
+        QMutexLocker lock(&_deferredEventQueueMutex);
+        deferredEventQueueCopy = _deferredEventQueue;
+        _eventCompressor.clear();
+        _deferredEventQueue.clear();
+    }
+
+    while (!deferredEventQueueCopy.isEmpty())
+    {
+        QEvent event(deferredEventQueueCopy.dequeue());
+        QGLWidget::event(&event);
+    }
+}
+
+bool GLWidget::event( QEvent* event )
+{
+
+    // QEvent::Hide
+    //
+    // workaround "Qt-workaround" that does glFinish before hiding the widget
+    // (the Qt workaround was seen at least in Qt 4.6.3 and 4.7.0)
+    //
+    // Qt makes the context current, performs glFinish, and releases the context.
+    // This makes the problem in OSG multithreaded environment as the context
+    // is active in another thread, thus it can not be made current for the purpose
+    // of glFinish in this thread.
+
+    // QEvent::ParentChange
+    //
+    // Reparenting GLWidget may create a new underlying window and a new GL context.
+    // Qt will then call doneCurrent on the GL context about to be deleted. The thread
+    // where old GL context was current has no longer current context to render to and
+    // we cannot make new GL context current in this thread.
+
+    // We workaround above problems by deferring execution of problematic event requests.
+    // These events has to be enqueue and executed later in a main GUI thread (GUI operations
+    // outside the main thread are not allowed) just before makeCurrent is called from the
+    // right thread. The good place for doing that is right after swap in a swapBuffersImplementation.
+
+    if (event->type() == QEvent::Hide)
+    {
+        // enqueue only the last of QEvent::Hide and QEvent::Show
+        enqueueDeferredEvent(QEvent::Hide, QEvent::Show);
+        return true;
+    }
+    else if (event->type() == QEvent::Show)
+    {
+        // enqueue only the last of QEvent::Show or QEvent::Hide
+        enqueueDeferredEvent(QEvent::Show, QEvent::Hide);
+        return true;
+    }
+    else if (event->type() == QEvent::ParentChange)
+    {
+        // enqueue only the last QEvent::ParentChange
+        enqueueDeferredEvent(QEvent::ParentChange);
+        return true;
+    }
+
+    // perform regular event handling
+    return QGLWidget::event( event );
+}
+
+void GLWidget::resizeEvent( QResizeEvent* event )
+{
+    const QSize& size = event->size();
+
+    int scaled_width = static_cast<int>(size.width()*_devicePixelRatio);
+    int scaled_height = static_cast<int>(size.height()*_devicePixelRatio);
+    _gw->resized( x(), y(), scaled_width,  scaled_height);
+    _gw->getEventQueue()->windowResize( x(), y(), scaled_width, scaled_height );
+    _gw->requestRedraw();
+}
+
+void GLWidget::moveEvent( QMoveEvent* event )
+{
+    const QPoint& pos = event->pos();
+    int scaled_width = static_cast<int>(width()*_devicePixelRatio);
+    int scaled_height = static_cast<int>(height()*_devicePixelRatio);
+    _gw->resized( pos.x(), pos.y(), scaled_width,  scaled_height );
+    _gw->getEventQueue()->windowResize( pos.x(), pos.y(), scaled_width,  scaled_height );
+}
+
+void GLWidget::glDraw()
+{
+    _gw->requestRedraw();
+}
+
+GraphicsWindowQt::GraphicsWindowQt( osg::GraphicsContext::Traits* traits, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f )
+:   _realized(false)
+{
+
+    _widget = NULL;
+    _traits = traits;
+    init( parent, shareWidget, f );
+}
+
+GraphicsWindowQt::GraphicsWindowQt( GLWidget* widget )
+:   _realized(false)
+{
+    _widget = widget;
+    _traits = _widget ? createTraits( _widget ) : new osg::GraphicsContext::Traits;
+    init( NULL, NULL, 0 );
+}
+
+GraphicsWindowQt::~GraphicsWindowQt()
+{
+    close();
+
+    // remove reference from GLWidget
+    if ( _widget )
+        _widget->_gw = NULL;
+}
+
+bool GraphicsWindowQt::init( QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f )
+{
+    // update _widget and parent by WindowData
+    WindowData* windowData = _traits.get() ? dynamic_cast<WindowData*>(_traits->inheritedWindowData.get()) : 0;
+    if ( !_widget )
+        _widget = windowData ? windowData->_widget : NULL;
+    if ( !parent )
+        parent = windowData ? windowData->_parent : NULL;
+
+    // create widget if it does not exist
+    _ownsWidget = _widget == NULL;
+    if ( !_widget )
+    {
+        // shareWidget
+        if ( !shareWidget ) {
+            GraphicsWindowQt* sharedContextQt = dynamic_cast<GraphicsWindowQt*>(_traits->sharedContext.get());
+            if ( sharedContextQt )
+                shareWidget = sharedContextQt->getGLWidget();
+        }
+
+        // WindowFlags
+        Qt::WindowFlags flags = f | Qt::Window | Qt::CustomizeWindowHint;
+        if ( _traits->windowDecoration )
+            flags |= Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowSystemMenuHint
+#if (QT_VERSION_CHECK(4, 5, 0) <= QT_VERSION)
+                | Qt::WindowCloseButtonHint
+#endif
+                ;
+
+        // create widget
+        _widget = new GLWidget( traits2qglFormat( _traits.get() ), parent, shareWidget, flags );
+    }
+
+    // set widget name and position
+    // (do not set it when we inherited the widget)
+    if ( _ownsWidget )
+    {
+        _widget->setWindowTitle( _traits->windowName.c_str() );
+        _widget->move( _traits->x, _traits->y );
+        if ( !_traits->supportsResize ) _widget->setFixedSize( _traits->width, _traits->height );
+        else _widget->resize( _traits->width, _traits->height );
+    }
+
+    // initialize widget properties
+    _widget->setAutoBufferSwap( false );
+    _widget->setMouseTracking( true );
+    _widget->setGraphicsWindow( this );
+    useCursor( _traits->useCursor );
+
+    // initialize State
+    setState( new osg::State );
+    getState()->setGraphicsContext(this);
+
+    // initialize contextID
+    if ( _traits.valid() && _traits->sharedContext.valid() )
+    {
+        getState()->setContextID( _traits->sharedContext->getState()->getContextID() );
+        incrementContextIDUsageCount( getState()->getContextID() );
+    }
+    else
+    {
+        getState()->setContextID( osg::GraphicsContext::createNewContextID() );
+    }
+
+    // make sure the event queue has the correct window rectangle size and input range
+    getEventQueue()->syncWindowRectangleWithGraphicsContext();
+
+    return true;
+}
+
+QGLFormat GraphicsWindowQt::traits2qglFormat( const osg::GraphicsContext::Traits* traits )
+{
+    QGLFormat format( QGLFormat::defaultFormat() );
+
+    format.setAlphaBufferSize( traits->alpha );
+    format.setRedBufferSize( traits->red );
+    format.setGreenBufferSize( traits->green );
+    format.setBlueBufferSize( traits->blue );
+    format.setDepthBufferSize( traits->depth );
+    format.setStencilBufferSize( traits->stencil );
+    format.setSampleBuffers( traits->sampleBuffers );
+    format.setSamples( traits->samples );
+
+    format.setAlpha( traits->alpha>0 );
+    format.setDepth( traits->depth>0 );
+    format.setStencil( traits->stencil>0 );
+    format.setDoubleBuffer( traits->doubleBuffer );
+    format.setSwapInterval( traits->vsync ? 1 : 0 );
+    format.setStereo( traits->quadBufferStereo ? 1 : 0 );
+
+    return format;
+}
+
+void GraphicsWindowQt::qglFormat2traits( const QGLFormat& format, osg::GraphicsContext::Traits* traits )
+{
+    traits->red = format.redBufferSize();
+    traits->green = format.greenBufferSize();
+    traits->blue = format.blueBufferSize();
+    traits->alpha = format.alpha() ? format.alphaBufferSize() : 0;
+    traits->depth = format.depth() ? format.depthBufferSize() : 0;
+    traits->stencil = format.stencil() ? format.stencilBufferSize() : 0;
+
+    traits->sampleBuffers = format.sampleBuffers() ? 1 : 0;
+    traits->samples = format.samples();
+
+    traits->quadBufferStereo = format.stereo();
+    traits->doubleBuffer = format.doubleBuffer();
+
+    traits->vsync = format.swapInterval() >= 1;
+}
+
+osg::GraphicsContext::Traits* GraphicsWindowQt::createTraits( const QGLWidget* widget )
+{
+    osg::GraphicsContext::Traits *traits = new osg::GraphicsContext::Traits;
+
+    qglFormat2traits( widget->format(), traits );
+
+    QRect r = widget->geometry();
+    traits->x = r.x();
+    traits->y = r.y();
+    traits->width = r.width();
+    traits->height = r.height();
+
+    traits->windowName = widget->windowTitle().toLocal8Bit().data();
+    Qt::WindowFlags f = widget->windowFlags();
+    traits->windowDecoration = ( f & Qt::WindowTitleHint ) &&
+                            ( f & Qt::WindowMinMaxButtonsHint ) &&
+                            ( f & Qt::WindowSystemMenuHint );
+    QSizePolicy sp = widget->sizePolicy();
+    traits->supportsResize = sp.horizontalPolicy() != QSizePolicy::Fixed ||
+                            sp.verticalPolicy() != QSizePolicy::Fixed;
+
+    return traits;
+}
+
+bool GraphicsWindowQt::setWindowRectangleImplementation( int x, int y, int width, int height )
+{
+    if ( _widget == NULL )
+        return false;
+
+    _widget->setGeometry( x, y, width, height );
+    return true;
+}
+
+void GraphicsWindowQt::getWindowRectangle( int& x, int& y, int& width, int& height )
+{
+    if ( _widget )
+    {
+        const QRect& geom = _widget->geometry();
+        x = geom.x();
+        y = geom.y();
+        width = geom.width();
+        height = geom.height();
+    }
+}
+
+bool GraphicsWindowQt::setWindowDecorationImplementation( bool windowDecoration )
+{
+    Qt::WindowFlags flags = Qt::Window|Qt::CustomizeWindowHint;//|Qt::WindowStaysOnTopHint;
+    if ( windowDecoration )
+        flags |= Qt::WindowTitleHint|Qt::WindowMinMaxButtonsHint|Qt::WindowSystemMenuHint;
+    _traits->windowDecoration = windowDecoration;
+
+    if ( _widget )
+    {
+        _widget->setWindowFlags( flags );
+
+        return true;
+    }
+
+    return false;
+}
+
+bool GraphicsWindowQt::getWindowDecoration() const
+{
+    return _traits->windowDecoration;
+}
+
+void GraphicsWindowQt::grabFocus()
+{
+    if ( _widget )
+        _widget->setFocus( Qt::ActiveWindowFocusReason );
+}
+
+void GraphicsWindowQt::grabFocusIfPointerInWindow()
+{
+    if ( _widget->underMouse() )
+        _widget->setFocus( Qt::ActiveWindowFocusReason );
+}
+
+void GraphicsWindowQt::raiseWindow()
+{
+    if ( _widget )
+        _widget->raise();
+}
+
+void GraphicsWindowQt::setWindowName( const std::string& name )
+{
+    if ( _widget )
+        _widget->setWindowTitle( name.c_str() );
+}
+
+std::string GraphicsWindowQt::getWindowName()
+{
+    return _widget ? _widget->windowTitle().toStdString() : "";
+}
+
+void GraphicsWindowQt::useCursor( bool cursorOn )
+{
+    if ( _widget )
+    {
+        _traits->useCursor = cursorOn;
+        if ( !cursorOn ) _widget->setCursor( Qt::BlankCursor );
+        else _widget->setCursor( _currentCursor );
+    }
+}
+
+void GraphicsWindowQt::setCursor( MouseCursor cursor )
+{
+    if ( cursor==InheritCursor && _widget )
+    {
+        _widget->unsetCursor();
+    }
+
+    switch ( cursor )
+    {
+    case NoCursor: _currentCursor = Qt::BlankCursor; break;
+    case RightArrowCursor: case LeftArrowCursor: _currentCursor = Qt::ArrowCursor; break;
+    case InfoCursor: _currentCursor = Qt::SizeAllCursor; break;
+    case DestroyCursor: _currentCursor = Qt::ForbiddenCursor; break;
+    case HelpCursor: _currentCursor = Qt::WhatsThisCursor; break;
+    case CycleCursor: _currentCursor = Qt::ForbiddenCursor; break;
+    case SprayCursor: _currentCursor = Qt::SizeAllCursor; break;
+    case WaitCursor: _currentCursor = Qt::WaitCursor; break;
+    case TextCursor: _currentCursor = Qt::IBeamCursor; break;
+    case CrosshairCursor: _currentCursor = Qt::CrossCursor; break;
+    case HandCursor: _currentCursor = Qt::OpenHandCursor; break;
+    case UpDownCursor: _currentCursor = Qt::SizeVerCursor; break;
+    case LeftRightCursor: _currentCursor = Qt::SizeHorCursor; break;
+    case TopSideCursor: case BottomSideCursor: _currentCursor = Qt::UpArrowCursor; break;
+    case LeftSideCursor: case RightSideCursor: _currentCursor = Qt::SizeHorCursor; break;
+    case TopLeftCorner: _currentCursor = Qt::SizeBDiagCursor; break;
+    case TopRightCorner: _currentCursor = Qt::SizeFDiagCursor; break;
+    case BottomRightCorner: _currentCursor = Qt::SizeBDiagCursor; break;
+    case BottomLeftCorner: _currentCursor = Qt::SizeFDiagCursor; break;
+    default: break;
+    };
+    if ( _widget ) _widget->setCursor( _currentCursor );
+}
+
+bool GraphicsWindowQt::valid() const
+{
+    return _widget && _widget->isValid();
+}
+
+bool GraphicsWindowQt::realizeImplementation()
+{
+    // save the current context
+    // note: this will save only Qt-based contexts
+    const QGLContext *savedContext = QGLContext::currentContext();
+
+    // initialize GL context for the widget
+    if ( !valid() )
+        _widget->glInit();
+
+    // make current
+    _realized = true;
+    bool result = makeCurrent();
+    _realized = false;
+
+    // fail if we do not have current context
+    if ( !result )
+    {
+        if ( savedContext )
+            const_cast< QGLContext* >( savedContext )->makeCurrent();
+
+        OSG_WARN << "Window realize: Can make context current." << std::endl;
+        return false;
+    }
+
+    _realized = true;
+
+    // make sure the event queue has the correct window rectangle size and input range
+    getEventQueue()->syncWindowRectangleWithGraphicsContext();
+
+    // make this window's context not current
+    // note: this must be done as we will probably make the context current from another thread
+    //       and it is not allowed to have one context current in two threads
+    if( !releaseContext() )
+        OSG_WARN << "Window realize: Can not release context." << std::endl;
+
+    // restore previous context
+    if ( savedContext )
+        const_cast< QGLContext* >( savedContext )->makeCurrent();
+
+    return true;
+}
+
+bool GraphicsWindowQt::isRealizedImplementation() const
+{
+    return _realized;
+}
+
+void GraphicsWindowQt::closeImplementation()
+{
+    if ( _widget )
+        _widget->close();
+    _realized = false;
+}
+
+void GraphicsWindowQt::runOperations()
+{
+    // While in graphics thread this is last chance to do something useful before
+    // graphics thread will execute its operations.
+    if (_widget->getNumDeferredEvents() > 0)
+        _widget->processDeferredEvents();
+
+    if (QGLContext::currentContext() != _widget->context())
+        _widget->makeCurrent();
+
+    GraphicsWindow::runOperations();
+}
+
+bool GraphicsWindowQt::makeCurrentImplementation()
+{
+    if (_widget->getNumDeferredEvents() > 0)
+        _widget->processDeferredEvents();
+
+    _widget->makeCurrent();
+
+    return true;
+}
+
+bool GraphicsWindowQt::releaseContextImplementation()
+{
+    _widget->doneCurrent();
+    return true;
+}
+
+void GraphicsWindowQt::swapBuffersImplementation()
+{
+    _widget->swapBuffers();
+
+    // FIXME: the processDeferredEvents should really be executed in a GUI (main) thread context but
+    // I couln't find any reliable way to do this. For now, lets hope non of *GUI thread only operations* will
+    // be executed in a QGLWidget::event handler. On the other hand, calling GUI only operations in the
+    // QGLWidget event handler is an indication of a Qt bug.
+    if (_widget->getNumDeferredEvents() > 0)
+        _widget->processDeferredEvents();
+
+    // We need to call makeCurrent here to restore our previously current context
+    // which may be changed by the processDeferredEvents function.
+    if (QGLContext::currentContext() != _widget->context())
+        _widget->makeCurrent();
+}
+
+void GraphicsWindowQt::requestWarpPointer( float x, float y )
+{
+    if ( _widget )
+        QCursor::setPos( _widget->mapToGlobal(QPoint((int)x,(int)y)) );
+}
+
+
+class QtWindowingSystem : public osg::GraphicsContext::WindowingSystemInterface
+{
+public:
+
+    QtWindowingSystem()
+    {
+        OSG_INFO << "QtWindowingSystemInterface()" << std::endl;
+    }
+
+    ~QtWindowingSystem()
+    {
+        if (osg::Referenced::getDeleteHandler())
+        {
+            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0);
+            osg::Referenced::getDeleteHandler()->flushAll();
+        }
+    }
+
+    // Access the Qt windowing system through this singleton class.
+    static QtWindowingSystem* getInterface()
+    {
+        static QtWindowingSystem* qtInterface = new QtWindowingSystem;
+        return qtInterface;
+    }
+
+    // Return the number of screens present in the system
+    virtual unsigned int getNumScreens( const osg::GraphicsContext::ScreenIdentifier& /*si*/ )
+    {
+        OSG_WARN << "osgQt: getNumScreens() not implemented yet." << std::endl;
+        return 0;
+    }
+
+    // Return the resolution of specified screen
+    // (0,0) is returned if screen is unknown
+    virtual void getScreenSettings( const osg::GraphicsContext::ScreenIdentifier& /*si*/, osg::GraphicsContext::ScreenSettings & /*resolution*/ )
+    {
+        OSG_WARN << "osgQt: getScreenSettings() not implemented yet." << std::endl;
+    }
+
+    // Set the resolution for given screen
+    virtual bool setScreenSettings( const osg::GraphicsContext::ScreenIdentifier& /*si*/, const osg::GraphicsContext::ScreenSettings & /*resolution*/ )
+    {
+        OSG_WARN << "osgQt: setScreenSettings() not implemented yet." << std::endl;
+        return false;
+    }
+
+    // Enumerates available resolutions
+    virtual void enumerateScreenSettings( const osg::GraphicsContext::ScreenIdentifier& /*screenIdentifier*/, osg::GraphicsContext::ScreenSettingsList & /*resolution*/ )
+    {
+        OSG_WARN << "osgQt: enumerateScreenSettings() not implemented yet." << std::endl;
+    }
+
+    // Create a graphics context with given traits
+    virtual osg::GraphicsContext* createGraphicsContext( osg::GraphicsContext::Traits* traits )
+    {
+        if (traits->pbuffer)
+        {
+            OSG_WARN << "osgQt: createGraphicsContext - pbuffer not implemented yet." << std::endl;
+            return NULL;
+        }
+        else
+        {
+            osg::ref_ptr< GraphicsWindowQt > window = new GraphicsWindowQt( traits );
+            if (window->valid()) return window.release();
+            else return NULL;
+        }
+    }
+
+private:
+
+    // No implementation for these
+    QtWindowingSystem( const QtWindowingSystem& );
+    QtWindowingSystem& operator=( const QtWindowingSystem& );
+};
+
diff --git a/files/gamecontrollerdb.txt b/files/gamecontrollerdb.txt
index bd8d9c5fc..634dfa1cc 100644
--- a/files/gamecontrollerdb.txt
+++ b/files/gamecontrollerdb.txt
@@ -24,11 +24,14 @@
 341a3608000000000000504944564944,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 ffff0000000000000000504944564944,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 6d0416c2000000000000504944564944,Generic DirectInput Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+0d0f6e00000000000000504944564944,HORIPAD 4,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,platform:Windows,
 6d0419c2000000000000504944564944,Logitech F710 Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 88880803000000000000504944564944,PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b9,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b0,y:b3,platform:Windows,
 4c056802000000000000504944564944,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Windows,
 25090500000000000000504944564944,PS3 DualShock,a:b2,b:b1,back:b9,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b0,y:b3,platform:Windows,
-4c05c405000000000000504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+4c05c405000000000000504944564944,Sony DualShock 4,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b13,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,platform:Windows,
+4c05cc09000000000000504944564944,Sony DualShock 4,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b13,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,platform:Windows,
+4c05a00b000000000000504944564944,Sony DualShock 4 Wireless Adaptor,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b13,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,platform:Windows,
 6d0418c2000000000000504944564944,Logitech RumblePad 2 USB,platform:Windows,x:b0,a:b1,b:b2,y:b3,back:b8,start:b9,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,
 36280100000000000000504944564944,OUYA Controller,platform:Windows,a:b0,b:b3,y:b2,x:b1,start:b14,guide:b15,leftstick:b6,rightstick:b7,leftshoulder:b4,rightshoulder:b5,dpup:b8,dpleft:b10,dpdown:b9,dpright:b11,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:b12,righttrigger:b13,
 4f0400b3000000000000504944564944,Thrustmaster Firestorm Dual Power,a:b0,b:b2,y:b3,x:b1,start:b10,guide:b8,back:b9,leftstick:b11,rightstick:b12,leftshoulder:b4,rightshoulder:b6,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b5,righttrigger:b7,platform:Windows,
@@ -39,6 +42,30 @@ ff113133000000000000504944564944,SVEN X-PAD,platform:Windows,a:b2,b:b3,y:b1,x:b0
 8f0e0300000000000000504944564944,Piranha xtreme,platform:Windows,x:b3,a:b2,b:b1,y:b0,back:b8,start:b9,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b7,righttrigger:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a3,righty:a2,
 8f0e0d31000000000000504944564944,Multilaser JS071 USB,platform:Windows,a:b1,b:b2,y:b3,x:b0,start:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,
 10080300000000000000504944564944,PS2 USB,platform:Windows,a:b2,b:b1,y:b0,x:b3,start:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a4,righty:a2,lefttrigger:b4,righttrigger:b5,
+79000600000000000000504944564944,G-Shark GS-GP702,a:b2,b:b1,x:b3,y:b0,back:b8,start:b9,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a4,lefttrigger:b6,righttrigger:b7,platform:Windows,
+4b12014d000000000000504944564944,NYKO AIRFLO,a:b0,b:b1,x:b2,y:b3,back:b8,guide:b10,start:b9,leftstick:a0,rightstick:a2,leftshoulder:a3,rightshoulder:b5,dpup:h0.1,dpdown:h0.0,dpleft:h0.8,dpright:h0.2,leftx:h0.6,lefty:h0.12,rightx:h0.9,righty:h0.4,lefttrigger:b6,righttrigger:b7,platform:Windows,
+d6206dca000000000000504944564944,PowerA Pro Ex,a:b1,b:b2,x:b0,y:b3,back:b8,guide:b12,start:b9,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.0,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,platform:Windows,
+a3060cff000000000000504944564944,Saitek P2500,a:b2,b:b3,y:b1,x:b0,start:b4,guide:b10,back:b5,leftstick:b8,rightstick:b9,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,platform:Windows,
+4f0415b3000000000000504944564944,Thrustmaster Dual Analog 3.2,platform:Windows,x:b1,a:b0,b:b2,y:b3,back:b8,start:b9,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b6,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,
+6f0e1e01000000000000504944564944,Rock Candy Gamepad for PS3,platform:Windows,a:b1,b:b2,x:b0,y:b3,back:b8,start:b9,guide:b12,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,
+83056020000000000000504944564944,iBuffalo USB 2-axis 8-button Gamepad,a:b1,b:b0,y:b2,x:b3,start:b7,back:b6,leftshoulder:b4,rightshoulder:b5,leftx:a0,lefty:a1,platform:Windows,
+10080100000000000000504944564944,PS1 USB,platform:Windows,a:b2,b:b1,x:b3,y:b0,back:b8,start:b9,leftshoulder:b6,rightshoulder:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a3,righty:a2,lefttrigger:b4,righttrigger:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,
+49190204000000000000504944564944,Ipega PG-9023,a:b0,b:b1,x:b3,y:b4,back:b10,start:b11,leftstick:b13,rightstick:b14,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:b8,righttrigger:b9,platform:Windows,
+4f0423b3000000000000504944564944,Dual Trigger 3-in-1,a:b1,b:b2,x:b0,y:b3,back:b8,start:b9,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:b6,righttrigger:b7,platform:Windows,
+0d0f4900000000000000504944564944,Hatsune Miku Sho Controller,a:b1,b:b2,x:b0,y:b3,back:b8,guide:b12,start:b9,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,platform:Windows,
+79004318000000000000504944564944,Mayflash GameCube Controller Adapter,platform:Windows,a:b1,b:b2,x:b0,y:b3,back:b0,start:b9,guide:b0,leftshoulder:b4,rightshoulder:b7,leftstick:b0,rightstick:b0,leftx:a0,lefty:a1,rightx:a5,righty:a2,lefttrigger:a3,righttrigger:a4,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,
+79000018000000000000504944564944,Mayflash WiiU Pro Game Controller Adapter (DInput),a:b1,b:b2,x:b0,y:b3,back:b8,start:b9,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,platform:Windows,
+2509e803000000000000504944564944,Mayflash Wii Classic Controller,a:b1,b:b0,x:b3,y:b2,back:b8,guide:b10,start:b9,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:b11,dpdown:b13,dpleft:b12,dpright:b14,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,platform:Windows,
+300f1001000000000000504944564944,Saitek P480 Rumble Pad,a:b2,b:b3,x:b0,y:b1,back:b8,start:b9,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b6,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a2,lefttrigger:b5,righttrigger:b7,platform:Windows,
+10280900000000000000504944564944,8Bitdo SFC30 GamePad,a:b1,b:b0,y:b3,x:b4,start:b11,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,platform:Windows,
+63252305000000000000504944564944,USB Vibration Joystick (BM),platform:Windows,x:b3,a:b2,b:b1,y:b0,back:b8,start:b9,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,
+20380900000000000000504944564944,8Bitdo NES30 PRO Wireless,platform:Windows,a:b0,b:b1,x:b3,y:b4,leftshoulder:b6,rightshoulder:b7,lefttrigger:b8,righttrigger:b9,back:b10,start:b11,leftstick:b13,rightstick:b14,leftx:a0,lefty:a1,rightx:a3,righty:a4,dpup:h0.1,dpright:h0.2,dpdown:h0.4,dpleft:h0.8,
+02200090000000000000504944564944,8Bitdo NES30 PRO USB,platform:Windows,a:b0,b:b1,x:b3,y:b4,leftshoulder:b6,rightshoulder:b7,lefttrigger:b8,righttrigger:b9,back:b10,start:b11,leftstick:b13,rightstick:b14,leftx:a0,lefty:a1,rightx:a3,righty:a4,dpup:h0.1,dpright:h0.2,dpdown:h0.4,dpleft:h0.8,
+ff113133000000000000504944564944,Gembird JPD-DualForce,platform:Windows,a:b2,b:b3,x:b0,y:b1,start:b9,back:b8,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a4,lefttrigger:b6,righttrigger:b7,leftstick:b10,rightstick:b11,
+341a0108000000000000504944564944,EXEQ RF USB Gamepad 8206,a:b0,b:b1,x:b2,y:b3,leftshoulder:b4,rightshoulder:b5,leftstick:b8,rightstick:b7,back:b8,start:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,platform:Windows,
+c0111352000000000000504944564944,Battalife Joystick,platform:Windows,x:b4,a:b6,b:b7,y:b5,back:b2,start:b3,leftshoulder:b0,rightshoulder:b1,leftx:a0,lefty:a1,
+100801e5000000000000504944564944,NEXT Classic USB Game Controller,a:b0,b:b1,back:b8,start:b9,rightx:a2,righty:a3,leftx:a0,lefty:a1,platform:Windows,
+79000600000000000000504944564944,NGS Phantom,a:b2,b:b3,y:b1,x:b0,start:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a4,lefttrigger:b6,righttrigger:b7,platform:Windows,
 
 # OS X
 0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
@@ -47,23 +74,49 @@ ff113133000000000000504944564944,SVEN X-PAD,platform:Windows,a:b2,b:b3,y:b1,x:b0
 6d040000000000001fc2000000000000,Logitech F710 Gamepad (XInput),a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
 6d0400000000000019c2000000000000,Logitech Wireless Gamepad (DInput),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
 4c050000000000006802000000000000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Mac OS X,
-4c05000000000000c405000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,Platform:Mac OS X,
+4c05000000000000c405000000000000,Sony DualShock 4,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b13,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,platform:Mac OS X,
+4c05000000000000cc09000000000000,Sony DualShock 4 V2,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b13,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,platform:Mac OS X,
 5e040000000000008e02000000000000,X360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
 891600000000000000fd000000000000,Razer Onza Tournament,a:b0,b:b1,y:b3,x:b2,start:b8,guide:b10,back:b9,leftstick:b6,rightstick:b7,leftshoulder:b4,rightshoulder:b5,dpup:b11,dpleft:b13,dpdown:b12,dpright:b14,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,platform:Mac OS X,
 4f0400000000000000b3000000000000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,y:b3,x:b1,start:b10,guide:b8,back:b9,leftstick:b11,rightstick:,leftshoulder:b4,rightshoulder:b6,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b5,righttrigger:b7,platform:Mac OS X,
 8f0e0000000000000300000000000000,Piranha xtreme,platform:Mac OS X,x:b3,a:b2,b:b1,y:b0,back:b8,start:b9,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b7,righttrigger:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a3,righty:a2,
 0d0f0000000000004d00000000000000,HORI Gem Pad 3,platform:Mac OS X,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,
+79000000000000000600000000000000,G-Shark GP-702,a:b2,b:b1,x:b3,y:b0,back:b8,start:b9,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:b6,righttrigger:b7,platform:Mac OS X,
+4f0400000000000015b3000000000000,Thrustmaster Dual Analog 3.2,platform:Mac OS X,x:b1,a:b0,b:b2,y:b3,back:b8,start:b9,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b6,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,
+AD1B00000000000001F9000000000000,Gamestop BB-070 X360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+050000005769696d6f74652028303000,Wii Remote,a:b4,b:b5,y:b9,x:b10,start:b6,guide:b8,back:b7,dpup:b2,dpleft:b0,dpdown:b3,dpright:b1,leftx:a0,lefty:a1,lefttrigger:b12,righttrigger:,leftshoulder:b11,platform:Mac OS X,
+83050000000000006020000000000000,iBuffalo USB 2-axis 8-button Gamepad,a:b1,b:b0,x:b3,y:b2,back:b6,start:b7,leftshoulder:b4,rightshoulder:b5,leftx:a0,lefty:a1,platform:Mac OS X,
+bd1200000000000015d0000000000000,Tomee SNES USB Controller,x:b3,a:b2,b:b1,y:b0,back:b8,start:b9,leftshoulder:b4,rightshoulder:b5,leftx:a0,lefty:a1,platform:Mac OS X,
+79000000000000001100000000000000,Retrolink Classic Controller,x:b3,a:b2,b:b1,y:b0,back:b8,start:b9,leftshoulder:b4,rightshoulder:b5,leftx:a3,lefty:a4,platform:Mac OS X,
+5e04000000000000dd02000000000000,Xbox One Wired Controller,platform:Mac OS X,x:b2,a:b0,b:b1,y:b3,back:b9,guide:b10,start:b8,dpleft:b13,dpdown:b12,dpright:b14,dpup:b11,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b6,rightstick:b7,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+5e04000000000000ea02000000000000,Xbox Wireless Controller,platform:Mac OS X,x:b2,a:b0,b:b1,y:b3,back:b9,guide:b10,start:b8,dpleft:b13,dpdown:b12,dpright:b14,dpup:b11,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b6,rightstick:b7,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+5e04000000000000e002000000000000,Xbox Wireless Controller,platform:Mac OS X,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b10,start:b7,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b8,rightstick:b9,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+050000005769696d6f74652028313800,Wii U Pro Controller,a:b16,b:b15,x:b18,y:b17,back:b7,guide:b8,start:b6,leftstick:b23,rightstick:b24,leftshoulder:b19,rightshoulder:b20,dpup:b11,dpdown:b12,dpleft:b13,dpright:b14,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b21,righttrigger:b22,platform:Mac OS X,
+79000000000000000018000000000000,Mayflash WiiU Pro Game Controller Adapter (DInput),a:b4,b:b8,x:b0,y:b12,back:b32,start:b36,leftstick:b40,rightstick:b44,leftshoulder:b16,rightshoulder:b20,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a4,rightx:a8,righty:a12,lefttrigger:b24,righttrigger:b28,platform:Mac OS X,
+2509000000000000e803000000000000,Mayflash Wii Classic Controller,a:b1,b:b0,x:b3,y:b2,back:b8,guide:b10,start:b9,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:b11,dpdown:b13,dpleft:b12,dpright:b14,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,platform:Mac OS X,
+351200000000000021ab000000000000,SFC30 Joystick,a:b1,b:b0,x:b4,y:b3,back:b10,start:b11,leftshoulder:b6,rightshoulder:b7,leftx:a0,lefty:a1,platform:Mac OS X,
+b4040000000000000a01000000000000,Sega Saturn USB Gamepad,a:b0,b:b1,x:b3,y:b4,back:b5,guide:b2,start:b8,leftshoulder:b6,rightshoulder:b7,leftx:a0,lefty:a1,platform:Mac OS X,
+81170000000000007e05000000000000,Sega Saturn,x:b0,a:b2,b:b4,y:b6,start:b13,dpleft:b15,dpdown:b16,dpright:b14,dpup:b17,leftshoulder:b8,lefttrigger:a5,lefttrigger:b10,rightshoulder:b9,righttrigger:a4,righttrigger:b11,leftx:a0,lefty:a2,platform:Mac OS X,
+10280000000000000900000000000000,8Bitdo SFC30 GamePad,a:b1,b:b0,x:b4,y:b3,back:b10,start:b11,leftshoulder:b6,rightshoulder:b7,leftx:a0,lefty:a1,platform:Mac OS X,
+d814000000000000cecf000000000000,MC Cthulhu,platform:Mac OS X,leftx:,lefty:,rightx:,righty:,lefttrigger:b6,a:b1,b:b2,y:b3,x:b0,start:b9,back:b8,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,righttrigger:b7,
+0d0f0000000000006600000000000000,HORIPAD FPS PLUS 4,platform:Mac OS X,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:b6,righttrigger:a4,
 
 # Linux
 0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 03000000ba2200002010000001010000,Jess Technology USB Game Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
 030000006d04000019c2000010010000,Logitech Cordless RumblePad 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000006d0400001dc2000014400000,Logitech F310 Gamepad (XInput),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006d04000016c2000011010000,Logitech F310 Gamepad (DInput),x:b0,a:b1,b:b2,y:b3,back:b8,start:b9,dpleft:h0.8,dpdown:h0.0,dpdown:h0.4,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,leftshoulder:h0.0,dpup:h0.1,leftshoulder:h0.0,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,platform:Linux,
 030000006d0400001ec2000020200000,Logitech F510 Gamepad (XInput),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006d04000019c2000011010000,Logitech F710 Gamepad (DInput),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000006d0400001fc2000005030000,Logitech F710 Gamepad (XInput),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000004c0500006802000011010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
-030000004c050000c405000011010000,Sony DualShock 4,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:b6,righttrigger:b7,platform:Linux,
+030000004c050000c405000011010000,Sony DualShock 4,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b13,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,platform:Linux,
+050000004c050000c405000000010000,Sony DualShock 4 BT,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000004c050000cc09000011010000,Sony DualShock 4 V2,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b13,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,platform:Linux,
+050000004c050000cc09000000010000,Sony DualShock 4 V2 BT,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b13,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,platform:Linux,
+030000004c050000a00b000011010000,Sony DualShock 4 Wireless Adaptor,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b13,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,platform:Linux,
+030000006f0e00003001000001010000,EA Sports PS3 Controller,platform:Linux,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,
 03000000de280000ff11000001000000,Valve Streaming Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e0400008e02000014010000,X360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e0400008e02000010010000,X360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
@@ -87,15 +140,57 @@ ff113133000000000000504944564944,SVEN X-PAD,platform:Windows,a:b2,b:b3,y:b1,x:b0
 030000006f0e00001f01000000010000,Generic X-Box pad,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,
 03000000280400000140000000010000,Gravis GamePad Pro USB ,platform:Linux,x:b0,a:b1,b:b2,y:b3,back:b8,start:b9,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftx:a0,lefty:a1,
 030000005e0400008902000021010000,Microsoft X-Box pad v2 (US),platform:Linux,x:b3,a:b0,b:b1,y:b4,back:b6,start:b7,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b5,lefttrigger:a2,rightshoulder:b2,righttrigger:a5,leftstick:b8,rightstick:b9,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+030000005e0400008502000000010000,Microsoft X-Box pad (Japan),platform:Linux,x:b3,a:b0,b:b1,y:b4,back:b6,start:b7,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b5,lefttrigger:a2,rightshoulder:b2,righttrigger:a5,leftstick:b8,rightstick:b9,leftx:a0,lefty:a1,rightx:a3,righty:a4,
 030000006f0e00001e01000011010000,Rock Candy Gamepad for PS3,platform:Linux,a:b1,b:b2,x:b0,y:b3,back:b8,start:b9,guide:b12,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,
 03000000250900000500000000010000,Sony PS2 pad with SmartJoy adapter,platform:Linux,a:b2,b:b1,y:b0,x:b3,start:b8,back:b9,leftstick:b10,rightstick:b11,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b4,righttrigger:b5,
 030000008916000000fd000024010000,Razer Onza Tournament,a:b0,b:b1,y:b3,x:b2,start:b7,guide:b8,back:b6,leftstick:b9,rightstick:b10,leftshoulder:b4,rightshoulder:b5,dpup:b13,dpleft:b11,dpdown:b14,dpright:b12,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,platform:Linux,
 030000004f04000000b3000010010000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,y:b3,x:b1,start:b10,guide:b8,back:b9,leftstick:b11,rightstick:b12,leftshoulder:b4,rightshoulder:b6,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b5,righttrigger:b7,platform:Linux,
 03000000ad1b000001f5000033050000,Hori Pad EX Turbo 2,a:b0,b:b1,y:b3,x:b2,start:b7,guide:b8,back:b6,leftstick:b9,rightstick:b10,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,platform:Linux,
-050000004c050000c405000000010000,PS4 Controller (Bluetooth),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
 060000004c0500006802000000010000,PS3 Controller (Bluetooth),a:b14,b:b13,y:b12,x:b15,start:b3,guide:b16,back:b0,leftstick:b1,rightstick:b2,leftshoulder:b10,rightshoulder:b11,dpup:b4,dpleft:b7,dpdown:b6,dpright:b5,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b8,righttrigger:b9,platform:Linux,
-03000000790000000600000010010000,DragonRise Inc.   Generic   USB  Joystick  ,platform:Linux,x:b3,a:b2,b:b1,y:b0,back:b8,start:b9,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+050000004c0500006802000000010000,PS3 Controller (Bluetooth),a:b14,b:b13,y:b12,x:b15,start:b3,guide:b16,back:b0,leftstick:b1,rightstick:b2,leftshoulder:b10,rightshoulder:b11,dpup:b4,dpleft:b7,dpdown:b6,dpright:b5,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b8,righttrigger:b9,platform:Linux,
+03000000790000000600000010010000,DragonRise Inc.   Generic   USB  Joystick  ,x:b3,a:b2,b:b1,y:b0,back:b8,start:b9,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a3,rightx:a1,righty:a4,
 03000000666600000488000000010000,Super Joy Box 5 Pro,platform:Linux,a:b2,b:b1,x:b3,y:b0,back:b9,start:b8,leftshoulder:b6,rightshoulder:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b4,righttrigger:b5,dpup:b12,dpleft:b15,dpdown:b14,dpright:b13,
 05000000362800000100000002010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,platform:Linux,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,
 05000000362800000100000003010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,platform:Linux,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,
-030000008916000001fd000024010000,Razer Onza Classic Edition,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8tart:b7,dpleft:b11,dpdown:b14,dpright:b12,dpup:b13,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+030000008916000001fd000024010000,Razer Onza Classic Edition,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:b11,dpdown:b14,dpright:b12,dpup:b13,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+030000005e040000d102000001010000,Microsoft X-Box One pad,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.0,dpdown:h0.4,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,leftshoulder:h0.0,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+030000005e040000dd02000003020000,Microsoft X-Box One pad v2,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.0,dpdown:h0.4,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,leftshoulder:h0.0,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,platform:Linux,
+03000000790000001100000010010000,RetroLink Saturn Classic Controller,platform:Linux,x:b3,a:b0,b:b1,y:b4,back:b5,guide:b2,start:b8,leftshoulder:b6,rightshoulder:b7,leftx:a0,lefty:a1,
+050000007e0500003003000001000000,Nintendo Wii U Pro Controller,platform:Linux,a:b0,b:b1,x:b3,y:b2,back:b8,start:b9,guide:b10,leftshoulder:b4,rightshoulder:b5,leftstick:b11,rightstick:b12,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,dpup:b13,dpleft:b15,dpdown:b14,dpright:b16,
+030000005e0400008e02000004010000,Microsoft X-Box 360 pad,platform:Linux,a:b0,b:b1,x:b2,y:b3,back:b6,start:b7,guide:b8,leftshoulder:b4,rightshoulder:b5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,
+030000000d0f00002200000011010000,HORI CO. LTD. REAL ARCADE Pro.V3,platform:Linux,x:b0,a:b1,b:b2,y:b3,back:b8,guide:b12,start:b9,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,
+030000000d0f00001000000011010000,HORI CO. LTD. FIGHTING STICK 3,platform:Linux,x:b0,a:b1,b:b2,y:b3,back:b8,guide:b12,start:b9,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7
+03000000f0250000c183000010010000,Goodbetterbest Ltd USB Controller,platform:Linux,x:b0,a:b1,b:b2,y:b3,back:b8,guide:b12,start:b9,dpleft:h0.8,dpdown:h0.0,dpdown:h0.4,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,leftshoulder:h0.0,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,
+0000000058626f782047616d65706100,Xbox Gamepad (userspace driver),platform:Linux,a:b0,b:b1,x:b2,y:b3,start:b7,back:b6,guide:b8,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,lefttrigger:a5,righttrigger:a4,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a2,righty:a3,
+03000000ff1100003133000010010000,PC Game Controller,a:b2,b:b1,y:b0,x:b3,start:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,platform:Linux,
+030000005e0400008e02000020200000,SpeedLink XEOX Pro Analog Gamepad pad,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+030000006f0e00001304000000010000,Generic X-Box pad,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.0,dpdown:h0.4,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,leftshoulder:h0.0,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:a0,rightstick:a3,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+03000000a306000018f5000010010000,Saitek PLC Saitek P3200 Rumble Pad,platform:Linux,x:b0,a:b1,b:b2,y:b3,back:b8,start:b9,dpleft:h0.8,dpdown:h0.0,dpdown:h0.4,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,leftshoulder:h0.0,leftshoulder:b4,lefttrigger:a2,rightshoulder:b6,rightshoulder:b5,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+03000000830500006020000010010000,iBuffalo USB 2-axis 8-button Gamepad,a:b1,b:b0,x:b3,y:b2,back:b6,start:b7,leftshoulder:b4,rightshoulder:b5,leftx:a0,lefty:a1,platform:Linux,
+03000000bd12000015d0000010010000,Tomee SNES USB Controller,x:b3,a:b2,b:b1,y:b0,back:b8,start:b9,leftshoulder:b4,rightshoulder:b5,leftx:a0,lefty:a1,platform:Linux,
+03000000790000001100000010010000,Retrolink Classic Controller,x:b3,a:b2,b:b1,y:b0,back:b8,start:b9,leftshoulder:b4,rightshoulder:b5,leftx:a0,lefty:a1,platform:Linux,
+03000000c9110000f055000011010000,HJC Game GAMEPAD,leftx:a0,lefty:a1,dpdown:h0.4,rightstick:b11,rightshoulder:b5,rightx:a2,start:b9,righty:a3,dpleft:h0.8,lefttrigger:b6,x:b2,dpup:h0.1,back:b8,leftstick:b10,leftshoulder:b4,y:b3,a:b0,dpright:h0.2,righttrigger:b7,b:b1,platform:Linux,
+03000000a30600000c04000011010000,Saitek P2900 Wireless Pad,a:b1,b:b2,y:b3,x:b0,start:b12,guide:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a2,lefttrigger:b4,righttrigger:b5,platform:Linux,
+03000000341a000005f7000010010000,GameCube {HuiJia USB box},a:b1,b:b2,y:b3,x:b0,start:b9,guide:,back:,leftstick:,rightstick:,leftshoulder:,dpleft:b15,dpdown:b14,dpright:b13,leftx:a0,lefty:a1,rightx:a5,righty:a2,lefttrigger:a3,righttrigger:a4,rightshoulder:b7,dpup:b12,platform:Linux,
+030000006e0500000320000010010000,JC-U3613M - DirectInput Mode,platform:Linux,x:b0,a:b2,b:b3,y:b1,back:b10,guide:b12,start:b11,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b8,rightstick:b9,leftx:a0,lefty:a1,rightx:a2,righty:a3,
+030000006f0e00004601000001010000,Rock Candy Wired Controller for Xbox One,platform:Linux,a:b0,b:b1,x:b2,y:b3,leftshoulder:b4,rightshoulder:b5,back:b6,start:b7,guide:b8,leftstick:b9,rightstick:b10,lefttrigger:a2,righttrigger:a5,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+03000000380700001647000010040000,Mad Catz Wired Xbox 360 Controller,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.0,dpdown:h0.4,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,leftshoulder:h0.0,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+030000006f0e00003901000020060000,Afterglow Wired Controller for Xbox One,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,platform:Linux,
+030000004f04000015b3000010010000,Thrustmaster Dual Analog 4,platform:Linux,a:b0,b:b2,x:b1,y:b3,start:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b6,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b5,righttrigger:b7,
+05000000102800000900000000010000,8Bitdo SFC30 GamePad,platform:Linux,x:b4,a:b1,b:b0,y:b3,back:b10,start:b11,leftshoulder:b6,rightshoulder:b7,leftx:a0,lefty:a1,
+03000000d81400000862000011010000,HitBox (PS3/PC) Analog Mode,platform:Linux,a:b1,b:b2,y:b3,x:b0,start:b12,guide:b9,back:b8,leftshoulder:b4,rightshoulder:b5,lefttrigger:b6,righttrigger:b7,leftx:a0,lefty:a1,
+030000000d0f00000d00000000010000,hori,platform:Linux,a:b0,b:b6,y:b2,x:b1,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,start:b9,guide:b10,back:b8,leftshoulder:b3,rightshoulder:b7,leftx:b4,lefty:b5,
+03000000ad1b000016f0000090040000,Mad Catz Xbox 360 Controller,platform:Linux,a:b0,b:b1,y:b3,x:b2,start:b7,guide:b8,back:b6,leftstick:b9,rightstick:b10,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,
+03000000d814000007cd000011010000,Toodles 2008 Chimp PC/PS3,platform:Linux,a:b0,b:b1,y:b2,x:b3,start:b9,back:b8,leftshoulder:b4,rightshoulder:b5,leftx:a0,lefty:a1,lefttrigger:b6,righttrigger:b7,
+03000000fd0500000030000000010000,InterAct GoPad I-73000 (Fighting Game Layout),platform:Linux,a:b3,b:b4,y:b1,x:b0,start:b7,back:b6,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,
+05000000010000000100000003000000,Nintendo Wiimote,platform:Linux,a:b0,b:b1,y:b3,x:b2,start:b9,guide:b10,back:b8,leftstick:b11,rightstick:b12,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,
+030000005e0400008e02000062230000,Microsoft X-Box 360 pad,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+03000000a30600000901000000010000,Saitek P880,a:b2,b:b3,y:b1,x:b0,leftstick:b8,rightstick:b9,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a2,lefttrigger:b6,righttrigger:b7,platform:Linux,
+030000006f0e00000103000000020000,Logic3 Controller,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.0,dpdown:h0.4,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,leftshoulder:h0.0,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+05000000380700006652000025010000,Mad Catz C.T.R.L.R ,platform:Linux,x:b0,a:b1,b:b2,y:b3,back:b8,guide:b12,start:b9,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,
+030000005e0400008e02000073050000,Speedlink TORID Wireless Gamepad,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+03000000ad1b00002ef0000090040000,Mad Catz Fightpad SFxT,platform:Linux,a:b0,b:b1,y:b3,x:b2,start:b7,guide:b8,back:b6,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,lefttrigger:a2,righttrigger:a5,
+05000000a00500003232000001000000,8Bitdo Zero GamePad,platform:Linux,a:b0,b:b1,x:b3,y:b4,back:b10,start:b11,leftshoulder:b6,rightshoulder:b7,leftx:a0,lefty:a1,
+030000001008000001e5000010010000,NEXT Classic USB Game Controller,a:b0,b:b1,back:b8,start:b9,rightx:a2,righty:a3,leftx:a0,lefty:a1,platform:Linux,
+03000000100800000300000010010000,USB Gamepad,platform:Linux,a:b2,b:b1,x:b3,y:b0,start:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a2,lefttrigger:b4,righttrigger:b5,
+05000000ac0500003232000001000000,VR-BOX,platform:Linux,a:b0,b:b1,x:b2,y:b3,start:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a2,lefttrigger:b4,righttrigger:b5,
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index 7494d3ba2..d909a629a 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -1,6 +1,10 @@
+if (NOT DEFINED OPENMW_MYGUI_FILES_ROOT)
+    return()
+endif()
+
 # Copy resource files into the build directory
 set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(DDIR ${OpenMW_BINARY_DIR}/resources/mygui)
+set(DDIR ${OPENMW_MYGUI_FILES_ROOT}/resources/mygui)
 
 set(MYGUI_FILES
     core.skin
@@ -89,6 +93,10 @@ set(MYGUI_FILES
     ../launcher/images/openmw.png
     OpenMWResourcePlugin.xml
     skins.xml
+
+    tes3mp_login.layout
+    tes3mp_login.skin.xml
+    tes3mp_dialog_list.layout
 )
 
 
diff --git a/files/mygui/openmw_alchemy_window.layout b/files/mygui/openmw_alchemy_window.layout
index e098800af..ef8296980 100644
--- a/files/mygui/openmw_alchemy_window.layout
+++ b/files/mygui/openmw_alchemy_window.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Window_NoCaption" layer="Windows" position="0 0 588 444" name="_Main">
+    <Widget type="Window" skin="MW_Window_NoCaption" layer="Windows" align="Center" position="0 0 588 444" name="_Main">
        <Property key="MinSize" value="425 360"/>
 
         <!-- Name -->
diff --git a/files/mygui/openmw_chargen_birth.layout b/files/mygui/openmw_chargen_birth.layout
index d13a5a02d..2375e5277 100644
--- a/files/mygui/openmw_chargen_birth.layout
+++ b/files/mygui/openmw_chargen_birth.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 527 378" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 527 378" align="Center" name="_Main">
 
         <!-- Birthsign list -->
         <Widget type="ListBox" skin="MW_List" position="8 8 232 137" name="BirthsignList"/>
diff --git a/files/mygui/openmw_chargen_class.layout b/files/mygui/openmw_chargen_class.layout
index aae3c7035..53a6a6642 100644
--- a/files/mygui/openmw_chargen_class.layout
+++ b/files/mygui/openmw_chargen_class.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 491 316" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 491 316" align="Center" name="_Main">
 
         <!-- Class list -->
         <Widget type="ListBox" skin="MW_List" position="8 8 194 138" name="ClassList"/>
diff --git a/files/mygui/openmw_chargen_class_description.layout b/files/mygui/openmw_chargen_class_description.layout
index eaf754697..3d341eee5 100644
--- a/files/mygui/openmw_chargen_class_description.layout
+++ b/files/mygui/openmw_chargen_class_description.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 244 248" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 244 248" align="Center" name="_Main">
 
         <!-- Edit box -->
         <Widget type="Widget" skin="MW_Box" position="8 8 220 192" align="Stretch" name="Client"/>
diff --git a/files/mygui/openmw_chargen_create_class.layout b/files/mygui/openmw_chargen_create_class.layout
index 1d071e621..5f0b02c1b 100644
--- a/files/mygui/openmw_chargen_create_class.layout
+++ b/files/mygui/openmw_chargen_create_class.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 498 198" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 498 198" align="Center" name="_Main">
 
         <!-- Class name -->
         <Widget type="TextBox" skin="NormalText" position="8 8 52 23" name="LabelT" align="Left Top">
diff --git a/files/mygui/openmw_chargen_generate_class_result.layout b/files/mygui/openmw_chargen_generate_class_result.layout
index edbbaeb57..83595fafd 100644
--- a/files/mygui/openmw_chargen_generate_class_result.layout
+++ b/files/mygui/openmw_chargen_generate_class_result.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 289 256" name="_Main">
+    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 289 256" align="Center" name="_Main">
         <Property key="AutoResize" value="true"/>
         <Property key="Padding" value="12"/>
         <Property key="Spacing" value="8"/>
diff --git a/files/mygui/openmw_chargen_race.layout b/files/mygui/openmw_chargen_race.layout
index 1290795ed..58eb6f6f7 100644
--- a/files/mygui/openmw_chargen_race.layout
+++ b/files/mygui/openmw_chargen_race.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 588 433" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 588 433" align="Center" name="_Main">
 
         <!-- Appearance -->
         <Widget type="TextBox" skin="HeaderText" position="8 16 241 18" name="AppearanceT" align="Left Top">
diff --git a/files/mygui/openmw_chargen_review.layout b/files/mygui/openmw_chargen_review.layout
index db55e8754..1099fcd3b 100644
--- a/files/mygui/openmw_chargen_review.layout
+++ b/files/mygui/openmw_chargen_review.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 541 428" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 541 428" align="Center" name="_Main">
 
         <!-- Player Name, Race, Class and Birthsign -->
         <Widget type="Widget" skin="MW_Box" position="8 8 265 126">
diff --git a/files/mygui/openmw_chargen_select_attribute.layout b/files/mygui/openmw_chargen_select_attribute.layout
index cd722ef3e..a00577e41 100644
--- a/files/mygui/openmw_chargen_select_attribute.layout
+++ b/files/mygui/openmw_chargen_select_attribute.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 217 234" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 217 234" align="Center" name="_Main">
         <Widget type="Widget" skin="" position="14 14 186 203" align="Stretch">
 
             <!-- Label -->
diff --git a/files/mygui/openmw_chargen_select_skill.layout b/files/mygui/openmw_chargen_select_skill.layout
index 8d4ffdba2..b6e90b688 100644
--- a/files/mygui/openmw_chargen_select_skill.layout
+++ b/files/mygui/openmw_chargen_select_skill.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 477 270" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 477 270" align="Center" name="_Main">
         <Widget type="Widget" skin="" position="17 14 447 239" align="Stretch">
 
             <!-- Label -->
diff --git a/files/mygui/openmw_chargen_select_specialization.layout b/files/mygui/openmw_chargen_select_specialization.layout
index d0b74104b..70c5fdca5 100644
--- a/files/mygui/openmw_chargen_select_specialization.layout
+++ b/files/mygui/openmw_chargen_select_specialization.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
     <!-- correct size is 247 144, adjust when skin is changed to a dialog -->
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 247 144" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 247 144" align="Center" name="_Main">
         <Widget type="Widget" skin="" position="14 14 216 113" align="Stretch">
 
             <!-- Label -->
diff --git a/files/mygui/openmw_confirmation_dialog.layout b/files/mygui/openmw_confirmation_dialog.layout
index 1bedc8372..fbf779cd1 100644
--- a/files/mygui/openmw_confirmation_dialog.layout
+++ b/files/mygui/openmw_confirmation_dialog.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 300 130" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 300 130" align="Center" name="_Main">
         <Property key="Visible" value="false"/>
 
         <Widget type="EditBox" skin="MW_TextEditClient" position="16 8 268 130" name="Message" align="Center Top">
diff --git a/files/mygui/openmw_count_window.layout b/files/mygui/openmw_count_window.layout
index 27b62ebf0..891f9f00c 100644
--- a/files/mygui/openmw_count_window.layout
+++ b/files/mygui/openmw_count_window.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout" version="3.2.0">
-    <Widget type="Window" skin="MW_Dialog" position="0 0 600 128" layer="Windows" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" position="0 0 600 128" align="Center" layer="Windows" name="_Main">
         <Property key="Visible" value="false"/>
         <Widget type="TextBox" skin="SandText" position="4 4 592 24" align="Left Top HStretch" name="LabelText">
             <Property key="TextAlign" value="Center"/>
diff --git a/files/mygui/openmw_edit_effect.layout b/files/mygui/openmw_edit_effect.layout
index 6123f90a7..387c01231 100644
--- a/files/mygui/openmw_edit_effect.layout
+++ b/files/mygui/openmw_edit_effect.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 362 310" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 362 310" align="Center" name="_Main">
 
         <Widget type="ImageBox" skin="ImageBox" position="8 12 16 16" name="EffectImage">
         </Widget>
diff --git a/files/mygui/openmw_edit_note.layout b/files/mygui/openmw_edit_note.layout
index 652f67f0c..eb2a2789d 100644
--- a/files/mygui/openmw_edit_note.layout
+++ b/files/mygui/openmw_edit_note.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 336 242" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 336 242" align="Center" name="_Main">
 
         <Widget type="AutoSizedTextBox" skin="SandText" position="13 13 200 16">
             <Property key="Caption" value="#{sEditNote}"/>
diff --git a/files/mygui/openmw_enchanting_dialog.layout b/files/mygui/openmw_enchanting_dialog.layout
index b90fc7a77..88e0ec247 100644
--- a/files/mygui/openmw_enchanting_dialog.layout
+++ b/files/mygui/openmw_enchanting_dialog.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 560 400" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 560 400" align="Center" name="_Main">
 
         <Widget type="HBox" position="12 12 250 30">
 
diff --git a/files/mygui/openmw_hud.layout b/files/mygui/openmw_hud.layout
index 03c05260f..0412860ea 100644
--- a/files/mygui/openmw_hud.layout
+++ b/files/mygui/openmw_hud.layout
@@ -59,7 +59,7 @@
         <Widget type="Button" skin="" position="82 146 36 41" align="Left Bottom" name="WeapBox">
             <Widget type="Widget" skin="HUD_Box" position="0 0 36 36">
                 <Property key="NeedMouse" value="false"/>
-                <Widget type="ItemWidget" skin="MW_ItemIcon" position="-3 -3 42 42" align="Left Top" name="WeapImage">
+                <Widget type="ItemWidget" skin="MW_ItemIconNoShadow" position="-3 -3 42 42" align="Left Top" name="WeapImage">
                     <Property key="NeedMouse" value="false"/>
                 </Widget>
             </Widget>
@@ -71,7 +71,7 @@
         <!-- Selected spell box -->
         <Widget type="Button" position="122 146 36 41" align="Left Bottom" name="SpellBox">
             <Widget type="Widget" skin="HUD_Box" position="0 0 36 36">
-                <Widget type="ItemWidget" skin="MW_ItemIcon" position="-3 -3 42 42" align="Left Top" name="SpellImage"/>
+                <Widget type="ItemWidget" skin="MW_ItemIconNoShadow" position="-3 -3 42 42" align="Left Top" name="SpellImage"/>
                 <Property key="NeedMouse" value="false"/>
             </Widget>
             <Widget type="ProgressBar" skin="MW_EnergyBar_Magic" position="0 36 36 6" align="Left Bottom" name="SpellStatus">
diff --git a/files/mygui/openmw_hud_energybar.skin.xml b/files/mygui/openmw_hud_energybar.skin.xml
index 640133d66..2b41b5ea9 100644
--- a/files/mygui/openmw_hud_energybar.skin.xml
+++ b/files/mygui/openmw_hud_energybar.skin.xml
@@ -61,14 +61,14 @@
 
     <Resource type="ResourceSkin" name="MW_EnergyBar_Magic" size="64 12">
         <Property key="TrackSkin" value="MW_BarTrack_Magic"/>
-        <Property key="TrackWidth" value="1"/>
+        <Property key="TrackFill" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
     </Resource>
     <Resource type="ResourceSkin" name="MW_EnergyBar_Weapon" size="64 12">
         <Property key="TrackSkin" value="MW_BarTrack_Weapon"/>
-        <Property key="TrackWidth" value="1"/>
+        <Property key="TrackFill" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
@@ -76,7 +76,7 @@
 
     <Resource type="ResourceSkin" name="MW_EnergyBar_Red" size="64 12">
         <Property key="TrackSkin" value="MW_BarTrack_Red"/>
-        <Property key="TrackWidth" value="1"/>
+        <Property key="TrackFill" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
@@ -84,7 +84,7 @@
 
     <Resource type="ResourceSkin" name="MW_EnergyBar_Green" size="64 12">
         <Property key="TrackSkin" value="MW_BarTrack_Green"/>
-        <Property key="TrackWidth" value="1"/>
+        <Property key="TrackFill" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
@@ -92,7 +92,7 @@
 
     <Resource type="ResourceSkin" name="MW_EnergyBar_Blue" size="64 12">
         <Property key="TrackSkin" value="MW_BarTrack_Blue"/>
-        <Property key="TrackWidth" value="1"/>
+        <Property key="TrackFill" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
@@ -100,7 +100,7 @@
 
     <Resource type="ResourceSkin" name="MW_EnergyBar_Yellow" size="64 12">
         <Property key="TrackSkin" value="MW_BarTrack_Yellow"/>
-        <Property key="TrackWidth" value="1"/>
+        <Property key="TrackFill" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
diff --git a/files/mygui/openmw_infobox.layout b/files/mygui/openmw_infobox.layout
index 4e70cd2c4..ea9f78614 100644
--- a/files/mygui/openmw_infobox.layout
+++ b/files/mygui/openmw_infobox.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 545 265" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 545 265" align="Center" name="_Main">
 
         <!-- Edit box -->
         <Widget type="Widget" skin="" position="14 14 516 70" name="TextBox" align="Top HCenter">
diff --git a/files/mygui/openmw_interactive_messagebox.layout b/files/mygui/openmw_interactive_messagebox.layout
index a72bebf3a..50bc178ed 100644
--- a/files/mygui/openmw_interactive_messagebox.layout
+++ b/files/mygui/openmw_interactive_messagebox.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="MessageBox" position="0 0 500 400" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="MessageBox" position="0 0 500 400" align="Center" name="_Main">
         <Widget type="EditBox" skin="MW_TextEditClient" position="10 10 490 20" align="Left Top Stretch" name="message">
             <Property key="FontName" value="Default"/>
             <Property key="TextAlign" value="Center"/>
diff --git a/files/mygui/openmw_itemselection_dialog.layout b/files/mygui/openmw_itemselection_dialog.layout
index 5fc286298..5ae30563a 100644
--- a/files/mygui/openmw_itemselection_dialog.layout
+++ b/files/mygui/openmw_itemselection_dialog.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" position="0 0 380 285" layer="Windows" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" position="0 0 380 285" layer="Windows" align="Center" name="_Main">
 
         <Widget type="TextBox" skin="SandText" position="8 8 300 18" name="Label"/>
 
diff --git a/files/mygui/openmw_jail_screen.layout b/files/mygui/openmw_jail_screen.layout
index 4385494e1..ef37c73d8 100644
--- a/files/mygui/openmw_jail_screen.layout
+++ b/files/mygui/openmw_jail_screen.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Widget" skin="MW_Dialog" layer="LoadingScreen" position="0 0 300 48" name="_Main">
+    <Widget type="Widget" skin="MW_Dialog" layer="LoadingScreen" position="0 0 300 48" align="Center" name="_Main">
 
         <Widget type="TextBox" skin="SandText" position="20 8 260 18" align="Stretch" name="LoadingText">
             <Property key="TextAlign" value="Center"/>
diff --git a/files/mygui/openmw_levelup_dialog.layout b/files/mygui/openmw_levelup_dialog.layout
index ead181d26..ad0004934 100644
--- a/files/mygui/openmw_levelup_dialog.layout
+++ b/files/mygui/openmw_levelup_dialog.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 0 0" name="_Main">
+    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 0 0" align="Center" name="_Main">
         <Property key="Padding" value="12"/>
         <Property key="Spacing" value="8"/>
         <Property key="AutoResize" value="true"/>
diff --git a/files/mygui/openmw_list.skin.xml b/files/mygui/openmw_list.skin.xml
index ce8209e3d..9f5b2e94d 100644
--- a/files/mygui/openmw_list.skin.xml
+++ b/files/mygui/openmw_list.skin.xml
@@ -9,6 +9,7 @@
         <Property key="MinTrackSize" value="14"/>
         <Property key="VerticalAlignment" value="false"/>
         <Property key="MoveToClick" value="true"/>
+        <Property key="TrackFill" value="1"/>
 
         <Property key="WheelPage" value="36"/>
         <Property key="ViewPage" value="36"/>
@@ -50,6 +51,7 @@
         <Property key="TrackRangeMargins" value="20 19"/>
         <Property key="MinTrackSize" value="14"/>
         <Property key="MoveToClick" value="true"/>
+        <Property key="TrackFill" value="1"/>
 
         <Property key="WheelPage" value="36"/>
         <Property key="ViewPage" value="36"/>
@@ -157,6 +159,15 @@
         </Child>
     </Resource>
 
+    <Resource type="ResourceSkin" name="MW_ItemChargeView" size="516 516" align="Left Top">
+        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="Stretch"/>
+
+        <Child type="ScrollView" skin="MW_ScrollView" offset="3 3 509 509" align="Stretch" name="ScrollView">
+            <Property key="CanvasAlign" value="Left Top"/>
+            <Property key="NeedMouse" value="true"/>
+        </Child>
+    </Resource>
+
     <Resource type="ResourceSkin" name="MW_SpellView" size="516 516" align="Left Top">
         <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="Stretch"/>
 
diff --git a/files/mygui/openmw_magicselection_dialog.layout b/files/mygui/openmw_magicselection_dialog.layout
index bf4cb71d4..5301ecfe9 100644
--- a/files/mygui/openmw_magicselection_dialog.layout
+++ b/files/mygui/openmw_magicselection_dialog.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" position="0 0 330 370" layer="Windows" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" position="0 0 330 370" layer="Windows" align="Center" name="_Main">
 
         <Widget type="TextBox" skin="SandText" position="8 8 292 24">
             <Property key="Caption" value="#{sMagicSelectTitle}"/>
diff --git a/files/mygui/openmw_merchantrepair.layout b/files/mygui/openmw_merchantrepair.layout
index 23ab6008f..de5d0e316 100644
--- a/files/mygui/openmw_merchantrepair.layout
+++ b/files/mygui/openmw_merchantrepair.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 418 248" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 418 248" align="Center" name="_Main">
         <Property key="Visible" value="false"/>
 
         <Widget type="TextBox" skin="SandText" position="8 18 418 24" align="Right Top">
diff --git a/files/mygui/openmw_persuasion_dialog.layout b/files/mygui/openmw_persuasion_dialog.layout
index 6fb298914..d9a673ec2 100644
--- a/files/mygui/openmw_persuasion_dialog.layout
+++ b/files/mygui/openmw_persuasion_dialog.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 220 192" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 220 192" align="Center" name="_Main">
 
         <Widget type="TextBox" skin="NormalText" position="0 4 220 24">
             <Property key="Caption" value="#{sPersuasionMenuTitle}"/>
diff --git a/files/mygui/openmw_progress.skin.xml b/files/mygui/openmw_progress.skin.xml
index 71bbfe9f0..95f5b378c 100644
--- a/files/mygui/openmw_progress.skin.xml
+++ b/files/mygui/openmw_progress.skin.xml
@@ -54,7 +54,7 @@
 
     <Resource type="ResourceSkin" name="MW_Progress_Red" size="64 12">
         <Property key="TrackSkin" value="MW_Track_Red"/>
-        <Property key="TrackWidth" value="1"/>
+        <Property key="TrackFill" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
@@ -62,7 +62,7 @@
 
     <Resource type="ResourceSkin" name="MW_Progress_Green" size="64 12">
         <Property key="TrackSkin" value="MW_Track_Green"/>
-        <Property key="TrackWidth" value="1"/>
+        <Property key="TrackFill" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
@@ -70,7 +70,7 @@
 
     <Resource type="ResourceSkin" name="MW_Progress_Blue" size="64 12">
         <Property key="TrackSkin" value="MW_Track_Blue"/>
-        <Property key="TrackWidth" value="1"/>
+        <Property key="TrackFill" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
@@ -78,18 +78,19 @@
 
     <Resource type="ResourceSkin" name="MW_Progress_LightBlue" size="64 6">
         <Property key="TrackSkin" value="MW_BigTrack_Progress_Blue_Small"/>
-        <Property key="TrackWidth" value="1"/>
+        <Property key="TrackFill" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 6" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 2" align="Stretch" name="Client"/>
     </Resource>
 
     <Resource type="ResourceSkin" name="MW_Progress_Drowning" size="64 6">
-        <Child type="Widget" skin="MW_BigTrack_Progress_Red_Small" offset="0 0 64 6" align="Stretch"/>
+        <Property key="TrackSkin" value="MW_BigTrack_Progress_Red_Small"/>
+        <Property key="TrackFill" value="1"/>
     </Resource>
 
     <Resource type="ResourceSkin" name="MW_ProgressScroll_Loading" size="64 6">
-        <Property key="TrackWidth" value="1"/>
+        <Property key="TrackFill" value="1"/>
         <Property key="TrackRangeMargins" value="0 0"/>
         <Property key="MinTrackSize" value="1"/>
         <Property key="VerticalAlignment" value="false"/>
diff --git a/files/mygui/openmw_quickkeys_menu.layout b/files/mygui/openmw_quickkeys_menu.layout
index d7e976d45..3371b4f49 100644
--- a/files/mygui/openmw_quickkeys_menu.layout
+++ b/files/mygui/openmw_quickkeys_menu.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" position="0 0 370 230" layer="Windows" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" position="0 0 370 230" layer="Windows" align="Center" name="_Main">
 
         <Widget type="TextBox" skin="SandText" position="8 8 354 18">
             <Property key="Caption" value="#{sQuickMenuTitle}"/>
diff --git a/files/mygui/openmw_recharge_dialog.layout b/files/mygui/openmw_recharge_dialog.layout
index 1b2ad947b..9301bec92 100644
--- a/files/mygui/openmw_recharge_dialog.layout
+++ b/files/mygui/openmw_recharge_dialog.layout
@@ -1,27 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 329 253" name="_Main">
+    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 329 253" align="Center" name="_Main">
+        <Property key="Padding" value="12"/>
+        <Property key="Spacing" value="8"/>
 
-        <Widget type="Widget" skin="" position="4 4 321 42" name="GemBox">
-            <Widget type="ItemWidget" skin="MW_ItemIconSmall" position="5 6 32 32" name="GemIcon"/>
+        <Widget type="HBox" name="GemBox">
+            <UserString key="HStretch" value="true"/>
 
-            <Widget type="TextBox" skin="SandText" position="55 13 250 18" name="ChargeLabel">
+            <Widget type="ItemWidget" skin="MW_ItemIconSmall" position="0 0 32 32" name="GemIcon"/>
+            <Widget type="Widget">
+                <UserString key="HStretch" value="true"/>
+            </Widget>
+            <Widget type="AutoSizedTextBox" skin="SandText" name="ChargeLabel">
                 <Property key="Caption" value="#{sQuality}"/>
                 <Property key="TextAlign" value="Right"/>
             </Widget>
 
         </Widget>
 
-        <Widget type="Widget" skin="MW_Box" position="6 46 309 160" align="Left Stretch" name="Box">
-            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 301 152" align="Left Top Stretch" name="View">
-                <Property key="CanvasAlign" value="Left"/>
-            </Widget>
+        <Widget type="ItemChargeView" skin="MW_ItemChargeView" align="Left Stretch" name="Box">
+            <UserString key="VStretch" value="true"/>
+            <UserString key="HStretch" value="true"/>
         </Widget>
 
-        <Widget type="AutoSizedButton" skin="MW_Button" position="239 214 75 24" name="CancelButton">
-            <Property key="ExpandDirection" value="Left"/>
-            <Property key="Caption" value="#{sCancel}"/>
+        <Widget type="HBox">
+            <UserString key="HStretch" value="true"/>
+            <Widget type="Widget">
+                <UserString key="HStretch" value="true"/>
+            </Widget>
+            <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
+                <Property key="Caption" value="#{sCancel}"/>
+            </Widget>
         </Widget>
 
     </Widget>
diff --git a/files/mygui/openmw_repair.layout b/files/mygui/openmw_repair.layout
index 09a372440..9a349c56b 100644
--- a/files/mygui/openmw_repair.layout
+++ b/files/mygui/openmw_repair.layout
@@ -1,31 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 329 253" name="_Main">
+    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 329 253" align="Center" name="_Main">
+        <Property key="Padding" value="12"/>
+        <Property key="Spacing" value="8"/>
 
-        <Widget type="Widget" skin="" position="4 4 321 42" name="ToolBox">
-            <Widget type="ItemWidget" skin="MW_ItemIconSmall" position="5 6 32 32" name="ToolIcon"/>
+        <Widget type="HBox" name="ToolBox">
+            <UserString key="HStretch" value="true"/>
 
-            <Widget type="AutoSizedTextBox" skin="SandText" position="55 13 300 18" name="UsesLabel">
+            <Widget type="ItemWidget" skin="MW_ItemIconSmall" position="0 0 32 32" name="ToolIcon"/>
+
+            <Widget type="AutoSizedTextBox" skin="SandText" name="UsesLabel">
                 <Property key="Caption" value="#{sUses}"/>
             </Widget>
-
-            <Widget type="TextBox" skin="SandText" position="55 13 250 18" name="QualityLabel">
+            <Widget type="Widget">
+                <UserString key="HStretch" value="true"/>
+            </Widget>
+            <Widget type="AutoSizedTextBox" skin="SandText" name="QualityLabel">
                 <Property key="Caption" value="#{sQuality}"/>
                 <Property key="TextAlign" value="Right"/>
             </Widget>
-
         </Widget>
 
-        <Widget type="Widget" skin="MW_Box" position="6 46 309 160" align="Left Stretch" name="RepairBox">
-            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 301 152" align="Left Top Stretch" name="RepairView">
-                <Property key="CanvasAlign" value="Left"/>
-            </Widget>
+        <Widget type="ItemChargeView" skin="MW_ItemChargeView" align="Left Stretch" name="RepairBox">
+            <UserString key="VStretch" value="true"/>
+            <UserString key="HStretch" value="true"/>
         </Widget>
 
-        <Widget type="AutoSizedButton" skin="MW_Button" position="239 214 75 24" name="CancelButton">
-            <Property key="ExpandDirection" value="Left"/>
-            <Property key="Caption" value="#{sCancel}"/>
+        <Widget type="HBox">
+            <UserString key="HStretch" value="true"/>
+            <Widget type="Widget">
+                <UserString key="HStretch" value="true"/>
+            </Widget>
+            <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
+                <Property key="Caption" value="#{sCancel}"/>
+            </Widget>
         </Widget>
 
     </Widget>
diff --git a/files/mygui/openmw_resources.xml b/files/mygui/openmw_resources.xml
index ab6899341..9a6cfd038 100644
--- a/files/mygui/openmw_resources.xml
+++ b/files/mygui/openmw_resources.xml
@@ -113,6 +113,22 @@
     </Resource>
 
     <Resource type="ResourceLayout" name="MW_ItemIcon" version="3.2.0">
+        <Widget type="Widget" skin="" position="0 0 42 42" name="Root">
+            <Widget type="ImageBox" skin="ImageBox" position="0 0 42 42" align="Stretch" name="Frame">
+                <Widget type="TextBox" skin="CountText" position="5 19 32 18" align="Right Bottom" name="Text">
+                    <Property key="TextAlign" value="Right"/>
+                    <Property key="TextShadow" value="true"/>
+                </Widget>
+                <Widget type="ImageBox" skin="ImageBox" position="5 5 32 32" align="Stretch" name="Item"/>
+                <Widget type="ImageBox" skin="ImageBox" position="9 9 32 32" align="Stretch" name="ItemShadow">
+                    <Property key="Colour" value="0 0 0"/>
+                    <Property key="Alpha" value="0.5"/>
+                </Widget>
+            </Widget>
+        </Widget>
+    </Resource>
+
+    <Resource type="ResourceLayout" name="MW_ItemIconNoShadow" version="3.2.0">
         <Widget type="Widget" skin="" position="0 0 42 42" name="Root">
             <Widget type="ImageBox" skin="ImageBox" position="0 0 42 42" align="Stretch" name="Frame">
                 <Widget type="TextBox" skin="CountText" position="5 19 32 18" align="Right Bottom" name="Text">
@@ -128,6 +144,10 @@
         <Widget type="Widget" skin="" position="0 0 32 32" name="Root">
             <Widget type="ImageBox" skin="ImageBox" position="0 0 32 32" align="Stretch" name="Frame">
                 <Widget type="ImageBox" skin="ImageBox" position="0 0 32 32" align="Stretch" name="Item"/>
+                <Widget type="ImageBox" skin="ImageBox" position="4 4 32 32" align="Stretch" name="ItemShadow">
+                    <Property key="Colour" value="0 0 0"/>
+                    <Property key="Alpha" value="0.5"/>
+                </Widget>
             </Widget>
         </Widget>
     </Resource>
@@ -140,6 +160,10 @@
                     <Property key="TextShadow" value="true"/>
                 </Widget>
                 <Widget type="ImageBox" skin="ImageBox" position="5 5 32 32" align="Center" name="Item"/>
+                <Widget type="ImageBox" skin="ImageBox" position="9 9 32 32" align="Stretch" name="ItemShadow">
+                    <Property key="Colour" value="0 0 0"/>
+                    <Property key="Alpha" value="0.5"/>
+                </Widget>
             </Widget>
 
             <Widget type="Widget" skin="MW_Box_Overlay" position="0 0 50 50" align="Stretch"/>
diff --git a/files/mygui/openmw_savegame_dialog.layout b/files/mygui/openmw_savegame_dialog.layout
index c97e7f815..40288f0f5 100644
--- a/files/mygui/openmw_savegame_dialog.layout
+++ b/files/mygui/openmw_savegame_dialog.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 600 400" name="_Main">
+    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 600 400" align="Center" name="_Main">
         <Property key="Padding" value="12"/>
         <Property key="Spacing" value="8"/>
 
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index cf7fe1be7..8ff850cae 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -10,7 +10,7 @@
                     <Widget type="TextBox" skin="NormalText" position="0 0 352 16" align="Left Top">
                         <Property key="Caption" value="#{sTransparency_Menu}"/>
                     </Widget>
-                    <Widget type="MWScrollBar" skin="MW_HScroll" position="0 20 352 14" align="Left Top HStretch" name="MenuTransparencySlider">
+                    <Widget type="MWScrollBar" skin="MW_HScroll" position="0 20 352 14" align="Left Top HStretch">
                         <Property key="Range" value="10000"/>
                         <Property key="Page" value="300"/>
                         <UserString key="SettingType" value="Slider"/>
@@ -31,7 +31,7 @@
                     <Widget type="TextBox" skin="NormalText" position="0 0 352 16" align="Left Top">
                         <Property key="Caption" value="#{sMenu_Help_Delay}"/>
                     </Widget>
-                    <Widget type="MWScrollBar" skin="MW_HScroll" position="0 20 352 14" align="Left Top HStretch" name="ToolTipDelaySlider">
+                    <Widget type="MWScrollBar" skin="MW_HScroll" position="0 20 352 14" align="Left Top HStretch">
                         <Property key="Range" value="10000"/>
                         <Property key="Page" value="300"/>
                         <UserString key="SettingType" value="Slider"/>
@@ -52,7 +52,7 @@
                     <Widget type="TextBox" skin="NormalText" position="0 0 352 16" align="Left Top" name="DifficultyText">
                         <Property key="Caption" value="#{sDifficulty}"/>
                     </Widget>
-                    <Widget type="MWScrollBar" skin="MW_HScroll" position="0 20 352 14" align="Left Top HStretch" name="DifficultySlider">
+                    <Widget type="MWScrollBar" skin="MW_HScroll" position="0 20 352 14" align="Left Top HStretch">
                         <Property key="Range" value="10000"/>
                         <Property key="Page" value="300"/>
                         <UserString key="SettingType" value="Slider"/>
@@ -74,7 +74,7 @@
                     </Widget>
                 </Widget>
                 <Widget type="HBox" skin="" position="4 200 260 24">
-                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="AutosaveButton">
+                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="Saves"/>
                         <UserString key="SettingName" value="autosave"/>
                         <UserString key="SettingType" value="CheckButton"/>
@@ -84,7 +84,7 @@
                     </Widget>
                 </Widget>
                 <Widget type="HBox" skin="" position="4 230 260 24">
-                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="BestAttackButton">
+                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="Game"/>
                         <UserString key="SettingName" value="best attack"/>
                         <UserString key="SettingType" value="CheckButton"/>
@@ -94,7 +94,7 @@
                     </Widget>
                 </Widget>
                 <Widget type="HBox" skin="" position="4 260 260 24">
-                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="SubtitlesButton">
+                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="GUI"/>
                         <UserString key="SettingName" value="subtitles"/>
                         <UserString key="SettingType" value="CheckButton"/>
@@ -104,7 +104,7 @@
                     </Widget>
                 </Widget>
                 <Widget type="HBox" skin="" position="4 290 260 24">
-                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="CrosshairButton">
+                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="HUD"/>
                         <UserString key="SettingName" value="crosshair"/>
                         <UserString key="SettingType" value="CheckButton"/>
@@ -119,7 +119,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 4 352 18" align="Left Top">
                     <Property key="Caption" value="#{sMaster}"/>
                 </Widget>
-                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 28 352 18" align="HStretch Top" name="MasterVolume">
+                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 28 352 18" align="HStretch Top">
                     <Property key="Range" value="10000"/>
                     <Property key="Page" value="300"/>
                     <UserString key="SettingType" value="Slider"/>
@@ -130,7 +130,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 54 352 18" align="Left Top">
                     <Property key="Caption" value="#{sVoice}"/>
                 </Widget>
-                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 78 352 18" align="HStretch Top" name="VoiceVolume">
+                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 78 352 18" align="HStretch Top">
                     <Property key="Range" value="10000"/>
                     <Property key="Page" value="300"/>
                     <UserString key="SettingType" value="Slider"/>
@@ -141,7 +141,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 104 352 18" align="Left Top">
                     <Property key="Caption" value="#{sEffects}"/>
                 </Widget>
-                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 128 352 18" align="HStretch Top" name="EffectsVolume">
+                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 128 352 18" align="HStretch Top">
                     <Property key="Range" value="10000"/>
                     <Property key="Page" value="300"/>
                     <UserString key="SettingType" value="Slider"/>
@@ -152,7 +152,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 154 352 18" align="Left Top">
                     <Property key="Caption" value="#{sFootsteps}"/>
                 </Widget>
-                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 178 352 18" align="HStretch Top" name="FootstepsVolume">
+                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 178 352 18" align="HStretch Top">
                     <Property key="Range" value="10000"/>
                     <Property key="Page" value="300"/>
                     <UserString key="SettingType" value="Slider"/>
@@ -163,7 +163,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 204 352 18" align="Left Top">
                     <Property key="Caption" value="#{sMusic}"/>
                 </Widget>
-                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 228 352 18" align="HStretch Top" name="MusicVolume">
+                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 228 352 18" align="HStretch Top">
                     <Property key="Range" value="10000"/>
                     <Property key="Page" value="300"/>
                     <UserString key="SettingType" value="Slider"/>
@@ -189,7 +189,7 @@
                     <Property key="Caption" value="#{sControlsMenu1}"/>
                 </Widget>
                 <Widget type="HBox" skin="" position="4 224 300 24" align="Left Bottom">
-                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Bottom" name="InvertYButton">
+                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Bottom">
                         <UserString key="SettingCategory" value="Input"/>
                         <UserString key="SettingName" value="invert y axis"/>
                         <UserString key="SettingType" value="CheckButton"/>
@@ -201,7 +201,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 254 336 18" align="Left Bottom">
                     <Property key="Caption" value="Camera sensitivity"/>
                 </Widget>
-                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 278 336 18" align="HStretch Bottom" name="CameraSensitivitySlider">
+                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 278 336 18" align="HStretch Bottom">
                     <Property key="Range" value="10000"/>
                     <Property key="Page" value="300"/>
                     <UserString key="SettingType" value="Slider"/>
@@ -257,18 +257,6 @@
                                 <Property key="Caption" value="Window border"/>
                             </Widget>
                         </Widget>
-                        <Widget type="HBox" skin="" position="182 124 300 24">
-                            <Property key="Visible" value="false"/>
-                            <UserString key="Hidden" value="true"/>
-                            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="ShadersButton">
-                                <UserString key="SettingCategory" value="Objects"/>
-                                <UserString key="SettingName" value="shaders"/>
-                                <UserString key="SettingType" value="CheckButton"/>
-                            </Widget>
-                            <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 108 16" align="Left Top">
-                                <Property key="Caption" value="Object shaders"/>
-                            </Widget>
-                        </Widget>
 
                         <Widget type="TextBox" skin="SandText" position="182 94 300 32" align="Left Top">
                             <Property key="MultiLine" value="true"/>
@@ -277,7 +265,7 @@
 
                         <Widget type="TextBox" skin="NormalText" position="0 198 329 18" align="Left Top" name="FovText">
                         </Widget>
-                        <Widget type="MWScrollBar" skin="MW_HScroll" position="0 222 329 18" align="HStretch Top" name="FOVSlider">
+                        <Widget type="MWScrollBar" skin="MW_HScroll" position="0 222 329 18" align="HStretch Top">
                             <Property key="Range" value="10000"/>
                             <Property key="Page" value="300"/>
                             <UserString key="SettingType" value="Slider"/>
@@ -332,7 +320,7 @@
                             <Widget type="TextBox" skin="SandText" position="0 0 300 24" align="Left Top" name="AnisotropyLabel">
                                 <Property key="Caption" value="Anisotropy"/>
                             </Widget>
-                            <Widget type="MWScrollBar" skin="MW_HScroll" position="0 28 150 18" align="Left Top" name="AnisotropySlider">
+                            <Widget type="MWScrollBar" skin="MW_HScroll" position="0 28 150 18" align="Left Top">
                                 <Property key="Range" value="17"/>
                                 <UserString key="SettingType" value="Slider"/>
                                 <UserString key="SettingCategory" value="General"/>
@@ -344,7 +332,7 @@
                         <Widget type="TextBox" skin="NormalText" position="4 130 322 18" align="Left Top">
                             <Property key="Caption" value="#{sRender_Distance}"/>
                         </Widget>
-                        <Widget type="MWScrollBar" skin="MW_HScroll" position="4 154 322 18" align="Left Top" name="ViewDistanceSlider">
+                        <Widget type="MWScrollBar" skin="MW_HScroll" position="4 154 322 18" align="Left Top">
                             <Property key="Range" value="10000"/>
                             <Property key="Page" value="300"/>
                             <UserString key="SettingType" value="Slider"/>
@@ -366,7 +354,7 @@
                     <Widget type="TabItem" skin="" position="0 28 352 268">
                         <Property key="Caption" value="  Water  "/>
                         <Widget type="HBox" skin="" position="4 4 350 24">
-                            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="WaterShaderButton">
+                            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                                 <UserString key="SettingCategory" value="Water"/>
                                 <UserString key="SettingName" value="shader"/>
                                 <UserString key="SettingType" value="CheckButton"/>
@@ -377,7 +365,7 @@
                         </Widget>
                         <Widget type="Widget" skin="" position="24 32 300 230">
                             <Widget type="HBox" skin="" position="4 0 350 24">
-                                <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="RefractionButton">
+                                <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                                     <UserString key="SettingCategory" value="Water"/>
                                     <UserString key="SettingName" value="refraction"/>
                                     <UserString key="SettingType" value="CheckButton"/>
@@ -396,12 +384,21 @@
                                     <Property key="Caption" value="Texture quality"/>
                                 </Widget>
                             </Widget>
+                            <Widget type="HBox" skin="" position="4 56 350 24">
+                                <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
+                                    <UserString key="SettingCategory" value="Water"/>
+                                    <UserString key="SettingName" value="reflect actors"/>
+                                    <UserString key="SettingType" value="CheckButton"/>
+                                </Widget>
+                                <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 79 16" align="Left Top">
+                                    <Property key="Caption" value="Reflect actors"/>
+                                </Widget>
+                            </Widget>
                         </Widget>
 
                     </Widget>
                     <!--
                     <Widget type="TabItem" skin="" position="0 28 352 268">
-                    -->
                     <Widget type="Widget" skin="" position="0 28 352 268">
                         <Property key="Visible" value="false"/>
                         <Property key="Caption" value="  Shadows  "/>
@@ -479,6 +476,7 @@
                             </Widget>
                         </Widget>
                     </Widget>
+                    -->
                 </Widget>
             </Widget>
         </Widget>
diff --git a/files/mygui/openmw_spell_buying_window.layout b/files/mygui/openmw_spell_buying_window.layout
index 0350f1e27..73fb6e869 100644
--- a/files/mygui/openmw_spell_buying_window.layout
+++ b/files/mygui/openmw_spell_buying_window.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 306" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 306" align="Center" name="_Main">
         <Property key="Visible" value="false"/>
 
         <Widget type="TextBox" skin="SandText" position="8 10 450 18" align="Right Top">
diff --git a/files/mygui/openmw_spellcreation_dialog.layout b/files/mygui/openmw_spellcreation_dialog.layout
index 11197bf2a..e14674ad6 100644
--- a/files/mygui/openmw_spellcreation_dialog.layout
+++ b/files/mygui/openmw_spellcreation_dialog.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 560 394" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 560 394" align="Center" name="_Main">
 
         <Widget type="HBox" position="12 12 250 30">
             <Widget type="AutoSizedTextBox" skin="NormalText">
diff --git a/files/mygui/openmw_text_input.layout b/files/mygui/openmw_text_input.layout
index 012b0a82b..64ec61b02 100644
--- a/files/mygui/openmw_text_input.layout
+++ b/files/mygui/openmw_text_input.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 320 97" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 320 97" align="Center" name="_Main">
 
         <!-- Appearance -->
         <Widget type="TextBox" skin="ProgressText" position="6 6 300 18" name="LabelT" align="Left Top">
diff --git a/files/mygui/openmw_trade_window.layout b/files/mygui/openmw_trade_window.layout
index b2017661b..6d5dfb89b 100644
--- a/files/mygui/openmw_trade_window.layout
+++ b/files/mygui/openmw_trade_window.layout
@@ -61,7 +61,7 @@
             </Widget>
 
             <Widget type="AutoSizedButton" skin="MW_Button" position="0 60 60 24" name="MaxSaleButton" align="Left Top">
-                <Property key="Caption" value="Max. Sale"/> <!-- GMST sMaxSale doesn't work -->
+                <Property key="Caption" value="#{sMaxSale}"/>
             </Widget>
         </Widget>
 
diff --git a/files/mygui/openmw_trainingwindow.layout b/files/mygui/openmw_trainingwindow.layout
index c58bd0ab3..19c6a6712 100644
--- a/files/mygui/openmw_trainingwindow.layout
+++ b/files/mygui/openmw_trainingwindow.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 319 200" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 319 200" align="Center" name="_Main">
 
         <Widget type="TextBox" skin="NormalText" position="0 5 319 24" name="Select" align="Right Top">
             <Property key="TextAlign" value="Center"/>
diff --git a/files/mygui/openmw_travel_window.layout b/files/mygui/openmw_travel_window.layout
index 3603f7dcb..2d6b1324a 100644
--- a/files/mygui/openmw_travel_window.layout
+++ b/files/mygui/openmw_travel_window.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 304" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 304" align="Center" name="_Main">
         <Property key="Visible" value="false"/>
 
         <Widget type="TextBox" skin="SandText" position="8 10 24 24" name="Select" align="Right Top">
diff --git a/files/mygui/openmw_wait_dialog.layout b/files/mygui/openmw_wait_dialog.layout
index 7c065038d..112fa6001 100644
--- a/files/mygui/openmw_wait_dialog.layout
+++ b/files/mygui/openmw_wait_dialog.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 600 200" name="_Main">
+    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 600 200" align="Center" name="_Main">
         <Property key="Padding" value="12"/>
         <Property key="Spacing" value="8"/>
         <Property key="AutoResize" value="true"/>
diff --git a/files/mygui/openmw_wait_dialog_progressbar.layout b/files/mygui/openmw_wait_dialog_progressbar.layout
index 93793fd8e..92fcb15cf 100644
--- a/files/mygui/openmw_wait_dialog_progressbar.layout
+++ b/files/mygui/openmw_wait_dialog_progressbar.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 219 40" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 219 40" align="Center" name="_Main">
 
         <Widget type="ProgressBar" skin="MW_Progress_Blue" position="5 6 199 20" name="ProgressBar">
             <Widget type="TextBox" skin="SandText" position="0 0 199 20" name="ProgressText">
diff --git a/files/mygui/tes3mp_dialog_list.layout b/files/mygui/tes3mp_dialog_list.layout
new file mode 100644
index 000000000..573fba1a6
--- /dev/null
+++ b/files/mygui/tes3mp_dialog_list.layout
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 400 400" name="_Main">
+        <Property key="Visible" value="false"/>
+
+        <Widget type="EditBox" skin="MW_TextEditClient" position="13 8 368 48" name="Message" align="Center Top">
+            <Property key="FontName" value="Default"/>
+            <Property key="TextAlign" value="Top HCenter"/>
+            <Property key="Static" value="true"/>
+            <Property key="WordWrap" value="true"/>
+            <Property key="MultiLine" value="true"/>
+        </Widget>
+
+        <Widget type="ListBox" skin="MW_List" position="13 56 368 290" align="Left Top" name="ListBox"/>
+
+        <Widget type="VBox" position="0 362 392 24" align="Right Bottom">
+            <Widget type="HBox">
+                <Property key="Spacing" value="8"/>
+
+                <Widget type="AutoSizedButton" skin="MW_Button" name="OkButton" align="Right Bottom">
+                    <Property key="Caption" value="OK"/>
+                </Widget>
+            </Widget>
+
+            <Widget type="Widget"/>
+        </Widget>
+    </Widget>
+</MyGUI>
diff --git a/files/mygui/tes3mp_login.layout b/files/mygui/tes3mp_login.layout
new file mode 100644
index 000000000..7c9c37d7f
--- /dev/null
+++ b/files/mygui/tes3mp_login.layout
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MyGUI type="Layout" version="3.2.0">
+    <Widget type="Window" skin="MW_Dialog" position="0 0 600 600" layer="Windows" name="_Main">
+        <Widget type="TextBox" skin="ProgressText" position="6 6 300 18" align="Left Top" name="LabelName">
+            <Property key="TextAlign" value="Left Top"/>
+            <Property key="Caption" value="Login"/>
+        </Widget>
+        <Widget type="EditBox" skin="MW_TextEdit" position="6 28 300 30" align="Left Top" name="EditLogin"/>
+        <Widget type="TextBox" skin="ProgressText" position="6 58 300 18" align="Left Top" name="LabelServer">
+            <Property key="TextAlign" value="Left Top"/>
+            <Property key="Caption" value="Server address and port"/>
+        </Widget>
+        <Widget type="EditBox" skin="MW_TextEdit" position="6 80 300 30" align="Left Top" name="EditServer"/>
+        <Widget type="EditBox" skin="MW_TextEdit" position="306 80 80 30" align="Left Top" name="EditPort"/>
+
+        <Widget type="AutoSizedButton" skin="MW_Button" position="540 560 42 23" name="ButtonConnect">
+            <Property key="ExpandDirection" value="Left"/>
+            <Property key="Caption" value="Connect"/>
+        </Widget>
+
+    </Widget>
+    <CodeGeneratorSettings/>
+</MyGUI>
diff --git a/files/mygui/tes3mp_login.skin.xml b/files/mygui/tes3mp_login.skin.xml
new file mode 100644
index 000000000..70c2a5c81
--- /dev/null
+++ b/files/mygui/tes3mp_login.skin.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MyGUI>
+
+</MyGUI>
\ No newline at end of file
diff --git a/files/opencs/flying eye.png b/files/opencs/flying-eye.png
similarity index 100%
rename from files/opencs/flying eye.png
rename to files/opencs/flying-eye.png
diff --git a/files/opencs/raster/scene-exterior-parts/0_backdrop.png b/files/opencs/raster/scene-exterior-parts/0_backdrop.png
new file mode 100644
index 000000000..f95983cc1
Binary files /dev/null and b/files/opencs/raster/scene-exterior-parts/0_backdrop.png differ
diff --git a/files/opencs/raster/scene-exterior-parts/1_grid.png b/files/opencs/raster/scene-exterior-parts/1_grid.png
new file mode 100644
index 000000000..9711df62c
Binary files /dev/null and b/files/opencs/raster/scene-exterior-parts/1_grid.png differ
diff --git a/files/opencs/raster/scene-exterior-parts/2_arrows.png b/files/opencs/raster/scene-exterior-parts/2_arrows.png
new file mode 100644
index 000000000..f388255ad
Binary files /dev/null and b/files/opencs/raster/scene-exterior-parts/2_arrows.png differ
diff --git a/files/opencs/raster/scene-exterior-parts/3_cell_marker.png b/files/opencs/raster/scene-exterior-parts/3_cell_marker.png
new file mode 100644
index 000000000..a2de374b7
Binary files /dev/null and b/files/opencs/raster/scene-exterior-parts/3_cell_marker.png differ
diff --git a/files/opencs/raster/scene-exterior-parts/4_terrain.png b/files/opencs/raster/scene-exterior-parts/4_terrain.png
new file mode 100644
index 000000000..95901c805
Binary files /dev/null and b/files/opencs/raster/scene-exterior-parts/4_terrain.png differ
diff --git a/files/opencs/raster/scene-exterior-parts/5_divider.png b/files/opencs/raster/scene-exterior-parts/5_divider.png
new file mode 100644
index 000000000..b34af53c5
Binary files /dev/null and b/files/opencs/raster/scene-exterior-parts/5_divider.png differ
diff --git a/files/opencs/raster/scene-exterior-parts/composite_the_icons.sh b/files/opencs/raster/scene-exterior-parts/composite_the_icons.sh
new file mode 100755
index 000000000..939bda923
--- /dev/null
+++ b/files/opencs/raster/scene-exterior-parts/composite_the_icons.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Run this from the "parts" directory to composite the final 32 icons
+# Also creates status (masked) variants of the icons while at it
+
+set -e
+
+mkdir -p status
+i=0
+
+for grid in '' '*_grid*'; do
+for arrows in '' '*_arrows*'; do
+for cell_marker in '' '*_cell_marker*'; do
+    files=$(echo $grid $arrows $cell_marker | tr ' ' '\n' | sort -n | tr '\n' ' ')
+    convert *backdrop* $files *terrain* -background transparent -mosaic \
+            -crop '23x48+25+0' *mask* -mosaic status/$i.png
+    i=$((i+1))
+done;done;done;
diff --git a/files/opencs/raster/scene-exterior-parts/mask.png b/files/opencs/raster/scene-exterior-parts/mask.png
new file mode 100644
index 000000000..8bd6f6362
Binary files /dev/null and b/files/opencs/raster/scene-exterior-parts/mask.png differ
diff --git a/files/opencs/raster/scene-view-parts/mask.png b/files/opencs/raster/scene-view-parts/mask.png
index e075fe8f5..65c6d736b 100644
Binary files a/files/opencs/raster/scene-view-parts/mask.png and b/files/opencs/raster/scene-view-parts/mask.png differ
diff --git a/files/opencs/resources.qrc b/files/opencs/resources.qrc
index 1bcd3ab4f..7e798527c 100644
--- a/files/opencs/resources.qrc
+++ b/files/opencs/resources.qrc
@@ -77,7 +77,7 @@
         <file alias="day">Sun-48.png</file>
         <file alias="bright">Lightbulb-48.png</file>
         <file alias="1st-person">eyeballdude.png</file>
-        <file alias="free-camera">flying eye.png</file>
+        <file alias="free-camera">flying-eye.png</file>
         <file alias="orbiting-camera">orbit2.png</file>
         <file alias="play">scene-play.png</file>
         <file alias="scene-view-1">scene-view-references.png</file>
@@ -117,5 +117,16 @@
         <file alias="scene-view-c29">scene-view-status-29.png</file>
         <file alias="scene-view-c30">scene-view-status-30.png</file>
         <file alias="scene-view-c31">scene-view-status-31.png</file>
+        <file alias="scene-view-marker-2">scene-exterior-arrows.png</file>
+        <file alias="scene-view-marker-4">scene-exterior-borders.png</file>
+        <file alias="scene-view-marker-1">scene-exterior-marker.png</file>
+        <file alias="scene-view-marker-c0">scene-exterior-status-0.png</file>
+        <file alias="scene-view-marker-c1">scene-exterior-status-1.png</file>
+        <file alias="scene-view-marker-c2">scene-exterior-status-2.png</file>
+        <file alias="scene-view-marker-c3">scene-exterior-status-3.png</file>
+        <file alias="scene-view-marker-c4">scene-exterior-status-4.png</file>
+        <file alias="scene-view-marker-c5">scene-exterior-status-5.png</file>
+        <file alias="scene-view-marker-c6">scene-exterior-status-6.png</file>
+        <file alias="scene-view-marker-c7">scene-exterior-status-7.png</file>
     </qresource>
 </RCC>
diff --git a/files/opencs/scalable/scene-exterior.svg b/files/opencs/scalable/scene-exterior.svg
new file mode 100644
index 000000000..7021a0440
--- /dev/null
+++ b/files/opencs/scalable/scene-exterior.svg
@@ -0,0 +1,599 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="release.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627416"
+     inkscape:cx="20.879288"
+     inkscape:cy="20.372195"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer18"
+     showgrid="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1145"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     borderlayer="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       snapvisiblegridlinesonly="true"
+       enabled="true"
+       visible="true"
+       empspacing="5"
+       id="grid3763"
+       type="xygrid" />
+    <sodipodi:guide
+       id="guide3765"
+       position="23.997436,11.766699"
+       orientation="1,0" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient7238">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop7240" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.090625;"
+         offset="1"
+         id="stop7242" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6025-6">
+      <stop
+         id="stop6027-7"
+         offset="0"
+         style="stop-color:#00b800;stop-opacity:0;" />
+      <stop
+         style="stop-color:#00b800;stop-opacity:1;"
+         offset="0.36666667"
+         id="stop6029-6" />
+      <stop
+         style="stop-color:#00b800;stop-opacity:1;"
+         offset="0.66666669"
+         id="stop6031-9" />
+      <stop
+         id="stop6035-6"
+         offset="1"
+         style="stop-color:#00b800;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="14.000408"
+       x2="42"
+       y1="39.000408"
+       x1="-7"
+       gradientTransform="translate(2.9999999e-8,-2.000408)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6524"
+       xlink:href="#linearGradient6025-6"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="29.398096"
+       x2="37.608032"
+       y1="28.018894"
+       x1="30.672773"
+       gradientTransform="matrix(-0.83144597,-0.55560561,0.55560561,-0.83144597,45.935299,71.338161)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3975-167"
+       xlink:href="#linearGradient3969-161"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3969-161">
+      <stop
+         id="stop18844"
+         offset="0"
+         style="stop-color:#6f6457;stop-opacity:1" />
+      <stop
+         id="stop18846"
+         offset="1"
+         style="stop-color:#5b534a;stop-opacity:0.3286385" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7010-1-474"
+       id="radialGradient4670-35"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95227996,-0.23567774,0.30143492,1.1936264,-2.8135066,-1.0081679)"
+       cx="26.614479"
+       cy="31.523769"
+       fx="26.614479"
+       fy="31.523769"
+       r="5.2661862" />
+    <linearGradient
+       id="linearGradient7010-1-474">
+      <stop
+         style="stop-color:#807460;stop-opacity:1;"
+         offset="0"
+         id="stop18850" />
+      <stop
+         style="stop-color:#5b534a;stop-opacity:0;"
+         offset="1"
+         id="stop18852" />
+    </linearGradient>
+    <radialGradient
+       r="8.3862238"
+       fy="22.70536"
+       fx="29.436325"
+       cy="22.70536"
+       cx="29.436325"
+       gradientTransform="matrix(-1.9078913,-0.3577294,0.3543385,-1.8898065,77.115924,73.438975)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5037-916"
+       xlink:href="#linearGradient7183-781"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient7183-781">
+      <stop
+         id="stop18856"
+         offset="0"
+         style="stop-color:#807460;stop-opacity:1;" />
+      <stop
+         style="stop-color:#6d6459;stop-opacity:1;"
+         offset="0.5"
+         id="stop18858" />
+      <stop
+         id="stop18860"
+         offset="1"
+         style="stop-color:#5b534a;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7010-1-4-568"
+       id="radialGradient4704-570"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.6953365,-0.42516526,-0.53664221,2.1533153,79.941524,-28.543415)"
+       cx="26.264538"
+       cy="30.721058"
+       fx="26.264538"
+       fy="30.721058"
+       r="5.2661862" />
+    <linearGradient
+       id="linearGradient7010-1-4-568">
+      <stop
+         style="stop-color:#807460;stop-opacity:1;"
+         offset="0"
+         id="stop18864" />
+      <stop
+         style="stop-color:#5b534a;stop-opacity:0;"
+         offset="1"
+         id="stop18866" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.097046,-0.45710235,0.82311479,-1.9754762,30.795013,72.834528)"
+       r="10.938465"
+       fy="21.819239"
+       fx="23.476456"
+       cy="21.819239"
+       cx="23.476456"
+       id="radialGradient7024-931"
+       xlink:href="#linearGradient7018-328"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient7018-328">
+      <stop
+         style="stop-color:#807460;stop-opacity:1;"
+         offset="0"
+         id="stop18870" />
+      <stop
+         style="stop-color:#5b534a;stop-opacity:1;"
+         offset="1"
+         id="stop18872" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.396372,-0.19828289,0.19312312,1.3600352,-16.605237,-6.5520458)"
+       r="5.2661862"
+       fy="31.523769"
+       fx="26.614479"
+       cy="31.523769"
+       cx="26.614479"
+       id="radialGradient4653-266"
+       xlink:href="#linearGradient7010-731"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient7010-731">
+      <stop
+         style="stop-color:#807460;stop-opacity:1;"
+         offset="0"
+         id="stop18876" />
+      <stop
+         style="stop-color:#5b534a;stop-opacity:1;"
+         offset="1"
+         id="stop18878" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter5130"
+       x="-0.1974474"
+       width="1.3948948"
+       y="-0.51336323"
+       height="2.0267265">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.0695067"
+         id="feGaussianBlur5132" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7238"
+       id="radialGradient7244"
+       cx="24"
+       cy="24"
+       fx="24"
+       fy="24"
+       r="24"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Sergey &quot;Shnatsel&quot; Davidoff &lt;shnatsel@gmail.com&gt;</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Sergey &quot;Shnatsel&quot; Davidoff &lt;shnatsel@gmail.com&gt;</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <cc:license
+           rdf:resource="http://www.gnu.org/copyleft/gpl.html" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer20"
+     inkscape:label="preview_backdrop"
+     style="display:none">
+    <rect
+       style="color:#000000;fill:#5e5e5e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5066"
+       width="104.91696"
+       height="71.241005"
+       x="-31.908192"
+       y="-11.573744"
+       ry="2" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer21"
+     inkscape:label="backdrop"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <rect
+       style="opacity:0.07000002;color:#000000;fill:url(#radialGradient7244);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7236"
+       width="48"
+       height="48"
+       x="0"
+       y="0"
+       ry="0" />
+  </g>
+  <g
+     style="display:inline"
+     transform="translate(0,-1004.3622)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="credits"
+     sodipodi:insensitive="true">
+    <text
+       sodipodi:linespacing="125%"
+       id="text3111"
+       y="1072.3622"
+       x="24"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+       xml:space="preserve"><tspan
+         y="1072.3622"
+         x="24"
+         id="tspan3113"
+         sodipodi:role="line">This icon was designed by</tspan><tspan
+         id="tspan3115"
+         y="1087.3622"
+         x="24"
+         sodipodi:role="line">Sergey &quot;Shnatsel&quot; Davidoff</tspan><tspan
+         id="tspan3117"
+         y="1102.3622"
+         x="24"
+         sodipodi:role="line">for OpenMW content editor</tspan><tspan
+         id="tspan3119"
+         y="1117.3622"
+         x="24"
+         sodipodi:role="line">Licensed under GNU GPLv3</tspan></text>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:label="Green grid"
+     id="layer15"
+     inkscape:groupmode="layer"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path3963"
+       d="m -15,40.999592 60,-30"
+       style="fill:none;stroke:url(#linearGradient6524);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <use
+       height="48"
+       width="48"
+       transform="matrix(-1,0,0,1,49.085273,-2.9802322e-8)"
+       id="use3979"
+       xlink:href="#path3963"
+       y="0"
+       x="0" />
+    <use
+       height="48"
+       width="48"
+       transform="matrix(-1,0,0,-1,49.960273,59.433592)"
+       id="use3981"
+       xlink:href="#path3963"
+       y="0"
+       x="0" />
+    <use
+       height="48"
+       width="48"
+       transform="matrix(1,0,0,-1,2.9999999e-8,59.808592)"
+       id="use3983"
+       xlink:href="#path3963"
+       y="0"
+       x="0" />
+  </g>
+  <g
+     style="display:inline"
+     inkscape:label="arrows"
+     id="layer18"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:transform-center-y="-1.3065395"
+       inkscape:connector-curvature="0"
+       id="path6548-6"
+       d="M 7.0003592,40 5.7187282,33.53125 5.691,31.668544 19.000359,38 l 0,2 z"
+       inkscape:transform-center-x="-0.82672021"
+       style="color:#000000;fill:#a46932;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:transform-center-y="-1.3065395"
+       inkscape:connector-curvature="0"
+       id="path6548"
+       d="M 7.0003592,38.02941 5.7343532,31.665593 19.000359,38 z"
+       inkscape:transform-center-x="-0.82672021"
+       style="color:#000000;fill:#c73838;fill-opacity:0.4642857;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:none;stroke:none"
+       d="m -15.883883,44.257017 60,-30"
+       id="path6591"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <use
+       height="48"
+       width="48"
+       transform="matrix(-1,0,0,1,49.019506,0)"
+       id="use6705"
+       inkscape:transform-center-y="-1.3065395"
+       inkscape:transform-center-x="0.82672001"
+       xlink:href="#path6548-6"
+       y="0"
+       x="0" />
+    <use
+       height="48"
+       width="48"
+       transform="matrix(-1,0,0,1,49.000359,0)"
+       id="use6707"
+       inkscape:transform-center-y="-1.3065395"
+       inkscape:transform-center-x="0.82672021"
+       xlink:href="#path6548"
+       y="0"
+       x="0" />
+    <path
+       style="color:#000000;fill:#a46932;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:transform-center-x="-0.82672021"
+       d="m 41.737185,18.966172 1.266006,6.363817 0.005,2.253488 L 29.773398,21 29.737185,18.995582 z"
+       id="use6709-8"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-y="-1.3065395"
+       sodipodi:nodetypes="cccccc" />
+    <use
+       height="48"
+       width="48"
+       transform="matrix(-1,0,0,-1,48.737544,56.995582)"
+       id="use6709"
+       inkscape:transform-center-y="1.3065395"
+       inkscape:transform-center-x="0.8267198"
+       xlink:href="#path6548"
+       y="0"
+       x="0" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6784"
+       d="m -14.321383,58.322026 60,-30"
+       style="fill:none;stroke:none" />
+    <use
+       height="48"
+       width="48"
+       transform="matrix(-1,0,0,1,49.013105,0)"
+       id="use6790"
+       inkscape:transform-center-y="-1.3065395"
+       inkscape:transform-center-x="0.82672021"
+       xlink:href="#use6709-8"
+       y="0"
+       x="0" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path6548"
+       inkscape:transform-center-x="-0.8267198"
+       inkscape:transform-center-y="1.3065395"
+       id="use6788"
+       transform="matrix(1,0,0,-1,0.2705605,56.995582)"
+       width="48"
+       height="48" />
+  </g>
+  <g
+     inkscape:label="Terrain"
+     id="layer16"
+     inkscape:groupmode="layer"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <rect
+       transform="matrix(0.89115873,-0.45369165,0.89115873,0.45369165,0,0)"
+       y="37.637562"
+       x="-28.283714"
+       height="18.238897"
+       width="18.238897"
+       id="rect3961"
+       style="color:#000000;fill:#6f6453;fill-opacity:1;stroke:none;stroke-width:1.11205709;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="sssccccsscss"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0"
+       d="m 25.380453,17.09992 c 0.448985,0.143237 0.854776,0.397902 1.222884,0.736155 1.576994,1.449093 5.6499,3.494788 6.277116,5.823239 0.436921,1.622009 5.290083,6.173714 5.290083,6.173714 0,0 -4.48248,1.970091 -4.50883,3.201844 -0.648493,0.4398 -8.956726,4.582587 -8.956726,4.582587 0,0 -13.419185,-6.274012 -15.544194,-7.801468 1.704099,-1.205773 1.33792,-2.867547 2.943409,-4.109956 1.552359,-1.201295 2.411571,-3.953907 3.352021,-5.340617 0.636931,-0.939166 2.49346,-1.051666 3.42424,-1.602309 1.801206,-1.053489 2.03605,-2.202744 3.429187,-2.217663 0.95667,-0.01024 1.92904,0.19022 3.07081,0.554474 z"
+       style="color:#000000;fill:url(#radialGradient7024-931);fill-opacity:1;stroke:#535147;stroke-width:0.99999994;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="ssccsccs"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8-2"
+       d="m 30.182359,18.544171 c 0.457569,0.100018 1.017158,2.321731 1.99223,3.503213 1.129552,1.368666 6.609183,8.650854 3.581153,10.009732 -3.098521,1.525151 -11.501378,3.885835 -11.501378,3.885835 0,0 -2.766953,-0.79804 -4.652265,-2.639621 -1.885312,-1.84158 -5.445964,-6.712837 -1.919398,-10.886997 2.369375,-0.857841 3.605956,-0.512218 5.348277,-2.207754 1.495498,-1.024176 5.670382,-1.988134 7.151381,-1.664408 z"
+       style="color:#000000;fill:url(#radialGradient5037-916);fill-opacity:1;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="sscccccs"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8-8-8-6"
+       d="m 38.70681,30.174956 c -0.230709,1.481253 -1.497429,0.887737 -3.235256,1.810349 -4.87473,2.587993 -3.736785,1.036511 -3.736785,1.036511 0,0 -1.749465,-2.67057 -2.462659,-4.280303 -0.255043,-3.550221 -1.473766,-4.080338 -1.315533,-4.04078 1.52261,-1.526788 3.895404,0.01397 4.125891,-2.16444 1.910675,3.395304 2.219325,3.52568 2.825514,4.409866 1.549833,1.540739 4.210949,0.582825 3.798828,3.228797 z"
+       style="opacity:0.73303169;color:#000000;fill:url(#linearGradient3975-167);fill-opacity:1;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="ssccccs"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8-8"
+       d="m 30.506535,28.661205 c -0.286832,0.06207 -0.637616,1.440778 -1.24885,2.173962 -0.371672,0.445825 -1.241731,2.021835 -1.241731,2.021835 0,0 2.061612,1.080889 2.963411,1.481521 1.728381,-0.919695 2.275266,-1.008149 4.084661,-2.229151 -0.740871,-1.230476 -0.949334,-2.158444 -2.124637,-2.963802 -0.937469,-0.635565 -1.504474,-0.685257 -2.432854,-0.484365 z"
+       style="color:#000000;fill:url(#radialGradient4670-35);fill-opacity:1;stroke:#535147;stroke-width:0.99999994;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="sscccscs"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8-8-8"
+       d="m 23.362157,25.687571 c 1.482597,0.221906 4.553745,0.314958 3.460754,2.55183 -0.45723,0.935748 0.177712,4.221939 0.177712,4.221939 0,0 -3.97963,2.833818 -5.585097,3.556563 -3.077023,-1.65914 -9.505701,-4.859459 -9.505701,-4.859459 0,0 2.122607,-0.80651 3.125322,-2.288344 0.728622,-1.076772 1.39168,-2.139239 2.272245,-2.750673 1.531504,-1.558959 3.406391,-0.828249 6.054765,-0.431856 z"
+       style="color:#000000;fill:url(#radialGradient4704-570);fill-opacity:1;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="ssccccs"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8"
+       d="m 24.210883,28.327642 c -0.457569,0.100018 -2.326313,0.342641 -3.05289,1.691252 -1.186317,2.20194 -4.323164,3.567429 -4.323164,3.567429 0,0 6.69174,3.244393 8.130336,3.889987 2.757202,-1.482035 3.629621,-1.624573 6.51606,-3.592147 -1.181875,-1.982841 -1.514426,-3.478208 -3.38933,-4.775996 -1.495498,-1.024176 -2.400013,-1.104251 -3.881012,-0.780525 z"
+       style="color:#000000;fill:url(#radialGradient4653-266);fill-opacity:1;stroke:#535147;stroke-width:0.99999994;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="ccssscc"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8-2-5"
+       d="m 32.615577,33.512922 c 1.062838,-0.476966 7.161501,-3.634889 7.161501,-3.634889 0,0 -3.234968,-1.688243 -4.897736,-3.383489 -1.913522,-1.950899 -2.312513,-3.971887 -2.704753,-4.44716 -0.975071,-1.181483 -1.402078,-3.579972 -1.859647,-3.67999 -1.480999,-0.323726 -2.031961,-0.111064 -3.527459,0.913108 -1.874904,1.297788 -0.716877,2.032432 -3.086252,2.890273"
+       style="color:#000000;fill:none;stroke:#535147;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="ccscsc"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8-8-8-0"
+       d="m 21.415526,36.017904 c -3.077023,-1.705841 -9.505701,-4.996242 -9.505701,-4.996242 0,0 2.122607,-0.829211 3.125322,-2.352756 0.728622,-1.10708 1.39168,-2.199453 2.272245,-2.828098 1.565567,-1.406321 3.09482,-1.720341 5.480241,-0.620789 1.078559,0.497159 1.75386,0.858547 2.709453,0.417094"
+       style="color:#000000;fill:none;stroke:#535147;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8-8-8-0-9"
+       d="m 15.141878,20.891061 c 0.85846,-1.450515 2.210937,-1.720342 4.684746,-0.31143"
+       style="color:#000000;fill:none;stroke:#535147;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer19"
+     inkscape:label="cell marker"
+     sodipodi:insensitive="true"
+     style="display:inline">
+    <rect
+       style="opacity:0.5;color:#000000;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5130);enable-background:accumulate"
+       id="rect4346-9"
+       width="13"
+       height="5"
+       x="18"
+       y="7"
+       ry="2"
+       transform="matrix(1.093603,0,0,1.093603,-2.2932737,-0.88922859)" />
+    <rect
+       style="opacity:0.93000034;color:#000000;fill:#57554d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4346"
+       width="13"
+       height="5"
+       x="18"
+       y="7"
+       ry="2" />
+    <path
+       transform="matrix(1.0597281,0,0,0.96469901,-1.5237828,0.35824528)"
+       style="font-size:5.55187035px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;writing-mode:lr-tb;text-anchor:end;opacity:0.78082192;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+       d="m 20.40625,7.9375 a 0.05416374,0.05416374 0 0 0 0,0.03125 0.05416374,0.05416374 0 0 0 -0.03125,0 0.05416374,0.05416374 0 0 0 0,0.03125 0.05416374,0.05416374 0 0 0 0,0.03125 0.05416374,0.05416374 0 0 0 0.03125,0 l 1,1.4375 -1.0625,1.46875 a 0.05416374,0.05416374 0 0 0 -0.03125,0 0.05416374,0.05416374 0 0 0 0,0.03125 0.05416374,0.05416374 0 0 0 0,0.03125 0.05416374,0.05416374 0 0 0 0.03125,0 0.05416374,0.05416374 0 0 0 0,0.03125 0.05416374,0.05416374 0 0 0 0.03125,0 l 0.5,0 a 0.05416374,0.05416374 0 0 0 0.03125,0 0.05416374,0.05416374 0 0 0 0,-0.03125 L 21.71875,9.84375 22.53125,11 a 0.05416374,0.05416374 0 0 0 0,0.03125 0.05416374,0.05416374 0 0 0 0.03125,0 l 0.5,0 a 0.05416374,0.05416374 0 0 0 0.03125,0 0.05416374,0.05416374 0 0 0 0,-0.03125 0.05416374,0.05416374 0 0 0 0.03125,0 0.05416374,0.05416374 0 0 0 0,-0.03125 0.05416374,0.05416374 0 0 0 0,-0.03125 0.05416374,0.05416374 0 0 0 -0.03125,0 l -1.0625,-1.46875 1,-1.4375 a 0.05416374,0.05416374 0 0 0 0.03125,0 0.05416374,0.05416374 0 0 0 0,-0.03125 0.05416374,0.05416374 0 0 0 0,-0.03125 0.05416374,0.05416374 0 0 0 -0.03125,0 0.05416374,0.05416374 0 0 0 0,-0.03125 0.05416374,0.05416374 0 0 0 -0.03125,0 l -0.5,0 a 0.05416374,0.05416374 0 0 0 -0.03125,0 0.05416374,0.05416374 0 0 0 0,0.03125 l -0.75,1.125 -0.75,-1.125 a 0.05416374,0.05416374 0 0 0 0,-0.03125 0.05416374,0.05416374 0 0 0 -0.03125,0 l -0.5,0 a 0.05416374,0.05416374 0 0 0 -0.03125,0 z"
+       id="path5013"
+       inkscape:connector-curvature="0" />
+    <g
+       style="font-size:5.55187035px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;writing-mode:lr-tb;text-anchor:end;opacity:0.78082192;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+       id="text4348-0" />
+    <g
+       style="font-size:5.55187035px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;writing-mode:lr-tb;text-anchor:end;opacity:0.78082192;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+       id="text4348-2"
+       transform="matrix(1,0,0,0.9600565,0.03314563,0.37946329)">
+      <path
+         style="marker:none"
+         d="m 26,7.9375 a 0.05634237,0.05634237 0 0 0 0,0.03125 0.05634237,0.05634237 0 0 0 -0.03125,0 0.05634237,0.05634237 0 0 0 0,0.03125 0.05634237,0.05634237 0 0 0 0,0.03125 0.05634237,0.05634237 0 0 0 0.03125,0 l 1.1875,1.53125 c 0,0 -0.1155,0.3913824 -0.34375,0.71875 -0.224794,0.322412 -0.561479,0.51476 -0.75,0.6875 a 0.05634237,0.05634237 0 0 0 -0.03125,0 0.05634237,0.05634237 0 0 0 0,0.03125 0.05634237,0.05634237 0 0 0 0,0.03125 0.05634237,0.05634237 0 0 0 0.03125,0 0.05634237,0.05634237 0 0 0 0,0.03125 0.05634237,0.05634237 0 0 0 0.03125,0 l 0.53125,0 a 0.05634237,0.05634237 0 0 0 0.03125,0 c 0.393478,-0.169092 0.583736,-0.549796 0.71875,-0.6875 0.03046,-0.03107 0.08097,-0.08081 0.125,-0.15625 0.04403,-0.07544 0.09547,-0.167502 0.15625,-0.28125 0.121556,-0.2274955 0.263021,-0.4974755 0.40625,-0.78125 0.286458,-0.567549 0.5625,-1.125 0.5625,-1.125 a 0.05634237,0.05634237 0 0 0 0,-0.03125 0.05634237,0.05634237 0 0 0 0,-0.03125 0.05634237,0.05634237 0 0 0 -0.03125,0 0.05634237,0.05634237 0 0 0 0,-0.03125 0.05634237,0.05634237 0 0 0 -0.03125,0 l -0.5,0 a 0.05634237,0.05634237 0 0 0 -0.03125,0 0.05634237,0.05634237 0 0 0 0,0.03125 0.05634237,0.05634237 0 0 0 -0.03125,0 l -0.59375,1.0625 -0.875,-1.0625 a 0.05634237,0.05634237 0 0 0 0,-0.03125 0.05634237,0.05634237 0 0 0 -0.03125,0 l -0.5,0 A 0.05634237,0.05634237 0 0 0 26,7.9375 z"
+         id="path5018"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.77999998;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 24.234375,9.84375 -0.1875,1.53125 0.5,0.15625 0.4375,-1.5 z"
+       id="path4400"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+  <g
+     sodipodi:insensitive="true"
+     style="display:none"
+     inkscape:label="divider"
+     id="layer3"
+     inkscape:groupmode="layer">
+    <path
+       inkscape:connector-curvature="0"
+       id="path3771"
+       d="m 24.5,-30.497582 0,88.12502"
+       style="fill:none;stroke:#ac0c0c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-exterior-arrows.png b/files/opencs/scene-exterior-arrows.png
new file mode 100644
index 000000000..f388255ad
Binary files /dev/null and b/files/opencs/scene-exterior-arrows.png differ
diff --git a/files/opencs/scene-exterior-borders.png b/files/opencs/scene-exterior-borders.png
new file mode 100644
index 000000000..9711df62c
Binary files /dev/null and b/files/opencs/scene-exterior-borders.png differ
diff --git a/files/opencs/scene-exterior-marker.png b/files/opencs/scene-exterior-marker.png
new file mode 100644
index 000000000..a2de374b7
Binary files /dev/null and b/files/opencs/scene-exterior-marker.png differ
diff --git a/files/opencs/scene-exterior-markers.png b/files/opencs/scene-exterior-markers.png
new file mode 100644
index 000000000..a2de374b7
Binary files /dev/null and b/files/opencs/scene-exterior-markers.png differ
diff --git a/files/opencs/scene-exterior-status-0.png b/files/opencs/scene-exterior-status-0.png
new file mode 100644
index 000000000..f95de53e3
Binary files /dev/null and b/files/opencs/scene-exterior-status-0.png differ
diff --git a/files/opencs/scene-exterior-status-1.png b/files/opencs/scene-exterior-status-1.png
new file mode 100644
index 000000000..09427b0c2
Binary files /dev/null and b/files/opencs/scene-exterior-status-1.png differ
diff --git a/files/opencs/scene-exterior-status-2.png b/files/opencs/scene-exterior-status-2.png
new file mode 100644
index 000000000..086fe7b0a
Binary files /dev/null and b/files/opencs/scene-exterior-status-2.png differ
diff --git a/files/opencs/scene-exterior-status-3.png b/files/opencs/scene-exterior-status-3.png
new file mode 100644
index 000000000..68cdb07d2
Binary files /dev/null and b/files/opencs/scene-exterior-status-3.png differ
diff --git a/files/opencs/scene-exterior-status-4.png b/files/opencs/scene-exterior-status-4.png
new file mode 100644
index 000000000..c984989b5
Binary files /dev/null and b/files/opencs/scene-exterior-status-4.png differ
diff --git a/files/opencs/scene-exterior-status-5.png b/files/opencs/scene-exterior-status-5.png
new file mode 100644
index 000000000..dee32f443
Binary files /dev/null and b/files/opencs/scene-exterior-status-5.png differ
diff --git a/files/opencs/scene-exterior-status-6.png b/files/opencs/scene-exterior-status-6.png
new file mode 100644
index 000000000..877b005e4
Binary files /dev/null and b/files/opencs/scene-exterior-status-6.png differ
diff --git a/files/opencs/scene-exterior-status-7.png b/files/opencs/scene-exterior-status-7.png
new file mode 100644
index 000000000..6a8afeff7
Binary files /dev/null and b/files/opencs/scene-exterior-status-7.png differ
diff --git a/files/opencs/scene-view-status-0.png b/files/opencs/scene-view-status-0.png
index b98230f01..2b2bb4d29 100644
Binary files a/files/opencs/scene-view-status-0.png and b/files/opencs/scene-view-status-0.png differ
diff --git a/files/opencs/scene-view-status-1.png b/files/opencs/scene-view-status-1.png
index 43b597c01..ba18877b9 100644
Binary files a/files/opencs/scene-view-status-1.png and b/files/opencs/scene-view-status-1.png differ
diff --git a/files/opencs/scene-view-status-10.png b/files/opencs/scene-view-status-10.png
index ca511b9c8..d6e23431e 100644
Binary files a/files/opencs/scene-view-status-10.png and b/files/opencs/scene-view-status-10.png differ
diff --git a/files/opencs/scene-view-status-11.png b/files/opencs/scene-view-status-11.png
index 3028217ba..21a77c533 100644
Binary files a/files/opencs/scene-view-status-11.png and b/files/opencs/scene-view-status-11.png differ
diff --git a/files/opencs/scene-view-status-12.png b/files/opencs/scene-view-status-12.png
index 974519c54..efe608d2e 100644
Binary files a/files/opencs/scene-view-status-12.png and b/files/opencs/scene-view-status-12.png differ
diff --git a/files/opencs/scene-view-status-13.png b/files/opencs/scene-view-status-13.png
index 4c075704a..2fe7d4025 100644
Binary files a/files/opencs/scene-view-status-13.png and b/files/opencs/scene-view-status-13.png differ
diff --git a/files/opencs/scene-view-status-14.png b/files/opencs/scene-view-status-14.png
index 1e6d726da..56f77199f 100644
Binary files a/files/opencs/scene-view-status-14.png and b/files/opencs/scene-view-status-14.png differ
diff --git a/files/opencs/scene-view-status-15.png b/files/opencs/scene-view-status-15.png
index 3a2073628..5dab523c6 100644
Binary files a/files/opencs/scene-view-status-15.png and b/files/opencs/scene-view-status-15.png differ
diff --git a/files/opencs/scene-view-status-16.png b/files/opencs/scene-view-status-16.png
index d0fb54047..2ff5aba75 100644
Binary files a/files/opencs/scene-view-status-16.png and b/files/opencs/scene-view-status-16.png differ
diff --git a/files/opencs/scene-view-status-17.png b/files/opencs/scene-view-status-17.png
index 9d95cc855..1b30b6be1 100644
Binary files a/files/opencs/scene-view-status-17.png and b/files/opencs/scene-view-status-17.png differ
diff --git a/files/opencs/scene-view-status-18.png b/files/opencs/scene-view-status-18.png
index 0a9013aed..363d396cb 100644
Binary files a/files/opencs/scene-view-status-18.png and b/files/opencs/scene-view-status-18.png differ
diff --git a/files/opencs/scene-view-status-19.png b/files/opencs/scene-view-status-19.png
index d57fab446..31f90a5d3 100644
Binary files a/files/opencs/scene-view-status-19.png and b/files/opencs/scene-view-status-19.png differ
diff --git a/files/opencs/scene-view-status-2.png b/files/opencs/scene-view-status-2.png
index 2c892213b..06e4cd393 100644
Binary files a/files/opencs/scene-view-status-2.png and b/files/opencs/scene-view-status-2.png differ
diff --git a/files/opencs/scene-view-status-20.png b/files/opencs/scene-view-status-20.png
index 2be69333c..5420953ed 100644
Binary files a/files/opencs/scene-view-status-20.png and b/files/opencs/scene-view-status-20.png differ
diff --git a/files/opencs/scene-view-status-21.png b/files/opencs/scene-view-status-21.png
index f5ad22340..7344f3195 100644
Binary files a/files/opencs/scene-view-status-21.png and b/files/opencs/scene-view-status-21.png differ
diff --git a/files/opencs/scene-view-status-22.png b/files/opencs/scene-view-status-22.png
index afb0c7dd5..99977a1cc 100644
Binary files a/files/opencs/scene-view-status-22.png and b/files/opencs/scene-view-status-22.png differ
diff --git a/files/opencs/scene-view-status-23.png b/files/opencs/scene-view-status-23.png
index bee128d24..6c428e5a8 100644
Binary files a/files/opencs/scene-view-status-23.png and b/files/opencs/scene-view-status-23.png differ
diff --git a/files/opencs/scene-view-status-24.png b/files/opencs/scene-view-status-24.png
index 677a56448..903a4d5a4 100644
Binary files a/files/opencs/scene-view-status-24.png and b/files/opencs/scene-view-status-24.png differ
diff --git a/files/opencs/scene-view-status-25.png b/files/opencs/scene-view-status-25.png
index 151278eff..dd7ad5458 100644
Binary files a/files/opencs/scene-view-status-25.png and b/files/opencs/scene-view-status-25.png differ
diff --git a/files/opencs/scene-view-status-26.png b/files/opencs/scene-view-status-26.png
index 3ddeed8f1..fca0ed8e9 100644
Binary files a/files/opencs/scene-view-status-26.png and b/files/opencs/scene-view-status-26.png differ
diff --git a/files/opencs/scene-view-status-27.png b/files/opencs/scene-view-status-27.png
index 93058121e..1a888bff9 100644
Binary files a/files/opencs/scene-view-status-27.png and b/files/opencs/scene-view-status-27.png differ
diff --git a/files/opencs/scene-view-status-28.png b/files/opencs/scene-view-status-28.png
index 5008026a1..5b11fda91 100644
Binary files a/files/opencs/scene-view-status-28.png and b/files/opencs/scene-view-status-28.png differ
diff --git a/files/opencs/scene-view-status-29.png b/files/opencs/scene-view-status-29.png
index 7b355fe13..211890638 100644
Binary files a/files/opencs/scene-view-status-29.png and b/files/opencs/scene-view-status-29.png differ
diff --git a/files/opencs/scene-view-status-3.png b/files/opencs/scene-view-status-3.png
index 5157e170f..7d23409f7 100644
Binary files a/files/opencs/scene-view-status-3.png and b/files/opencs/scene-view-status-3.png differ
diff --git a/files/opencs/scene-view-status-30.png b/files/opencs/scene-view-status-30.png
index 0712a5482..825bc772c 100644
Binary files a/files/opencs/scene-view-status-30.png and b/files/opencs/scene-view-status-30.png differ
diff --git a/files/opencs/scene-view-status-4.png b/files/opencs/scene-view-status-4.png
index f29445f5a..82057190d 100644
Binary files a/files/opencs/scene-view-status-4.png and b/files/opencs/scene-view-status-4.png differ
diff --git a/files/opencs/scene-view-status-5.png b/files/opencs/scene-view-status-5.png
index e77290f68..79532bf0f 100644
Binary files a/files/opencs/scene-view-status-5.png and b/files/opencs/scene-view-status-5.png differ
diff --git a/files/opencs/scene-view-status-6.png b/files/opencs/scene-view-status-6.png
index a2f9a8a99..2b1d38526 100644
Binary files a/files/opencs/scene-view-status-6.png and b/files/opencs/scene-view-status-6.png differ
diff --git a/files/opencs/scene-view-status-7.png b/files/opencs/scene-view-status-7.png
index ce4e20e00..991668330 100644
Binary files a/files/opencs/scene-view-status-7.png and b/files/opencs/scene-view-status-7.png differ
diff --git a/files/opencs/scene-view-status-8.png b/files/opencs/scene-view-status-8.png
index f0c499832..406649aac 100644
Binary files a/files/opencs/scene-view-status-8.png and b/files/opencs/scene-view-status-8.png differ
diff --git a/files/opencs/scene-view-status-9.png b/files/opencs/scene-view-status-9.png
index b30c3eec5..cf83a9f7c 100644
Binary files a/files/opencs/scene-view-status-9.png and b/files/opencs/scene-view-status-9.png differ
diff --git a/files/openmw.cfg b/files/openmw.cfg
index 3a9bd8762..199e09403 100644
--- a/files/openmw.cfg
+++ b/files/openmw.cfg
@@ -2,7 +2,6 @@
 # Modifications should be done on the user openmw.cfg file instead
 # (see: https://wiki.openmw.org/index.php?title=Paths)
 
-data="?mw?Data Files"
 data=${MORROWIND_DATA_FILES}
 data-local="?userdata?data"
 resources=${OPENMW_RESOURCE_FILES}
diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local
index 71cd3bfbf..0640ec843 100644
--- a/files/openmw.cfg.local
+++ b/files/openmw.cfg.local
@@ -3,7 +3,6 @@
 # (see: https://wiki.openmw.org/index.php?title=Paths)
 
 data="?global?data"
-data="?mw?Data Files"
 data=./data
 data-local="?userdata?data"
 resources=./resources
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 4a9a5dd65..91329b8ca 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -16,9 +16,11 @@
 # Near clipping plane (>0.0, e.g. 0.01 to 18.0).
 near clip = 1
 
-# Cull objects smaller than one pixel.
+# Cull objects that occupy less than 'small feature culling pixel size' on the screen.
 small feature culling = true
 
+small feature culling pixel size = 2.0
+
 # Maximum visible distance (e.g. 2000.0 to 6666.0).  Caution: this setting
 # can dramatically affect performance, see documentation for details.
 viewing distance = 6666.0
@@ -40,11 +42,14 @@ exterior cell load distance = 1
 # Preload cells in a background thread. All settings starting with 'preload' have no effect unless this is enabled.
 preload enabled = true
 
+# The number of threads to be used for preloading operations.
+preload num threads = 1
+
 # Preload adjacent cells when moving close to an exterior cell border.
 preload exterior grid = true
 
 # Preload possible fast travel destinations.
-preload fast travel = true
+preload fast travel = false
 
 # Preload the locations that doors lead to.
 preload doors = true
@@ -52,9 +57,24 @@ preload doors = true
 # Preloading distance threshold
 preload distance = 1000
 
-# How long to keep preloaded cells and cached models/textures/collision shapes in cache
-# after they're no longer referenced/required (in seconds)
-cache expiry delay = 300
+# Controls whether or not the nodes/collision shapes are pre-"instanced" (i.e. cloned) when a cell is preloaded.
+# Enabling this option slightly reduces the time it takes to transition into a preloaded cell, but also results in higher memory usage
+# proportional to the number of cells that are preloaded.
+preload instances = true
+
+# The minimum amount of cells in the preload cache before unused cells start to get thrown out (see "preload cell expiry delay").
+# This value should be lower or equal to 'preload cell cache max'.
+preload cell cache min = 12
+
+# The maximum amount of cells in the preload cache. A too high value could cause you to run out of memory.
+# You may need to reduce this setting when running lots of mods or high-res texture replacers.
+preload cell cache max = 20
+
+# How long to keep preloaded cells in cache after they're no longer referenced/required (in seconds)
+preload cell expiry delay = 5
+
+# How long to keep models/textures/collision shapes in cache after they're no longer referenced/required (in seconds)
+cache expiry delay = 5
 
 [Map]
 
@@ -130,6 +150,13 @@ difficulty = 0
 # Show duration of magic effect and lights in the spells window.
 show effect duration = false
 
+# Prevents merchants from equipping items that are sold to them.
+prevent merchant equipping = false
+
+# Makes player followers and escorters start combat with enemies who have started combat with them
+# or the player. Otherwise they wait for the enemies or the player to do an attack first.
+followers attack on sight = false
+
 [General]
 
 # Anisotropy reduces distortion in textures at low angles (e.g. 0 to 16).
@@ -147,6 +174,59 @@ texture min filter = linear
 # Texture mipmap type.  (none, nearest, or linear).
 texture mipmap = nearest
 
+[Shaders]
+
+# Force rendering with shaders. By default, only bump-mapped objects will use shaders.
+# Enabling this option may cause slightly different visuals if the "clamp lighting" option
+# is set to false. Otherwise, there should not be a visual difference.
+force shaders = false
+
+# Force the use of per pixel lighting. By default, only bump mapped objects use per-pixel lighting.
+# Has no effect if the 'force shaders' option is false.
+# Enabling per-pixel lighting can result in visual differences to the original MW engine. It is not
+# recommended to enable this option when using vanilla Morrowind files, because certain lights in Morrowind
+# rely on vertex lighting to look as intended.
+force per pixel lighting = false
+
+# Restrict the amount of lighting that an object can receive to a maximum of (1,1,1).
+# Only affects objects that render with shaders (see 'force shaders' option). Always affects terrain.
+# Setting this option to 'true' results in fixed-function compatible lighting, but the lighting
+# may appear 'dull' and there might be color shifts.
+# Setting this option to 'false' results in more realistic lighting.
+clamp lighting = true
+
+# If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
+# (see 'normal map pattern', e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
+# If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file (.nif or .osg file).
+# Affects objects.
+auto use object normal maps = false
+
+# If this option is enabled, specular maps are automatically recognized and used if they are named appropriately
+# (see 'specular map pattern', e.g. for a base texture foo.dds, the specular map texture would have to be named foo_spec.dds).
+# If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file (.osg file, not supported in .nif files).
+# Affects objects.
+auto use object specular maps = false
+
+# See 'auto use object normal maps'. Affects terrain.
+auto use terrain normal maps = false
+
+# If a file with pattern 'terrain specular map pattern' exists, use that file as a 'diffuse specular' map. The texture
+# must contain the layer color in the RGB channel (as usual), and a specular multiplier in the alpha channel.
+auto use terrain specular maps = false
+
+# The filename pattern to probe for when detecting normal maps (see 'auto use object normal maps', 'auto use terrain normal maps')
+normal map pattern = _n
+
+# Alternative filename pattern to probe for when detecting normal maps. Files with this pattern are expected to include 'height' in the alpha channel.
+# This height is used for parallax effects. Works for both terrain and objects.
+normal height map pattern = _nh
+
+# The filename pattern to probe for when detecting object specular maps (see 'auto use object specular maps')
+specular map pattern = _spec
+
+# The filename pattern to probe for when detecting terrain specular maps (see 'auto use terrain specular maps')
+terrain specular map pattern = _diffusespec
+
 [Input]
 
 # Capture control of the cursor prevent movement outside the window.
@@ -264,53 +344,11 @@ rtt size = 512
 # Enable refraction which affects visibility through water plane.
 refraction = false
 
-[Objects]
-
-# Enable shaders for objects other than water. Unused.
-shaders = true
-
-[Terrain]
-
-# Use shaders for terrain?  Unused.
-shader = true
-
-# Distant land is rendered?  Unused.
-distant land = false
-
-[Shadows]
-
-# Enable shadows. Other shadow settings disabled if false. Unused.
-enabled = false
-
-# Size of the shadow textures in pixels.  Unused.  (e.g. 256 to 2048).
-texture size = 1024
-
-# Actors cast shadows.  Unused.
-actor shadows = true
-
-# Static objects cast shadows.  Unused.
-statics shadows = true
-
-# Terrain cast shadows.  Unused.
-terrain shadows = true
-
-# Miscellaneous objects cast shadows.  Unused.
-misc shadows = true
-
-# Debugging of shadows.  Unused.
-debug = false
-
-# Fraction of distance after which shadow starts to fade out.  Unused.
-fade start = 0.8
-
-# Split shadow maps, allowing for a larger shadow distance.  Unused.
-split = false
-
-# Distance for shadows if not split.  Smaller is poorer. Unused.
-shadow distance = 1300
+# Draw NPCs and creatures on water reflections.
+reflect actors = false
 
-# Distance for shadows if split.  Unused.
-split shadow distance = 14000
+# Overrides the value in '[Camera] small feature culling pixel size' specifically for water reflection/refraction textures.
+small feature culling pixel size = 20.0
 
 [Windows]
 
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index fc4706c1f..5ca0d1e83 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -1,11 +1,21 @@
+if (NOT DEFINED OPENMW_SHADERS_ROOT)
+    return()
+endif()
+
 # Copy resource files into the build directory
 set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(DDIR ${OpenMW_BINARY_DIR}/resources/shaders)
+set(DDIR ${OPENMW_SHADERS_ROOT}/resources/shaders)
 
 set(SHADER_FILES
     water_vertex.glsl
     water_fragment.glsl
     water_nm.png
+    objects_vertex.glsl
+    objects_fragment.glsl
+    terrain_vertex.glsl
+    terrain_fragment.glsl
+    lighting.glsl
+    parallax.glsl
 )
 
 copy_all_files(${CMAKE_CURRENT_SOURCE_DIR} ${DDIR} "${SHADER_FILES}")
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
new file mode 100644
index 000000000..7b8486fbe
--- /dev/null
+++ b/files/shaders/lighting.glsl
@@ -0,0 +1,54 @@
+#define MAX_LIGHTS 8
+
+vec4 doLighting(vec3 viewPos, vec3 viewNormal, vec4 vertexColor)
+{
+    vec3 lightDir;
+    float d;
+
+#if @colorMode == 3
+    vec4 diffuse = gl_FrontMaterial.diffuse;
+    vec3 ambient = vertexColor.xyz;
+#elif @colorMode == 2
+    vec4 diffuse = vertexColor;
+    vec3 ambient = vertexColor.xyz;
+#else
+    vec4 diffuse = gl_FrontMaterial.diffuse;
+    vec3 ambient = gl_FrontMaterial.ambient.xyz;
+#endif
+    vec4 lightResult = vec4(0.0, 0.0, 0.0, diffuse.a);
+
+    for (int i=0; i<MAX_LIGHTS; ++i)
+    {
+        lightDir = gl_LightSource[i].position.xyz - (viewPos.xyz * gl_LightSource[i].position.w);
+        d = length(lightDir);
+        lightDir = normalize(lightDir);
+
+        lightResult.xyz += (ambient * gl_LightSource[i].ambient.xyz + diffuse.xyz * gl_LightSource[i].diffuse.xyz * max(dot(viewNormal.xyz, lightDir), 0.0)) * clamp(1.0 / (gl_LightSource[i].constantAttenuation + gl_LightSource[i].linearAttenuation * d + gl_LightSource[i].quadraticAttenuation * d * d), 0.0, 1.0);
+    }
+
+    lightResult.xyz += gl_LightModel.ambient.xyz * ambient;
+
+#if @colorMode == 1
+    lightResult.xyz += vertexColor.xyz;
+#else
+    lightResult.xyz += gl_FrontMaterial.emission.xyz;
+#endif
+
+#if @clamp
+    lightResult = clamp(lightResult, vec4(0.0, 0.0, 0.0, 0.0), vec4(1.0, 1.0, 1.0, 1.0));
+#else
+    lightResult = max(lightResult, 0.0);
+#endif
+    return lightResult;
+}
+
+
+vec3 getSpecular(vec3 viewNormal, vec3 viewDirection, float shininess, vec3 matSpec)
+{
+    vec3 lightDir = normalize(gl_LightSource[0].position.xyz);
+    float NdotL = max(dot(viewNormal, lightDir), 0.0);
+    if (NdotL < 0)
+        return vec3(0,0,0);
+    vec3 halfVec = normalize(lightDir - viewDirection);
+    return pow(max(dot(viewNormal, halfVec), 0.0), 128) * gl_LightSource[0].specular.xyz * matSpec;
+}
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
new file mode 100644
index 000000000..5a72b44b3
--- /dev/null
+++ b/files/shaders/objects_fragment.glsl
@@ -0,0 +1,154 @@
+#version 120
+
+#if @diffuseMap
+uniform sampler2D diffuseMap;
+varying vec2 diffuseMapUV;
+#endif
+
+#if @darkMap
+uniform sampler2D darkMap;
+varying vec2 darkMapUV;
+#endif
+
+#if @detailMap
+uniform sampler2D detailMap;
+varying vec2 detailMapUV;
+#endif
+
+#if @decalMap
+uniform sampler2D decalMap;
+varying vec2 decalMapUV;
+#endif
+
+#if @emissiveMap
+uniform sampler2D emissiveMap;
+varying vec2 emissiveMapUV;
+#endif
+
+#if @normalMap
+uniform sampler2D normalMap;
+varying vec2 normalMapUV;
+varying vec4 passTangent;
+#endif
+
+#if @envMap
+uniform sampler2D envMap;
+varying vec2 envMapUV;
+uniform vec4 envMapColor;
+#endif
+
+#if @specularMap
+uniform sampler2D specularMap;
+varying vec2 specularMapUV;
+#endif
+
+varying float depth;
+
+#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
+
+#if !PER_PIXEL_LIGHTING
+varying vec4 lighting;
+#else
+varying vec4 passColor;
+#endif
+varying vec3 passViewPos;
+varying vec3 passNormal;
+
+#include "lighting.glsl"
+#include "parallax.glsl"
+
+void main()
+{
+#if @diffuseMap
+    vec2 adjustedDiffuseUV = diffuseMapUV;
+#endif
+
+#if @normalMap
+    vec4 normalTex = texture2D(normalMap, normalMapUV);
+
+    vec3 normalizedNormal = normalize(passNormal);
+    vec3 normalizedTangent = normalize(passTangent.xyz);
+    vec3 binormal = cross(normalizedTangent, normalizedNormal);
+    mat3 tbnTranspose = mat3(normalizedTangent, binormal, normalizedNormal);
+
+    vec3 viewNormal = gl_NormalMatrix * normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
+#else
+    vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
+#endif
+
+#if @parallax
+    vec3 cameraPos = (gl_ModelViewMatrixInverse * vec4(0,0,0,1)).xyz;
+    vec3 objectPos = (gl_ModelViewMatrixInverse * vec4(passViewPos, 1)).xyz;
+    vec3 eyeDir = normalize(cameraPos - objectPos);
+    vec2 offset = getParallaxOffset(eyeDir, tbnTranspose, normalTex.a, (passTangent.w > 0) ? -1.f : 1.f);
+    adjustedDiffuseUV += offset; // only offset diffuse for now, other textures are more likely to be using a completely different UV set
+
+    // TODO: check not working as the same UV buffer is being bound to different targets
+    // if diffuseMapUV == normalMapUV
+#if 1
+    // fetch a new normal using updated coordinates
+    normalTex = texture2D(normalMap, adjustedDiffuseUV);
+    viewNormal = gl_NormalMatrix * normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
+#endif
+
+#endif
+
+#if @diffuseMap
+    gl_FragData[0] = texture2D(diffuseMap, adjustedDiffuseUV);
+#else
+    gl_FragData[0] = vec4(1.0, 1.0, 1.0, 1.0);
+#endif
+
+#if @detailMap
+    gl_FragData[0].xyz *= texture2D(detailMap, detailMapUV).xyz * 2.0;
+#endif
+
+#if @darkMap
+    gl_FragData[0].xyz *= texture2D(darkMap, darkMapUV).xyz;
+#endif
+
+#if @decalMap
+    vec4 decalTex = texture2D(decalMap, decalMapUV);
+    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, decalTex.xyz, decalTex.a);
+#endif
+
+#if !PER_PIXEL_LIGHTING
+    gl_FragData[0] *= lighting;
+#else
+    gl_FragData[0] *= doLighting(passViewPos, normalize(viewNormal), passColor);
+#endif
+
+#if @emissiveMap
+    gl_FragData[0].xyz += texture2D(emissiveMap, emissiveMapUV).xyz;
+#endif
+
+
+#if @envMap
+
+#if @normalMap
+    // if using normal map + env map, take advantage of per-pixel normals for texCoordGen
+    vec3 viewVec = normalize(passViewPos.xyz);
+    vec3 r = reflect( viewVec, viewNormal );
+    float m = 2.0 * sqrt( r.x*r.x + r.y*r.y + (r.z+1.0)*(r.z+1.0) );
+    vec2 texCoordGen = vec2(r.x/m + 0.5, r.y/m + 0.5);
+    gl_FragData[0].xyz += texture2D(envMap, texCoordGen).xyz * envMapColor.xyz;
+#else
+    gl_FragData[0].xyz += texture2D(envMap, envMapUV).xyz * envMapColor.xyz;
+#endif
+
+#endif
+
+#if @specularMap
+    vec4 specTex = texture2D(specularMap, specularMapUV);
+    float shininess = specTex.a * 255;
+    vec3 matSpec = specTex.xyz;
+#else
+    float shininess = gl_FrontMaterial.shininess;
+    vec3 matSpec = gl_FrontMaterial.specular.xyz;
+#endif
+
+    gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos.xyz), shininess, matSpec);
+
+    float fogValue = clamp((depth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
+    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
+}
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
new file mode 100644
index 000000000..e140cd6ad
--- /dev/null
+++ b/files/shaders/objects_vertex.glsl
@@ -0,0 +1,102 @@
+#version 120
+
+#if @diffuseMap
+varying vec2 diffuseMapUV;
+#endif
+
+#if @darkMap
+varying vec2 darkMapUV;
+#endif
+
+#if @detailMap
+varying vec2 detailMapUV;
+#endif
+
+#if @decalMap
+varying vec2 decalMapUV;
+#endif
+
+#if @emissiveMap
+varying vec2 emissiveMapUV;
+#endif
+
+#if @normalMap
+varying vec2 normalMapUV;
+varying vec4 passTangent;
+#endif
+
+#if @envMap
+varying vec2 envMapUV;
+#endif
+
+#if @specularMap
+varying vec2 specularMapUV;
+#endif
+
+varying float depth;
+
+#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
+
+#if !PER_PIXEL_LIGHTING
+varying vec4 lighting;
+#else
+varying vec4 passColor;
+#endif
+varying vec3 passViewPos;
+varying vec3 passNormal;
+
+#include "lighting.glsl"
+
+void main(void)
+{
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    depth = gl_Position.z;
+
+    vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
+    gl_ClipVertex = viewPos;
+    vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
+
+#if @envMap
+    vec3 viewVec = normalize(viewPos.xyz);
+    vec3 r = reflect( viewVec, viewNormal );
+    float m = 2.0 * sqrt( r.x*r.x + r.y*r.y + (r.z+1.0)*(r.z+1.0) );
+    envMapUV = vec2(r.x/m + 0.5, r.y/m + 0.5);
+#endif
+
+#if @diffuseMap
+    diffuseMapUV = (gl_TextureMatrix[@diffuseMapUV] * gl_MultiTexCoord@diffuseMapUV).xy;
+#endif
+
+#if @darkMap
+    darkMapUV = (gl_TextureMatrix[@darkMapUV] * gl_MultiTexCoord@darkMapUV).xy;
+#endif
+
+#if @detailMap
+    detailMapUV = (gl_TextureMatrix[@detailMapUV] * gl_MultiTexCoord@detailMapUV).xy;
+#endif
+
+#if @decalMap
+    decalMapUV = (gl_TextureMatrix[@decalMapUV] * gl_MultiTexCoord@decalMapUV).xy;
+#endif
+
+#if @emissiveMap
+    emissiveMapUV = (gl_TextureMatrix[@emissiveMapUV] * gl_MultiTexCoord@emissiveMapUV).xy;
+#endif
+
+#if @normalMap
+    normalMapUV = (gl_TextureMatrix[@normalMapUV] * gl_MultiTexCoord@normalMapUV).xy;
+    passTangent = gl_MultiTexCoord7.xyzw;
+#endif
+
+#if @specularMap
+    specularMapUV = (gl_TextureMatrix[@specularMapUV] * gl_MultiTexCoord@specularMapUV).xy;
+#endif
+
+#if !PER_PIXEL_LIGHTING
+    lighting = doLighting(viewPos.xyz, viewNormal, gl_Color);
+#else
+    passColor = gl_Color;
+#endif
+    passViewPos = viewPos.xyz;
+    passNormal = gl_Normal.xyz;
+}
diff --git a/files/shaders/parallax.glsl b/files/shaders/parallax.glsl
new file mode 100644
index 000000000..433dbcd3e
--- /dev/null
+++ b/files/shaders/parallax.glsl
@@ -0,0 +1,8 @@
+#define PARALLAX_SCALE 0.04
+#define PARALLAX_BIAS -0.02
+
+vec2 getParallaxOffset(vec3 eyeDir, mat3 tbnTranspose, float height, float flipY)
+{
+    vec3 TSeyeDir = normalize(eyeDir * tbnTranspose);
+    return vec2(TSeyeDir.x, TSeyeDir.y * flipY) * ( height * PARALLAX_SCALE + PARALLAX_BIAS );
+}
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
new file mode 100644
index 000000000..134e838c0
--- /dev/null
+++ b/files/shaders/terrain_fragment.glsl
@@ -0,0 +1,85 @@
+#version 120
+
+varying vec2 uv;
+
+uniform sampler2D diffuseMap;
+
+#if @normalMap
+uniform sampler2D normalMap;
+#endif
+
+#if @blendMap
+uniform sampler2D blendMap;
+#endif
+
+varying float depth;
+
+#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
+
+#if !PER_PIXEL_LIGHTING
+varying vec4 lighting;
+#else
+varying vec4 passColor;
+#endif
+varying vec3 passViewPos;
+varying vec3 passNormal;
+
+#include "lighting.glsl"
+#include "parallax.glsl"
+
+void main()
+{
+    vec2 adjustedUV = (gl_TextureMatrix[0] * vec4(uv, 0.0, 1.0)).xy;
+
+#if @normalMap
+    vec4 normalTex = texture2D(normalMap, adjustedUV);
+
+    vec3 normalizedNormal = normalize(passNormal);
+    vec3 tangent = vec3(1.0, 0.0, 0.0);
+    vec3 binormal = normalize(cross(tangent, normalizedNormal));
+    tangent = normalize(cross(normalizedNormal, binormal)); // note, now we need to re-cross to derive tangent again because it wasn't orthonormal
+    mat3 tbnTranspose = mat3(tangent, binormal, normalizedNormal);
+
+    vec3 viewNormal = normalize(gl_NormalMatrix * (tbnTranspose * (normalTex.xyz * 2.0 - 1.0)));
+#else
+    vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
+#endif
+
+#if @parallax
+    vec3 cameraPos = (gl_ModelViewMatrixInverse * vec4(0,0,0,1)).xyz;
+    vec3 objectPos = (gl_ModelViewMatrixInverse * vec4(passViewPos, 1)).xyz;
+    vec3 eyeDir = normalize(cameraPos - objectPos);
+    adjustedUV += getParallaxOffset(eyeDir, tbnTranspose, normalTex.a, 1.f);
+
+    // update normal using new coordinates
+    normalTex = texture2D(normalMap, adjustedUV);
+    viewNormal = normalize(gl_NormalMatrix * (tbnTranspose * (normalTex.xyz * 2.0 - 1.0)));
+#endif
+
+    vec4 diffuseTex = texture2D(diffuseMap, adjustedUV);
+    gl_FragData[0] = vec4(diffuseTex.xyz, 1.0);
+
+#if @blendMap
+    vec2 blendMapUV = (gl_TextureMatrix[1] * vec4(uv, 0.0, 1.0)).xy;
+    gl_FragData[0].a *= texture2D(blendMap, blendMapUV).a;
+#endif
+
+#if !PER_PIXEL_LIGHTING
+    gl_FragData[0] *= lighting;
+#else
+    gl_FragData[0] *= doLighting(passViewPos, normalize(viewNormal), passColor);
+#endif
+
+#if @specularMap
+    float shininess = 128; // TODO: make configurable
+    vec3 matSpec = vec3(diffuseTex.a, diffuseTex.a, diffuseTex.a);
+#else
+    float shininess = gl_FrontMaterial.shininess;
+    vec3 matSpec = gl_FrontMaterial.specular.xyz;
+#endif
+
+    gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos), shininess, matSpec);
+
+    float fogValue = clamp((depth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
+    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
+}
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
new file mode 100644
index 000000000..e2a180153
--- /dev/null
+++ b/files/shaders/terrain_vertex.glsl
@@ -0,0 +1,36 @@
+#version 120
+
+varying vec2 uv;
+varying float depth;
+
+#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
+
+#if !PER_PIXEL_LIGHTING
+varying vec4 lighting;
+#else
+varying vec4 passColor;
+#endif
+varying vec3 passViewPos;
+varying vec3 passNormal;
+
+#include "lighting.glsl"
+
+void main(void)
+{
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    depth = gl_Position.z;
+
+    vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
+    gl_ClipVertex = viewPos;
+
+#if !PER_PIXEL_LIGHTING
+    vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
+    lighting = doLighting(viewPos.xyz, viewNormal, gl_Color);
+#else
+    passColor = gl_Color;
+#endif
+    passNormal = gl_Normal.xyz;
+    passViewPos = viewPos.xyz;
+
+    uv = gl_MultiTexCoord0.xy;
+}
diff --git a/files/tes3mp/browser.rc b/files/tes3mp/browser.rc
new file mode 100644
index 000000000..9895e8c8b
--- /dev/null
+++ b/files/tes3mp/browser.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "tes3mp.ico"
diff --git a/files/tes3mp/files/scripts/include/tes3mp.callbacks.inc b/files/tes3mp/files/scripts/include/tes3mp.callbacks.inc
new file mode 100644
index 000000000..e66d97ee2
--- /dev/null
+++ b/files/tes3mp/files/scripts/include/tes3mp.callbacks.inc
@@ -0,0 +1,23 @@
+forward OnCreate(ID);
+forward OnDestroy(ID);
+forward OnSpawn(ID);
+forward OnActivate(ID, actor);
+forward OnCellChange(ID, cell);
+forward OnItemCountChange(ID, count);
+forward OnItemConditionChange(ID, Float:condition);
+forward OnItemEquippedChange(ID, Bool:equipped);
+forward OnActorValueChange(ID, ActorValue:index, Float:value);
+forward OnActorBaseValueChange(ID, ActorValue:index, Float:value);
+forward OnActorSneak(ID, Bool:sneaking);
+forward OnActorDeath(ID, killer, cause);
+forward OnActorAttack(victim, attacker, weapon, damage);
+forward OnPlayerDisconnect(ID, reason);
+forward OnPlayerRequestGame(ID);
+forward OnPlayerChat(ID, message{});
+
+forward OnClientAuthenticate(const name{}, const pwd{});
+forward OnGameTimeChange(year, month, day, hour);
+forward OnServerInit();
+forward OnServerExit(Bool:error);
+
+forward OnCharGen(ID);
diff --git a/files/tes3mp/files/scripts/include/tes3mp.functions.inc b/files/tes3mp/files/scripts/include/tes3mp.functions.inc
new file mode 100644
index 000000000..c31993a67
--- /dev/null
+++ b/files/tes3mp/files/scripts/include/tes3mp.functions.inc
@@ -0,0 +1,30 @@
+const Sex: {
+	Male = 0,
+	Female = 1,
+}
+
+const Race: {
+	Argoninan = "Argonian",
+	Breton = "Breton",
+	DarkElf = "Dark Elf",
+	HighElf = "High Elf",
+	Imperial = "Imperial",
+	Khajiit = "Khajiit",
+	Nord = "Nord",
+	Orc = "Orc",
+	Redguard = "Redguard",
+	WoodElf = "Wood Elf"
+}
+
+native Bool:Kick(ID);
+native SetRespawnTime(interval);
+native GetRespawnTime();
+native SetSpawnCell(cell);
+native GetSpawnCell();
+
+native Bool:IsPlayer(ID);
+
+native GetBaseName(ID, message);
+native SetBaseName(ID);
+
+native CharGen(ID);
diff --git a/files/tes3mp/files/scripts/include/tes3mp.inc b/files/tes3mp/files/scripts/include/tes3mp.inc
new file mode 100644
index 000000000..e69de29bb
diff --git a/files/tes3mp/files/scripts/include/tes3mp.transloc.inc b/files/tes3mp/files/scripts/include/tes3mp.transloc.inc
new file mode 100644
index 000000000..a879b3f91
--- /dev/null
+++ b/files/tes3mp/files/scripts/include/tes3mp.transloc.inc
@@ -0,0 +1,10 @@
+native Bool:IsCell(cell);
+native Bool:IsInterior(cell);
+
+native GetPosition(ID, Float:x, Float:y, Float:z);
+native SetPosition(ID, Float:x, Float:y, Float:z);
+native GetRotation(ID, Float:x, Float:y, Float:z);
+native SetRotation(ID, Float:x, Float:y, Float:z);
+native SetCell(ID, cell);
+native GetCell(ID);
+
diff --git a/files/tes3mp/files/scripts/include/tes3mp.world.inc b/files/tes3mp/files/scripts/include/tes3mp.world.inc
new file mode 100644
index 000000000..aa1c62542
--- /dev/null
+++ b/files/tes3mp/files/scripts/include/tes3mp.world.inc
@@ -0,0 +1,15 @@
+native SetGameWeather(weather);
+native SetGameTime(time);
+native SetGameYear(year);
+native SetGameMonth(month);
+native SetGameDay(day);
+native SetGameHour(hour);
+native SetTimeScale(Float:scale);
+
+native GetGameWeather();
+native GetGameTime();
+native GetGameYear();
+native GetGameMonth();
+native GetGameDay();
+native GetGameHour();
+native Float:GetTimeScale();
diff --git a/files/tes3mp/tes3mp-client-default.cfg b/files/tes3mp/tes3mp-client-default.cfg
new file mode 100644
index 000000000..ed7c4498b
--- /dev/null
+++ b/files/tes3mp/tes3mp-client-default.cfg
@@ -0,0 +1,23 @@
+[General]
+server = mp.tes3mp.com
+port = 25565
+password =
+# 0 - Verbose (spam), 1 - Info, 2 - Warnings, 3 - Errors, 4 - Only fatal errors
+loglevel = 0
+
+[Master]
+address = master.tes3mp.com
+port = 8080
+
+[Chat]
+# Use https://wiki.libsdl.org/SDL_Keycode to find the correct key codes when rebinding
+#
+# For chatting
+keySay = Y
+# For enabling or disabling the chat window
+keyChatMode = F2
+x = 0
+y = 0
+w = 390
+h = 250
+delay = 5.0 # How long the message will be displayed in hidden mode
diff --git a/files/tes3mp/tes3mp-server-default.cfg b/files/tes3mp/tes3mp-server-default.cfg
new file mode 100644
index 000000000..759c050a8
--- /dev/null
+++ b/files/tes3mp/tes3mp-server-default.cfg
@@ -0,0 +1,19 @@
+[General]
+address = 0.0.0.0
+port = 25565
+players = 64
+hostname = My TES3MP server
+# 0 - Verbose (spam), 1 - Info, 2 - Warnings, 3 - Errors, 4 - Only fatal errors
+loglevel = 1
+password =
+
+[Plugins]
+#home = ~/local/openmw/tes3mp
+home = ~/ClionProjects/PS-dev
+plugins = server.lua
+
+[MasterServer]
+enabled = true
+address = master.tes3mp.com
+port = 8080
+rate = 1000
diff --git a/files/tes3mp/tes3mp.ico b/files/tes3mp/tes3mp.ico
new file mode 100644
index 000000000..793865963
Binary files /dev/null and b/files/tes3mp/tes3mp.ico differ
diff --git a/files/tes3mp/tes3mp.rc b/files/tes3mp/tes3mp.rc
new file mode 100644
index 000000000..9895e8c8b
--- /dev/null
+++ b/files/tes3mp/tes3mp.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "tes3mp.ico"
diff --git a/files/tes3mp/tes3mp_logo.png b/files/tes3mp/tes3mp_logo.png
new file mode 100644
index 000000000..de8812962
Binary files /dev/null and b/files/tes3mp/tes3mp_logo.png differ
diff --git a/files/tes3mp/ui/Main.ui b/files/tes3mp/ui/Main.ui
new file mode 100644
index 000000000..c3de17df5
--- /dev/null
+++ b/files/tes3mp/ui/Main.ui
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>tes3mp Server Browser</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="QTabWidget" name="tabWidget">
+      <property name="currentIndex">
+       <number>0</number>
+      </property>
+      <widget class="QWidget" name="tabBrowser">
+       <attribute name="title">
+        <string>Browser</string>
+       </attribute>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QTableView" name="tblServerBrowser">
+          <property name="selectionMode">
+           <enum>QAbstractItemView::SingleSelection</enum>
+          </property>
+          <property name="selectionBehavior">
+           <enum>QAbstractItemView::SelectRows</enum>
+          </property>
+          <property name="sortingEnabled">
+           <bool>true</bool>
+          </property>
+          <attribute name="verticalHeaderVisible">
+           <bool>false</bool>
+          </attribute>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="tabFavorites">
+       <attribute name="title">
+        <string>Favorites</string>
+       </attribute>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QTableView" name="tblFavorites">
+          <property name="selectionMode">
+           <enum>QAbstractItemView::SingleSelection</enum>
+          </property>
+          <property name="selectionBehavior">
+           <enum>QAbstractItemView::SelectRows</enum>
+          </property>
+          <property name="sortingEnabled">
+           <bool>true</bool>
+          </property>
+          <attribute name="verticalHeaderVisible">
+           <bool>false</bool>
+          </attribute>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+    </item>
+    <item>
+     <widget class="QGroupBox" name="groupBoxFilters">
+      <property name="title">
+       <string>Filters</string>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_6">
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <item>
+            <widget class="QLabel" name="lblMaxLatency">
+             <property name="text">
+              <string>Max latency:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboLatency">
+             <item>
+              <property name="text">
+               <string>All</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>&lt;50</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>&lt;100</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>&lt;150</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>&lt;200</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>&lt;250</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_5">
+           <item>
+            <widget class="QLabel" name="lblGameMode">
+             <property name="text">
+              <string>Game mode</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLineEdit" name="leGamemode"/>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_7">
+         <item>
+          <widget class="QCheckBox" name="cBoxNotFull">
+           <property name="text">
+            <string>Not full</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="cBoxWithPlayers">
+           <property name="text">
+            <string>With players</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QToolBar" name="toolBar">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <property name="movable">
+    <bool>false</bool>
+   </property>
+   <property name="floatable">
+    <bool>false</bool>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionPlay"/>
+   <addaction name="separator"/>
+   <addaction name="actionAdd"/>
+   <addaction name="actionAdd_by_IP"/>
+   <addaction name="actionDelete"/>
+   <addaction name="separator"/>
+   <addaction name="actionRefresh"/>
+  </widget>
+  <action name="actionAdd">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Add</string>
+   </property>
+  </action>
+  <action name="actionDelete">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Delete</string>
+   </property>
+  </action>
+  <action name="actionRefresh">
+   <property name="text">
+    <string>Refresh</string>
+   </property>
+  </action>
+  <action name="actionPlay">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Play</string>
+   </property>
+  </action>
+  <action name="actionAdd_by_IP">
+   <property name="text">
+    <string>Add by address</string>
+   </property>
+  </action>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/files/tes3mp/ui/ServerInfo.ui b/files/tes3mp/ui/ServerInfo.ui
new file mode 100644
index 000000000..3ecae318b
--- /dev/null
+++ b/files/tes3mp/ui/ServerInfo.ui
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>430</width>
+    <height>447</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Connect</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Server Name:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="lblName">
+       <property name="text">
+        <string notr="true">TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>Address:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="leAddr">
+       <property name="text">
+        <string notr="true"/>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>Players:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="lblPlayers">
+       <property name="text">
+        <string notr="true">0 / 0</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_5">
+     <item>
+      <widget class="QLabel" name="label_8">
+       <property name="text">
+        <string>Ping:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="lblPing">
+       <property name="text">
+        <string notr="true">-1</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Players:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QListWidget" name="listPlayers">
+     <property name="selectionMode">
+      <enum>QAbstractItemView::NoSelection</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Plugins:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QListWidget" name="listPlugins">
+     <property name="selectionMode">
+      <enum>QAbstractItemView::NoSelection</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="btnCancel">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+       <property name="default">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="btnRefresh">
+       <property name="text">
+        <string>Refresh</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="btnConnect">
+       <property name="text">
+        <string>Connect</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>btnCancel</sender>
+   <signal>clicked()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>489</x>
+     <y>524</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>316</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>btnConnect</sender>
+   <signal>clicked()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>580</x>
+     <y>524</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>316</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/plugins/mygui_resource_plugin/CMakeLists.txt b/plugins/mygui_resource_plugin/CMakeLists.txt
index 72965c917..be834b17d 100644
--- a/plugins/mygui_resource_plugin/CMakeLists.txt
+++ b/plugins/mygui_resource_plugin/CMakeLists.txt
@@ -27,6 +27,5 @@ set_target_properties(${MYGUI_RESOURCE_PLUGIN_LIBRARY} PROPERTIES PREFIX "")
 
 target_link_libraries(${MYGUI_RESOURCE_PLUGIN_LIBRARY}
     ${OGRE_LIBRARIES}
-    ${MYGUI_LIBRARIES}
     components
 )
diff --git a/tes3mp-changelog.md b/tes3mp-changelog.md
new file mode 100644
index 000000000..9f1027df0
--- /dev/null
+++ b/tes3mp-changelog.md
@@ -0,0 +1,70 @@
+0.5.1
+-----
+
+* Fixes to server crashes caused by incorrect cell comparison added by bandwidth optimization changes
+* Fixes to server browser freezes caused by connection failures and incomplete data received from master server
+
+0.5.0
+-----
+
+* Server browser
+* Synchronization of containers
+* Reworked world packets allowing for the saving and loading of world state, including container state
+* Bandwidth optimization by forwarding the most frequent player packets only to other players in the same loaded cells
+
+0.4.1
+-----
+
+* Packet for saving and loading spellbooks
+
+0.4.0
+-----
+
+* Synchronization of spells
+* Packet for saving and loading inventories
+* Being in a menu no longer prevents you from sending packets about your client
+* Fixes to freezes and problems caused by players moving around in cells from expansions/plugins that are not loaded by others
+
+0.3.0
+-----
+
+* Synchronization of world object removal, placement, scaling, locking and unlocking
+* Synchronization of local, global and member script variables for specific scripts
+* Synchronization for the setdelete, placeat, setscale, lock and unlock console commands
+* Player markers on minimap
+* Death reasons in chat
+* Fixes to client freezes related to players logging in at the same time
+* Fixes to server crashes related to sending information about invalid players
+
+0.2.0
+-----
+
+* Packets for saving and loading classes, birthsigns, dynamic stats, levels, level progress, attribute bonuses from skill increases and progress towards skill increases
+* Version checking to prevent mismatches between clients and servers
+
+0.0.1b
+------
+
+* Synchronization of attributes and skills
+* Fixes to memory leaks related to player initialization on Windows servers
+* Fixes to various graphical glitches
+* Main menu buttons for starting, saving and loading games are now disabled
+
+0.0.1a
+------
+
+* Combat animation
+* Synchronization of melee and ranged (bow, crossbow, throwable weapons) combat
+* Synchronization of health, magicka, fatigue and death
+* Synchronization of cell changes
+* Server-side Lua scripting
+* Chat
+
+0.0.1
+-----
+
+* Initial networking and packet architecture
+* Synchronization of player character generation
+* Synchronization of player position
+* Synchronization of player attack states (unarmed, armed with a weapon, using a spell)
+* Synchronization of movement and jump animations
diff --git a/tes3mp-credits.md b/tes3mp-credits.md
new file mode 100644
index 000000000..a64de238a
--- /dev/null
+++ b/tes3mp-credits.md
@@ -0,0 +1,49 @@
+tes3mp Credits
+==============
+
+Programmers
+-----------
+
+    Stanislav Zhukov (Koncord) - Overall architecture, networking & scripting systems, player sync, server browser
+    David Cernat - World sync & state saving/loading, player state saving/loading, general bug fixes
+    Battlerax - Various fixes
+
+
+Script developers
+-----------------
+
+    Grim Kriegor - Teleportation commands, various early script fixes
+
+
+Testers
+-------
+
+    Volk Milit (Ja'Virr-Dar) - Team manager, Debian Linux
+    Shnatsel - Debian Linux
+    Goodevil - Mint and Xubuntu Linux
+
+
+Public Relations and Translations
+---------------------------------
+
+    Volk Milit (Ja'Virr-Dar) - Public relations & news writer
+    Shnatsel - Translator & news writer
+
+
+Art
+---
+
+    Texafornian - tes3mp logo
+
+
+Special thanks
+--------------
+
+    Camul
+    iGrebla
+    Luc Keating
+    Norc
+    Rhiyo
+
+
+Thanks to the developers of OpenMW. They do amazing things.