Work on module support, start template support