Mercury Editor Integration

Fixed bugs in staging