More work on making each of the modules indipendant