Worked out a slightly better table strategy. Making indexes a separate step