Added basic CLI handling.