Add reshape.
Add more data munging.