Added file iteration and more