watcher and dev mostly done