Make importing supa fast

Other things go here....