I'm adding better command parsing.