Level Work

Added Barriers to Levels.
Merge Fixes

Fixed