Phase 1 integration

Compiles, about to integrate xaml