Integration

Merge changes ready for beta review