Added two modules and a loading mechanic.
Fine tuned modules