Added initial versions of command line support.