Add logging and File Checks