Added ability to set options on the command line, need to clean up later