Merging Unified

This represents a major migration towards 'unified'-style lua scripts.