More work on modules.