Feature/actually fix cli