Adsding new file.
Separated parsing from mapping; removed the parsing/mapping test outside the loop.