Merging Victor's changes to Library Import using the new Mirror classes.These are currently flagged off as they have yet to be tested. We will be using these Mirror classes consistently from here on and will fix defects along the way