Did some work on folder iteration, more work needed