will also probably need to update travis.yml for this -- and guard the imports as requested.