More work on getting module and import data.