Work on commands and OI