Importing is all working, just need a couple tweaks for dates