More refactoring
track switching working again