Track controller refactor