Modules

Make macro modules that are expanded inline