Terminal return

Already includes changes from my previous PR