WIP filename/filehandle handling