redid it all, added array