FileHandling refactored to keep data, name, and type of file. Needs more work and edgcase specs