Get terminal working with new structure