Move some array based stuff