Work on commands a bit