massive progress on module loader