error
Revert "error"

This reverts commit 8a33a4ce4571e5b3bf23048e51b1181eca67dd8c.
fao
final commit with watcher thread and network support