Get initial import working