I don't think this array wrapping should stay.