File list is now its own thing
File doesn't exist yet
Derp
Merge branch 'master' into highlighter