Added some array stuff that doesn't quite work yet...