Work on the modules, clean up