Reorganize commands
Add some queue control, ifs, etc.
add stop and run commands