starting to add module support