Starting to refactor to combine Get and Import functions