WIP submission for array support.