Add more command possibilities (regexes are awesome)