More work on setting up files