Fixed array addressing problem, now have to get array typing right