getting close to XTF integration
almost ready to deploy to XTF