Wip branch allow concats of extra data