Folders follow up

Initial follow-up, still some pending
Do we need `_start` and `_failedContent` here? They seem to be remainders of when this was a recursive function