First pass at setting up import/initial import
Some cleanup; some comments for cleanup TODO