Finally have the untracked files issue resolved