Modules are all f'd up. Trying to fix.