CLI option and basic commands now work