Working towards file handling working once again

Slowly but surely...