Logging data added
95% - file resolution outstanding
logging final