[MODULES] NEED A DECENT TEST -  DONE ! :)