Did some more work on commands