conversion largely complete. haddock and imports need love still.