Finally get commands working