Upload/Extracting working, further effort required on import consistency checking - #16