Started adding new file logic