User check should only be in cli.py, not here