Partial work on concat rework