WIP on import rework
More docker scripts