Refactor, added command line arguments to variables list.
New tasks.