Bring the code up to a stage where it all imports correctly