added alpha version of entity watcher