Vid 1383

Don't merge just yet, still have to figure out why the last couple assertions are failing. 
Doesn't look like this import ever gets used ( so says my actually working IDE :) ).