Make file tree work
Merge branch 'gareth/FileTreeBranch'