Much nicer array building now