Removed typedef; everything struct vector