bit more progress, mostly on the modules