16 Commits (refactor-terminal)