Mostly working on tracking files already loaded