add module watcher via extend
slight refactor for naming
finished!!