Integration

Pulling current integration into master as a new baseline.