Enabled reloading watcher, added TODO