1st stage Array changeover

Will most likely wind up moving everything to one large nested array for
performance, but this is a start