new module , complete reworking it's much simpler now . still need to remove obsolete modules