Rebuilding Fortress.  Everything is sort of imbetween old and new right now.
Merge pull request #1 from silentorb/master

ReSync with original