refactor(command_list): Refactored out map data function and now map data as looping through the file
merge to master