Added a few Modules, slightly changed how moduoes are loaded