First take at list commands
Fix test