Merging in code from OOBBs branch. NAB is now an actual engine.