wip
killing watcher
refactoring
name changing