Addressed a few TODOs in the backfill chunk code. But still needs rewrite in one part.