Refactoring of import nearly done
Sums handled now on import