Closer to Production

Many changes, cleaning up and making robust. Still need to finish the
check against ModifiedDate of imported csv