Add advanced command-line usage initial support.
More advanced testing - very initial version.