#40 #44 #32 - Rework the LocalModule