Lots of additions, more commands.