Add command line arguments. Fetch tokens. Add some comments