Moved terminal outputs into listings