Change from terminal selector away from Maybe