add a TODO pull this into some MatrixJoiner like we did in the original API. It came up twice already.