16 Commits (feat/cli-stacking)