Beginning of shell integration
Before demo