WIP - array types too