Latest progress on the New Track build

cleaning up after another busy night