Added World
Wrapped World instead of Terminal in main