Wip/more commands

Here are some more.