Trying to handle ImportErrors - Issue #5

Still a lot to do but here are some tests