TODO idea on TAP backfill