Open / Close now handled, additional code to ensure CSV, XLS and XLSX are all handled correctly