Not importing matplotlib until needed

Slightly more testing