Added ability to run from the console