Started working on array handling