Added hacky terminal support