More fleshed out CLI