Making progress on terminal