Added new modules

Hope it'll work and we don't have to start everyting over....