Expanded TODOs for local fs; running validation on S3 and Layout structures.