Add ToDo in main for handling args better