Latest progress on the New Track build

Working on the 3rd straight