Divide commands up more logically.