- Big refactor in terminal related code.