Queue refactor

Addresses issue #232.
There should not be any max_execition_limit at the CLI. You think this can be removed?