Finalise import

Do we need to create instances here, or can `switch` just be a static method?