Added some functionality to the quick-run tool